Commit Graph

5010 Commits

Author SHA1 Message Date
ebaydayz
d124a5d2f7 Make switch weapon interrupt autorun
Fixes #1850
2017-01-02 14:41:53 -05:00
ebaydayz
d5a3cdb2e3 Remove antiwall glitch blocks for vanilla hospitals 2017-01-02 13:36:59 -05:00
icomrade
62b7c2194b Lazily implement nutrition configuration
also tweak the working values for chopping wood
2017-01-01 20:24:48 -05:00
ebaydayz
5cb485ccfb Prevent purchasing negative number of items
Fixes mistake from ffef031 @icomrade . _amount here is the quantity the
player enters in the quantity box when buying. The only time it is less
than or equal to zero is if the player enters zero or a negative number.
It has nothing to do with the buy or sell price.

Thanks Sercan for reporting.
2017-01-01 18:32:20 -05:00
ebaydayz
e4aeee37fd Use waterHoleProxy in drink water and fill water #1835
The slow searches are needed on other maps until waterHoleProxy objects
are added for them. They need to be added at every pond and
non-"Land_pumpa" well. Right now Chernarus is the only map that has them
placed.

Fixes #1835
Fixes #1841
2017-01-01 16:55:00 -05:00
ebaydayz
30f1827509 Prevent 'name' error when player is killed while logging in
Prevents WARNING: Function 'name' - x is dead when player is killed
while logging in.
2016-12-31 18:20:49 -05:00
ebaydayz
0b27653833 Add config variable DZE_ServerLogHits 2016-12-31 17:37:34 -05:00
ebaydayz
4fa36dfd94 Fix selling of Javelin, Stinger and some other items
Fixes #1844
2016-12-31 17:14:16 -05:00
Kobayashi
79bbc2c5a4 Backwards array call to Z_checkArrayInConfig (#1845)
Z_checkArrayInConfig is expecting weapons in position 0 for _this, all other stuff like get z_at_getGearItems.sqf and z_at_getVehicleItems.sqf passes the weapons array in position 0.
2016-12-31 16:03:16 -05:00
ebaydayz
7ce4ba32a2 Add shadow to dayz_rollingMessages 2016-12-30 16:40:10 -05:00
ebaydayz
d4b286660f Fix base objects duplicating when using plot take ownership #1811
Fixes #1811
2016-12-30 16:29:34 -05:00
icomrade
2d595118c3 Building upgrades from backpack 2016-12-30 16:16:51 -05:00
ebaydayz
e33519ffd4 Readd changes from #1836
I accidentally removed these when resolving merge conflicts with 854c41c
.
2016-12-30 14:16:18 -05:00
ebaydayz
05e7a41c0e Update change log 2016-12-30 13:50:21 -05:00
ebaydayz
76e80a9388 Merge remote-tracking branch 'origin/master' 2016-12-29 21:06:54 -05:00
ebaydayz
101a6fc698 Fix wrong eventhandlers on viral zeds #1819 2016-12-29 20:53:35 -05:00
oiad
854c41cf8c switchModel, jerry_fill, packTent changes/fixes (#1836)
* switchModel, jerry_fill, water_fill, drinkWater, packTent changes/fixes

player_packTent: Add private array since there was none. Make it match
player_packVault so a player can't pack the tent with others near (to
stop duping)

water_fill:
Fixed the massive lag issue with the check for ponds etc, Originally was
being done searching for all which is quite intensive, now only
searching for waterholeproxy which matches all the water holes on
chernarus I could try.
Fixed a few localizations. Thanks @schwanzkopfhegel

player_drinkWater: Same as above. Also removed a lot of unused private
variables.

jerry_fill:
Made the minimum fill level of fuel tanks 10% of
dayz_randomMaxFuelAmount so the tank will always have fuel
Fixed issue with ItemFuelBarrel only using 40 litres from a tank.
Thanks @schwanzkopfhegel
Display how much fuel was needed if the tank is empty
Fix issue if the tank was empty that dayz_actionInProgress was not reset

player_switchModel:
Fixed issue of coins dissapearing on gear change
Fixed old commented out code that was broken so now you will go back
into the camera view you were in before you changed clothes

* Revert drinkWater/water_fill changes

My previous commit can only be used on chernarus since it's the only map
that has the waterholeproxy we rely on.

* crafting localization fix

* Update german translations

* Rework

* Missed private variable

* Rework again

* Update german string
2016-12-29 19:47:04 -05:00
icomrade
b355ae6a61 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-12-29 15:51:06 -05:00
icomrade
c64c181f95 Handle boiled waterbottles < 10oz
should fix #1838 Translation fixes are probably necessary
2016-12-29 15:50:53 -05:00
A Man
c5ac6e458b Changing Fire Barrel output (#1843)
The fire barrel output should be a fire barrel not a empty fuel barrel.
2016-12-29 15:50:29 -05:00
ebaydayz
3176e1619d Set POI and infectiousWaterHoles off by default 2016-12-28 17:33:03 -05:00
ebaydayz
d509c15c82 Split player_death into scheduled and unscheduled #1833
Death message was sometimes showing incorrectly due to spawn delay.

Also the sched_corpses two minute loop was occasionally deleting bodies
right away because bodyName setVariable was delayed by the time it took
PVDZ_plr_death to send (up to a few seconds). See #1825
2016-12-28 16:16:46 -05:00
icomrade
b807648cc6 Fix #1831 generator inventory not saving 2016-12-28 16:00:56 -05:00
icomrade
fc9b01e91c Add HiveExt.ini config variable MaintenanceObjects
see bc67e02a223d0d2b9e9688cb5a2ce047edb60e1d for hiveExt changes
2016-12-28 13:08:21 -05:00
ebaydayz
0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -05:00
A Man
3151c0df84 Update player_craftItem.sqf (#1830)
Adding the ability to craft with all Dayz_Ignators when dayz_matchboxCount = true; For example crafting a Firebarrel
2016-12-26 14:11:22 -05:00
ebaydayz
64f6a9daa3 Exit vanilla craft item when action is in progress
Fixes #1826
2016-12-25 20:01:55 -05:00
ebaydayz
b962bd50b9 Use faster switch in repair and salvage
7496ef5d5c (commitcomment-20292237)
2016-12-25 17:51:32 -05:00
ebaydayz
1d0a1bf9a2 Add comment about disabling GemWorthArray 2016-12-25 17:29:53 -05:00
oiad
75243933b4 Move more debug lines to #ifdef (#1829)
* Move more debug lines to #ifdef

Tidys up server RPT

Also make the combination rolling text overwrite the previous build
spam.

* Make additional changes
2016-12-25 17:20:30 -05:00
ebaydayz
7496ef5d5c Fix undefined color error in repair_vehicle.sqf
Same color error as f92b751 .

Also same issue in salvage_vehicle.sqf as described in #1828

Added setVariable exceptions for tank hit points.
2016-12-24 20:17:08 -05:00
Kobayashi
811e06ffe2 Detection of part doesn't work (#1828)
For tanks and other vehicles not explicitly defined in configs, _part will return with "" using gettext(), evaluating if it is nil doesn't do anything. With this change it will properly allow for repairing tracks on tanks with scrap metal.
2016-12-24 19:27:25 -05:00
ebaydayz
7e341739ee Readd hive shutdown code from 1051 #1822
Fixes hive connection error when child 302 call fails.
2016-12-24 18:09:01 -05:00
ebaydayz
d694130fdc Remove a duplicate localization 2016-12-23 15:37:42 -05:00
ebaydayz
6f0c70989b Remove unnecessary check in player_spawn_2
This doesn't run on the server.
2016-12-23 14:59:55 -05:00
ebaydayz
bf00c3f8bb Correct comment from 4d3f707 again 2016-12-22 22:20:47 -05:00
ebaydayz
0ffbdde2e8 Correct comment from 4d3f707 2016-12-22 22:17:27 -05:00
ebaydayz
4d3f707417 Stop autoRun and remove drink from hands at ponds #1827
Fixes #1827
2016-12-22 21:52:22 -05:00
ebaydayz
f1b991acd2 Add M4SPR_DZE which spawns with 30Rnd Stanag default 2016-12-22 15:42:00 -05:00
oiad
9889c8cd76 Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg (#1824)
* server_updateObject force update for single currency

This modifies server_updateObject to force update/save to the hive if
the item being saved is in the DZE_MoneyStorageClasses array.

Previously if you force saved the object multiple times, the coins would
not get updated until the inventory changed, which if this was for a
bank object it would never update.

(This applies if you are using PVDZ_veh_Save to save the object)

* z_at_calcDefaultCurrencyNoImg prettyfication

This fixes a long standing issue in my brain about how this text was
always displayed, to me it seemed very untidy and just thrown together
(since I borrowed it from the IMG version)

Changes the output from this example: 7 Ruby 1 Amethyst 3 Gold 4 10oz
Silver 5 Silver
To this prettier and more logical example: 7 Ruby, 1 Amethyst, 3 Gold, 4
10oz Silver and 5 Silver

Make texts great again!

* z_at_logtrade fixes

Removes hard coded "Coins" text and replaces it with configVariables
version.

Also removes duplicate code and simplifies it.

* Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg

This merges these two files together since they are largely the same,
this also adds an optional argument to change the font size which is
useful for custom scripts that use this function.

Examples of use:

[_number,true] call z_calcCurrency; // Return a string of text with no
images
[_number,false] call z_calcCurrency; // Return a string of text with
images
[_number,false,0.7] call z_calcCurrency; // Return a string of text with
the currency in it and sets the font size to 0.7
2016-12-22 14:16:38 -05:00
ebaydayz
5b7b1d69bd Add HALO spawn height config var
Height can be changed without overwriting player_monitor.fsm now.

Also
fixed my mistake from 3257d0f, need to HALO directly from debug pos for
antiTP compatibility.
2016-12-13 19:50:22 -05:00
oiad
ce75f87e1d server_updateObject force update for single currency (#1821)
This modifies server_updateObject to force update/save to the hive if
the item being saved is in the DZE_MoneyStorageClasses array.

Previously if you force saved the object multiple times, the coins would
not get updated until the inventory changed, which if this was for a
bank object it would never update.

(This applies if you are using PVDZ_veh_Save to save the object)
2016-12-13 13:06:57 -05:00
ebaydayz
c9c31c1a32 Fix wrong bleeding icon on vanilla status UI
Now using the correct updated icon from vanilla. All other icons are up
to date.
2016-12-13 12:14:53 -05:00
ebaydayz
b62569932d Fix missing return variable in sched_antiTeleport
My mistake from 5058308
2016-12-12 16:22:43 -05:00
ebaydayz
b4c239729c Fix self actions duplicating when changing clothes and looking at a safe
This was also a bug in 1051. Thanks to Epoch forums user jOoPs for
reporting.
2016-12-12 15:23:31 -05:00
ebaydayz
bff2a3091d Remove two unused files
Vanilla commit:

64ea1eaa76
2016-12-11 15:25:57 -05:00
ebaydayz
3257d0fd88 Move HALO spawn below enableSimulation in player_monitor.fsm #1809
Fixes stuck floating in air on Napf when dayz_paraspawn = true; Should
also fix #1809.

Fixes #1809
2016-12-11 13:44:01 -05:00
ebaydayz
46355aed38 Add back missing Epoch player_antiWall call #1817 2016-12-10 21:20:04 -05:00
ebaydayz
2a1bd74eca Fix no damage from hitting ground after HALO if autoOpenChute=-1
My mistake when adding this.
2016-12-10 20:25:36 -05:00
ebaydayz
6ecdabc92d Fix swimming in ground glitch at certain spots on Napf 2016-12-10 16:36:51 -05:00