Commit Graph

967 Commits

Author SHA1 Message Date
icomrade bd35e0a574 Should prevent change clothes dupe
awaiting feedback, but I half-commited it in my previous commit accidently, so whatever
2017-07-26 12:46:58 -04:00
icomrade 73926b8785 prevent logout with d/c #1938
Should work to prevent the issue described in #1938 by disabling the abort option, causing the player to alt + F4 if they want to log out without reconnecting. which results in the gear pile/weaponholder from not being created.
2017-07-26 12:39:37 -04:00
icomrade 5acad04c43 should fix #1938
Also prevents logout on onPause conditions, i.e. logout if in combat, another player is near, or a zombie is near
2017-07-25 14:32:49 -04:00
ebayShopper 6fec7bc4a2 Fix short knockouts for tranquilizer bolt
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/9b5d1409bd0db4b98863f7eb85813a6a63d444ec
2017-06-23 18:16:57 -04:00
ebayShopper 88f7687bec Prevent double death issue
Prevents conflicts with using setDamage or setHit to kill a player as
described in:

https://epochmod.com/forum/topic/43990-when-player-dies-kill-message-appears-twice-and-spawn-in-worldspace/#comment-293696

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a7b650daa1b84266ef13cc4253b4b78d6401d0fa
2017-06-11 17:57:49 -04:00
ebayShopper 39e05ad0e4 Update vanilla building
Vanilla commits:

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

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

https://github.com/DayZMod/DayZ/commit/156b90ccb54d44bfc7ac49ed55757282f82e5831
2017-06-10 10:45:14 -04:00
ebayShopper 867c618470 Fix double tranquilized message
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ee22070e9ae0720a1c47ce0c0406b51be0a9d396
2017-06-10 10:17:30 -04:00
ebayShopper 72df07bdf2 Remove medic animation from lock and unlock safe
Closes #1942 in combination with 48858b2

The "packing" variable was made redundant by dayz_actionInProgress
because it was only set locally.

DisableUserInput is unnecessary now because server_handleSafeGear is
called unscheduled. Getting the cargo, creating the new safe and
deleting the old one should complete in the same frame with no window
for players to remove gear:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/compile/server_handleSafeGear.sqf#L51-L67

The "claimed" check is also no longer needed because
server_handleSafeGear is called unscheduled and exits if the object is
null, so two players attempting to unlock at the same time will not
work.
2017-06-06 18:53:44 -04:00
ebayShopper 48858b2e6c Add medic anim function with proper interrupt
Closes #1386

Vanilla commits
applied:
https://github.com/DayZMod/DayZ/commit/f99a3deced4f4314c4b9a26c1c822e5c5d7f90eb
https://github.com/DayZMod/DayZ/commit/731b957e8e1c3f1bb08474fb397af6165e48a8df

Removed
two unused files and a few variables made redundant by actionInProgress
2017-06-06 15:25:14 -04:00
ebayShopper 78c4ebd597 Add hidden gear display for force saves
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/9170e0f8a0c602efb44a1b419e38ea3eb0dd7f95
2017-04-17 17:04:17 -04:00
ebayShopper 78fbd7ac53 Remove some unnecessary translations
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
2017-04-15 14:19:26 -04:00
ebayShopper 4bf4c62b1d Make free slots display more accurate in gear
Use the cursorTarget at the time the gear dialog was opened instead of
the cursorTarget at the time the script runs. The script can be delayed
by several seconds (spawn is scheduled).
2017-04-14 17:18:16 -04:00
ebayShopper e99792d0f4 Update jerry_fill.sqf
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/ef236938c1531e9d7ba8865fdd09bdf006adc979
2017-04-14 11:26:23 -04:00
ebayShopper 9fc72a8b87 Change dayz_survived to actual play time
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/18eaecb19fc1ea26f5769fccd920824bf843e19b

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

https://github.com/DayZMod/DayZ/commit/78ea61e3345e197e9350910b5808d85ef56f7f11

https://github.com/DayZMod/DayZ/commit/8309427f0dc3f7e5a6acd1d5ec1d155cbe11aec5

