Commit Graph

227 Commits

Author SHA1 Message Date
ebayShopper
6a711deccc Add reliable workaround for swimming in ground and air issue
Fixes #1913
2017-03-23 15:58:14 -04: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
icomrade
52c9c7ceda Somewhat better VON Block
Not perfect, occasionally the player can double tap a button to lock VON
on - which now they cannot turn off unless they open the escape menu and
double tap to turn off.

Chat channel changes are now blocked when VON is active.

ActionKeys are now recalculated on key binding change, but it is
important to note that double tap bindings DO NOT work with the
ActionKeys command. This is why inputAction check is neccesary

Summary: Double tapping a key to lock von on (VoiceOverNet) is not
reliably blocked, nor is it blocked at all in secondary
displays/dialogs. otherwise, this works pretty well.
2016-11-26 18:48:11 -05:00
ebaydayz
b9a5c59660 Include all controls in VON block
Moved to display 46 keydown since keydown on 63 only fires after the VON
transmission has already started (slight delay).

Added mouseButtonDown so it can not be bypassed via assigning a mouse
button.
2016-11-25 18:22:41 -05:00
icomrade
1097eaba0c Add block for voice channels
use DZE_DisabledChannels as decribed in configvariables.sqf
2016-11-25 13:05:27 -05:00
ebaydayz
ec6b5eb679 Move Repair and Salvage back to fn_selfActions
Partial revert of: 3aad4b6

Unfortunately this will not support loading external vehicle addons
(with custom UserActions) which we can not include in Epoch. Child
UserActions overwrite inherited UserActions.
2016-11-23 13:34:22 -05:00
ebaydayz
43b900835e Fix infectiousWaterholes init again 2016-11-21 20:28:07 -05:00
ebaydayz
6853263f3d Update zombie generate
Vanilla commits:

09aa9f8879

68be696c4d
2016-11-21 18:33:41 -05:00
ebaydayz
3aad4b61e9 Move some addActions to config UserActions
Should improve client FPS while still allowing conditions and scripts to
be customized.

Some special vehicles like MV22, UH1Y, etc. have UserActions overwritten
in their configs, so please let me know if you find any others that do
not get the option to repair or salvage because UserActions is
overwritten in their config. I think I got them all.

Vanilla commits:

a8c4238c0c

350d73abe1
2016-11-20 19:47:21 -05:00
ebaydayz
f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz
89078d1611 Fix abort and gear menu staying open at same time 2016-11-13 14:49:04 -05:00
ebaydayz
6fb4290ffe Remove unused compile
Vanilla commit:

4a18d5023d
2016-11-09 12:33:11 -05:00
ebaydayz
93a988955f Use shorter file names for groups 2016-11-02 17:25:25 -04:00
oiad
b1171c5f9b player_wearclothes changes, string changes and maintain area moving (#1783)
* player_wearclothes changes, string changes and maintain area moving

Adds 2 toggles for admins to modify:

DZE_backpackRemove forces the player to drop his/her backpack when they
change gear.
DZE_maintainCurrencyRate modifies the amount of worth each item is worth
to maintain.

Changes the error message in player_wearClothes to tell the player why
they can't change gear yet
Remove some debug lines that spam RPT

* Rework

Rework as per @ebaydayz

* Rework

Rework
2016-10-30 14:11:54 -04:00
ebaydayz
0be3a8522e Add sleep before refreshing controls
Vanilla commit:

e6e0d057dd
2016-10-29 15:52:55 -04:00
oiad
1c7e96a0ff Advanced trading modifications, maintain_area modifications (#1780)
* Advanced trading modifications, maintain_area modifications

This lot of changes brings forth the following:

Sets up a "default" set of compiles that are the minimum needed for
maintain_area.sqf and custom scripts to utilize the gem based currency
that @icomrade added.

maintain_area.sqf: This will now utilize the gem based currency system.

Removed the redundant Z_Vehicle and replaced it with the Epoch built in
DZE_myVehicle

z_at_buyItems: Code tidying and optimization

z_at_checkCloseVehicle: Tidied up the code since removing Z_Vehicle
allowed us to remove some now useless code.

z_at_getVehicleItems: Removed the nearestObjects check for your vehicle
since we now do z_checkCloseVehicle on Advanced trading start up.

* Advanced trading missed redundant variables

As per description

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Revert "Advanced trading rework"

This reverts commit a589bd19b9.

* Advanced trading rework

We don't need to check for close vehicle anymore now for backpack money
since we've made z_vehicle redundant.

* Advanced trading rework

More rework

* Remove single currency add/remove coins functions

at request of @ebaydayz.
2016-10-28 19:29:04 -04:00
ebaydayz
f770b0a85d Add group system
Initial commit, not tested in multiplayer yet. Some revisions still left
to do.
2016-10-27 16:06:49 -04:00
ebaydayz
d13aafcd0c Add streamer mode game options setting
The chat list does not appear to be toggleable on the fly because it is
a display with no accessible controls. Giving it an idd and using
closeDisplay did not work. So it needs to be manually set off screen in
its config or covered up.
2016-10-19 15:49:30 -04:00
ebaydayz
fffcf43bbb Spawn infectious waterholes locally on each machine
Vanilla commits:

2d47c7250c

94a0bac524

44b7114129
2016-10-17 16:49:24 -04:00
ebaydayz
de219116a8 Optimize save after trade
See my comment on b806043

Veh_setFixServer only runs on the server, so the client does not need to
compile it.

The PVDZ_veh_Save PVEH is only added on the server, so it should never
be sent with regular publicVariable anymore.
2016-10-02 15:44:51 -04:00
ebaydayz
88c1b83c31 Fix mine detection in death messages again 2016-09-30 20:06:18 -04:00
ebaydayz
d335ee2b1c Fix death message mine and satchel detection 2016-09-30 19:14:11 -04:00
ebaydayz
b45d6d9a24 Color new killfeed death messages
The player who died is colored red and the killer is colored green. The
weapon now points in the direction of the player who died.

Also reverted 66fd5be since it did not help. It is already done globally
in player_death.sqf anyway. I tested again and this actually fixes the
problem.
2016-09-29 20:26:26 -04:00