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

b653 pt1

Browse Source 
- fixed a typo in takeCrypto and updated private array
- moved epoch_2DCtrlHeartbeat to is Critical logic so it only beats when
critical (todo make slower faster based on high or low status)
This commit is contained in:
vbawol 2016-11-11 16:43:48 -06:00
parent aeab62fd0c
commit ba6f19e7bb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -91,8 +91,8 @@ EPOCH_currentTargetMode = _currentTargetMode;
_forceUpdate = "forceUpdate" in _criticalAttributes; _forceUpdate = "forceUpdate" in _criticalAttributes;
_forceFatigue = "forceFatigue" in _criticalAttributes; _forceFatigue = "forceFatigue" in _criticalAttributes;
_forceBloodRise = "forceBloodRise" in _criticalAttributes; _forceBloodRise = "forceBloodRise" in _criticalAttributes;
[_curCtrl,0.55] call epoch_2DCtrlHeartbeat;
}; };
[_curCtrl,0.55] call epoch_2DCtrlHeartbeat;
// todo make this reversable or even limited to a color range. // todo make this reversable or even limited to a color range.
_color = [_playerLimitMin,_playerLimitMax,_currentVarVal,1] call EPOCH_colorRange; _color = [_playerLimitMin,_playerLimitMax,_currentVarVal,1] call EPOCH_colorRange;
_curCtrl ctrlSetTextColor _color; _curCtrl ctrlSetTextColor _color;

8
Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf
View File

@ -12,7 +12,9 @@
Github: Github:
https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeTrade.sqf https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeTrade.sqf
*/ */
private ["_current_crypto","_player","_object","_getCrypto"]; //[[[cog import generate_private_arrays ]]]
private ["_getCrypto"];
//[[[end]]]
params ["_player",["_token","",[""]],"_object"]; params ["_player",["_token","",[""]],"_object"];
if !([_player,_token] call EPOCH_server_getPToken) exitWith {}; if !([_player,_token] call EPOCH_server_getPToken) exitWith {};
@ -21,10 +23,10 @@ if (_player distance _object > 10) exitWith {};
_getCrypto = _object getVariable["Crypto", 0]; _getCrypto = _object getVariable["Crypto", 0];
if (_getCrypto > 0) then { if (_getCrypto > 0) then {
// remove crypto from object // remove crypto from object
_object setVariable["Crypto", nil, true]; _object setVariable["Crypto", nil, true];
// send data back to player
[_player,_getCrypto] call EPOCH_server_effectCrypto; [_player,_getCrypto] call EPOCH_server_effectCrypto;
// debug and logging. // debug and logging.
diag_log format["Epoch: ADMIN: %1 picked up %2 Crypto from object %3 with puid %4 at %5", getPlayerUID _player, _current_crypto, [_object, typeOf _object],_object getVariable['PUID', ''],getposATL _object]; diag_log format["Epoch: ADMIN: %1 picked up %2 Crypto from object %3 with puid %4 at %5", getPlayerUID _player, _getCrypto, [_object, typeOf _object],_object getVariable['PUID', ''],getposATL _object];
}; };