Commit Graph

792 Commits

Author SHA1 Message Date
ebayShopper 635e1e5483 Use alive for gut zombie check #1957
Closes #1957
2017-07-08 15:40:06 -04:00
ebayShopper 75ba14a68d Fix stringtable typo 2017-06-11 17:52:59 -04:00
ebayShopper e0d271671a Remove unused crafting recipes
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/809de6a0a3a968f23b9ef35cc0f051de705094a4

https://github.com/DayZMod/DayZ/commit/93c128085a066932c4070a8070e786ddd5a5401f
2017-06-10 13:06:16 -04:00
ebayShopper abdb3e0e42 Fix survival time not counted after clothes change
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/cf4fde633539a6980f3ca4297cd37c558d4fca03

https://github.com/DayZMod/DayZ/commit/74dd04616f81f580057927bad37be98156a7b123
2017-06-10 10:07:19 -04:00
ebayShopper 48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
https://github.com/DayZMod/DayZ/commit/f99a3deced4f4314c4b9a26c1c822e5c5d7f90eb
https://github.com/DayZMod/DayZ/commit/731b957e8e1c3f1bb08474fb397af6165e48a8df

Removed
two unused files and a few variables made redundant by actionInProgress
2017-06-06 15:25:14 -04:00
ebayShopper 78c4ebd597 Add hidden gear display for force saves
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/a4f8690404514431246d99f351aa2d9f459f65a5

