W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,107 Commits 20 Branches 18 Tags
097a02b19a59d729de1cfbd4e52a8bfc04c1dfa0
Commit Graph

907 Commits

Author SHA1 Message Date
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
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
05f1cf9fe0 Use nearObjects instead of nearestObjects for spawn check #1816 
Lowered spawn check radius for loot and zombies to the same as 1051.
(200m)
 2017-01-30 15:45:14 -05:00
ebaydayz
2ecb614534 Update comments for POI spawning 
Vanilla commits:

1f89bcfb98

0defa2af1e
 2017-01-29 20:14:43 -05:00
ebaydayz
8c1caa9c1c Remove some redundant checks 
Vanilla commits:

da7061429a

da55eaa53e
 2017-01-29 19:36:48 -05:00
ebaydayz
cfd0f74870 Send damage selection normally for RPT log c10a7c3 2017-01-29 12:02:27 -05:00
ebaydayz
611fd73bbd Shorten some isKindOf checks 2017-01-28 21:04:26 -05:00
ebaydayz
9270050bc6 Update damage handler again 
This fixes hits from players shooting from vehicle weapons not showning
in server RPT.
 2017-01-28 20:38:35 -05:00
ebaydayz
c10a7c3bc9 Update damage handler 
- Added damage and selection to server RPT hit log
- Increased damage a bit for RunOver due to consistently low damage in
testing
 2017-01-28 16:08:56 -05:00
ebaydayz
d30b7b5ffc Prevent queuing multiple vehicle upgrades 2017-01-27 20:23:36 -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
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:

4e886c8c27
 2017-01-27 13:17:14 -05:00
ebaydayz
c7b71f93f0 Remove fn_upgradeActions 
Vanilla commit:

02bc22f325
 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:

2ee56936be

8497b42d3f

eb234f8b06
 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:

b5a9125086
 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:

68ffe8b158
 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:

ef243327b5
 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:
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
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:

64ea1eaa76
 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