From 452ce5761858c27777459a65af951a26a9f2e22f Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sun, 3 Jul 2016 12:01:32 -0400 Subject: [PATCH] Temperature badges + heatpack changes + some translation fixes Vanilla development commit: https://github.com/DayZMod/DayZ/commit/e89176d565b5f71479baf5f4ae8daad4108e00c3 --- .../CfgVehicles/Buildings/Land_Fire.hpp | 32 +++++++++--------- SQF/dayz_code/actions/player_useMeds.sqf | 3 +- SQF/dayz_code/compile/fn_temperatur.sqf | 19 ++++++++--- SQF/dayz_code/compile/player_updateGui.sqf | 15 ++++++-- SQF/dayz_code/configVariables.sqf | 2 +- .../status/status_temp_border_down1_ca.paa | Bin 0 -> 5655 bytes .../status/status_temp_border_down2_ca.paa | Bin 0 -> 5655 bytes .../status/status_temp_border_down3_ca.paa | Bin 0 -> 5655 bytes .../gui/status/status_temp_border_up1_ca.paa | Bin 0 -> 5655 bytes .../gui/status/status_temp_border_up2_ca.paa | Bin 0 -> 5655 bytes .../gui/status/status_temp_border_up3_ca.paa | Bin 0 -> 5655 bytes SQF/dayz_code/init/variables.sqf | 10 ++++++ SQF/dayz_code/stringtable.xml | 16 +++++++-- 13 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 SQF/dayz_code/gui/status/status_temp_border_down1_ca.paa create mode 100644 SQF/dayz_code/gui/status/status_temp_border_down2_ca.paa create mode 100644 SQF/dayz_code/gui/status/status_temp_border_down3_ca.paa create mode 100644 SQF/dayz_code/gui/status/status_temp_border_up1_ca.paa create mode 100644 SQF/dayz_code/gui/status/status_temp_border_up2_ca.paa create mode 100644 SQF/dayz_code/gui/status/status_temp_border_up3_ca.paa diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp index 0597f8717..d8d1de2bd 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp @@ -51,8 +51,8 @@ class Land_Fire: House class UserActions { class lightup { - displayNameDefault = "Light fire"; - displayName = "Light fire"; + displayNameDefault = $STR_ACTIONS_LIGHTFIRE; + displayName = $STR_ACTIONS_LIGHTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; @@ -60,8 +60,8 @@ class Land_Fire: House statement = "[this,true] call dayz_inflame"; }; class putout { - displayNameDefault = "Put out fire"; - displayName = "Put out fire"; + displayNameDefault = $STR_ACTIONS_PUTOUTFIRE; + displayName = $STR_ACTIONS_PUTOUTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; @@ -80,8 +80,8 @@ class Land_Fire_barrel : Land_Fire destrType=DestructEngine; class UserActions { class lightup { - displayNameDefault = "Light fire"; - displayName = "Light fire"; + displayNameDefault = $STR_ACTIONS_LIGHTFIRE; + displayName = $STR_ACTIONS_LIGHTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; @@ -89,8 +89,8 @@ class Land_Fire_barrel : Land_Fire statement = "[this,true] call dayz_inflame_other"; }; class putout { - displayNameDefault = "Put out fire"; - displayName = "Put out fire"; + displayNameDefault = $STR_ACTIONS_PUTOUTFIRE; + displayName = $STR_ACTIONS_PUTOUTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; @@ -117,8 +117,8 @@ class Land_Fire_DZ : Land_Fire { }; */ class lightup { - displayNameDefault = "Light fire"; - displayName = "Light fire"; + displayNameDefault = $STR_ACTIONS_LIGHTFIRE; + displayName = $STR_ACTIONS_LIGHTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; @@ -126,8 +126,8 @@ class Land_Fire_DZ : Land_Fire { statement = "[this,true] call dayz_inflame"; }; class putout { - displayNameDefault = "Put out fire"; - displayName = "Put out fire"; + displayNameDefault = $STR_ACTIONS_PUTOUTFIRE; + displayName = $STR_ACTIONS_PUTOUTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; @@ -169,8 +169,8 @@ class Misc_TyreHeap: Land_Fire displayName=$STR_DN_TYREHEAP; class UserActions { class lightup { - displayNameDefault = "Light fire"; - displayName = "Light fire"; + displayNameDefault = $STR_ACTIONS_LIGHTFIRE; + displayName = $STR_ACTIONS_LIGHTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; @@ -178,8 +178,8 @@ class Misc_TyreHeap: Land_Fire statement = "[this,true] call dayz_inflame_other"; }; class putout { - displayNameDefault = "Put out fire"; - displayName = "Put out fire"; + displayNameDefault = $STR_ACTIONS_PUTOUTFIRE; + displayName = $STR_ACTIONS_PUTOUTFIRE; position = "ohniste"; radius = 3; onlyForPlayer = 0; diff --git a/SQF/dayz_code/actions/player_useMeds.sqf b/SQF/dayz_code/actions/player_useMeds.sqf index 4295f04ec..5fa9c5e2f 100644 --- a/SQF/dayz_code/actions/player_useMeds.sqf +++ b/SQF/dayz_code/actions/player_useMeds.sqf @@ -53,7 +53,8 @@ switch (_item) do { }; case "ItemHeatPack": { player removeMagazine "ItemHeatPack"; - dayz_temperatur = (dayz_temperatur + 5) min dayz_temperaturmax; + //dayz_temperatur = (dayz_temperatur + 5) min dayz_temperaturmax; + r_player_warming_heatpack = [true, diag_tickTime]; localize "str_player_27" call dayz_rollingMessages; }; case "bloodTester": { diff --git a/SQF/dayz_code/compile/fn_temperatur.sqf b/SQF/dayz_code/compile/fn_temperatur.sqf index 190bd80dd..393fcfbd1 100644 --- a/SQF/dayz_code/compile/fn_temperatur.sqf +++ b/SQF/dayz_code/compile/fn_temperatur.sqf @@ -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); \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_updateGui.sqf b/SQF/dayz_code/compile/player_updateGui.sqf index d81693e1f..b0c5dca0b 100644 --- a/SQF/dayz_code/compile/player_updateGui.sqf +++ b/SQF/dayz_code/compile/player_updateGui.sqf @@ -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; diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index 4a73565dc..a6ae8536f 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -21,7 +21,7 @@ DynamicVehicleFuelLow = 0; // Min fuel random vehicles can spawn with DynamicVehicleFuelHigh = 100; // Max fuel random vehicles can spawn with DZE_NoVehicleExplosions = false; //Disable vehicle explosions to prevent damage to objects by ramming - doesn't work with amphibious pook which you should not use due to other issues -DZE_TempVars = [7, 15, 4, 4, 2, 3, 2, 0.25, 0.75, 0.5]; //[vehicle, fire, building, moving, sun, water, standing, rain, wind, night] water, standing, rain, wind and night factors have a negative impact on temperature, the greater they are the quicker the player gets cold +DZE_TempVars = [7, 15, 4, 4, 2, 6, 3, 2, 0.25, 0.75, 0.5]; //[vehicle, fire, building, moving, sun, heatpack, water, standing, rain, wind, night] water, standing, rain, wind and night factors have a negative impact on temperature, the greater they are the quicker the player gets cold DZE_WeatherVariables = [10, 20, 5, 10, 0, 0.2, 0, 1, 0, 0.8, 0, 8, 25, 50, 0, false]; //See DynamicWeatherEffects.sqf for info on these values DZE_TwoPrimaries = 2; // 0 do not allow primary weapon on back. 1 allow primary weapon on back, but not when holding a primary weapon in hand. 2 allow player to hold two primary weapons, one on back and one in their hands. DZE_AntiWallLimit = 3; // Number of activations before player_antiWall kills player for glitching attempt. Lower is stricter, but may result in false positives. diff --git a/SQF/dayz_code/gui/status/status_temp_border_down1_ca.paa b/SQF/dayz_code/gui/status/status_temp_border_down1_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..39bf270229323d5426b53e2416028f26437f3442 GIT binary patch literal 5655 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 literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status/status_temp_border_up2_ca.paa b/SQF/dayz_code/gui/status/status_temp_border_up2_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..bd17415c4327b689604e270eed98c467e9978fef GIT binary patch literal 5655 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 literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 531fd04de..2981db674 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -328,6 +328,16 @@ r_antiD_done = false; carryClick = false; dayz_workingInprogress = false; +//player warming up vars +//heatpack +r_player_warming_heatpack = [false, 0]; +r_player_warming_heatpack_time = 600; + +//displays temp progress +r_player_temp_factor = 0; //to be used for temp(up/down) indicators +r_player_temp_min_factor = -0.04; //(lvl3 down arrow) +r_player_temp_max_factor = 0.04; //(lvl3 up arrow) + //INT Nutrition Info r_player_Nutrition = 0; // Calories r_player_nutritionMuilpty = 2; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 1f69ba792..78e5e3941 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -26,6 +26,15 @@ Posbírat %1 %1 aufsammeln + + Light fire + Зажечь огонь + + + Put out fire + Погасить огонь + + Drop Выбросить @@ -2831,7 +2840,7 @@ Blueprint to create a Herbal Drink. Required - 1 Water bottle boiled and one herb box. - Рецепт приготовления травяного напитка. Требуется: бутылка кипяченой воды и коробка трав. + Рецепт приготовления травяного напитка. Требуется: бутылка чистой воды и коробка трав. Blueprint para crear una bebida a base de plantas. Requerido - 1 Botella de agua hervida y una caja de hierbas. Blueprint pour créer une boisson à base de plantes. Required - 1 bouteille d'eau bouillie et une boîte d'herbe. Blueprint vytvořit Herbal drink. Povinné - 1 láhev vody vařené a jedna bylina box. @@ -5706,7 +5715,7 @@ MRE EPa - Cухпай + Сухой паёк MRE MRE Repas instantané Vojenská dávka @@ -10347,6 +10356,7 @@ SVD Camo + СВД(кам) @@ -10723,7 +10733,7 @@ A Rail Integration System kit designed for the SA-58 assault rifle. - Комплект рельсовай системы интеграции разработанной для SA-58 + Комплект рельсовой системы интеграции разработанной для SA-58