https://github.com/DayZMod/DayZ/commit/9170e0f8a0c602efb44a1b419e38ea3eb0dd7f95
2017-04-17 17:04:17 -04:00
oiad 2f0774d531 Forbid removing the plot/door owner from objects (#1948)
This makes it so only the door or plot owner can remove them selves from
doors/plots or the UIDS in
DZE_PlotManagementAdmins/DZE_DoorManagementAdmins.
2017-04-17 13:52:36 -04:00
ebayShopper 78fbd7ac53 Remove some unnecessary translations
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
2017-04-15 14:19:26 -04:00
ebayShopper e99792d0f4 Update jerry_fill.sqf
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ef236938c1531e9d7ba8865fdd09bdf006adc979
2017-04-14 11:26:23 -04:00
ebayShopper 9fc72a8b87 Change dayz_survived to actual play time
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/18eaecb19fc1ea26f5769fccd920824bf843e19b

https://github.com/DayZMod/DayZ/commit/b76b1200cabac8661a0628489a128a561f1f379c

https://github.com/DayZMod/DayZ/commit/78ea61e3345e197e9350910b5808d85ef56f7f11

https://github.com/DayZMod/DayZ/commit/8309427f0dc3f7e5a6acd1d5ec1d155cbe11aec5

Should be ready for Hive update @icomrade . If you upload it to a test
folder I'll test it.
2017-04-13 18:35:28 -04:00
ebayShopper 267f34572e Update object_upgradeStorage.sqf
Vanilla commit: 6e4a697
2017-04-13 14:38:07 -04:00
oiad bf6a980d4c Dont show you have the item if it's not nearby (#1937)
* Dont show you have the item if it's not nearby

This was showing you had a vehicle in the trader menu even if it was
over the other side of the map, I think this works better only showing
it if it's within the trader zone.

* Forgot missing operator
2017-04-10 20:03:37 -04:00
ebayShopper 75cf8648d7 Fix error from 95ab6a2 2017-04-05 15:59:15 -04:00
ebayShopper 4b14397c7b Fix purchased boat not spawning on helipad
https://epochmod.com/forum/topic/43644-problem-with-napf-boat-spawn-in-1061/
2017-04-05 15:49:16 -04:00
ebayShopper 95ab6a28ab Fix unable to sell _DZE1-4 cars when base is removed from trader
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/
2017-04-05 12:04:00 -04:00
ebayShopper b70555e664 Delete added trees after chopping down
Like 496681c, if a tree or plant was added with createVehicle it can be
deleted with deleteVehicle.
2017-04-04 13:55:43 -04:00
ebayShopper 496681cd9b Add support for harvesting added plants
Closes #1928
2017-04-04 13:32:06 -04:00
oiad 088945e074 Remove public variable event handler when using config traders. (#1930)
* Remove public variable event handler when using config traders.

This stops the public variable event handler from being loaded when
you're using config based traders, it's not needed in this situation

* Change nearestObjects to nearEntities in z_checkCloseVehicle.sqf

* Fixes vehicle selling not able to sell correctly

If more than 1 vehicle of the same classname was in a trader and the
local vehicle was further away it would not be able to be sold till
moved closer. We are using DZE_myVehicle for everything and we do
previous checks to make sure it's not null and local so we can assume it
is okay to use.

Fixes
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/#comment-290036
2017-04-01 13:02:51 -04:00
ebayShopper 6717b0c26e Remove client side disable sim on DZE_GodModeBase objects
Continuation of d7a3b30
This partially reverts ea94ec4.

Epoch has never disabled simulation client side on any buildables prior
to ea94ec4. We now know it disables storage capability, may disable
lighting the object with scripted light sources and potentially cause
other issues.
https://community.bistudio.com/wiki/enableSimulation

If we readd this in the future it should be well tested. It should also
be done properly in the vehicle init field, so it takes affect on all
clients, including JIP, instead of only the player building it (until
they relog).
2017-03-31 16:15:07 -04:00
ebayShopper 746b921321 Use nearEntities for plot pole searches
Also made 73899d5 compatible with DZE_permanentPlot = false; at the
request of @oiad
2017-03-29 16:04:48 -04:00
ebayShopper 30d961931f Fix unable to sell classic 'ItemBloodbag' at traders
Mistake from 4fa36df
2017-03-29 12:22:31 -04:00
icomrade 35556adbfb Merge pull request #1918 from oiad/master
Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
2017-03-28 08:53:14 -07:00
oiad d7a3b30753 Fix for unable to access shed/geared objects until you relog.
https://epochmod.com/forum/topic/43482-storage-sheds-issue/
2017-03-28 19:25:14 +13:00
F507DMT 04d1622bc9 Update fill_nearestVehicle.sqf (#1923)
() - condition
{} - code execution, heavier code
2017-03-26 13:27:26 -04:00
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:

https://github.com/DayZMod/DayZ/commit/0332fcbe711b657723704fc9a4d5fd8f66f52b77
2017-03-20 18:18:04 -04:00
ebayShopper da3b345921 Update push plane conditions
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/23f6ffab90a5d313e8451ac1c2db195adfbf5658
2017-03-20 17:44:46 -04:00
ebayShopper e38f47375c Fix some issues with traps
Removed two unused files.

Vanilla commits:

https://github.com/DayZMod/DayZ/commit/42e72463a3f3722ad974d50a093b4f57edbf8c00

https://github.com/DayZMod/DayZ/commit/02726fb1923a7354121796a0e306a8ca92cdc42f

https://github.com/DayZMod/DayZ/commit/6a7c53ebcf48f6e552bf4d5bb65be07792a0cd92

https://github.com/DayZMod/DayZ/commit/1fb6308995584472b0494a54d211dc5b216bfd98

https://github.com/DayZMod/DayZ/commit/9543ea057f97ba6f1105f6abecaa04e1fe5d4457
2017-03-20 15:53:35 -04:00
ebayShopper 100f9f5da8 Fix unable to chop down POI trees
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/0bc12e21b0b6c103f6c7631310788e14ec96b8d8
2017-03-20 14:58:49 -04:00
ebayShopper 3d8814bc33 Update vanilla building
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/5604a8820bb2d1f6ae3459a92fbefa6cc93fe3c0
2017-03-19 16:59:41 -04:00
ebayShopper 9190f303f9 Replace max blood constant of 12000 to r_player_bloodTotal
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/78b608c854b90640ca1d46ae6c2708b525bc55e0
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:

https://github.com/DayZMod/DayZ/commit/69002014b230b5b2b14df2d813248724b2c93fd3
2017-02-20 13:28:19 -05:00
ebayShopper 9e0c251baf Update vanilla building again
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/ddcc7c7349c9a17b6c2abe46bb1518c1a2f32727

https://github.com/DayZMod/DayZ/commit/e4144e561f50e4b50f0ec5a9c1203233c66b0f27
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:

https://github.com/DayZMod/DayZ/commit/8fdd0e915a2386eef35d6f1d5d9c81b3d640646c

https://github.com/DayZMod/DayZ/commit/6afd0bc103b7462e83ea4d94c240a6fb23cb2a59
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:

https://github.com/DayZMod/DayZ/commit/da7061429a8cda4d31f95bcfdf564e4b255bbcfb

https://github.com/DayZMod/DayZ/commit/da55eaa53e2a9bda3a30733785b2e0f5b540bb53
2017-01-29 19:36:48 -05:00
ebaydayz c7b71f93f0 Remove fn_upgradeActions
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/02bc22f325ff57c16b25c20b5de6ecb81d29d86c
2017-01-26 21:19:17 -05:00
ebaydayz ff6463473f Update vanilla building
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/2ee56936bec09fbc1fe4bc37f8b0fe0a7894348c

https://github.com/DayZMod/DayZ/commit/8497b42d3f9e406f84cc9a3bd5cf13744108d30a

https://github.com/DayZMod/DayZ/commit/eb234f8b0685ea331ebacf949ff6147ac2bdfdc4
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