Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #991 from morgoth0/patch-16

Browse Source 
Patch 16
This commit is contained in:
He-Man
2018-08-16 16:47:21 +02:00
committed by GitHub
parent 911ce3da49 ad4d044d41
commit c91b182f3d
11 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/compile/building/EPOCH_maintainIT.sqf
View File

@ -35,7 +35,7 @@ if (EPOCH_playerCrypto > 0) then {
if (_maintainCount > 0) then { if (_maintainCount > 0) then {
if (EPOCH_playerCrypto < _maintainCount) exitwith { if (EPOCH_playerCrypto < _maintainCount) exitwith {
[format ["You need %1 Krypto to maintain your base.",_maintainCount], 5] call Epoch_message; [format ["You need %1 Crypto to maintain your base.",_maintainCount], 5] call Epoch_message;
}; };
_rnd = format ["rmx_var_temp%1%2",floor random 100, selectRandom ["A","B","C","D","E","F"]]; _rnd = format ["rmx_var_temp%1%2",floor random 100, selectRandom ["A","B","C","D","E","F"]];
@ -54,7 +54,7 @@ if (EPOCH_playerCrypto > 0) then {
EPOCH_maintainLockout = nil; EPOCH_maintainLockout = nil;
}; };
[format["Cost %1 Krypto to maintain base.", _maintainCount], 5] call Epoch_message; [format["Cost %1 Crypto to maintain base.", _maintainCount], 5] call Epoch_message;
} else { } else {
["Nothing needs Maintaining", 5] call Epoch_message; ["Nothing needs Maintaining", 5] call Epoch_message;
}; };

4
Sources/epoch_code/compile/p2p_trading/EPOCH_TradeLoop.sqf
View File

@ -47,8 +47,8 @@ if (!isNull EPOCH_p2ptradeTarget) then {
_tradeCryptoOffer = (_tradeOffer select 1); _tradeCryptoOffer = (_tradeOffer select 1);
if (_tradeCryptoOffer > 0) then { if (_tradeCryptoOffer > 0) then {
_index = lbAdd[1502, format["%1 Krypto", _tradeCryptoOffer]]; _index = lbAdd[1502, format["%1 Crypto", _tradeCryptoOffer]];
lbSetData[1502, _index, "Krypto"]; lbSetData[1502, _index, "Crypto"];
lbSetPicture[1502, _index, "\x\addons\a3_epoch_code\Data\UI\cc_ca.paa"]; lbSetPicture[1502, _index, "\x\addons\a3_epoch_code\Data\UI\cc_ca.paa"];
}; };

4
Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd.sqf
View File

@ -133,7 +133,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then {
_cryptoCount = _cryptoCount + _worth; _cryptoCount = _cryptoCount + _worth;
}; };
}; };
ctrlSetText [_CryptoInCtrl, (format["%1 Krypto", _cryptoCount])]; ctrlSetText [_CryptoInCtrl, (format["%1 Crypto", _cryptoCount])];
_cryptoCount = 0; _cryptoCount = 0;
_sizeOut = lbSize _TraderItemsOutBox; _sizeOut = lbSize _TraderItemsOutBox;
if (_sizeOut > 0) then { if (_sizeOut > 0) then {
@ -152,7 +152,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then {
_cryptoCount = _cryptoCount + _worth; _cryptoCount = _cryptoCount + _worth;
}; };
}; };
ctrlSetText [_CryptoOutCtrl, (format["%1 Krypto", _cryptoCount])]; ctrlSetText [_CryptoOutCtrl, (format["%1 Crypto", _cryptoCount])];
if (_control == _PlayerItemsBox) then { if (_control == _PlayerItemsBox) then {
lbSetCurSel [_PlayerFilerDropDown, 0]; lbSetCurSel [_PlayerFilerDropDown, 0];
}; };

4
Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd2.sqf
View File

