Commit Graph

5429 Commits

Author SHA1 Message Date
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
441110d05b Fix wrong bleeding icon on Epoch legacy status UI
Thanks to Epoch forums user Angelone for reporting
2017-11-07 17:24:09 -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
f2360a9cd8 Do not use localize on server machine
These were resulting in sloppy mixed language sentences.

The server language never changes, so localize should not be used server
side, unless complete translations are added for all logs, which is not
worth the effort. Only admins see them, unlike client side strings which
are seen by everyone.
2017-11-05 15:05:59 -05:00
ebayShopper
5a5323bdd7 Move large format strings to str formatText
These may exceed 2048 in some cases, so best to be safe and use str
formatText.

Partial revert of fbfb124 to more readable form
2017-11-05 12:12:26 -05:00
ebayShopper
ff397773b1 Update version numbers 2017-11-04 16:14:16 -04: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
4570c96f7f Update change log 2017-11-03 18:34:14 -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
6e48434001 Lower destroyed vehicle cleanup time to 5 minutes
Update to 78460ce
2017-10-31 14:06:43 -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
icomrade
33b1b8877f Merge pull request #1992 from AirwavesMan/master
Adding door localization
2017-10-26 09:18:51 -04:00
A Man
b904ba4ca7 update 2017-10-26 15:02:35 +02:00
A Man
150068a205 Adding door localization 2017-10-26 02:14:27 +02:00
A Man
9f7695385d Update doors with localization 2017-10-26 02:13:50 +02:00
icomrade
7cd8cd18d4 revert 68be0c6003 2017-10-25 16:23:49 -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
A Man
7a8d23bdeb German stringstable overhaul again (#1991)
* German stringstable overhaul

* update

* update

* update
2017-10-22 20:11:35 +13:00
icomrade
0a2c352993 Merge pull request #1990 from oiad/patch-2
Fix issues with DZE_limitPlots
2017-10-15 11:56:13 -04: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 73899d520f (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
icomrade
eb4cc51239 Merge pull request #1989 from dreamforceinc/patch-1
Update russian translation.
2017-10-10 19:32:56 -04:00
W0LF
765ed17a78 Update russian translation. 2017-10-10 23:43:05 +03:00
icomrade
298b3e823b Merge pull request #1988 from BigEgg17/master
Added option to limit build height
2017-10-08 13:37:31 -04: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
dc3939fce5 Update Change Log 2017-10-08 00:06:18 -05:00
BigEgg
3521447972 Update Change Log 2017-10-08 00:02:49 -05:00
BigEgg
20d2d1f078 Altered variable in configVariables.sqf
Salival recommended that I change the variable name to DZE_BuildHeightLimit.
2017-10-07 23:55:01 -05:00
BigEgg
c00b0ad1af Added build height check to modular_build.sqf 2017-10-07 23:53:20 -05:00
BigEgg
ac72c00687 Added build height check to dze_buildChecks.sqf 2017-10-07 23:45:27 -05:00
BigEgg
820d8bdf2b Update stringtable.xml 2017-10-07 23:42:00 -05:00
BigEgg
730dcb88a2 Add DZE_HeightLimit to configVariables.sqf 2017-10-07 23:14:30 -05:00
icomrade
67ebb65081 Merge pull request #1987 from oiad/patch-1
Alter DZE_SafeZonePosCheck to allow custom radii
2017-10-05 09:58:03 -04: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
icomrade
e079381931 move deleteVehicle to server 2017-09-26 16:18:47 -04:00
icomrade
02ff9be46d init vars earlier in updgrade veh
also move vehicle later so the player can't get in until after vehicle is fully initialized
2017-09-25 12:36:37 -04:00
icomrade
95b3174e04 move SQF wait/loop to get OID to SQL Procedure
for some reason you cannot directly get the OID using SELECT LAST_INSERT_ID(); and you cannot return it within the same hive call as the insert call (????).

Requires new procedure for 1.0.6.2
2017-09-25 12:14:41 -04:00
icomrade
cb5d61eff7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2017-09-19 12:28:19 -04:00
icomrade
83eb130fd2 add BAF_L85A2_RIS_TWS_DZ #1983 2017-09-19 12:27:33 -04:00
ebayShopper
6ab4faba39 Update AI hit log
Correction for 6239959

@oiad isPlayer is not reliable on dead units which may be passed to
fa_plr2Str. Also, the other scripts which call fa_plr2Str always provide
a player, so we only want to check for AI on the hit log source.
2017-09-19 12:11:27 -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