Commit Graph

277 Commits

Author SHA1 Message Date
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:

1f89bcfb98

0defa2af1e
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
c7b71f93f0 Remove fn_upgradeActions
Vanilla commit:

02bc22f325
2017-01-26 21:19:17 -05:00
ebaydayz
ff6463473f Update vanilla building
Vanilla commits:

2ee56936be

8497b42d3f

eb234f8b06
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
58025f591f Fix certain buildables not removable #1859 2017-01-06 16:18:59 -05:00
ebaydayz
571e8d7b11 Add LightPole_DZ to DZE_isRemovable #1859 2017-01-06 15:53:38 -05:00
oiad
6f072982c3 Add harder penalties for wrong combination on doors, More spelling mistakes. (#1847)
* More spelling mistakes

Further to commit:
0e938ba8f3

* Add harder penalties for wrong combination on doors

This adds a variable (DZE_doorManagementHarderPenalty) to make attempts
at code breaking doors harder. This will exponentially increment the
time between attempts or if you set it to false will make it 5 seconds
between attempts.

Unlike the original (that was useless TBH) this will actually lock out
the combo lock UI until the timer is set.

Will reset completely after 120 seconds.

* Add German translations

* Resolve merge conflict

* Resolve merge conflict
2017-01-03 16:39:05 -05:00
icomrade
b807648cc6 Fix #1831 generator inventory not saving 2016-12-28 16:00:56 -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
5058308f00 Prevent issues caused by respawn_west marker being moved
Vanilla commit:

39bcedb4b6
2016-12-05 14:37:28 -05:00
ebaydayz
f03f116dfc Fix Arma cheats still enterable under certain circumstances
Thanks to Epoch forums user Golgofinyanin for reporting.
https://epochmod.com/forum/profile/13156-golgofinyanin/
2016-12-03 16:50:55 -05:00
ebaydayz
5d1a6939e6 Fix refuel at gas station with generator #1806
Fixed mistake from: e398250

The refuel code was only running if a fuel truck was passed to the
script.

Also removed fuel truck classes that do not exist from the
dze_fueltruckarray.
2016-12-02 12:34:51 -05:00
ebaydayz
bee00e9a57 EnableRadio if globalChat death messages are on 2016-11-30 00:36:51 -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
7c566a1345 Remove unused variable dayz_deseedloot 2016-11-26 14:08:34 -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
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
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
2f1c57047a Fix infectedWaterHoles init for non-cherno maps 2016-11-20 20:03:18 -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
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
43330c2046 Diminish humanity reward for transfusion
As suggested on:
cdb9776
and
https://github.com/DayZMod/DayZ/issues/731
2016-11-15 15:31:58 -05:00
ebaydayz
cdb9776d4e Add bloodbag cooldown 2016-11-15 13:57:40 -05:00
ebaydayz
abeb5f9383 Remove vehicle actions when unconscious 2016-11-12 17:54:27 -05:00
ebaydayz
6fb4290ffe Remove unused compile
Vanilla commit:

4a18d5023d
2016-11-09 12:33:11 -05:00
oiad
d7f35c0cf3 Fix spelling mistake of classname DZ_Czech_Vest_Pouch (#1792)
* Fix spelling mistake of classname DZ_Czech_Vest_Pouch

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per subject

* Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch.

As per

* More typo SQL goodness

As per subject
2016-11-04 21:40:27 -04:00
A Man
41324139eb Adding CanvasHut_DZ to DZE_isRemovable (#1785)
* Adding CanvasHut_DZ to DZE_isRemovable

CanvasHut_DZ had no remove option.

* Update Prop_Defs.hpp
2016-10-31 19:26:40 -04:00
ebaydayz
dbb9e97efc Update group dialog 2016-10-28 20:10:18 -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
f21b4f0f41 Remove t_stub_picea.p3d from dayz_trees
See:

bf31d8f6e7 (commitcomment-19441154)
2016-10-15 16:48:29 -04:00
ebaydayz
7044b0095d Get player name before death
Vanilla commit:

3e8c9410c5
2016-10-13 16:01:55 -04:00
icomrade
bf31d8f6e7 Update tree array for NAPF
thanks @ndavalos
2016-10-12 14:55:24 -04:00
icomrade
b25b7636a7 Direct menu to cursortarget or player
Please test the living hell out of this.
2016-10-07 13:46:53 -04:00
oiad
5472eda2a8 Add M240Nest_DZ to maintain classes variable. (#1773)
* Add M240Nest_DZ to maintain classes variable.

This makes it so M240Nest can be maintained. (Which it should be)
2016-10-06 14:46:35 -04:00
ebaydayz
2ee06afea7 Sync chopped down trees for JIP players
Vanilla commit:

a57478fb1a
2016-10-05 17:24:10 -04:00
icomrade
869f98efd7 Fix change clothes dupe 2016-09-27 20:55:06 -04:00
ebaydayz
9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -04:00
icomrade
40d419e475 Re-add abort timeout
Timeout is no longer restarted when you click abort and the loop now
closes the gear menu so the player cannot attempt to dupe with the gear
menu and abort menu open at the same time.
2016-09-23 19:10:39 -04:00
icomrade
7f0935c639 add floors to drop array 2016-09-22 15:14:05 -04:00
icomrade
6ae64eb622 Prevent player from dragging through walls 2016-09-22 14:03:23 -04:00
ebaydayz
c7a6c71330 Disable vanilla base building actions for now
Since we are not going to use vanilla base building.
2016-09-12 16:11:29 -04:00
ebaydayz
2bb5c5942c Retire cone and pole plot previews in favor of dome
Thanks @oiad for pointing this out.

Poles are not used for previewing anymore. Cones do not give as much
information as the dome.

The dome is visible at night and under night vision too.
2016-09-12 13:39:00 -04:00
ebaydayz
16e4dc7b30 Move HeliCrash and CarePackage area variables to markers
This allows finer grained control of crashsite, carepackage and infected
camp spawn positions and radii (further north, south, east, west, etc.).

Also removed some hardcoded checks for Chernarus, since
dayz_townGenerator should always be off on other maps for now. Someone
may add town generator coordinates for other maps later.

Related vanilla commits:

b20b402bf0

7c8b69eb82

7dfd3ef9cf
2016-09-11 14:45:49 -04:00