W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

This will fix an obvious typo for the variable s_player_upgradeStorage (#1705)

Browse Source 
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading fixes (again)

* Advanced trading rework

Fixes all problems @ebaydayz

* Rename typo'd variable "s_player_upgradestorage"

This renames an obviously typo'd variable to what it should be.

* fixes derp string.

* asdf (#3)

asdf
This commit is contained in:
oiad
2016-07-06 13:40:31 +12:00
committed by ebaydayz
parent f7d765e669
commit e30f18190f
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SQF/dayz_code/actions/object_upgradeFireplace.sqf
View File

@@ -25,8 +25,8 @@ if (isNull _cursorTarget) exitWith {};
_item = typeof _cursorTarget;
//remove action menu
player removeAction s_player_upgradestroage;
s_player_upgradestroage = -1;
player removeAction s_player_upgradestorage;
s_player_upgradestorage = -1;
//Not needed
//_itemName = getText (configFile >> "CfgVehicles" >> _item >> "displayName");
@@ -191,4 +191,4 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
} else {
"Object has no upgrade option." call dayz_rollingMessages;
*/
};
};

6
SQF/dayz_code/actions/object_upgradeStorage.sqf
View File

@@ -21,8 +21,8 @@ _item = typeof _cursorTarget;
//diag_log (str(_item));
//remove action menu
player removeAction s_player_upgradestroage;
s_player_upgradestroage = -1;
player removeAction s_player_upgradestorage;
s_player_upgradestorage = -1;
//Not needed
//_itemName = getText (configFile >> "CfgVehicles" >> _item >> "displayName");
@@ -210,4 +210,4 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
} else {
"Object has no upgrade option." call dayz_rollingMessages;
*/
};
};

18
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -448,15 +448,15 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
if (_ownerID == _id) then {
//upgrade items
if (_typeOfCursorTarget in _upgradeItems) then {
if (s_player_upgradestroage < 0) then {
if (s_player_upgradestorage < 0) then {
if (isText (configFile >> "CfgVehicles" >> _typeOfCursorTarget >> "Upgrade" >> "create")) then {
_displayName = getText (configFile >> "CfgVehicles" >> _typeOfCursorTarget >> "displayName");
s_player_upgradestroage = player addAction [format[localize "str_upgrade",_displayName], "\z\addons\dayz_code\actions\object_upgradeStorage.sqf",_cursorTarget, 0, false, true];
s_player_upgradestorage = player addAction [format[localize "str_upgrade",_displayName], "\z\addons\dayz_code\actions\object_upgradeStorage.sqf",_cursorTarget, 0, false, true];
};
};
} else {
player removeAction s_player_upgradestroage;
s_player_upgradestroage = -1
player removeAction s_player_upgradestorage;
s_player_upgradestorage = -1
};
if (_istypeTent) then {
//Packing my tent
@@ -468,8 +468,8 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
s_player_packtent = -1;
};
} else {
player removeAction s_player_upgradestroage;
s_player_upgradestroage = -1;
player removeAction s_player_upgradestorage;
s_player_upgradestorage = -1;
player removeAction s_player_packtent;
s_player_packtent = -1;
};
@@ -1119,8 +1119,8 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
//debug
//player removeAction s_player_debugCheck;
//s_player_debugCheck = -1;
player removeAction s_player_upgradestroage;
s_player_upgradestroage = -1;
player removeAction s_player_upgradestorage;
s_player_upgradestorage = -1;
//Unlock,Lock
player removeAction s_player_setCode;
s_player_setCode = -1;
@@ -1222,4 +1222,4 @@ if (_dogHandle > 0) then {
};
//Monitor
player setVariable ["selfActions", diag_ticktime, false];
player setVariable ["selfActions", diag_ticktime, false];

4
SQF/dayz_code/init/variables.sqf
View File

@@ -190,7 +190,7 @@ dayz_resetSelfActions = {
s_player_debugCheck = -1;
s_player_destorytent = -1;
s_player_attach_bomb = -1;
s_player_upgradestroage = -1;
s_player_upgradestorage = -1;
s_player_Drinkfromhands = -1;
s_player_lockhouse = -1;
s_player_unlockhouse = -1;
@@ -686,4 +686,4 @@ if (!isDedicated) then {
DZE_Surrender = false;
DZE_Quarantine = false;
DZE_InRadiationZone = false;
};
};