From ae31744203a2ff4671bce12b2ae1d89da852ecc8 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:24:16 -0400 Subject: [PATCH 01/11] Update EPOCH_takeCrypto.sqf Correct the spelling of Crypto --- Sources/epoch_code/compile/traders/EPOCH_takeCrypto.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/traders/EPOCH_takeCrypto.sqf b/Sources/epoch_code/compile/traders/EPOCH_takeCrypto.sqf index 3589ed06..6034a420 100644 --- a/Sources/epoch_code/compile/traders/EPOCH_takeCrypto.sqf +++ b/Sources/epoch_code/compile/traders/EPOCH_takeCrypto.sqf @@ -7,9 +7,9 @@ if (!isNull _this) then { _getCrypto = _this getVariable["Crypto", 0]; if (_getCrypto > 0) then { [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 { - ["No Krypto found", 5] call Epoch_message; + ["No Crypto found", 5] call Epoch_message; }; }; [] spawn{ From be565d98b3c9ec9c5e471fb2e777ecdbdb07e37a Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:26:18 -0400 Subject: [PATCH 02/11] Update EPOCH_cGroup_onLoad.sqf Corrected spelling of crypto --- Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_onLoad.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_onLoad.sqf b/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_onLoad.sqf index 5fdc3d8d..b53c107b 100644 --- a/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_onLoad.sqf +++ b/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_onLoad.sqf @@ -19,7 +19,7 @@ if (Epoch_my_GroupUID != "") exitWith {(findDisplay -1200) closeDisplay 0}; disableSerialization; _textCtrl = (findDisplay -1200) displayCtrl 22; 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 { - _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]; }; From 4a6cfa13b4d0a5457a35524bf82f6ba8186fe1bc Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:26:55 -0400 Subject: [PATCH 03/11] Update EPOCH_maintainIT.sqf Corrected spelling of crypto --- Sources/epoch_code/compile/building/EPOCH_maintainIT.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/building/EPOCH_maintainIT.sqf b/Sources/epoch_code/compile/building/EPOCH_maintainIT.sqf index 7988b6ee..2bb0a6a4 100644 --- a/Sources/epoch_code/compile/building/EPOCH_maintainIT.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_maintainIT.sqf @@ -35,7 +35,7 @@ if (EPOCH_playerCrypto > 0) then { if (_maintainCount > 0) then { 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"]]; @@ -54,7 +54,7 @@ if (EPOCH_playerCrypto > 0) then { 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 { ["Nothing needs Maintaining", 5] call Epoch_message; }; From 278008f5fd9264306a5a45cf4d2a8bfea71490b4 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:29:28 -0400 Subject: [PATCH 04/11] Update EPOCH_TradeLoop.sqf Corrected spelling of crypto --- Sources/epoch_code/compile/p2p_trading/EPOCH_TradeLoop.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/p2p_trading/EPOCH_TradeLoop.sqf b/Sources/epoch_code/compile/p2p_trading/EPOCH_TradeLoop.sqf index 5612de94..bc14056c 100644 --- a/Sources/epoch_code/compile/p2p_trading/EPOCH_TradeLoop.sqf +++ b/Sources/epoch_code/compile/p2p_trading/EPOCH_TradeLoop.sqf @@ -47,8 +47,8 @@ if (!isNull EPOCH_p2ptradeTarget) then { _tradeCryptoOffer = (_tradeOffer select 1); if (_tradeCryptoOffer > 0) then { - _index = lbAdd[1502, format["%1 Krypto", _tradeCryptoOffer]]; - lbSetData[1502, _index, "Krypto"]; + _index = lbAdd[1502, format["%1 Crypto", _tradeCryptoOffer]]; + lbSetData[1502, _index, "Crypto"]; lbSetPicture[1502, _index, "\x\addons\a3_epoch_code\Data\UI\cc_ca.paa"]; }; From d14cd07ad84f4a76b56c2a8c879f02757fcfe921 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:30:58 -0400 Subject: [PATCH 05/11] Update EPOCH_Group_BtnInvite.sqf Corrected spelling of crypto --- .../epoch_code/gui/scripts/group/EPOCH_Group_BtnInvite.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnInvite.sqf b/Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnInvite.sqf index 2007c34d..10332a2b 100644 --- a/Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnInvite.sqf +++ b/Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnInvite.sqf @@ -49,7 +49,7 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArr _upgradePrice = parseNumber (EPOCH_group_upgrade_lvl select (_found+3)); if ((EPOCH_playerCrypto-_upgradePrice) >= 0) then { _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 { params ["_txt","_upgradePrice"]; _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 { - ["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; }; }; }; From 14653c13cc64c0e78c5536595de8e7cfefca3f8e Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:31:42 -0400 Subject: [PATCH 06/11] Update EPOCH_npcTraderAdd3.sqf Corrected spelling of crypto --- Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd3.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd3.sqf b/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd3.sqf index 26ecb852..a120e5a7 100644 --- a/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd3.sqf +++ b/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd3.sqf @@ -49,7 +49,7 @@ if (isClass (_config >> _uiItem)) then { _cryptoCount = _cryptoCount + _worth; }; }; - ctrlSetText [_CryptoInCtrl, (format["%1 Krypto", _cryptoCount])]; + ctrlSetText [_CryptoInCtrl, (format["%1 Crypto", _cryptoCount])]; _cryptoCount = 0; _sizeOut = lbSize _TraderItemsOutBox; if (_sizeOut > 0) then { @@ -68,5 +68,5 @@ if (isClass (_config >> _uiItem)) then { _cryptoCount = _cryptoCount + _worth; }; }; - ctrlSetText [_CryptoOutCtrl, (format["%1 Krypto", _cryptoCount])]; + ctrlSetText [_CryptoOutCtrl, (format["%1 Crypto", _cryptoCount])]; }; From 33220bfacc5a5931b2d6f77af589f64c069a1829 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:32:36 -0400 Subject: [PATCH 07/11] Update EPOCH_npcTraderAdd2.sqf Corrected spelling of crypto --- Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd2.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd2.sqf b/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd2.sqf index f22a2d1a..f6832e3e 100644 --- a/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd2.sqf +++ b/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd2.sqf @@ -127,7 +127,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then { _cryptoCount = _cryptoCount + _worth; }; }; - ctrlSetText [_CryptoInCtrl, (format["%1 Krypto", _cryptoCount])]; + ctrlSetText [_CryptoInCtrl, (format["%1 Crypto", _cryptoCount])]; _cryptoCount = 0; _sizeOut = lbSize _TraderItemsOutBox; if (_sizeOut > 0) then { @@ -146,7 +146,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then { _cryptoCount = _cryptoCount + _worth; }; }; - ctrlSetText [_CryptoOutCtrl, (format["%1 Krypto", _cryptoCount])]; + ctrlSetText [_CryptoOutCtrl, (format["%1 Crypto", _cryptoCount])]; } else { ["Limit one per trade", 5] call Epoch_message; From fd14dfa2142a6956e4826267a0a10996787c2038 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:33:14 -0400 Subject: [PATCH 08/11] Update EPOCH_npcTraderAdd.sqf Corrected spelling of crypto --- Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd.sqf b/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd.sqf index 26242be3..2d55b6c6 100644 --- a/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd.sqf +++ b/Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd.sqf @@ -133,7 +133,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then { _cryptoCount = _cryptoCount + _worth; }; }; - ctrlSetText [_CryptoInCtrl, (format["%1 Krypto", _cryptoCount])]; + ctrlSetText [_CryptoInCtrl, (format["%1 Crypto", _cryptoCount])]; _cryptoCount = 0; _sizeOut = lbSize _TraderItemsOutBox; if (_sizeOut > 0) then { @@ -152,7 +152,7 @@ if !(isNull EPOCH_lastNPCtradeTarget) then { _cryptoCount = _cryptoCount + _worth; }; }; - ctrlSetText [_CryptoOutCtrl, (format["%1 Krypto", _cryptoCount])]; + ctrlSetText [_CryptoOutCtrl, (format["%1 Crypto", _cryptoCount])]; if (_control == _PlayerItemsBox) then { lbSetCurSel [_PlayerFilerDropDown, 0]; }; From 1713516811e794639e46a44b9617b1cf7129d57d Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:34:01 -0400 Subject: [PATCH 09/11] Update EPOCH_cGroup_BtnCreate.sqf Corrected spelling of crypto --- Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_BtnCreate.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_BtnCreate.sqf b/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_BtnCreate.sqf index b16405ac..cb808dbf 100644 --- a/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_BtnCreate.sqf +++ b/Sources/epoch_code/gui/scripts/group/EPOCH_cGroup_BtnCreate.sqf @@ -48,6 +48,6 @@ if (count (_array-[32]) == 0) then { //32 = SPACE }; }; } 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; }; }; From 72f519c2f03d783bcaad838318d4c9e1851fcb8f Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:34:35 -0400 Subject: [PATCH 10/11] Update EPOCH_Group_onLoad.sqf Corrected spelling of crypto --- Sources/epoch_code/gui/scripts/group/EPOCH_Group_onLoad.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/epoch_code/gui/scripts/group/EPOCH_Group_onLoad.sqf b/Sources/epoch_code/gui/scripts/group/EPOCH_Group_onLoad.sqf index da3906ab..a77e83bc 100644 --- a/Sources/epoch_code/gui/scripts/group/EPOCH_Group_onLoad.sqf +++ b/Sources/epoch_code/gui/scripts/group/EPOCH_Group_onLoad.sqf @@ -71,7 +71,7 @@ if (_currentMaxMember < _groupSize) then { if (_playerIsLeader || _playerIsMod) then { _found = EPOCH_group_upgrade_lvl find _currentMaxMember; 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 { _BtnInvite ctrlSetText format ["No Upgrade Available!"]; _BtnInvite ctrlEnable false; From ad4d044d415a5fd49f5cb783b3ee8b4aa4e7ea7d Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 16 Aug 2018 10:35:18 -0400 Subject: [PATCH 11/11] Update CfgActionMenu_target.hpp Corrected spelling of crypto --- .../epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp index 242c8afc..818e3f2d 100644 --- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp +++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp @@ -81,7 +81,7 @@ class player_takeCrypto condition = "dyna_isDeadPlayer || (dyna_cursorTarget getVariable [""Crypto"",0]) > 0"; action = "dyna_cursorTarget call EPOCH_takeCrypto;"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\krypto.paa"; - tooltip = "Take Krypto"; + tooltip = "Take Crypto"; }; class player_trade {