Commit Graph

862 Commits

Author SHA1 Message Date
worldwidesorrow
1f60617862 Change to an inline function with exitWith
In cases like this where only one selection is required, the switch option is not the best option because it is slow. Using an inline function with exitWith, the most common options are placed at the top with the least common options placed near the bottom.
2019-12-11 17:38:51 -06:00
worldwidesorrow
65221ec477 Add server side security
This can be used to break a player's legs.
2019-12-11 17:34:23 -06:00
A Man
57a1f3cfa9 Localize and clean up trade_items_wo_db 2019-12-03 23:54:04 +01:00
A Man
b7892bfc68 Add animation to player_sharpen 2019-12-03 23:52:23 +01:00
A Man
e1ee80d02e Remove unused object_dismantle 2019-11-13 10:01:24 +01:00
A Man
5dd2fe6bc3 Remove unused player_chopWood 2019-11-11 11:07:25 +01:00
A Man
52c20fd512 Move fix bottle to epoch crafting 2019-11-04 10:59:06 +01:00
A Man
91a5ccf06a Add proper medic anim
The medic animation can be interrupted now. Also clean up the script from redundant code.
2019-11-01 16:07:39 +01:00
A Man
bc75ad8590 Adding combine matches 2019-11-01 16:01:20 +01:00
A Man
276615a8f1 Fuel container can be emptied now 2019-10-30 10:03:16 +01:00
A Man
915cf72df3 Adding dayz mod waterbottles
This commit adds the waterbottles from DayZ Mod. The icons were made by @DeVloek. The waterbottles are fully functional with all actions. To boil a plastic waterbottle you need an empty trash can.

Dogs could not be watered with other waterbottle than the ItemWaterbottle itself. This is fixed now. Also fix missing reset action from hide body.
2019-10-29 15:23:30 +01:00
A Man
63dfe8a802 Adding back break chance for wheels on salvaging
In Epoch 1.0.5.1 wheels could break on salvaging. This was unintentionally removed with Epoch 1.0.6. Thx @Seelenapperat
2019-10-27 18:46:02 +01:00
A Man
1268f55f32 Fix floating loot after remove, pack or output from fn_dropItem 2019-10-23 12:46:08 +02:00
A Man
ba8ff32cd7 Localize player_craftItem near check 2019-10-20 20:18:41 +02:00
A Man
c0e9fe62e1 Make Hide Body customizable
Do not use hideBody as command without the action. It just hides the body but it still can be geared. If using hideBody in correlation with deleteVehicle it breaks the allDead command.

player action ["hideBody", body] deletes the body and the marker from the map but it stays inside allDead.

This fixes the issue that hided players were still shown on the map and still searched for their body.

