Commit Graph

679 Commits

Author SHA1 Message Date
oiad 1f1e96b8fe Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:25:31 +13:00
icomrade d750f576ed Prevent Zed + loot spawn in safezones
thanks BaroN for the idea
2017-09-13 12:45:00 -04:00
ebayShopper 7a68f9f70b Add some basic compatibility for Ruegen map 2017-07-30 16:28:37 -04:00
icomrade 8035df0ba0 Rudimentary auth for DeleteObj
limits distance to object, as well as validating random auth key.  added server_deleteObjDirect which is only for direct execution on the server, whereas server_deleteObj should be used for PVEH execution only
2017-07-29 21:09:20 -04:00
icomrade 73926b8785 prevent logout with d/c #1938
Should work to prevent the issue described in #1938 by disabling the abort option, causing the player to alt + F4 if they want to log out without reconnecting. which results in the gear pile/weaponholder from not being created.
2017-07-26 12:39:37 -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 72df07bdf2 Remove medic animation from lock and unlock safe
Closes #1942 in combination with 48858b2

The "packing" variable was made redundant by dayz_actionInProgress
because it was only set locally.

DisableUserInput is unnecessary now because server_handleSafeGear is
called unscheduled. Getting the cargo, creating the new safe and
deleting the old one should complete in the same frame with no window
for players to remove gear:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/compile/server_handleSafeGear.sqf#L51-L67

The "claimed" check is also no longer needed because
server_handleSafeGear is called unscheduled and exits if the object is
null, so two players attempting to unlock at the same time will not
work.
2017-06-06 18:53:44 -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 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 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 b3fdd26d3b Update fn_damageHandler.sqf
Continuation of 50ba58f

Also removed some unused variables
2017-03-30 17:26:25 -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
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
icomrade 12abbfa686 Should fix #1926 2017-03-27 23:53:08 -04:00
ebayShopper 50ba58f5ae Fix death message showing RunOver when it shouldn't 2017-03-25 20:05:36 -04:00
ebayShopper 6a711deccc Add reliable workaround for swimming in ground and air issue
Fixes #1913
2017-03-23 15:58:14 -04:00
oiad 73899d520f Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
This adds DZE_limitPlots where admins can restrict a player to only
having 1 plot pole. Disabled by default.
2017-03-23 22:39:22 +13:00
ebayShopper 93d6c85dbc Skip gear sound in player_forceSave
Don't play sound when gear flashes open momentarily for force save and
backpack mag ammo count.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/98784aae797cc50978ad848b8ee9b4f70aad231f
2017-03-20 17:26:41 -04:00
ebayShopper 8d545d14a1 Fix dayz_lastSave variable again
Continuation of bca17aa.

This variable is set in player_forceSave and uses diag_tickTime.

Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/98af0ed8b936ea112de563f282f8177c8c1fb4cc
2017-03-20 16:46:11 -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
icomrade 7a6c6df33b re-add config for nutrition 2017-03-08 13:57:00 -05:00
ebayShopper da34b688d2 Fix hunger and thirst "working" hits way too high
By default this was multiplying all "Working" hunger and thirst hits by
10 @icomrade  because (1 min 0.1) always picks 0.1. For example:
dayz_thirst = dayz_thirst + (5 / 0.1)
dayz_thirst = dayz_thirst + 50

A config variable isn't really needed for this, since it is only used in
one file. It can be easily configured in compiles.sqf which most servers
already overwrite anyway.

This reverts 62b7c21.
2017-03-08 13:08:46 -05:00
ebayShopper 92b09aa530 Remove some unused variables
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/6479708205bccbb4bdd1379a53d9aeed5613f08a
2017-03-05 12:17:09 -05: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 9434d43561 Fix undefined error fnc_spawnObjects
My mistake from 26c1bd9
2017-03-01 13:42:21 -05:00
ebayShopper 61630e91b3 Update scripts.txt exceptions
- Removed some unneeded exceptions
- Moved tree chop PVEH to server compile only so client does not need
setdamage exception
- Replaced "showCommandingMenu" filter with stricter
"menu" filter
- Renamed two files with no changes for easier filtering of
"menu"

Vanilla
commits:
https://github.com/DayZMod/DayZ/commit/1d639b557b1b2a57399c113184e17992d678ef7b
https://github.com/DayZMod/DayZ/commit/3a29242537439b866388aeeb63574692d6e9677e
https://github.com/DayZMod/Battleye-Filters/commit/5cdf249ea979649246730e7e823a6d5f976d4157
2017-02-28 18:26:37 -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 27bca9a7d9 Update vanilla presets
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/8574fd898d98581384a4e1601c90df6d34821f5b
2017-02-19 18:56:52 -05:00
ebayShopper 952beed531 Tag map markers with player names #1871
closes #1871
2017-02-11 17:15:49 -05:00
ebaydayz 097a02b19a Make zombie_agent.fsm customizable for admins #1877
Also fixed HandleDamage EH was added twice. We moved it to the configs
and forgot to take it out of the FSM in 6853263.
2017-02-01 20:36:00 -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 9afb74ff26 Remove plot take ownership feature #1811
See #1811
2017-01-31 15:22:23 -05:00
ebaydayz 2ecb614534 Update comments for POI spawning
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/0defa2af1ec0a9a46d15a665eb25f6be604a0a07
2017-01-29 20:14:43 -05:00
ebaydayz a1c470d56f Hide group name tags at startup when streamerMode is on 2017-01-27 20:39:22 -05:00
ebaydayz 028924770f Increase headshot damage for non-zombie hits
A single headshot with a DMR from ~500m will now kill instead of doing
~8k blood as it did previously.
2017-01-27 17:43:29 -05:00
ebaydayz cc720f95b7 Offset DynamicText death message when in vehicle
Prevents vehicle health bar overlapping death message.
2017-01-27 16:38:50 -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 7d6319fa30 Remove PVEH when death messages are disabled 2017-01-25 13:51:01 -05:00
ebaydayz 405dd7e519 Disable flies by default and add enableFlies config variable
Also, when enabled, flies now spawn ten minutes after the player's death
instead of two minutes after as recommended by @oiad .
2017-01-25 13:05:09 -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
ebaydayz 26c1bd9a86 Properly disable town generator and plant spawner loops
Stops intensive loop from running unnecessarily when dayz_townGenerator
= false; The comfrey plants are pointless atm since the only thing they
may be used for is crafting a sepsis bandage.

Also added waterHoleProxy for Napf and Namalsk placed by @skigoggles

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b5a91250865db7f3bdce7f0d2bfc676be27d7884
2017-01-21 21:44:43 -05:00
icomrade c15caf5f8f Improve BIS_Effects fix #1883
Now stops particle effects loops when wreck is deleted.

Exucuted in an EH, so it should resolve any issue where the corepatch
fix version, or broken A2 version takes priority.

Minor script formating and performance improvements
2017-01-20 11:51:55 -05:00
ebaydayz 198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00