W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-06-29 21:21:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,440 Commits 20 Branches 18 Tags
ffdae898fcd566e5c65da68bdfd971d7134d7261
Commit Graph

1295 Commits

Author SHA1 Message Date
ebaydayz 1bb894b1c9 Add missing private var in player_death 2017-01-27 16:13:58 -05:00
ebaydayz d8ac3f42b1 Remove unnecessary check for upgrade storage 
Fixes desert tent not upgradeable

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/4e886c8c27265e78fec957bccfc9b7badaaf67c9
 2017-01-27 13:17:14 -05:00
ebaydayz c7b71f93f0 Remove fn_upgradeActions 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/02bc22f325ff57c16b25c20b5de6ecb81d29d86c
 2017-01-26 21:19:17 -05:00
ebaydayz 405dd7e519 Disable flies by default and add enableFlies config variable 
Also, when enabled, flies now spawn ten minutes after the player's death
instead of two minutes after as recommended by @oiad .
 2017-01-25 13:05:09 -05:00
ebaydayz 6c62b3f8e4 Rework player_death for respawnDelay=0; #1825 
See #1825
 2017-01-24 15:55:15 -05:00
ebaydayz ff6463473f Update vanilla building 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/2ee56936bec09fbc1fe4bc37f8b0fe0a7894348c

https://github.com/DayZMod/DayZ/commit/8497b42d3f9e406f84cc9a3bd5cf13744108d30a

https://github.com/DayZMod/DayZ/commit/eb234f8b0685ea331ebacf949ff6147ac2bdfdc4
 2017-01-22 14:41:53 -05:00
icomrade fc99604108 Better anim reset in player_death 2017-01-21 22:41:09 -05:00
ebaydayz 4613e0c084 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	CHANGE LOG 1.0.6.1.txt
 2017-01-21 21:46:58 -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:

https://github.com/DayZMod/DayZ/commit/b5a91250865db7f3bdce7f0d2bfc676be27d7884
 2017-01-21 21:44:43 -05:00
