Commit Graph
100 Commits
Author SHA1 Message Date
oiad b06d3d4623 Sync near player checks
Checking if the player is the closest is not always the best idea, this
fixes a few dupes and syncs the distance for all player checks
2020-06-13 11:26:44 +12:00
oiad d875697e29 Fix copy paste error
Thanks @ArmaWizard for the heads up
2020-05-20 08:44:27 +12:00
oiad dddd8c758a fn_selfActions cleanup 2020-04-25 20:13:08 +12:00
oiad 6cab237e23 Bump version number 2020-04-17 22:15:08 +12:00
oiad 9104e9486b Fix typos 2020-04-17 22:14:00 +12:00
oiad 342813f238 Update vehicle lists with ACR vehicles
This adds the vehicles that were added in the 1.64 A2 patch
2020-04-13 10:35:25 +12:00
oiad d5910357c0 Player loses humanity after hotwiring a vehicle 2020-04-07 10:39:52 +12:00
oiad 24bd87cc5f Allow fnc_lockCode to be used server/client side
This allows fnc_lockCode to be used by client and server side scripts.

This also does localization client side but server side the colors are
hard coded english.
2020-04-07 10:29:17 +12:00
oiad ca1eef5b90 Added more Russian translations
Thanks @Redlink-kam
2019-12-14 15:08:51 +13:00
oiad 9105a69b8f Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2019-10-31 08:20:56 +13:00
oiad 0617a77e1a Fix Advanced Trading lag exploit
Every button action that processes money/vehicles in some way should do
closeDialog before actions are called, currently it's possible to game
the system using a net limiter.

Thanks to Merlijn for the fix
2019-10-31 08:20:44 +13:00
oiad f6e8eca54b Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2019-10-30 22:17:29 +13:00
oiad 12f9e16407 Show distance/limit in failed distance verification check 2019-10-30 22:17:18 +13:00
oiad ac41428404 Change ComboLockUI to check if selected door is null
This then matches the safe/lockbox gui check which means modders can use
the GUI screens for setting /retreiving codes (as per my codeChange
script):

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/Configs/RscDisplay/safegui.hpp#L306

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/Configs/RscDisplay/safegui.hpp#L654

Also removed the check for the safeKeyPad since it's done further along
in `player_unlockVault` and also matches the lockbox ui.

Thanks to @AirwavesMan for reporting
2019-01-28 23:35:44 +13:00
oiad 0391fef4ff Update private tags
This was breaking scripts that use a variable called `_chance`

_chance = 30;
[player,"repair",0,false,50] call dayz_zombieSpeak;

_chance would get changed to 0
2019-01-05 11:12:29 +13:00
oiad 387f77b9da Update private tags 2019-01-05 09:32:12 +13:00
oiad c3cbca144e Add penalties for wrong safe/lockbox code
As per
https://github.com/EpochModTeam/DayZ-Epoch/commit/6f072982c3adb3655c214bae1a2f0b01e3e24e4a#diff-2b5340930b14ce1ae29d38ebc575c75a
2018-05-26 21:42:50 +12:00
oiad efc57840d2 Make upgrade localization overwrite displayed dayz_rollingMessages
By the look of it, I broke this file when I commited:
https://github.com/EpochModTeam/DayZ-Epoch/pull/1918/commits/d7a3b307531f226289f5031063efac90c63e1ff4
it seems it's to do with CRLF vs LF line endings.

Unfortunately, to fix it you have to commit the whole file again, zzz.
2018-05-21 23:04:02 +12:00
oiad 8f5a699278 Update localization 2018-05-21 22:50:39 +12:00
oiad a88eb092eb Update localization 2018-05-21 22:28:09 +12:00
oiad 562b9cff10 Add missing craftables to maintain array
"GunRack_DZ","WoodCrate_DZ","OutHouse_DZ","StorageShed_DZ","WoodShack_DZ","Wooden_shed_DZ"
arent a child of any of the other objects to be maintained and aren't in
the list
2018-04-16 23:45:14 +12:00
oiad bac0071745 Remove duplicate "DZ_buildables"
DZ_buildables is already part of DZE_maintainClasses
2018-04-16 23:45:14 +12:00
oiad 9d86d46075 Update German translation
Thanks @Relentless
2018-03-31 21:29:16 +13:00
oiad f65dedf9ed Change DZE_limitPlots to be configurable
This allows you to now specificy a maximum amount of plots per player
for them to place.