@ -127,7 +127,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then {
_cryptoCount = _cryptoCount + _worth; _cryptoCount = _cryptoCount + _worth;
}; };
}; };
ctrlSetText [_CryptoInCtrl, (format["%1 Krypto", _cryptoCount])]; ctrlSetText [_CryptoInCtrl, (format["%1 Crypto", _cryptoCount])];
_cryptoCount = 0; _cryptoCount = 0;
_sizeOut = lbSize _TraderItemsOutBox; _sizeOut = lbSize _TraderItemsOutBox;
if (_sizeOut > 0) then { if (_sizeOut > 0) then {
@ -146,7 +146,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then {
_cryptoCount = _cryptoCount + _worth; _cryptoCount = _cryptoCount + _worth;
}; };
}; };
ctrlSetText [_CryptoOutCtrl, (format["%1 Krypto", _cryptoCount])]; ctrlSetText [_CryptoOutCtrl, (format["%1 Crypto", _cryptoCount])];
} }
else { else {
["Limit one per trade", 5] call Epoch_message; ["Limit one per trade", 5] call Epoch_message;

4
Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd3.sqf
View File

@ -49,7 +49,7 @@ if (isClass (_config >> _uiItem)) then {
_cryptoCount = _cryptoCount + _worth; _cryptoCount = _cryptoCount + _worth;
}; };
}; };
ctrlSetText [_CryptoInCtrl, (format["%1 Krypto", _cryptoCount])]; ctrlSetText [_CryptoInCtrl, (format["%1 Crypto", _cryptoCount])];
_cryptoCount = 0; _cryptoCount = 0;
_sizeOut = lbSize _TraderItemsOutBox; _sizeOut = lbSize _TraderItemsOutBox;
if (_sizeOut > 0) then { if (_sizeOut > 0) then {
@ -68,5 +68,5 @@ if (isClass (_config >> _uiItem)) then {
_cryptoCount = _cryptoCount + _worth; _cryptoCount = _cryptoCount + _worth;
}; };
}; };
ctrlSetText [_CryptoOutCtrl, (format["%1 Krypto", _cryptoCount])]; ctrlSetText [_CryptoOutCtrl, (format["%1 Crypto", _cryptoCount])];
}; };

4
Sources/epoch_code/compile/traders/EPOCH_takeCrypto.sqf
View File

@ -7,9 +7,9 @@ if (!isNull _this) then {
_getCrypto = _this getVariable["Crypto", 0]; _getCrypto = _this getVariable["Crypto", 0];
if (_getCrypto > 0) then { if (_getCrypto > 0) then {
[player, Epoch_personalToken, _this] remoteExec ["EPOCH_server_takeCrypto",2]; [player, Epoch_personalToken, _this] remoteExec ["EPOCH_server_takeCrypto",2];
[format["You found %1 Krypto", _getCrypto], 5] call Epoch_message; [format["You found %1 Crypto", _getCrypto], 5] call Epoch_message;
} else { } else {
["No Krypto found", 5] call Epoch_message; ["No Crypto found", 5] call Epoch_message;
}; };
}; };
[] spawn{ [] spawn{

4
Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnInvite.sqf
View File

@ -49,7 +49,7 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArr
_upgradePrice = parseNumber (EPOCH_group_upgrade_lvl select (_found+3)); _upgradePrice = parseNumber (EPOCH_group_upgrade_lvl select (_found+3));
if ((EPOCH_playerCrypto-_upgradePrice) >= 0) then { if ((EPOCH_playerCrypto-_upgradePrice) >= 0) then {
_upgradeSlots = EPOCH_group_upgrade_lvl select (_found+2); _upgradeSlots = EPOCH_group_upgrade_lvl select (_found+2);
_txt = format["Do you want to upgrade your group from %1 to %2 slots for %3 Krypto?",_groupSize,_upgradeSlots,_upgradePrice]; _txt = format["Do you want to upgrade your group from %1 to %2 slots for %3 Crypto?",_groupSize,_upgradeSlots,_upgradePrice];
[_txt,_upgradePrice] spawn { [_txt,_upgradePrice] spawn {
params ["_txt","_upgradePrice"]; params ["_txt","_upgradePrice"];
_ret = [_txt,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage; _ret = [_txt,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
@ -58,7 +58,7 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArr
}; };
}; };
} else { } else {
["You don't have enough Krypto to upgrade your group!","Epoch Group Menu",true,false] spawn BIS_fnc_GUImessage; ["You don't have enough Crypto to upgrade your group!","Epoch Group Menu",true,false] spawn BIS_fnc_GUImessage;
}; };
}; };
}; };

