W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-22 20:12:20 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,014 Commits 20 Branches 18 Tags
5120d8a488a87d19a1d9f1419a05eec1b54a8ba4
Commit Graph

481 Commits

Author SHA1 Message Date
ebaydayz
5120d8a488 Fix incorrect backpack space calculation 
Fixes not being able to purchase into a half full backpack and free slot
counts text incorrect when buying into backpack.
 2016-05-08 16:21:24 -04:00
ebaydayz
84e64be47e Don't show debug message when paying with exact amount 2016-05-08 13:30:26 -04:00
ebaydayz
c477304571 Forbid buying duplicate tools into gear 2016-05-08 11:59:25 -04:00
ebaydayz
41e653136f Add attachments compatibility list to trader 
Also reduced item info size a bit to better fit normal and large
interface sizes.
 2016-05-07 19:29:00 -04:00
ebaydayz
03e3293795 Add extra vehicle info in Adv. Trading 
Translations are from Arma2OA languagecore.pbo
 2016-05-06 18:57:53 -04:00
ebaydayz
00cb76a496 Fix Adv. Trading pistol detection 
The secondaryWeapon command does not detect pistols. It returns the
unit's launcher.
https://community.bistudio.com/wiki/secondaryWeapon

This fixes the menu always showing your pistol slot as open, even when
you already have one.
 2016-05-05 17:25:47 -04:00
ebaydayz
7bc5d7f7f5 Fix full toolbelt showing -2 tool slots in Adv. Trade 
Correctly shows zero available tool slots when toolbelt, binocular and
NVG slots are full now.
 2016-05-05 16:50:09 -04:00
ebaydayz
fe54b78bdb Add backpack selling to Advanced Trading 
It was not possible to sell a backpack from your gear or vehicle.

Added option to sell from gear. Sell backpack from vehicle is still not
possible currently due to Arma limitations.
 2016-05-05 14:55:50 -04:00
ebaydayz
2c6ef2ced3 Don't show selected vehicleX message on Adv Trade startup 
Only show Selected vehicleX systemChat message when clicking the buy
in/sell from vehicle button. Previously it was showing every time the
menu opened.

Also added better logging to RPT. Shows "Trader Menu: %1 x %2 added" and
"Trader Menu: %1 added"
 2016-05-05 12:37:10 -04:00
ebaydayz
ef2c910bfc Fix open gear backpack slots always showing zero 
IsNil returns true as long as the variable is defined. In this case it
is defined as objNull when you have no backpack.
 2016-05-04 19:09:10 -04:00
ebaydayz
cb381c5ce3 Fix another transportMaxBackpacks typo 
This was responsible for vehicles showing zero and negative numbers of
available backpack slots.
 2016-05-04 18:42:20 -04:00
ebaydayz
ed9253671e Always open Advanced Trading in buy mode 
Fixes the unintended behavior of swapping between buy and sell each time
the menu is opened.
 2016-05-04 16:50:46 -04:00
ebaydayz
349e0a103d Fix trade title showing "Buying in vehicleX" when in sell mode 
Tested and confirmed working as intended now.
 2016-05-04 16:46:35 -04:00
ebaydayz
85869b32f1 Fix Adv. Trade secondary vehicle check 
Forgot this one. See:

f503e53097
 2016-05-04 15:53:25 -04:00
ebaydayz
f503e53097 Fix Adv. Trade nearby vehicle check detecting animals 
Was getting "Buying in Rabbit" when one was nearby.

No need to check "AllVehicles", this is faster and will get all drivable
vehicle types.
 2016-05-04 15:47:47 -04:00
ebaydayz
e6c5930415 Fix unit icon in Advanced Trading selling from gear box 
Adds a nice icon of the unit in the top right below "Gear" text.
 2016-05-04 14:39:40 -04:00
ebaydayz
800182f7e2 Fix can't buy backpack into vehicle with Advanced Trading 
The typo here was causing all vehicles to return 0 for
transportMaxBackpacks.
 2016-05-04 14:20:23 -04:00
ebaydayz
5043fafae4 Fix default currency display in Adv. Trading bag item info 
Fixes currency display name and picture not showing when looking at
backpack item info.

Also fixed localized string for weps and mags order reversed in item
info for backpacks and vehicles.
 2016-05-04 12:54:36 -04:00
ebaydayz
ee70dd49d3 Prevent rags duping 
Vanilla development commit:

31167114e7
 2016-05-03 17:28:33 -04:00
