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 branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental

Browse Source
This commit is contained in:
Raymix 2017-10-21 23:52:37 +01:00
commit 8b5f896424
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
View File

@ -47,6 +47,13 @@ _playerRadiation = missionNamespace getVariable [_playerRadiationKey, _playerRad
if (_playerRadiation > 1) then { if (_playerRadiation > 1) then {
_radiationVal = linearConversion [0,100,_playerRadiation,0.1,1,true]; _radiationVal = linearConversion [0,100,_playerRadiation,0.1,1,true];
[_radiationVal, 2] call epoch_setRadiation; [_radiationVal, 2] call epoch_setRadiation;
// if player has geiger counter make sound based on rads level
if ('ItemGeigerCounter_EPOCH' in assignedItems player) then {
_level = round(linearConversion [0,100,_radsLevel,0,3,true]);
_sound = format ["geiger_%1",_level];
playSound _sound;
};
} else { } else {
[0, 2] call epoch_setRadiation; [0, 2] call epoch_setRadiation;
}; };
@ -165,9 +172,9 @@ if (_wet) then {
}; };
// Hunger / Thirst // Hunger / Thirst
_hungerlossRate = _baseHungerLoss * timeMultiplier; _hungerlossRate = _baseHungerLoss * _lossMultiplier;
_thirstlossRate = _baseThirstLoss * timeMultiplier; _thirstlossRate = _baseThirstLoss * _lossMultiplier;
_alcoholLossRate = _baseAlcoholLoss * timeMultiplier; _alcoholLossRate = _baseAlcoholLoss * _lossMultiplier;
// Increase hunger if player is Fatigued // Increase hunger if player is Fatigued
_playerStamina = missionNamespace getVariable [_playerStaminaKey, _playerStaminaDefault]; _playerStamina = missionNamespace getVariable [_playerStaminaKey, _playerStaminaDefault];

8
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -117,6 +117,7 @@ _antagonistRndChance = ["CfgEpochClient", "antagonistRngChance", 100] call EPOCH
_baseHungerLoss = ["CfgEpochClient", "baseHungerLoss", 2] call EPOCH_fnc_returnConfigEntryV2; _baseHungerLoss = ["CfgEpochClient", "baseHungerLoss", 2] call EPOCH_fnc_returnConfigEntryV2;
_baseThirstLoss = ["CfgEpochClient", "baseThirstLoss", 2] call EPOCH_fnc_returnConfigEntryV2; _baseThirstLoss = ["CfgEpochClient", "baseThirstLoss", 2] call EPOCH_fnc_returnConfigEntryV2;
_baseAlcoholLoss = ["CfgEpochClient", "baseAlcoholLoss", 0.17] call EPOCH_fnc_returnConfigEntryV2; _baseAlcoholLoss = ["CfgEpochClient", "baseAlcoholLoss", 0.17] call EPOCH_fnc_returnConfigEntryV2;
_lossMultiplier = if (["CfgEpochClient", "accelerateHTALoss", true] call EPOCH_fnc_returnConfigEntryV2) then {timeMultiplier} else {1};
_energyCostNV = ["CfgEpochClient", "energyCostNV", 3] call EPOCH_fnc_returnConfigEntryV2; _energyCostNV = ["CfgEpochClient", "energyCostNV", 3] call EPOCH_fnc_returnConfigEntryV2;
_energyRegenMax = ["CfgEpochClient", "energyRegenMax", 5] call EPOCH_fnc_returnConfigEntryV2; _energyRegenMax = ["CfgEpochClient", "energyRegenMax", 5] call EPOCH_fnc_returnConfigEntryV2;
_energyRange = ["CfgEpochClient", "energyRange", 75] call EPOCH_fnc_returnConfigEntryV2; _energyRange = ["CfgEpochClient", "energyRange", 75] call EPOCH_fnc_returnConfigEntryV2;
@ -335,13 +336,8 @@ EPOCH_ActiveTraderMission = [];
_LastMissionTrigger = 0; _LastMissionTrigger = 0;
// setup radio active locations // setup radio active locations
//Commented out by Raymix: Does not set variable on locations for some reason
/*
{ {
_x params ["_loc", "_rads"]; _x params ["_loc", "_rads"];
_locSize = size _loc; _loc setVariable ["EPOCH_Rads", _rads];
_radius = sqrt((_locSize select 0)^2 + (_locSize select 1)^2);
_loc setVariable ["EPOCH_Rads", [_rads,_radius]];
} forEach (missionNamespace getVariable ["EPOCH_radioactiveLocations", []]); } forEach (missionNamespace getVariable ["EPOCH_radioactiveLocations", []]);
*/
// //