Commit Graph

846 Commits

Author SHA1 Message Date
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
ebaydayz
6cdc0a51c9 Add extra animations to ArmoredSUV, MV22, UH1Y 2016-11-26 21:14:12 -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
oiad
511dfd4025 dze_buildchecks plot pole distance fix (#1801)
Fixes the proper distance checks for dze_buildChecks.
2016-11-26 14:03:09 -05:00
ebaydayz
effabd711d Remove some more excessive client log spam
Only needed when debugging zombie targetting
2016-11-26 13:45:03 -05:00
ebaydayz
d14416931a Fix VON block mistake from b9a5c59
I forgot filterCheats is already called in keyboard.sqf
2016-11-25 19:31:14 -05:00
ebaydayz
27f492f401 Fix typo in VON block
My mistake from b9a5c59
2016-11-25 18:42:38 -05:00
ebaydayz
808c8cf736 Hide group icons on death screen 2016-11-25 18:30:48 -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
ebaydayz
b6d88b1329 Update vanilla building
Vanilla commits:

9b2092c9f7

674624d122
2016-11-25 16:25:26 -05:00
ebaydayz
ea389b59ea Remove unneeded isKindOf "Man" checks
"Man" includes animals and zombies:

https://community.bistudio.com/wiki/ArmA_2:_CfgVehicles#Man_Class_Vehicles
2016-11-23 14:43:59 -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
da5285e0ec Update damage handler diag_log
Vanilla commit:

21864d065c
2016-11-18 16:36:37 -05:00
ebaydayz
b01a4165a8 Comment some unused achievement code
Vanilla commits:

3ec1cc3c5d

3171f68bee
2016-11-18 13:22:36 -05:00
icomrade
e398250489 Fix refuel trucks, add upgraded trucks to array
Issue was:
A. with locality, we were checking the wrong vehicle in one instance and

B. with variable names, since we called local_setFuel and _vehicle was
private already from the calling script we ran into an issue with
duplicate variables causing the command to fail. local_setFuel doesnt
really need any local variable so I removed them and this fixed the
issue (script filters may need to be adjusted accordingly)
2016-11-16 14:53:17 -05:00
ebaydayz
f994b95c1d Add dayz_onBack to surrender 2016-11-16 13:34:48 -05:00
ebaydayz
414fd7e1b7 Add auto open chute option to HALO 2016-11-14 20:25:26 -05:00
ebaydayz
de44b32c83 Remove unneeded isBicycle check in fn_selfActions
Bicycles always have characterID=0, so there is no need to check.
2016-11-14 14:38:45 -05:00
ebaydayz
81013ace75 Fix gear menu bypass mistake from 89078d1 2016-11-13 15:02:36 -05:00
ebaydayz
89078d1611 Fix abort and gear menu staying open at same time 2016-11-13 14:49:04 -05:00
ebaydayz
e506a97ad6 Remove redundant check in player_onPause
Switch executes the first case that matches and does not check any more
cases after that. So these conditions are always met when this case is
checked.
https://community.bistudio.com/wiki/switch_do
2016-11-12 21:22:11 -05:00
oiad
be1fb51fe8 player_onPause fixes (#1796)
* player_onPause fixes

Properly displays the right message now for why you can't abort.

* Door Management/Plot Management isServer changes

Removes isServer, these are run on the client only so no need for this.

* dayz_server private tags

Fix a few missing private tags and remove a _forEachIndex tag.

Remove unused 1.0.5.1 dayz_server.pbo as it's no longer valid/needed
2016-11-12 20:56:58 -05:00
ebaydayz
00f1f8537a Remove redundant unconscious checks in damage handler
This is already check above. My mistake from e4ede46
2016-11-12 20:12:04 -05:00
ebaydayz
abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
ebaydayz
8b3376643d Fix unload patients action not being removed from vehicle 2016-11-12 17:23:52 -05:00
ebaydayz
e4ede46f59 Fix tranquiliser bolt 2016-11-12 16:50:24 -05:00
ebaydayz
e260d335ce Don't allow loading unconscious player into locked vehicle 2016-11-12 16:12:48 -05:00
ebaydayz
88870a6b2a Sync closeDisplay exit codes for easier scripts.txt filtering 2016-11-11 14:48:41 -05:00
ebaydayz
e927a759fe Fix load wounded mistake from 343003d 2016-11-10 20:33:24 -05:00
ebaydayz
343003d9dd Fix load wounded action undefined error 2016-11-10 19:12:43 -05:00
ebaydayz
2cb3dac0be Fix vehicle damage handler bug
Fixes vehicle appearing to repair itself on first hit. SetDamage 0 was
running if no parts were damaged because "totalDmg" is not a hitpoint.

Vanilla commit:

92ab8fe2d4
2016-11-10 15:51:36 -05:00
ebaydayz
6fb4290ffe Remove unused compile
Vanilla commit:

4a18d5023d
2016-11-09 12:33:11 -05:00
icomrade
fb734e30c7 allow removal of generator 2016-11-07 17:24:54 -05:00
ebaydayz
01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -05:00
ebaydayz
4263b0732f Allow damage from tripwire grenade
Vanilla commit:

30c746892f
2016-11-06 13:39:30 -05:00
ebaydayz
e1bf11c4bb Remove empty folder 2016-11-06 13:15:18 -05:00
ebaydayz
615f21165a Fix rejoin group after change clothes
Also removed redundant delete and remove for _oldUnit since it is
already done in call _switchUnit
2016-11-05 17:48:07 -04:00
oiad
497b065663 Localization changes/additions. (#1787)
* Localization changes/additions.

Fixes a few localizations, extends range for removing camo nets from
toolbox by 10m, I have found that 5m is just not enough.

* Toolbox change

Update camonet removal to 10m instead of 5m

* Safe zone no building near/blacklisted buildings no building near

Adds a check in dze_buildChecks to disallow building within a certain
distance of a safezone or a blacklisted object name.

* typo

fix typo

* Safezone/blacklisted changes

As per requests.

* Rework

Rework

* Remove unused variables

as per subject

* Misc changes

Fix unprivated var in calcfreespace
Made single currency buy/sell reporting more englishery
Localization cleanup of extra spaces

* rework

rework
2016-11-04 12:08:47 -04:00
ebaydayz
bff0e3281a Auto promote group leader after changing clothes 2016-10-31 18:11:28 -04:00
ebaydayz
1b3ed13a47 Remove unnecessary check in damage diag_log
Vanilla commit:

e826a8bda9
2016-10-31 16:04:27 -04:00
ebaydayz
25d6b6e448 Increase DZ_BlackScreen resource layer
Prevent rolling messages from showing over the top of it.

Also fixed grammar typo @oiad
2016-10-30 15:34:24 -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
abb0475d28 Use joinSilent instead of join 2016-10-30 13:54:55 -04:00
ebaydayz
c4ef6e3115 Hide showOnScreen for lock and unlock inside vehicle action 2016-10-29 17:06:47 -04:00
ebaydayz
92d6257b92 Updated humanity Regen when under 1
Vanilla commit:

8e844e2b63
2016-10-29 16:05:08 -04:00
ebaydayz
0be3a8522e Add sleep before refreshing controls
Vanilla commit:

e6e0d057dd
2016-10-29 15:52:55 -04:00
ebaydayz
fda831bf4f Consolidate redundant getPlayerUID in selfActions
Vanilla commit:

8c51a24956
2016-10-29 15:25:36 -04:00