Commit Graph

1013 Commits

Author SHA1 Message Date
ebaydayz
198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
oiad
fd0b81118b Move dze_supplyCrate and vein wrecks to CfgLoot (#1863)
* Move dze_supplyCrate and vein wrecks to CfgLoot

Moves both the supply crates and vein wrecks to the CfgLoot tables so
admins can customize.
Also modifies the main add item statement to allow support for weapons,
magazines and backpack refunding/spawning instead of hard coded
magazines.

Should be backwards compatible with the old style (I did test).

* Remove unused _activatingPlayer variable

* Rework
2017-01-14 19:40:54 -05:00
icomrade
f891797a0d Add full screen NVG
looking through a pinhole gets old
2017-01-12 15:00:29 -05:00
icomrade
9c81d727e3 Remove IR Laser from DZ L110A1 - Fix #1873
Thanks @DeVloek
2017-01-12 13:34:29 -05:00
ebaydayz
f25f5e96a6 Fix light fire and build fireplace over water #1866
Fixes #1866
2017-01-11 15:25:29 -05:00
ebaydayz
5c8ae96887 Add military flashlight attachments
Vanilla commit:

b6ba294b70
2017-01-09 20:19:01 -05:00
ebaydayz
7857272d82 Add loot pos for some more sahrani and tavi building types
Vanilla commits:

578e0f5c0a

18d1852b56

bbebc56102

e70074e44f

56d0ab54cb

fa8c01bae4

Added some new building types. No existing buildings were removed or
changed, just moved around to sync order.
2017-01-09 17:01:13 -05:00
ebaydayz
503206cad8 Update version numbers 2017-01-07 15:39:11 -05:00
ebaydayz
80def55420 Show respawn from player zombie or broken legs as suicide 2017-01-06 19:30:05 -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
ebaydayz
3a7744d18d Add back 1051 handling of RepairParts not listed in config 2017-01-06 12:36:08 -05:00
oiad
c5deead4fd Allow merlin_hc3 to be repaired properly (#1858)
The merlin has 20 windows + 2 side windows, glass 7 - 20 were showing up
as PartGeneric and breaking the repair script for some reason.

https://github.com/EpochModTeam/DayZ-Epoch/issues/1856#issue-199105821
2017-01-06 11:18:55 -05:00
oiad
d0257b3c7d Add logging failed safe/lockbox and door lock/unlock/failed code attempts (#1853)
* Add logging failed safe/lockbox and door lock/unlock/failed code attempts

This adds logging for both safes and lockboxes for failed code attempts.

Also adds logging for locking, unlocking and failed code attempts for
doors.

"salival (playerUID) FAILED unlocking LockBox with code: Red11 (actual:
Red57) @110069 [11044.4,8438.32,0.652]"
"salival (playerUID) UNLOCKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) PACKED LockBox with code: Green22 @110069
[11040.6,8438.91,0.834]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: EYESCAN (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) FAILED unlocking CinderWallDoorSmallLocked_DZ with
code: 100 (actual: 559) @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) UNLOCKED CinderWallDoorSmallLocked_DZ with code:
559 @110069 [11015.4,8458.74,5.272]"
"salival (playerUID) LOCKED CinderWallDoorSmallLocked_DZ with code: 559
@110069 [11015.4,8458.74,5.272]"

* Revert wrong hinge type

* Remove unused DZE_Lock_Door

* Rework

* Remove redundant code, Make single currency costs use BIS_fnc_numberText

* Rework

* Add changelog line
2017-01-05 16:45:10 -05:00
ebaydayz
cfe01e609e Set RU crates cargo capacity back to normal 2017-01-04 12:43:04 -05:00
ebayShopper
e453c7ee0c Fix wrong classname DZ_ExplosivesBoxRU in loot table #1852 2017-01-04 12:20:56 -05:00
ebaydayz
0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -05:00
ebaydayz
e4aeee37fd Use waterHoleProxy in drink water and fill water #1835
The slow searches are needed on other maps until waterHoleProxy objects
are added for them. They need to be added at every pond and
non-"Land_pumpa" well. Right now Chernarus is the only map that has them
placed.

Fixes #1835
Fixes #1841
2017-01-01 16:55:00 -05:00
ebaydayz
7ce4ba32a2 Add shadow to dayz_rollingMessages 2016-12-30 16:40:10 -05:00
ebaydayz
101a6fc698 Fix wrong eventhandlers on viral zeds #1819 2016-12-29 20:53:35 -05:00
icomrade
b355ae6a61 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-12-29 15:51:06 -05:00
icomrade
c64c181f95 Handle boiled waterbottles < 10oz
should fix #1838 Translation fixes are probably necessary
2016-12-29 15:50:53 -05:00
A Man
c5ac6e458b Changing Fire Barrel output (#1843)
The fire barrel output should be a fire barrel not a empty fuel barrel.
2016-12-29 15:50:29 -05:00
ebaydayz
d694130fdc Remove a duplicate localization 2016-12-23 15:37:42 -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
f1b991acd2 Add M4SPR_DZE which spawns with 30Rnd Stanag default 2016-12-22 15:42:00 -05:00
ebaydayz
c3bf1d29d6 Fix arrow and other WeaponHolderBase inherited destrType #1815
Prevents catching on fire when destroyed.
2016-12-09 13:28:31 -05:00
ebaydayz
4e92255749 Remove equip_Crossbow_Kit from loot tables for now #1814 2016-12-09 12:33:54 -05:00
ebaydayz
0d4d288d81 Fix DMR and M24 ammo price 2016-12-08 13:37:16 -05:00
ebaydayz
2db6692643 Fix undefined var dayz_clientPreload during intro.sqs 2016-12-05 11:14:06 -05:00
ebaydayz
eacc362e38 Fix z_hunter texture #1805 2016-12-02 10:51:13 -05:00
ebaydayz
119470809f Disable moving of group dialog 2016-12-01 20:31:04 -05:00
ebaydayz
74cc99ddad Remove identical lootPos comment
There was no difference between the lootpos except spacing after the
commas.
2016-11-30 12:17:06 -05:00
icomrade
c56e0d722c oops, these were already defined 2016-11-30 11:58:35 -05:00
icomrade
fc98864db9 LootPos for @MGTDB 2016-11-30 11:55:20 -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
ebayShopper
429a6aec9b Disable moving group dialog 2016-11-29 12:14:08 -05:00
ebaydayz
19e3947669 Fix empty snack bags giving drink option
Thanks @Helios27

https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-263117080
2016-11-27 12:02:29 -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
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
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
icomrade
1097eaba0c Add block for voice channels
use DZE_DisabledChannels as decribed in configvariables.sqf
2016-11-25 13:05:27 -05:00
ebaydayz
cf64805d10 Disable RadioProtocol group chat spam
Works well with AI, still needs multiplayer testing.
2016-11-24 17:46:57 -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
aea0bb1298 Update animal cleanup on log out
Partial revert of 0483fa6
2016-11-21 20:54:33 -05:00
ebaydayz
0483fa61f6 Fix live animals being deleted in front of players
Vanilla commits:

e14d45a55b

9d6be1731e
2016-11-21 18:49:03 -05:00