Needs additional testing for a new release.
2019-10-20 07:26:51 +02:00
A Man
096fc13150 Adding backpack support for zombies (#2033)
* Adding backpack support for zombies

* Adding backpack support for zombies

* Update CHANGE LOG 1.0.6.3.txt

* Fix jumping vehicles after fliping

* Update CHANGE LOG 1.0.6.3.txt
2019-09-16 11:38:38 +12:00
F507DMT
ca7a77e2ad Update player_switchWeapon.sqf (#2032)
* Update player_switchWeapon.sqf

It is forbidden to change weapons, when player swimming.

* Update player_switchWeapon.sqf
2019-03-11 22:44:33 +13:00
ebayShopper
392f8cb7b3 Update player_buildingDowngrade.sqf
Fixes #2018
2018-06-17 12:38:32 -04:00
ebayShopper
937741dc7d Update tame_dog.sqf
Fixes #2019
2018-06-17 11:50:36 -04:00
oiad
c3cbca144e Add penalties for wrong safe/lockbox code
As per
6f072982c3 (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:
d7a3b30753
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
bac0071745 Remove duplicate "DZ_buildables"
DZ_buildables is already part of DZE_maintainClasses
2018-04-16 23:45:14 +12:00
icomrade
f03f2454c9 Update for A2 1.64 GetHit
Replaced vehicle sethit/setvariable method with sethit/gethit and removed setvariable "Hit_" commands for vehicles (hit_partname can now probably be added to the setvariable filters list).

Modified object_getHit.sqf return to now provide the selection name in order to reduce redundant config lookups. Returns '[Damage, Part Name]', instead of just 'Damage'

Modified vehicle_GetHitpoints.sqf to remove incorrect hipoints from returning. Previously this script would return all hitpoints from any vehicle the current vehicle config inherited from, even if the hitpoint didn't exist in the calling vehicle. this posed a problem since getHit on an invalid part name returns Nil
2018-01-21 17:26:35 -05:00
ebayShopper
eb756bf325 Update vanilla object disassembly
Vanilla commit:
11e360732e
2018-01-17 16:50:30 -05:00
ebayShopper
07d8543e1d Update vanilla chop wood
Vanilla commits:
a17b0572eb
7793017310
2018-01-17 16:43:12 -05: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
ebayShopper
694ea87d0d Update scripts.txt
- Updated exceptions, added new filters and removed some which were not
useful
- Removed exceptions for testkit because it is not part of the mod
- Added notes to clarify for now, will move this info to BI wiki later
- Removed two unused files
2017-12-26 00:55:10 -05: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
ebayShopper
2a2198af68 Fix #2007
Oversight in e1b6125
2017-12-19 13:27:11 -05:00
oiad
1941832b3b Fix https://github.com/EpochModTeam/DayZ-Epoch/issues/2006
Partial revert
9b96ddd2c3
Thanks @ndavalos
2017-12-19 19:10:49 +13:00
ebayShopper
cfc6ad08af Remove unused parameter in PVDZ_hlt_Bleed
Vanilla commit:

83bf13c786
2017-12-17 12:44:03 -05:00
Kobayashi
5ef4f4b2ba remove private declaration _foreachindex (#2001) 2017-12-11 17:06:03 +13:00
ebayShopper
13c90993fc Sync Zupa dialog colors
Heights on the trader menu filter search box and amount box have also
been fixed.
Old: https://imgur.com/a/ld4XF
New: https://imgur.com/a/9T8VP
2017-12-08 18:03:23 -05:00
ebayShopper
b39a15cdd7 Update vanilla building
Vanilla commit:

ad0d514118
2017-12-04 13:49:12 -05:00
ebayShopper
2e01a8d8eb Update stringtable.xml
Vanilla commit:

39927eaa47
2017-11-25 16:05:20 -05:00
ebayShopper
90487cde10 Update player_fired.sqf
Vanilla commits:

70fc007062

f327c99b02
2017-11-22 12:49:06 -05:00
ebayShopper
4ea3f36830 Update PVDZ_sec_atp logs
This reverts commit 7b287a2

Vanilla commit:

a81dd8164c
2017-11-21 15:05:07 -05:00
ebayShopper
4b4bdbbc29 Update vanilla player_breakin.sqf
Vanilla commits:

63aaf07a30

b074e7d847

fb3f69a69a

416cc5dcf1

b6c0dd5849

39a3d45965
2017-11-20 13:57:19 -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
c4816c8d18 Fix error from c2d2ad2956 (diff-a36371a7b1009b3a95c359f8b1cfa)
Type name error, type Array expected Object
2017-11-18 23:11:18 +13: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
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
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
e1b6125761 Fix Javelin selling and _HasKey check again
@oiad Add the Javelin magazine as trade_items to a trader which only
sells magazines (like FriendlyAssaultRifleAmmo) and the Javelin weapon
as trade_weapons to a trader which only sells weapons (like
FriendlyAssaultRifle), then test your changes from f8a230e with both in
your gear. You will see it allows you to sell all the magazines and the
weapon at both traders. This is because the only condition to add the
item to the sellable array is that it exists as an entry in the
category. It never checks the entry type. This commit will check to make
sure the type matches in the config and the player's inventory.

I changed your static "trade_any_vehicle" to find the type in the
config, because it could also be "trade_any_boat/bicycle/vehicle_free".
Boats are handled differently for the hitpoints check in sellItems.sqf.

Also I noticed that both the _HasKey check and your new _y == _myVehType
check were not working for upgraded vehicles _DZE[1-4] because they had
been swapped out to  _baseVehicle. I forgot to account for that when I
added that feature.

This should resolve both problems. I tested both and everything looks
good. It can do with some more thorough testing though. Note
DZE_SaleRequiresKey is false by default.
2017-11-07 16:53:33 -05:00
ebayShopper
c2d2ad2956 Fix remove.sqf error from e079381
Wrecks were not deleted after removal following this change @icomrade

e079381931 (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
97a30adc3b Fix gem sell currency typo
@icomrade Correct me if I'm wrong, but it looks like this was a copy paste typo from https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcBuyableList.sqf#L57

in 83694a4
2017-10-25 14:12:01 -04:00
oiad
64b5659bbd Better checks for removing the owner of plots/doors
Revert
f0e8796996

Partial revert:
2f0774d531 (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