This is disabled by default.
2018-03-31 15:53:56 +13:00
oiad 6efd94f638 Add sorted classname lists for all Epoch 1.0.6.2 items 2018-03-31 10:13:16 +13:00
oiad e1f655106e Add prelocked versions of cinder door/garage
This is as per the wooden versions, adds cinder_door_kit_locked and
cinder_garage_kit_locked.

The same could be done for the version with the door WITHOUT the door
lock, but I feel this is enough.
2018-03-30 23:49:45 +13:00
oiad 3e0ddef7b1 Fix more dayz_serverKey from https://github.com/EpochModTeam/DayZ-Epoch/commit/b5f3f306de9e989a1106333e6feeb97f2e73a3d0
Thanks to @AirwavesMan for the heads up
Hopefully no more! :)
2018-01-21 12:48:52 +13:00
oiad b5f3f306de Fix publicVariableEval kicks from RNG fail
RNG can be a cruel mistress.
Fixes: Value Restriction #121 "PVDZE_veh_Publish2" =
[[99,[4763.93,7521.36,-0.000228882]],"CSJ_GyroCover",false,"ItemKeyBlack958",<NULL-object>,"iN4r7X7Psetsq"]

Thanks @AirwavesMan
2018-01-18 22:37:38 +13:00
oiad b791deeea8 Condense variables and remove unneeded _isPZombie checks
We're already checking for _isPZombie here:
https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/compile/fn_selfActions.sqf#L223
so we don't need to check it again with the trader or the attach to
heli.

Condensed the distance check to a variable
2018-01-06 17:37:06 +13:00
oiad 564e3da5c2 Add playerNear check to downgrading
Fixes dupe while downgrading locked doors, thanks @Shu for reporting
2018-01-02 20:57:07 +13:00
oiad 141b25e204 Update DZE_SafeZonePosCheck with missing operator
I possibly just need a little more sleep and a little less epoch time
2017-12-30 23:07:36 +13:00
oiad 6248addc3f Make Safe Zone Zombie and Loot spawning a toggle
As requested by a few admins that didn't realise it was now hard coded
to disable loot/zombie spawning
This requires the check since we're also using DZE_SafeZonePosCheck for
DZE_buildChecks with a forced radius.
2017-12-30 22:03:31 +13:00
oiad 2d437b444c Update README.md 2017-12-29 16:54:22 +13:00
oiad 7dd4ae453d Fix battleye kick from https://github.com/EpochModTeam/DayZ-Epoch/commit/4ea3f3683005ca69e697e27e6dbdcaab16cb73a9
https://github.com/EpochModTeam/DayZ-Epoch/blob/4ea3f3683005ca69e697e27e6dbdcaab16cb73a9/SQF/dayz_code/system/antihack.sqf
updated but the scripts.txt filter was forgotten
2017-12-26 15:51:43 +13:00
oiad 91669fae74 Fix Overwatch G3 glitch for combining
Fix
https://github.com/EpochModTeam/DayZ-Epoch/issues/1995#issuecomment-348188066
2017-12-26 11:58:36 +13:00
oiad e99d6259a2 Fix L85A2_SD_Base not using SD mags
Thanks @worldwidesorrow