Anton
75ae8ad3c0 a couple localization updates (#1690) 
* a couple localization updates

* fix merge conflicts

* fix

* fixes
 2016-05-03 15:15:44 -04:00
ebaydayz
1eeaa3e792 Add epoch_generateKey function 2016-05-03 13:35:50 -04:00
ebaydayz
2f98fc0451 Prevent MeleeMagazines being counted by BIS_fnc_inv 2016-05-03 13:35:50 -04:00
icomrade
3c27f76c7c use self actions to spawn plot radius, fixes #1566 2016-05-02 23:06:50 -04:00
icomrade
5f054393e5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf
 2016-05-02 20:44:50 -04:00
icomrade
575682b7c8 Add A Plot For Life modification by RimBlock 
A Plot For Life also includes Precise Base Building by Mikeeeyy. Precise
base building has no variable to switch it on or off, I don't think it
should.

Seems to work well enough, this may conflict with the duplicate object
uid fix, it appears to spam my server rpt.
 2016-05-02 20:42:37 -04:00
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz
8d82693c1b More Advanced Trading localization 
Russian translations provided by Epoch forums user koms:
http://epochmod.com/forum/profile/33066-koms/
 2016-05-02 17:32:27 -04:00
Anton
2a99cf8a63 more localization work (#1689) 2016-05-02 13:31:13 -04:00
ebaydayz
f848305b50 Update Advanced Trading with category reuse support 
Tested and working ok.
Updating with change from:

03b8c38c6a
 2016-05-01 19:02:29 -04:00
ebaydayz
66408ded24 Prevent trader menu action showing on players 
Fixes bug where player wearing a skin in serverTraders would show trader
menu action on him.
 2016-05-01 17:08:55 -04:00
icomrade
d6236dcb91 Fix improper total price in advanced trading 
Also sort gems by value when giving total price.
 2016-05-01 16:24:38 -04:00
ebaydayz
2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00
ebaydayz
b4cd47f5b5 Update PVDZ_plr_save in advanced trading 2016-05-01 13:21:17 -04:00
icomrade
1e65f7a959 Plot Management cleanup + improvement 
New compile DZE_GetPlotFriends

DZE_PlotManagementAdmins allows admin management of plot poles and
buildables near poles

DZE_MaxPlotFriends allows servers to allow more than 6 friends on a pole
at once
 2016-05-01 13:20:21 -04:00
icomrade
9e2728af07 Merge pull request #1686 from Bruce-LXXVI/pullrequest/plotManagement 
Pullrequest/plot management
 2016-05-01 11:05:54 -04:00
ebaydayz
6187006ece Remove duplicate fnc_inString 2016-05-01 11:01:26 -04:00
ebaydayz
f44901db1b Prevent spamming change clothes 
Vanilla development commit:

98733d37ab
 2016-04-30 16:48:05 -04:00
icomrade
83694a452e Gem Trading mostly finished 
Sometimes displays incorrect total price in advanced trading menu.
 2016-04-30 11:17:41 -04:00
icomrade
b5c2c6c7bd Fix remove object option 2016-04-29 20:48:16 -04:00
Bruce
59c731ba70 Added ZSCdefines. Checking plotfriends against dayz_playerUID. 2016-04-30 02:01:27 +02:00
Bruce
98bfee8bdf added plotManagement by DevZupa 2016-04-30 02:01:15 +02:00
icomrade
a86b28b0a7 Fix spawn height for boats, and buying bikes 2016-04-29 00:19:22 -04:00
icomrade
bc0d5027f5 Adv. Trading handle other and free vehicle types 
Allow players to sell vehicles without keys and add boat and bike
trading classes to buy/sell
 2016-04-28 23:40:28 -04:00
ebaydayz
4b9d6df0bb Finish localization support 
Vanilla development commit:

33c6cafbcb
 2016-04-28 22:13:48 -04:00
ebaydayz
2b61ce850a Allow sleeping at all tents 
Vanilla development commit:

e647be13c1
 2016-04-28 20:30:18 -04:00
icomrade
55f3a9dc79 Vehicle selling for advanced trading 
This should work fairly okay but I expect there may be a couple exploits
and glitches
 2016-04-28 18:35:03 -04:00
ebaydayz
d2ba027863 Perform build checks before removing magazines 
Also allow tents and stashes to be built without a plot pole (same as
1051).
 2016-04-28 15:32:32 -04:00
ebaydayz
034d898880 Update tent base class name 
DZ_storage_base is now the base class for all tent and stash types.
 2016-04-28 13:53:21 -04:00
ebaydayz
f42496bb03 Move build checks to separate files 
For better organization
 2016-04-28 11:52:23 -04:00
icomrade
b5af74b72b Add Vehicle Purchasing to Advanced Trading 
Allows 1 vehicle purchase at a time.
Vehicles will still spawn inside each other if one is already parked on
the pad.
 2016-04-27 22:04:47 -04:00