Commit Graph

248 Commits

Author SHA1 Message Date
A Man
bc75ad8590 Adding combine matches 2019-11-01 16:01:20 +01:00
ebayShopper
6caba339c9 Update change log
Minor improvement to b791dee and 6248add
2018-01-11 15:41:13 -05:00
oiad
141b25e204 Update DZE_SafeZonePosCheck with missing operator
I possibly just need a little more sleep and a little less epoch time
2017-12-30 23:07:36 +13:00
oiad
6248addc3f Make Safe Zone Zombie and Loot spawning a toggle
As requested by a few admins that didn't realise it was now hard coded
to disable loot/zombie spawning
This requires the check since we're also using DZE_SafeZonePosCheck for
DZE_buildChecks with a forced radius.
2017-12-30 22:03:31 +13:00
ebayShopper
694ea87d0d Update scripts.txt
- Updated exceptions, added new filters and removed some which were not
useful
- Removed exceptions for testkit because it is not part of the mod
- Added notes to clarify for now, will move this info to BI wiki later
- Removed two unused files
2017-12-26 00:55:10 -05:00
ebayShopper
2c83f2dfe4 Fix autorun freeze when spamming key 2017-12-21 13:23:23 -05:00
ebayShopper
894dafe4f5 Update change log 2017-12-10 16:47:24 -05:00
ebayShopper
b39a15cdd7 Update vanilla building
Vanilla commit:

ad0d514118
2017-12-04 13:49:12 -05:00
ebayShopper
fa0dfd4c47 Define fn_addCargo on server
Needed to define on both in 2f178d8 @oiad
2017-12-01 13:47:34 -05:00
ebayShopper
ac10daeb4d Update humanity morphing
Vanilla commits:

33d4165e64

6674be6d5f

f4d18a6fef
2017-11-25 14:52:06 -05:00
oiad
2f178d8978 Consolidate weapon/magazine/backpack adding to function
This moves a lot of duplicated code from a server side only function
(server_addCargo) to a client/server function called fn_addCargo.
2017-11-19 11:06:00 +13:00
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
e0d271671a Remove unused crafting recipes
Vanilla commits:

809de6a0a3

93c128085a
2017-06-10 13:06:16 -04:00
ebayShopper
48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
f99a3deced
731b957e8e

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
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
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:

98784aae79
2017-03-20 17:26:41 -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
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
9190f303f9 Replace max blood constant of 12000 to r_player_bloodTotal
Vanilla commit:

78b608c854
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:
1d639b557b
3a29242537
5cdf249ea9
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
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
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:

02bc22f325
2017-01-26 21:19: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:

b5a9125086
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
ebaydayz
f25f5e96a6 Fix light fire and build fireplace over water #1866
Fixes #1866
2017-01-11 15:25:29 -05:00
ebaydayz
131329fd59 Fix "AI" text localized on wrong client in death message #1867
Fixes #1867
2017-01-10 13:38:00 -05:00
ebaydayz
0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -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
0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -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
bff2a3091d Remove two unused files
Vanilla commit:

64ea1eaa76
2016-12-11 15:25:57 -05:00
icomrade
f18451ab48 Fix black crush in areas of shadows 2016-12-09 14:14:10 -05:00
ebaydayz
2160437e79 Convert POI to compact array format
Vanilla commit:

c71d8cb23c
2016-12-06 19:26:00 -05:00
ebaydayz
43d14dbdba Avoid potential issues with double private vars
_message is a commonly used var name
2016-12-02 14:39:04 -05:00
ebaydayz
baae92f9d8 Remove unused file 2016-12-01 16:28:19 -05:00
ebaydayz
416fdbc4ab Improve filterCheats and VON block
Filter cheats is now added to the main options menus that needed it.

It is not needed on the map (display 12) because KeyDown for display 46
also fires when it is open. So filterCheats was firing twice (once on
each display) in that case.

KeyDown does not fire on display 63 at all
regardless of whether PTT or VON is held down, toggled or chat open.
Keydown does fire on 55, but only after the mic icon is locked on, so it
is of limited use. MouseButtonDown does not fire on 55 or 63. So it is
useless to add to those displays. You can confirm this with:
(findDisplay 63) displayAddEventHandler ["KeyDown","systemchat
'fired';"];

Filter cheats is now only checked on display 46 when a
voice, channel, or cheat key is pressed instead of on every key press.
This still works 100% of the time for blocking cheat input. For
performance reasons it's probably not worth checking all the conditions
in filterCheats with every key press on display46 just for the VON
block. Doing so covers some edge combination bind cases better, so it
may be worth considering again if no better alternative is found. For
now this solution is good enough to cover the majority of cases without
slowing down the keyhandler during normal usage.

The VON message now
tells you exactly which channel block you triggered instead of listing
all of them.

Fixed issue mentioned in 52c9c7c with VON getting stuck on when using a
double tap keybind.

Tested:
1. Talk in side with regular/combo/mouse bind
2. Change channels
while mic is locked on with regular/combo/mouse bind
3. Change channels
with Up/Down arrows while chat is open.
4. Trying all cases in steps 1-3
with a dialog open.

It is possible to bypass the VON block with some different control
settings and combinations of the above, but for default controls and
common usage it works the majority of the time.
2016-11-29 23:44:28 -05:00