https://github.com/EpochModTeam/DayZ-Epoch/issues/2000#issuecomment-352939774
2017-12-20 17:40:11 +13:00
oiad 1941832b3b Fix https://github.com/EpochModTeam/DayZ-Epoch/issues/2006
Partial revert
https://github.com/EpochModTeam/DayZ-Epoch/commit/9b96ddd2c3f63a263d2408a0bfe95571fa8f32dd
Thanks @ndavalos
2017-12-19 19:10:49 +13:00
oiad 7857dedc86 Add German translations
Thanks @AirwavesMan for providing the translations!
2017-12-17 21:34:38 +13:00
oiad e0b444c3fd Update stringtables, fix translations 2017-12-17 14:50:32 +13:00
oiad edc6224bc3 Fix broken string table name
String STR_ITEM_DESC_tent_poles not found
2017-12-17 11:24:10 +13:00
oiad 373aeb2db7 Update stringtable.xml 2017-12-17 11:12:18 +13:00
oiad 7a93b5649a Add testkit link 2017-12-16 21:42:54 +13: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
oiad c4816c8d18 Fix error from https://github.com/EpochModTeam/DayZ-Epoch/commit/c2d2ad29567a48cee4b50623d7b8b7c50ccfafb9#diff-a36371a7b1009b3a95c359f8b1cfa
Type name error, type Array expected Object
2017-11-18 23:11:18 +13: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
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
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
oiad de94cdfb23 Check plot ownership when removing players from plot pole
Additional work for https://github.com/EpochModTeam/DayZ-Epoch/commit/73899d520fd2fe523ad9b0e28618697aa0933364#diff-0cdf3d56b40b62e92b498e7362874f34
This fixes an issue of players removing them selves from a plot so a friend can become plot owner and bypass the original DZE_limitPlots check
2017-10-15 23:53:24 +13: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
oiad 0aafb1d827 Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:27:09 +13:00
oiad 1f1e96b8fe Alter DZE_SafeZonePosCheck to allow custom radii 2017-10-04 21:25:31 +13:00
oiad 50ec89489d Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:51:48 +12:00
oiad 76bafe55ec Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:50:52 +12:00
oiad 27801a111b Fix auto unlock to function like storage
Safe/lockbox will be able to be auto unlocked after placing due to setting dayz_combination to _combination.
Locked doors use DZE_Lock_Door instead.
2017-09-11 22:49:32 +12:00
oiad e8a64c3757 Move more diag_log to debug lines 2017-09-09 12:16:58 +12:00
oiad ea38067cc1 Move more diag_log to debug lines 2017-09-09 12:11:38 +12:00
oiad bc93e246ee Add extra magazine instead of reloading current one
https://github.com/DayZMod/DayZ/commit/e7ffb88075b2e71ef442946af0663ade57ea01c4
2017-09-09 09:22:51 +12:00
oiad cdd0db805f Remove debug lines 2017-09-03 19:27:30 +12:00
oiad 5378b1ad76 Fix random count 2017-09-03 19:18:55 +12:00
oiad ce756a0622 Allow modular buildables to refund defined parts 2017-09-03 19:13:56 +12:00
oiad 0507563e17 Allow modular buildables to refund defined parts 2017-09-03 19:11:53 +12:00
oiad e1f48ea557 Allow modular buildables to refund defined parts
This allows typically not refunded modular buildables to be configured by the server admin.

	For example:
	DZE_modularConfig = [
		["CinderWall_DZ", [["CinderBlocks",7],["MortarBucket",2]]],
		["CinderWallDoor_DZ", [["CinderBlocks",7],["MortarBucket",2],["ItemTankTrap",3],["ItemPole",[1,3]]]]
	];

	This would refund 7 cinder blocks and 2 mortar for "CinderWall_DZ"
	For "CinderWallDoor_DZ" you would get 7 cinder blocks, 2 mortar, 3 tank traps and a random number of poles between 1 and 3.
	The refund amount can be an array where the first param is the minimum and the second is the maximum, it will refund a random amount between them.

Thanks to @BigEgg for the suggestion and sample code.
2017-09-03 19:03:33 +12:00
oiad b8dba25cc5 Only allow lock removal if door is unlocked 2017-09-03 13:56:06 +12:00
oiad 08796c65de Update server_swapObject.sqf 2017-08-31 00:07:16 +12:00
oiad 5eba1edf4b Update server_publishVehicle.sqf 2017-08-31 00:06:44 +12:00
oiad 9b79dde3aa Update server_publishVehicle3.sqf 2017-08-31 00:05:35 +12:00
oiad bbb7da7c3c Exclude DZE_PlotManagementAdmins from build checks (safeZone/no build near) 2017-08-31 00:03:36 +12:00
oiad 7a40f5d621 Add support for keeping the key on vehicle sale 2017-08-30 23:48:48 +12:00
oiad 63bc345f9f Add support for keeping the key on vehicle sale 2017-08-30 23:47:20 +12:00
oiad f8a230e3b1 Fix javelin/stinger selling
The previous fix https://github.com/EpochModTeam/DayZ-Epoch/commit/4fa36dfd94b0bbfc63a14bb28035a692101dd1b1 was not working correctly, if you had say the a stinger launcher and a stinger ammo it would detect them both as weapons, this properly classifies them and all others as how they should be.

Moved to use epoch_tempKeys also

This forces the player to only be able to sell a vehicle from the gear menu instead of backpack and vehicle menu since most of the time you would be using add all.

