W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-25 17:31:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Temperature badges + heatpack changes + some translation fixes

Browse Source 
Vanilla development commit:

e89176d565
This commit is contained in:
ebaydayz
2016-07-03 12:01:32 -04:00
parent cc2918989e
commit 452ce57618
13 changed files with 69 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SQF/dayz_code/compile/fn_temperatur.sqf
View File

@@ -29,13 +29,14 @@ _looptime = _this;
_building_factor = DZE_TempVars select 2;
_moving_factor = DZE_TempVars select 3;
_sun_factor = DZE_TempVars select 4;
_heatpack_factor = DZE_TempVars select 5;
//Negative effects
_water_factor = DZE_TempVars select 5;
_stand_factor = DZE_TempVars select 6;
_rain_factor = DZE_TempVars select 7;
_wind_factor = DZE_TempVars select 8;
_night_factor = DZE_TempVars select 9;
_water_factor = DZE_TempVars select 6;
_stand_factor = DZE_TempVars select 7;
_rain_factor = DZE_TempVars select 8;
_wind_factor = DZE_TempVars select 9;
_night_factor = DZE_TempVars select 10;
_difference = 0;
//_hasfireffect = false;
@@ -114,6 +115,13 @@ if(daytime > _sunrise && daytime < (24 - _sunrise) && !_raining && overcast <= 0
//diag_log format["sun - %1",_difference];
};
//heatpack
if(r_player_warming_heatpack select 0) then {
_difference = _difference + _heatpack_factor;
if ((diag_tickTime - (r_player_warming_heatpack select 1)) >= r_player_warming_heatpack_time) then {
r_player_warming_heatpack = [false,0];
};
};
//NEGATIVE EFFECTS
//water
@@ -171,4 +179,5 @@ _difference = _difference * SleepTemperatur / (60 / _looptime) * ((dayz_temperat
if (dayz_temperature_override) then { _difference = 0; if (dayz_temperatur < 37) then { dayz_temperatur = 37; } };
//Change Temperatur Should be moved in a own Function to allow adding of Items which increase the Temp like "hot tea"
r_player_temp_factor = _difference;
dayz_temperatur = (((dayz_temperatur + _difference) max dayz_temperaturmin) min dayz_temperaturmax);

15
SQF/dayz_code/compile/player_updateGui.sqf
View File

@@ -1,6 +1,6 @@
//private ["_display","_ctrlBloodOuter","_ctrlBlood","_ctrlBleed","_bloodVal","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_ctrlFoodBorder","_ctrlThirstBorder","_ctrlTempBorder","_tempVal","_array","_ctrlEar","_ctrlEye","_ctrlFracture","_visual","_audible","_uiNumber","_bloodText","_blood","_thirstLvl","_foodLvl","_tempImg","_bloodLvl","_tempLvl","_thirst","_food","_temp"];
private ["_flash","_array","_bloodText","_tempImg","_uiNumber","_blood","_foodLvl","_thirstLvl","_audible","_visual","_bloodType","_rhFactor","_ctrlBloodType", "_bloodTestdone",
private ["_flash","_array","_bloodText","_tempText","_tempImg","_uiNumber","_blood","_foodLvl","_thirstLvl","_audible","_visual","_bloodType","_rhFactor","_ctrlBloodType", "_bloodTestdone",
"_string","_humanityTarget","_distance","_size","_friendlies","_id","_rID","_rfriendlies","_rfriendlyTo","_color","_targetControl"];
_flash = {
@@ -143,9 +143,20 @@ switch true do {
case (_tempLvl > 28 and _tempLvl < 30): { _tempImg = 1 };
default { _tempImg = 0 };
};
_temp = "\z\addons\dayz_code\gui\status\status_temp_" + str(_tempImg) + "_ca.paa";
_tempText = "\z\addons\dayz_code\gui\status\status_temp_border";
switch true do {
case (r_player_temp_factor <= r_player_temp_min_factor): { _tempText = _tempText + "_down3_ca.paa" };
case ((r_player_temp_factor <= r_player_temp_min_factor*0.50) and (r_player_temp_factor > r_player_temp_min_factor)): { _tempText = _tempText + "_down2_ca.paa" };
case ((r_player_temp_factor < r_player_temp_min_factor*0.2) and (r_player_temp_factor > r_player_temp_min_factor*0.50)): { _tempText = _tempText + "_down1_ca.paa" };
case ((r_player_temp_factor > r_player_temp_max_factor*0.2) and (r_player_temp_factor < r_player_temp_max_factor*0.50)): { _tempText = _tempText + "_up1_ca.paa" };
case ((r_player_temp_factor >= r_player_temp_max_factor*0.50) and (r_player_temp_factor < r_player_temp_max_factor)): { _tempText = _tempText + "_up2_ca.paa" };
case (r_player_temp_factor >= r_player_temp_max_factor): { _tempText = _tempText + "_up3_ca.paa" };
default { _tempText = "\z\addons\dayz_code\gui\status\status_temp_outside_ca.paa" };
};
_ctrlTempBorder ctrlSetText _tempText;
_ctrlBlood ctrlSetText _blood;
_ctrlThirst ctrlSetText _thirst;
_ctrlFood ctrlSetText _food;