Commit Graph

1025 Commits

Author SHA1 Message Date
ebayShopper ac10daeb4d Update humanity morphing
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/33d4165e64fde04bf43628069e2d006b45548b38

https://github.com/DayZMod/DayZ/commit/6674be6d5faabc37699142d93e20e08527dda0c3

https://github.com/DayZMod/DayZ/commit/f4d18a6fefd231cef88d39e5b91e4827e09a7a28
2017-11-25 14:52:06 -05:00
ebayShopper 1e65d5d324 Move server_getDiff to missionNameSpace
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/d82f430c28f69c89c091bd18121578d293ba6400
2017-11-25 12:47:25 -05:00
ebayShopper 90487cde10 Update player_fired.sqf
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/70fc0070625545b5f4a1234df1e0fe2e837ad313

https://github.com/DayZMod/DayZ/commit/f327c99b023377f81ffe958c259e6c68bd4c68be
2017-11-22 12:49:06 -05:00
ebayShopper c671cf9661 Update player_death.sqf
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/0e0ffa1d6eb04b94c90b0ef0551920b523d367d7
2017-11-21 16:30:19 -05:00
ebayShopper 4ea3f36830 Update PVDZ_sec_atp logs
This reverts commit 7b287a2

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a81dd8164c2029221fc4924817615191032b1fa8
2017-11-21 15:05:07 -05:00
ebayShopper 4b4bdbbc29 Update vanilla player_breakin.sqf
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/63aaf07a30803c3d72bdc252b87c3ed974e5e740

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

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

https://github.com/DayZMod/DayZ/commit/416cc5dcf186f7d37f82a5198f86cbf048679f16

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

https://github.com/DayZMod/DayZ/commit/39a3d45965fba93fde635bc6429eb69fd1ab545d
2017-11-20 13:57:19 -05:00
ebayShopper 89a43cad8a Update vanilla vehicle_getOut log
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/403861fa1ae07c4f42e07a60bf687986092cca10

https://github.com/DayZMod/DayZ/commit/b4798403a8d18ce113fd49083cffe5539436f049
2017-11-19 10:31:51 -05:00
ebayShopper 137f448793 Update vanilla fence damage
Vanilla commits:

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

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

https://github.com/DayZMod/DayZ/commit/8b4a985cf632d0b0d14ca3e558c89729abeec5b0
2017-11-18 17:43:06 -05:00
oiad 9b96ddd2c3 Consolidate ItemKeyXXX/Colors to arrays.
Tidies up scripts inside epoch and for script creators.
Moved z_at_buyItems to epoch_generateKey.
2017-11-19 11:27:02 +13:00
oiad 2f178d8978 Consolidate weapon/magazine/backpack adding to function
This moves a lot of duplicated code from a server side only function
(server_addCargo) to a client/server function called fn_addCargo.
2017-11-19 11:06:00 +13:00
ebayShopper 9d64d318f6 Revert 83dd363, c4816c8
This reverts commits c4816c8 and 83dd363.

These were not errors, oiad did not properly update his dayz_server
before testing.

Renamed variables and added comments to clarify object or position can
be used
2017-11-18 11:39:41 -05:00
oiad 83dd363ff1 Fix error from https://github.com/EpochModTeam/DayZ-Epoch/commit/c2d2ad29567a48cee4b50623d7b8b7c50ccfafb9#diff-a36371a7b1009b3a95c359f8b1cfa
Type name error, type Array expected Object
2017-11-18 23:02:00 +13:00
ebayShopper 4953f33fdb Add configurable loot refresh timer
Vanilla commits:

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

https://github.com/DayZMod/DayZ/commit/657aaba83a60c6c8c69563e8e949a58861aab57c
2017-11-17 17:47:28 -05:00
ebayShopper 14a6252911 Fix DZE_BuildHeightLimit behavior
Corrections for #1988
@BigEgg17 abs(_objHDiff) only tells you how much you have raised the
ghost from where it was when you started building. To test the actual
height above ground or sea level you need to use _position select 2.

Say DZE_BuildHeightLimit was 60m and DZE_buildMaxMoveDistance was 20m.
If the player started building at 55m and then raised the object 20m,
they would be allowed to build at 75m with your check.

Also getPosATL should not be used here. For example, I am swimming on
the surface of the water on Napf and getPosATL returns a height of 29m.

@oiad you missed zombie_wildGenerate.sqf in #1987
2017-11-14 13:09:15 -05:00
ebayShopper c1110fc61c Fix a rare error with keyboard_keys
Some combo binds will cause actionKeys to return a number greater than
six digits. See AgentRev's note:
https://community.bistudio.com/wiki/actionKeys

