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

501 Commits

Author SHA1 Message Date
ebaydayz
a54e58c60c Localize remaining player_build text 
Also added config variables for MaxMove and MaxHeight distance when
building.

_reason was defined twice at the top of player_build.sqf.
 2016-05-19 16:15:27 -04:00
ebaydayz
914b37a413 Pass cursorTarget to maintain_area.sqf 
CursorTarget should always be passed from fn_selfActions, not reacquired
in action scripts. This is to ensure the same object is referenced. Plot
Management maintain_area is called from the dialog button, not
fn_selfactions.
 2016-05-19 13:10:20 -04:00
ebaydayz
1a238d1719 Fix wrong buildables count displayed in plot management 2016-05-18 20:20:20 -04:00
icomrade
2889d8f010 Should fix building issues with player sliding 
The change in module_build will only fix items that d ono have an offset
set in the config.

BoundingBox can be a bit generous but the player should be able to work
with any overestimation in size.
 2016-05-18 11:01:38 -04:00
ebaydayz
9d51fb2736 Fix plot management buttons color and text alignment 
Fixes unintended black on black buttons and left aligned button text.

Plot management uses Zupa's older defines. The only changes for this
button type are the background color and text alignment.

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588
 2016-05-17 22:02:21 -04:00
ebaydayz
f61c6d8dac Add plotManagementMustBeClose config option 
Setting false allows adding any online player to plot friends regardless
of their distance from the pole.
 2016-05-17 20:09:37 -04:00
ebaydayz
edb64c4e05 Fix plot manage array add errors from 1e65f7a 
@icomrade - when you use set to add an element to an array you do not
need to wrap it in brackets [ ] like you do with +.

This was making it a nested array which was not intended in the
original.
 2016-05-17 19:30:21 -04:00
ebaydayz
a466e43645 Move plotManagement compiles to compiles.sqf 
This was needlessly recompiling every time the addAction was clicked.

DisableSerialization is only needed if a display element is stored in a
variable within the current script. The called functions already have
it.
 2016-05-17 16:54:58 -04:00
icomrade
396d085672 Fix Hive error when saving vector building objects 2016-05-15 18:53:40 -04:00
icomrade
d442592e55 Fix #1691 2016-05-13 17:40:34 -04:00
icomrade
c118ecbb15 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-13 17:06:46 -04:00
icomrade
6d69ca92e3 Fix undefined player uid in modular build 2016-05-13 17:06:43 -04:00
ebaydayz
914162c698 Update messing variable in pz_feed.sqf 
Messing now has a third parameter for dayz_nutrition.
 2016-05-13 17:02:44 -04:00
icomrade
33c3c7601f Fix Private Arrays 2016-05-13 16:57:50 -04:00
icomrade
6c24aaeb3b Add Vector Building 2016-05-12 22:52:04 -04:00
ebaydayz
bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -04:00
ebaydayz
e60175b30c Fix wrong price when adding multiples of same item to buy list 
Modifying _temp was also modifying Z_BuyableArray. An independent copy
of the array was needed.
 2016-05-11 15:07:58 -04:00
ebaydayz
6ef59a0237 Add server RPT logging to Advanced Trading 2016-05-11 12:41:59 -04:00
ebaydayz
5ca182dffe Fix can't sell satchels with Adv. Trade 
Some items (like PipeBomb) are a class in both CfgMagazines and
CfgWeapons. BIS_fnc_invRemove uses weapon first, so that is why the
magazine was not being removed. Using config instead of string avoids
this problem.
 2016-05-09 14:10:20 -04:00
ebaydayz
c0cb702534 Add swap for classicBloodBagSystem in Adv. Trade 2016-05-08 17:31:23 -04:00
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