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

967 Commits

Author SHA1 Message Date
ebayShopper fdf24d4013 Update vanilla vehicle_getOut again 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/508e73d59c491556a45f1b5defe2163eaac5a6a1

https://github.com/DayZMod/DayZ/commit/cd260ad1f0543edc60af85824e7cc7a1db73e02e

https://github.com/DayZMod/DayZ/commit/2078268b67310eb46d52c4eea4917c10723e9ea0
 2017-02-19 16:54:59 -05:00
ebayShopper 6e846847de Only run group tags loop when in a group 2017-02-13 14:27:49 -05:00
oiad e8dd8fac63 Stop server_publishVehicle3 duping a vehicle if hive fails to update (#1895) 
* Stop server_publishVehicle3 duping a vehicle if hive fails to update

server_publishVehicle3 first creates the vehicle in the database then
reads it back to see if it's successful, previously it wasn't deleting
the vehicle if it failed.

Added a 1 second delay after the vehicle delete to stop duping of
vehicles also.

Fixed references to server_deleteObj that were using 2 parameters
instead of the required 3 and updated the example.

* Rework
 2017-02-13 14:09:21 -05:00
ebayShopper 2ef93e6c57 Fix panic sound chance from fbc56ff #1861 
Previously was ~8% chance every 1 second, so ~72% chance to play once or
more every 9 seconds.

Now it is a 50% chance to play once every 9 seconds.
 2017-02-12 16:04:48 -05:00
ebayShopper fbc56ff556 Fix panic sound overlapping #1861 2017-02-12 15:08:37 -05:00
ebayShopper 952beed531 Tag map markers with player names #1871 
closes #1871
 2017-02-11 17:15:49 -05:00
ebaydayz 18191b0e3a Use effectiveCommander for humanity hit 2017-02-05 16:30:32 -05:00
ebaydayz 76971cbaf4 Prevent sprint and prone through doors glitch 2017-02-02 16:57:30 -05:00
ebaydayz 59b1d1ea60 Update vanilla building 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/8fdd0e915a2386eef35d6f1d5d9c81b3d640646c

https://github.com/DayZMod/DayZ/commit/6afd0bc103b7462e83ea4d94c240a6fb23cb2a59
 2017-02-02 15:28:39 -05:00
ebaydayz b0ba29440d Update vanilla vehicle_getOut 
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/492ba6d33aec4acd88e0e81e40cece6f6a261cca
 2017-02-02 14:58:47 -05:00
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:

https://github.com/DayZMod/DayZ/commit/1f89bcfb9857e2bb94a0609cf7b0d89490272684

https://github.com/DayZMod/DayZ/commit/0defa2af1ec0a9a46d15a665eb25f6be604a0a07
 2017-01-29 20:14:43 -05:00
ebaydayz 8c1caa9c1c Remove some redundant checks 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/da7061429a8cda4d31f95bcfdf564e4b255bbcfb

https://github.com/DayZMod/DayZ/commit/da55eaa53e2a9bda3a30733785b2e0f5b540bb53
 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:

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