An example is NumLock + P [1.15763e+009]. Using a number this large as
an index errors out. Example:
test_array = [];
test_array set [9999991,true];

But six digits or less will not error:
test_array = [];
test_array set [999999,true];
2017-11-13 17:34:43 -05:00
ebayShopper eefcdf2610 Add basic security checks to object_killed
PVDZ_veh_Save = [_obj,"killed"]; could be abused in the same way as
server_deleteObj (42e0047)
2017-11-13 16:14:22 -05:00
oiad a1c14a2fd3 Fix broken DZE_SafeZonePosCheck for built items near safezones.
This was forgotten from my original commits
2017-11-12 12:40:34 +13:00
ebayShopper 0fadd1e5fc Slightly speed up a switch model check
Check once instead of twice
2017-11-10 12:03:05 -05:00
ebayShopper ac32a8b2cd Configure DZE_SafeZonePosArray by default
Zeds and loot should not spawn in trader cities by default, regardless
of whether the server uses safe zones.

For servers that do not use safezones, the only other things affected
are salvage and instant kill for vehicle explosions in trader cities.
Neither is a significant issue. Most servers use safezones anyway.

Following d750f57, changed to exitWith so the check is only called once
instead of multiple times. Also no need to call again in
zombie_generate, since that function is only called by
building_spawnZombies which already checks it.
2017-11-09 13:52:32 -05:00
ebayShopper 89d10fc973 Revert "Only allow lock removal if door is unlocked"
This reverts commit b8dba25

As discussed with oiad on Discord, this serves no purpose now, since
DZE_lockDoor == charID means the player either just unlocked, built,
upgraded or downgraded the door, so they want to see the action.
Logically a combo lock can be removed while a door is open. In case of
it being locked, you already know the code, so it is assumed you put it
in before removing it. Completing two-three steps at once is more
convenient for the player.

Also removed _isDestructable because there are no classes which inherit
from "BuiltItems" and have a lock
2017-11-08 14:15:25 -05:00
ebayShopper a7959c26de Fix build checks mistake in bbb7da7
@oiad when exitWith is inside an if () then it only exits that control
structure, not the whole script, so _canBuild could be overwritten by
_toolCheck below.
2017-11-08 10:59:22 -05:00
ebayShopper c2d2ad2956 Fix remove.sqf error from e079381
Wrecks were not deleted after removal following this change @icomrade

https://github.com/EpochModTeam/DayZ-Epoch/commit/e07938193161ae147523c3a4bae76eecbea787f4#diff-e057d99bdf425219ff82fc6220a85b86L154

In object_upgradeBuilding playerNear was exiting without readding
removed magazines.

I moved deletion back client side in packTent and upgradeStorage for
now, because there is potential for duping via pulling gear out of the
old tent during the deletion delay. PVS can be delayed especially when
the server is under load, so it can take a few seconds for the server to
delete the object after sending the request. These two scripts should be
the only ones where that could be problematic. Packing and upgrading
tents should eventually be moved completely server side like safes.
2017-11-04 14:35:51 -04:00
ebayShopper 42e00475d6 Add sender verification to publish and swap object
Continuation of 8035df0

This is important to have on publish to identify cheaters who spam
create objects in the database or create objects with bad inventory.

- Renamed variables to backport to vanilla
- Removed % and & due to code filtering in publicvariableval.txt

Changes in modular_build.sqf were the same as player_build.sqf.

Tested with building, upgrading buildable/vehicle/tent, downgrading,
buying a vehicle, destroying tent and removing an object.
2017-11-03 16:09:14 -04:00
ebayShopper f74e065de1 Remove redundant setVariable in humanityMorph
Setvariables made redundant by 9cc3c82

Also changed removeEventHandler to remove all, so if switchModel exits
at one of the exitWiths the player will not be left invincible.
2017-10-29 15:39:05 -04:00
ebayShopper a229057fc6 Readd shift + P block
My mistake in 780d5d8, I forgot actionKeys doesn't work on combination
binds.
2017-10-28 18:45:04 -04:00
ebayShopper 780d5d8775 Fix force save when pressing F4
Forgot to remove F4 from the blocked list in 5acad04 @icomrade so it was
being overwritten.

Shift + P is not a hardcoded engine bind. It is just the default
DSInterface bind, so actionKeys "DSInterface" covers that in f760896.
2017-10-28 18:34:37 -04:00
ebayShopper 82ccecef6c Fix occassional reposition to roof on namalsk, napf, tavi
Closes #1993
2017-10-26 18:08:12 -04:00
oiad 64b5659bbd Better checks for removing the owner of plots/doors
Revert
https://github.com/EpochModTeam/DayZ-Epoch/commit/f0e87969968646e0ae6e9acbdf7e3fa31a4dfd35