2
Sources/epoch_code/gui/scripts/group/EPOCH_Group_onLoad.sqf
View File

@ -71,7 +71,7 @@ if (_currentMaxMember < _groupSize) then {
if (_playerIsLeader || _playerIsMod) then { if (_playerIsLeader || _playerIsMod) then {
_found = EPOCH_group_upgrade_lvl find _currentMaxMember; _found = EPOCH_group_upgrade_lvl find _currentMaxMember;
if (count EPOCH_group_upgrade_lvl >= (_found+3)) then { if (count EPOCH_group_upgrade_lvl >= (_found+3)) then {
_BtnInvite ctrlSetText format ["Upgrade +%1 Slots for %2 Krypto",abs (_currentMaxMember-(EPOCH_group_upgrade_lvl select (_found+2))),EPOCH_group_upgrade_lvl select (_found+3)]; _BtnInvite ctrlSetText format ["Upgrade +%1 Slots for %2 Crypto",abs (_currentMaxMember-(EPOCH_group_upgrade_lvl select (_found+2))),EPOCH_group_upgrade_lvl select (_found+3)];
} else { } else {
_BtnInvite ctrlSetText format ["No Upgrade Available!"]; _BtnInvite ctrlSetText format ["No Upgrade Available!"];
_BtnInvite ctrlEnable false; _BtnInvite ctrlEnable false;

2
Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_BtnCreate.sqf
View File

@ -48,6 +48,6 @@ if (count (_array-[32]) == 0) then { //32 = SPACE
}; };
}; };
} else { } else {
["You don't have enough Krypto to create a group!","Epoch Group Menu",true,false] spawn BIS_fnc_GUImessage; ["You don't have enough Crypto to create a group!","Epoch Group Menu",true,false] spawn BIS_fnc_GUImessage;
}; };
}; };

4
Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_onLoad.sqf
View File

@ -19,7 +19,7 @@ if (Epoch_my_GroupUID != "") exitWith {(findDisplay -1200) closeDisplay 0};
disableSerialization; disableSerialization;
_textCtrl = (findDisplay -1200) displayCtrl 22; _textCtrl = (findDisplay -1200) displayCtrl 22;
if (EPOCH_playerCrypto < parseNumber(EPOCH_group_upgrade_lvl select 1)) then { if (EPOCH_playerCrypto < parseNumber(EPOCH_group_upgrade_lvl select 1)) then {
_textCtrl CtrlSetText format ["Need %1 Krypto to create your own group",EPOCH_group_upgrade_lvl select 1]; _textCtrl CtrlSetText format ["Need %1 Crypto to create your own group",EPOCH_group_upgrade_lvl select 1];
} else { } else {
_textCtrl CtrlSetText format["Cost to create group %1 Krypto", EPOCH_group_upgrade_lvl select 1]; _textCtrl CtrlSetText format["Cost to create group %1 Crypto", EPOCH_group_upgrade_lvl select 1];
}; };

2
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp
View File

@ -81,7 +81,7 @@ class player_takeCrypto
condition = "dyna_isDeadPlayer || (dyna_cursorTarget getVariable [""Crypto"",0]) > 0"; condition = "dyna_isDeadPlayer || (dyna_cursorTarget getVariable [""Crypto"",0]) > 0";
action = "dyna_cursorTarget call EPOCH_takeCrypto;"; action = "dyna_cursorTarget call EPOCH_takeCrypto;";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\krypto.paa"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\krypto.paa";
tooltip = "Take Krypto"; tooltip = "Take Crypto";
}; };
class player_trade class player_trade
{ {