From: https://epochmod.com/forum/topic/44413-prevent-selling-vehicles-from-backpack/?tab=comments#comment-297328
2017-08-26 09:56:28 +12:00
oiad 7decf4dd9e Switch forgotten "time" to "diag_tickTime"
Seems like these were forgotten at some point, the rest are diag_tickTime
2017-08-21 20:50:23 +12:00
oiad 5fc0b36e5b Fix bad sentences for locking/packing fails. 2017-08-20 23:00:35 +12:00
oiad 403e40063f Update server_handleSafeGear.sqf 2017-08-19 20:28:46 +12:00
oiad 367d74f3f4 Update server_handleSafeGear.sqf 2017-08-19 11:53:11 +12:00
oiad ecf013839e Dont show incomplete lockbox code
If the player enters a wrong code the algorithm can make the entered code seem completely bogus, let's just exit out of the routine if that's the case.

Sample bad code (Just hit red key):
```11:45:54 "salival (playerUID) FAILED unlocking LockBox with code: Red0-9900 (actual: Red34) @038117 [3899.36,3580.24,1.632]"```
2017-08-19 11:46:35 +12:00
oiad e21e0e217f Remove comment for engine starting/stopping
Actually makes this functional without editing it, this is quite useful for custom scripts.
2017-08-17 23:33:51 +12:00
oiad bdfbcb1e32 Fix vehicles bouncing when upgrading.
This helps stop vehicles bouncing when being upgraded.
The Vehicle Key Changer script I rewrote uses the epoch vehicle upgrade system to claim/change the vehicle key, we noticed that it was causing the vehicles to bounce, but VKC uses all the position functions from the epoch script so it's not something that VKC has introduced.
2017-08-17 23:28:16 +12:00
oiad 4355824aad Revert commit 2017-08-17 23:25:08 +12:00
oiad d04a99aa04 Fix vehicles bouncing when upgrading.
This helps stop vehicles bouncing when being upgraded.
The Vehicle Key Changer script I rewrote uses the epoch vehicle upgrade system to claim/change the vehicle key, we noticed that it was causing the vehicles to bounce, but VKC uses all the position functions from the epoch script so it's not something that VKC has introduced.
2017-08-17 23:19:48 +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
oiad 09bfddb46c Remove extra fn_selfActions check for refueling. (#1958) 2017-07-29 17:59:52 -04:00
oiad 2f0774d531 Forbid removing the plot/door owner from objects (#1948)
This makes it so only the door or plot owner can remove them selves from
doors/plots or the UIDS in
DZE_PlotManagementAdmins/DZE_DoorManagementAdmins.
2017-04-17 13:52:36 -04:00
oiad 8d3be10e61 Fix BagFenceRound making the player slide (#1946)
Fixes: https://github.com/EpochModTeam/DayZ-Epoch/issues/1945
2017-04-16 13:54:25 -04:00
oiad bf6a980d4c Dont show you have the item if it's not nearby (#1937)
* Dont show you have the item if it's not nearby

This was showing you had a vehicle in the trader menu even if it was
over the other side of the map, I think this works better only showing
it if it's within the trader zone.

* Forgot missing operator
2017-04-10 20:03:37 -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
oiad 088945e074 Remove public variable event handler when using config traders. (#1930)
* Remove public variable event handler when using config traders.

This stops the public variable event handler from being loaded when
you're using config based traders, it's not needed in this situation

* Change nearestObjects to nearEntities in z_checkCloseVehicle.sqf

* Fixes vehicle selling not able to sell correctly

If more than 1 vehicle of the same classname was in a trader and the
local vehicle was further away it would not be able to be sold till
moved closer. We are using DZE_myVehicle for everything and we do
previous checks to make sure it's not null and local so we can assume it
is okay to use.

Fixes
https://epochmod.com/forum/topic/43643-vehicle-dze4-can-not-be-sell/#comment-290036
2017-04-01 13:02:51 -04:00
oiad d7a3b30753 Fix for unable to access shed/geared objects until you relog.
https://epochmod.com/forum/topic/43482-storage-sheds-issue/
2017-03-28 19:25:14 +13:00
oiad 5abdefe792 Update german string 2017-03-25 10:06:48 +13:00
oiad 9d6d1386cd Add german string 2017-03-24 06:52:34 +13: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
oiad 9324deffaf server_updateObject better version. (#1910)
Cheers @ebayShopper
2017-03-16 11:46:23 -04:00
oiad 8c42460ba9 Revert force coins update, Add seperate coins update
This reverts
https://github.com/EpochModTeam/DayZ-Epoch/commit/ce75f87e1da90c5eb13fcd214b4ebef0a8bd566f
2017-03-16 06:56:29 +13: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