Partial revert:
https://github.com/EpochModTeam/DayZ-Epoch/commit/2f0774d531b950c3ab89ad82b019bd46c0c10ba4#diff-c3aa237d9007054fc3a724116a5d9f1a

This is a better check for removing the owner of plots/doors based on
conversations on discord.
Plot/door owner can remove them selves
plot/door friends can't remove plot owner
plot/door admins can remove anyone
2017-10-24 20:19:21 +13:00
oiad f0e8796996 Check if players are owner of other plots correctly
This fixes the checking done not picking up that a player was the owner of the plot by the userlist on the plot when it wasn't them that placed it
2017-10-16 00:04:59 +13:00
BigEgg e9ff8ff45b Removed "=" from dze_buildChecks.sqf
Salival recommended a >=, however upon further thought, this would be irrelevant as this variable is meant to prevent building over a certain height, not at that specific height. Having >= would restrict building at exactly 30 meters for example rather than simply above it. The = sign was also not used in modular_build.sqf
2017-10-08 00:12:19 -05:00
BigEgg ac72c00687 Added build height check to dze_buildChecks.sqf 2017-10-07 23:45:27 -05:00
oiad 6f7f1c7f93 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:30:48 +13:00
oiad c1c0db9b95 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:29:58 +13:00
oiad 2a5dab6d89 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:28:59 +13:00
oiad b318ee5c8b Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:27:58 +13:00
icomrade e079381931 move deleteVehicle to server 2017-09-26 16:18:47 -04:00
icomrade f69bd80f43 revert distance to player check
Occasionally errors out, but may not be worth implementing in Epoch due to the increased loot
2017-09-15 21:12:30 -04:00
icomrade 51ccf16c30 Fix dupe caused by dupe fix
thanks JasomTM and Salival
2017-09-15 20:16:59 -04:00
icomrade b8d5c7cda7 Change slow zombie behavior and variable
thanks for the idea DieTanx. note: The only changes to the FSM were in the action field of the UnitReady condition
2017-09-14 12:44:44 -04:00
icomrade 7ae6aa56dd Fix #1981 and Incidental dupe
thanks @AirwavesMan
2017-09-13 14:51:34 -04:00
icomrade d750f576ed Prevent Zed + loot spawn in safezones
thanks BaroN for the idea
2017-09-13 12:45:00 -04:00
icomrade e0005850b8 Prevent loot pile cleanup right next to player
https://github.com/DayZMod/DayZ/commit/726155f16d3f308e77ec549e3956a72f163b7968
2017-09-08 11:12:40 -04:00
icomrade 82db7d8109 consolidate eval 2017-09-08 10:11:20 -04:00
icomrade 26da25bf42 Merge pull request #1976 from oiad/patch-7
Only allow lock removal if door is unlocked
2017-09-08 10:05:28 -04:00
icomrade 7a3c831eb3 Merge pull request #1975 from oiad/patch-13
Exclude DZE_PlotManagementAdmins from build checks (safeZone/no build…
2017-09-08 10:05:02 -04:00
oiad b8dba25cc5 Only allow lock removal if door is unlocked 2017-09-03 13:56:06 +12:00
oiad bbb7da7c3c Exclude DZE_PlotManagementAdmins from build checks (safeZone/no build near) 2017-08-31 00:03:36 +12:00
oiad 7428f3fd1f AI hit messages and continuity
This changes the hit messages to only show AI instead of the AI's names.
Changes this:
20:08:37 "P1ayer PID#7(salival) hit by PID#1(Qadeer Hakimi) with
vil_G36VA4Eot/B_556x45_Ball <ammo left:25> from 356 meters in head_hit
for 0 damage"
To this:
20:08:37 "P1ayer PID#7(salival) hit by AI with
vil_G36VA4Eot/B_556x45_Ball <ammo left:25> from 356 meters in head_hit
for 0 damage"

Sanity fix for hit and kill for vehicles so they match:
Before:
22:44:03 "P1ayer PID#3(salival) hit by AI in Pickup (PK) DZ from 15
meters in head_hit for 0.88666 damage"
After:
22:44:03 "P1ayer PID#3(salival) hit by AI with a Pickup (PK) DZ from 15
meters in head_hit for 0.88666 damage"
Kill message:
22:44:04 "salival (76561197999617086) salival was killed
by AI with a Pickup_PK_INS_DZ from 15m"
2017-08-17 23:09:10 +12:00
oiad 2a01194d87 Condense locked status to a variable
This will be easier for custom mods that use the lock checking
(vkc/virtual garage etc) as well as removing overhead from
fn_selfActions
2017-08-06 09:41:23 +12:00
oiad 751fdc9e82 extend epoch_tempKeys to return key classnames also 2017-08-04 23:18:27 +12:00