Commit Graph

5030 Commits

Author SHA1 Message Date
ebaydayz
e4d48cbf38 Revert pain effect to pre-1.8 version #1839
Same as 1051

Vanilla commit:

9b6d3dcd9c
2017-01-07 16:51:48 -05:00
ebaydayz
503206cad8 Update version numbers 2017-01-07 15:39:11 -05:00
ebaydayz
fa89487f22 Revert pain effect to original #1839 2017-01-07 14:09:52 -05:00
icomrade
0c4d77d2aa Fix running corpses 2017-01-07 11:39:18 -05:00
icomrade
70948ad0a2 Fix unconcious input lock #1860
due to disableUserInput being a POS
2017-01-07 11:25:57 -05:00
ebaydayz
80def55420 Show respawn from player zombie or broken legs as suicide 2017-01-06 19:30:05 -05:00
ebaydayz
ad556aa0cb Remove two hardcoded Chernarus checks
Vanilla commit:

c8455bb718
2017-01-06 17:58:13 -05:00
ebaydayz
58025f591f Fix certain buildables not removable #1859 2017-01-06 16:18:59 -05:00
ebaydayz
571e8d7b11 Add LightPole_DZ to DZE_isRemovable #1859 2017-01-06 15:53:38 -05:00
ebaydayz
33672d99ee Lower or remove nutrition hit for some actions #1857
Fixes #1857
2017-01-06 13:27:22 -05:00
ebaydayz
3a7744d18d Add back 1051 handling of RepairParts not listed in config 2017-01-06 12:36:08 -05:00
oiad
c5deead4fd Allow merlin_hc3 to be repaired properly (#1858)
The merlin has 20 windows + 2 side windows, glass 7 - 20 were showing up
as PartGeneric and breaking the repair script for some reason.

https://github.com/EpochModTeam/DayZ-Epoch/issues/1856#issue-199105821
2017-01-06 11:18:55 -05:00
ebaydayz
e074ef0d44 Fix rapid starvation and dehydration from chainsaw and chop wood
Chainsaw is never used in player_chopWood.sqf. It is only called via
right click on Hatchet which was removed anyway.

The player already takes a nutrition hit on every swing of the hatchet,
and it can take up to twelve swings to chop down one tree.
2017-01-05 19:38:03 -05:00
oiad
d0257b3c7d Add logging failed safe/lockbox and door lock/unlock/failed code attempts (#1853)
* Add logging failed safe/lockbox and door lock/unlock/failed code attempts

This adds logging for both safes and lockboxes for failed code attempts.

Also adds logging for locking, unlocking and failed code attempts for
doors.

"salival (playerUID) FAILED unlocking LockBox with code: Red11 (actual:
Red57) @110069 [11044.4,8438.32,0.652]"
"salival (playerUID) UNLOCKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) PACKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: EYESCAN (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: 100 (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"

* Revert wrong hinge type

* Remove unused DZE_Lock_Door

* Rework

* Remove redundant code, Make single currency costs use BIS_fnc_numberText

* Rework

* Add changelog line
2017-01-05 16:45:10 -05:00
ebaydayz
731175f46b Prevent abuse of combine M24 and 2RndShotGun ammo #1848
Prevents duping exploit described in #1848

Fixes #1848
2017-01-04 16:16:15 -05:00
ebaydayz
cfe01e609e Set RU crates cargo capacity back to normal 2017-01-04 12:43:04 -05:00
ebayShopper
e453c7ee0c Fix wrong classname DZ_ExplosivesBoxRU in loot table #1852 2017-01-04 12:20:56 -05:00
ebaydayz
8d7799d180 Update change log 2017-01-03 16:47:26 -05:00
oiad
6f072982c3 Add harder penalties for wrong combination on doors, More spelling mistakes. (#1847)
* More spelling mistakes

Further to commit:
0e938ba8f3

* Add harder penalties for wrong combination on doors

This adds a variable (DZE_doorManagementHarderPenalty) to make attempts
at code breaking doors harder. This will exponentially increment the
time between attempts or if you set it to false will make it 5 seconds
between attempts.

Unlike the original (that was useless TBH) this will actually lock out
the combo lock UI until the timer is set.

Will reset completely after 120 seconds.

* Add German translations

* Resolve merge conflict

* Resolve merge conflict
2017-01-03 16:39:05 -05:00
ebaydayz
0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -05:00
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