Should be ready for Hive update @icomrade . If you upload it to a test
folder I'll test it.
2017-04-13 18:35:28 -04:00
ebayShopper df526285cd Fix potential undefined dayz_characterID variable on login
The scheduler can start running fn_selfActions before player_monitor.fsm
defines dayz_characterID when login or network return is slow.
2017-04-08 19:19:47 -04:00
oiad 992ab199dd Convert DZE_SafeZoneNoBuildItems to handle nested arrays for custom d… (#1934)
* Convert DZE_SafeZoneNoBuildItems to handle nested arrays for custom distances per items.

This makes the DZE_SafeZoneNoBuildItems be able to handle nested arrays,
This allows you to set custom distances per item instead of having it
all the default distance.

E.g DZE_SafeZoneNoBuildItems =
["VaultStorageLocked","LockboxStorageLocked",["Plastic_Pole_EP1_DZ",1300]];

* Fix forgotten exitWith syntax.

* Removed unneeded check.
2017-04-08 18:45:29 -04:00
ebayShopper b70555e664 Delete added trees after chopping down
Like 496681c, if a tree or plant was added with createVehicle it can be
deleted with deleteVehicle.
2017-04-04 13:55:43 -04:00
ebayShopper 496681cd9b Add support for harvesting added plants
Closes #1928
2017-04-04 13:32:06 -04:00
ebayShopper cb09bb6bc9 Tweak RunOver damage scaling again 2017-04-03 15:31:14 -04:00
ebayShopper f51ae4f071 Tweak RunOver damage scaling
More RunOver damage is processed after b3fdd26. This number may need to
be tweaked further after more testing.

This reverts 7d6651b.
2017-04-01 17:23:32 -04:00
ebayShopper 7d6651b1fe Use normal scaling for RunOver head hits 2017-03-31 19:22:42 -04:00
ebayShopper 3dc71602c0 Fix death message killer inaccurate in some cases 2017-03-31 18:30:39 -04:00
ebayShopper d5e808e4d1 Lower group icons resource layer
Following 12abbfa
2017-03-31 15:12:24 -04:00
ebayShopper 0e244196e5 Update keyboard.sqf
Forgot to remove after
https://github.com/EpochModTeam/DayZ-Epoch/commit/d1d5fe5#diff-91da615cb902d0198b7cd4c9b91b6fd0L351
2017-03-31 12:33:17 -04:00
ebayShopper b3fdd26d3b Update fn_damageHandler.sqf
Continuation of 50ba58f

Also removed some unused variables
2017-03-30 17:26:25 -04:00
ebayShopper 746b921321 Use nearEntities for plot pole searches
Also made 73899d5 compatible with DZE_permanentPlot = false; at the
request of @oiad
2017-03-29 16:04:48 -04:00
icomrade 35556adbfb Merge pull request #1918 from oiad/master
Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
2017-03-28 08:53:14 -07:00
ebayShopper c501a80dd7 Cleanup formatting from #1921 2017-03-26 14:37:14 -04:00
F507DMT 226dfcce53 Update object_monitorGear.sqf (#1921)
A few optimizations.

_weapons = []; THEN agen - _weapons = (getWeaponCargo _object) select 1; Same with _magazines, _backpacks
_weapons THEN use only one time: count _weapons, same with _control,_magazines, _backpacks
use many time (typeOf _object), better use one variable for that: _type

FIX in loop:
one more check old this bag: https://www.youtube.com/watch?v=3ecWX21wEe4

Use this, if you think it's right
2017-03-26 14:12:33 -04:00
ebayShopper 50ba58f5ae Fix death message showing RunOver when it shouldn't 2017-03-25 20:05:36 -04:00
ebayShopper 6a711deccc Add reliable workaround for swimming in ground and air issue
Fixes #1913
2017-03-23 15:58:14 -04:00
oiad 73899d520f Add DZE_limitPlots so admins can limit plot poles to 1 per UID.
This adds DZE_limitPlots where admins can restrict a player to only
having 1 plot pole. Disabled by default.
2017-03-23 22:39:22 +13:00
ebayShopper ad7a12771a Fix swimming in ground again #1913
Closes #1913
2017-03-22 14:59:31 -04:00
ebayShopper 8b3f28dc0c Update player_sharpen.sqf
Fixes extra knife being deleted if player already had a fully sharpened
knife on their toolbelt (duplicate weapon).

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/0332fcbe711b657723704fc9a4d5fd8f66f52b77
2017-03-20 18:18:04 -04:00
ebayShopper d4eb7ac6e4 Block bypassing unconscious wake up animation with bandage
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/698eacba79db042a201e9aa1bd57a22e5275148a
2017-03-20 18:01:30 -04:00
ebayShopper 93d6c85dbc Skip gear sound in player_forceSave
Don't play sound when gear flashes open momentarily for force save and
backpack mag ammo count.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/98784aae797cc50978ad848b8ee9b4f70aad231f
2017-03-20 17:26:41 -04:00
ebayShopper 100f9f5da8 Fix unable to chop down POI trees
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/0bc12e21b0b6c103f6c7631310788e14ec96b8d8
2017-03-20 14:58:49 -04:00
icomrade bca17aa2d6 Fix forcesave check
thanks @eraser1
2017-03-14 14:51:22 -04:00
oiad 2ec5390b70 Standardize coin variables, prevent coins not refreshing on skin change. (#1904)
* Standardize coin variables, prevent coins not refreshing on skin change.

* Add missing commit
2017-03-11 13:05:34 -05:00
ebayShopper da34b688d2 Fix hunger and thirst "working" hits way too high
By default this was multiplying all "Working" hunger and thirst hits by
10 @icomrade  because (1 min 0.1) always picks 0.1. For example:
dayz_thirst = dayz_thirst + (5 / 0.1)
dayz_thirst = dayz_thirst + 50

A config variable isn't really needed for this, since it is only used in
one file. It can be easily configured in compiles.sqf which most servers
already overwrite anyway.

This reverts 62b7c21.
2017-03-08 13:08:46 -05:00
ebayShopper 92b09aa530 Remove some unused variables
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/6479708205bccbb4bdd1379a53d9aeed5613f08a
2017-03-05 12:17:09 -05:00
ebayShopper 2032094fb4 Fix undefined groupTags error
My mistake from 6736cd9
2017-03-01 11:24:09 -05:00
ebayShopper 61630e91b3 Update scripts.txt exceptions
- Removed some unneeded exceptions
- Moved tree chop PVEH to server compile only so client does not need
setdamage exception
- Replaced "showCommandingMenu" filter with stricter
"menu" filter
- Renamed two files with no changes for easier filtering of
"menu"

Vanilla
commits:
https://github.com/DayZMod/DayZ/commit/1d639b557b1b2a57399c113184e17992d678ef7b
https://github.com/DayZMod/DayZ/commit/3a29242537439b866388aeeb63574692d6e9677e
https://github.com/DayZMod/Battleye-Filters/commit/5cdf249ea979649246730e7e823a6d5f976d4157
2017-02-28 18:26:37 -05:00
ebayShopper 122d9e16f7 Update player_packTent again 2017-02-26 16:43:33 -05:00
ebayShopper 0eaa995d27 Fix action in progress message in player_packTent 2017-02-26 14:03:39 -05:00
ebayShopper d12fda5e21 Add a few missing playerIsNear checks
Blocks duping method reported by Sercan and confirmed with @oiad .
Thanks
2017-02-25 17:29:27 -05:00
oiad 33fd92db67 Extend epoch_tempKeys to be able to read from backpack as well. (#1897)
* Extend epoch_tempKeys to be able to read from backpack as well.

* Rework
2017-02-24 16:58:16 -05:00
ebayShopper 6736cd92ff Update group tags again
Also fixed wrong string name "STR_EPOCH_RADIO_CONTACT_LOST" thanks @oiad
2017-02-24 14:11:55 -05:00
ebayShopper d416ae80ab Move study body back to fn_selfActions
Adding UserActions to players (CAManBase) is not efficient, because the
condition evaluates onEachFrame when you are "inside" that vehicle type.
Also admins usually want to add more custom actions to dead bodies
anyway.
https://community.bistudio.com/wiki/addAction#Syntax

This partially reverts 3aad4b6.
2017-02-21 15:12:41 -05:00
ebayShopper 9e0c251baf Update vanilla building again
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/e4144e561f50e4b50f0ec5a9c1203233c66b0f27
2017-02-19 18:44:47 -05:00