Commit Graph

768 Commits

Author SHA1 Message Date
ebayShopper
87abb204e9 Prevent drop melee weapon dupe
Also simplified player_addToolbelt by removing unnecessary code.

See: https://github.com/EpochModTeam/DayZ-Epoch/pull/1916
2017-03-25 16:27:58 -04:00
ebayShopper
8b3f28dc0c Update player_sharpen.sqf
Fixes extra knife being deleted if player already had a fully sharpened
knife on their toolbelt (duplicate weapon).

Vanilla commit:

0332fcbe71
2017-03-20 18:18:04 -04:00
ebayShopper
da3b345921 Update push plane conditions
Vanilla commit:

23f6ffab90
2017-03-20 17:44:46 -04:00
ebayShopper
e38f47375c Fix some issues with traps
Removed two unused files.

Vanilla commits:

42e72463a3

02726fb192

6a7c53ebcf

1fb6308995

9543ea057f
2017-03-20 15:53:35 -04:00
ebayShopper
100f9f5da8 Fix unable to chop down POI trees
Vanilla commit:

0bc12e21b0
2017-03-20 14:58:49 -04:00
ebayShopper
3d8814bc33 Update vanilla building
Vanilla commit:

5604a8820b
2017-03-19 16:59:41 -04:00
ebayShopper
9190f303f9 Replace max blood constant of 12000 to r_player_bloodTotal
Vanilla commit:

78b608c854
2017-03-05 09:59:11 -05:00
ebayShopper
122d9e16f7 Update player_packTent again 2017-02-26 16:43:33 -05:00
ebayShopper
62312a85c7 Add message for already wearing clothes
Because it isn't always obvious.
2017-02-26 15:31:59 -05:00
oiad
ea94ec4e8b Extend DZE_GodModeBase to built items (#1898)
This now makes buildables properly apply godmode instead of having to
wait till restart for:

* Being built
* Being upgraded
* Being downgraded
master
2017-02-26 13:50:11 -05:00
ebayShopper
d12fda5e21 Add a few missing playerIsNear checks
Blocks duping method reported by Sercan and confirmed with @oiad .
Thanks
2017-02-25 17:29:27 -05:00
ebayShopper
e8b328ff9c Fix remote vehicle lock and unlock actions refresh
Thanks @oiad
2017-02-24 19:55:24 -05:00
ebayShopper
d416ae80ab Move study body back to fn_selfActions
Adding UserActions to players (CAManBase) is not efficient, because the
condition evaluates onEachFrame when you are "inside" that vehicle type.
Also admins usually want to add more custom actions to dead bodies
anyway.
https://community.bistudio.com/wiki/addAction#Syntax

This partially reverts 3aad4b6.
2017-02-21 15:12:41 -05:00
ebayShopper
74ce95d4b1 Comment unused vanilla PVEHs
Vanilla commit:

69002014b2
2017-02-20 13:28:19 -05:00
ebayShopper
9e0c251baf Update vanilla building again
Vanilla commits:

ddcc7c7349

e4144e561f
2017-02-19 18:44:47 -05:00
ebayShopper
e2742ed18a Fix add melee to full toolbelt eating weapon
Melee weapons were eaten when trying to add them to a full toolbelt
because BIS_fnc_invAdd failed.
2017-02-13 16:21:08 -05:00
ebaydayz
59b1d1ea60 Update vanilla building
Vanilla commits:

8fdd0e915a

6afd0bc103
2017-02-02 15:28:39 -05:00
ebaydayz
6aa5c9b64f Add setting to disable base takeover #1886
No classes inherit from Generator_DZ, so there is no need to use
isKindOf over typeOf.
2017-02-01 12:16:16 -05:00
ebaydayz
9f7ae93bef Add permanent plot check to player_sleep 2017-01-31 16:15:27 -05:00
ebaydayz
9afb74ff26 Remove plot take ownership feature #1811
See #1811
2017-01-31 15:22:23 -05:00
ebaydayz
05f1cf9fe0 Use nearObjects instead of nearestObjects for spawn check #1816
Lowered spawn check radius for loot and zombies to the same as 1051.
(200m)
2017-01-30 15:45:14 -05:00
ebaydayz
8c1caa9c1c Remove some redundant checks
Vanilla commits:

da7061429a

da55eaa53e
2017-01-29 19:36:48 -05:00
ebaydayz
c7b71f93f0 Remove fn_upgradeActions
Vanilla commit:

02bc22f325
2017-01-26 21:19:17 -05:00
ebaydayz
ff6463473f Update vanilla building
Vanilla commits:

2ee56936be

8497b42d3f

eb234f8b06
2017-01-22 14:41:53 -05:00
ebaydayz
93cf3b22d3 Add missing fuel station for sahrani 2017-01-22 12:58:17 -05:00
icomrade
490fb90303 Disallow salvage in DZE_SafeZonePosArray locations
by request of JohnnyBravo666 on the epoch forums
2017-01-18 16:43:23 -05:00
ebaydayz
92ee58900c Fix trader menu server RPT logs partially localized on client 2017-01-17 14:39:31 -05:00
ebaydayz
13aaaa5b9a Remove NV cooldown for player zombies #1876 2017-01-16 19:03:49 -05:00
ebaydayz
198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
oiad
fd0b81118b Move dze_supplyCrate and vein wrecks to CfgLoot (#1863)
* Move dze_supplyCrate and vein wrecks to CfgLoot

Moves both the supply crates and vein wrecks to the CfgLoot tables so
admins can customize.
Also modifies the main add item statement to allow support for weapons,
magazines and backpack refunding/spawning instead of hard coded
magazines.

Should be backwards compatible with the old style (I did test).

* Remove unused _activatingPlayer variable

* Rework
2017-01-14 19:40:54 -05:00
icomrade
798a994b02 Should fix full cinder vector #1846 2017-01-14 17:55:56 -05:00
ebaydayz
0d2f91f3aa Fix trader menu server RPT log partially localized on client 2017-01-11 16:12:17 -05:00
ebaydayz
f25f5e96a6 Fix light fire and build fireplace over water #1866
Fixes #1866
2017-01-11 15:25:29 -05:00
ebaydayz
9d28504ecf Remove comment in player_wearClothes.sqf
Vanilla commit:

72b37dc108
2017-01-09 17:22:41 -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
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
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
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
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
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