oiad a68e4b273b fix epoch_tempKeys.sqf making massive arrays. (#1884) 
* fix epoch_tempKeys.sqf making massive arrays.

epoch_tempKeys was making a massive array every time it was called due
to them setting the array size to the _ownerKeyId instead of count
_temp_keys_names.

For example: Call this function 10k times in testkit and see it lag the
client due to making a massive array over and over again.

```"[[["9379"],[<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<n
"Test script finished. Code took 0.440002 seconds to run"
```

With fixed code:
```"[[["9379"],["Yellow Key (65d0)"]],false]"
"Test script finished. Code took 0.000991821 seconds to run"
```

* Update fn_selfActions to support fixed epoch_tempKeys fix.

Forgot this from my previous commit, this will select the right key now
for displaying in the unlock_veh.sqf (I broke this with my previous
commit)

* Rework
 2017-01-21 17:01:42 -05:00
ebaydayz d8828d9df1 Fix "AI" text localization again 
This was my mistake from 131329f. SourceName needs to be checked, not
bodyName.
 2017-01-19 17:36:26 -05:00
ebaydayz 194bad12ea Remove some more unused variables 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/68ffe8b1582de007f5392b137634e2aa82247d75
 2017-01-19 12:27:36 -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 076bd22bfe Update vanilla fence_handleDam.sqf 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ef243327b5ada720601867ece968ec02a580260f
 2017-01-09 17:34:58 -05:00
icomrade 0c4d77d2aa Fix running corpses 2017-01-07 11:39:18 -05:00
icomrade 70948ad0a2 Fix unconcious input lock #1860 
due to disableUserInput being a POS
 2017-01-07 11:25:57 -05:00
ebaydayz 33672d99ee Lower or remove nutrition hit for some actions #1857 
Fixes #1857
 2017-01-06 13:27:22 -05:00
ebaydayz e074ef0d44 Fix rapid starvation and dehydration from chainsaw and chop wood 
Chainsaw is never used in player_chopWood.sqf. It is only called via
right click on Hatchet which was removed anyway.

The player already takes a nutrition hit on every swing of the hatchet,
and it can take up to twelve swings to chop down one tree.
 2017-01-05 19:38:03 -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
oiad 6f072982c3 Add harder penalties for wrong combination on doors, More spelling mistakes. (#1847) 
* More spelling mistakes

Further to commit:
https://github.com/oiad/DayZ-Epoch/commit/0e938ba8f36b2631b98da1bdbfd3d6d578432110

* 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
ebaydayz 0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -05:00
ebaydayz d124a5d2f7 Make switch weapon interrupt autorun 
Fixes #1850
 2017-01-02 14:41:53 -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 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 0b27653833 Add config variable DZE_ServerLogHits 2016-12-31 17:37:34 -05:00
ebaydayz e33519ffd4 Readd changes from #1836 
I accidentally removed these when resolving merge conflicts with 854c41c
.
 2016-12-30 14:16:18 -05:00
icomrade c64c181f95 Handle boiled waterbottles < 10oz 
should fix #1838 Translation fixes are probably necessary
 2016-12-29 15:50:53 -05:00
ebaydayz d509c15c82 Split player_death into scheduled and unscheduled #1833 
Death message was sometimes showing incorrectly due to spawn delay.

Also the sched_corpses two minute loop was occasionally deleting bodies
right away because bodyName setVariable was delayed by the time it took
PVDZ_plr_death to send (up to a few seconds). See #1825
 2016-12-28 16:16:46 -05:00
ebaydayz 0e938ba8f3 Fix misspelled variable names DayZ_Ignators and destorytent 2016-12-26 14:28:43 -05:00
ebaydayz bf00c3f8bb Correct comment from 4d3f707 again 2016-12-22 22:20:47 -05:00
ebaydayz 0ffbdde2e8 Correct comment from 4d3f707 2016-12-22 22:17:27 -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 5b7b1d69bd Add HALO spawn height config var 
Height can be changed without overwriting player_monitor.fsm now.

Also
fixed my mistake from 3257d0f, need to HALO directly from debug pos for
antiTP compatibility.
 2016-12-13 19:50:22 -05:00
ebaydayz b4c239729c Fix self actions duplicating when changing clothes and looking at a safe 
This was also a bug in 1051. Thanks to Epoch forums user jOoPs for
reporting.
 2016-12-12 15:23:31 -05:00
ebaydayz bff2a3091d Remove two unused files 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/64ea1eaa76f6d3dce9b3be3685a8642de9390f43
 2016-12-11 15:25:57 -05:00
ebaydayz 46355aed38 Add back missing Epoch player_antiWall call #1817 2016-12-10 21:20:04 -05:00
ebaydayz 2a1bd74eca Fix no damage from hitting ground after HALO if autoOpenChute=-1 
My mistake when adding this.
 2016-12-10 20:25:36 -05:00
ebaydayz 6ecdabc92d Fix swimming in ground glitch at certain spots on Napf 2016-12-10 16:36:51 -05:00
ebaydayz d0e8291159 Fix floating arrows 
Fixes #1815
 2016-12-10 15:06:48 -05:00
icomrade 67e0dfee81 Remove Turbo and HoldBreath key blocks 2016-12-08 17:11:45 -05:00
ebaydayz 2c8f236f95 Fix death message in potential case of suicide 2016-12-08 14:37:04 -05:00
ebaydayz 2160437e79 Convert POI to compact array format 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/c71d8cb23c42407978328418959cb258bd59228f
 2016-12-06 19:26:00 -05:00
ebaydayz 66f87fac46 Move two localizations to epoch package in stringtable 
Vanilla doesn't refund modulars when deconstructing, Epoch does. Also
upgrade was moved to UserActions of dayz_buildings in vanilla.
 2016-12-06 13:59:25 -05:00
ebaydayz dd721ec572 Fix issue with tag friendlies #1807 2016-12-06 12:12:38 -05:00
ebaydayz 5058308f00 Prevent issues caused by respawn_west marker being moved 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/39bcedb4b6e6c1d61f8e8e837b35f28d3502e231
 2016-12-05 14:37:28 -05:00
ebaydayz 7af0cb2910 Lower numpad minus keydown timer for block cheats 
Fewer false positives
 2016-12-04 11:37:03 -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 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