From 91f9b3e33bbab6e763922ec5cd59ef856dc4bedb Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Tue, 29 Mar 2016 19:54:19 -0400 Subject: [PATCH] Make UI toggleable between three options Admin can choose vanilla, classic epoch or classic epoch dark. dayz_hungerThirst was replaced with dayz_NutritionSystem --- CHANGE LOG 1.0.6.txt | 10 +- .../Configs/RscDisplay/RscNewPlayerUI.hpp | 319 ----------- .../Configs/RscDisplay/RscOldPlayerUI.hpp | 287 ---------- .../Configs/RscDisplay/RscPlayerUI.hpp | 236 +++++++- SQF/dayz_code/NOTE.txt | 7 - SQF/dayz_code/actions/fill_nearestVehicle.sqf | 2 +- SQF/dayz_code/actions/fill_startGenerator.sqf | 2 +- SQF/dayz_code/actions/fire_light.sqf | 2 +- SQF/dayz_code/actions/jerry_fill.sqf | 2 +- SQF/dayz_code/actions/modular_build.sqf | 2 +- SQF/dayz_code/actions/player_build.sqf | 2 +- .../actions/player_buildingDowngrade.sqf | 2 +- .../actions/player_buildingMaint.sqf | 2 +- SQF/dayz_code/actions/player_checkRecipe.sqf | 2 - SQF/dayz_code/actions/player_copyKey.sqf | 2 +- SQF/dayz_code/actions/player_craftItem.sqf | 2 +- SQF/dayz_code/actions/player_craftitemGUI.sqf | 2 - SQF/dayz_code/actions/player_harvestPlant.sqf | 2 +- SQF/dayz_code/actions/player_loadCrate.sqf | 2 +- SQF/dayz_code/actions/player_upgrade.sqf | 2 +- SQF/dayz_code/actions/remove.sqf | 2 +- SQF/dayz_code/actions/stopGenerator.sqf | 2 +- SQF/dayz_code/actions/tow_AttachStraps.sqf | 2 +- SQF/dayz_code/actions/tow_DetachStraps.sqf | 2 +- SQF/dayz_code/actions/trade_any_bicycle.sqf | 2 +- .../actions/trade_any_bicycle_old.sqf | 2 +- SQF/dayz_code/actions/trade_any_boat.sqf | 2 +- SQF/dayz_code/actions/trade_any_boat_old.sqf | 2 +- SQF/dayz_code/actions/trade_any_vehicle.sqf | 2 +- .../actions/trade_any_vehicle_free.sqf | 2 +- .../actions/trade_any_vehicle_old.sqf | 2 +- SQF/dayz_code/actions/trade_backpacks.sqf | 2 +- SQF/dayz_code/actions/trade_backpacks_old.sqf | 2 +- SQF/dayz_code/actions/trade_items.sqf | 2 +- SQF/dayz_code/actions/trade_items_old.sqf | 2 +- SQF/dayz_code/actions/trade_items_wo_db.sqf | 2 +- SQF/dayz_code/actions/trade_weapons.sqf | 2 +- SQF/dayz_code/actions/trade_weapons_old.sqf | 2 +- SQF/dayz_code/actions/vault_pitch.sqf | 2 +- SQF/dayz_code/compile/fn_updateCraftUI.sqf | 2 - .../compile/player_countMagazines.sqf | 66 +-- SQF/dayz_code/compile/player_lockVault.sqf | 2 +- SQF/dayz_code/compile/player_packVault.sqf | 2 +- SQF/dayz_code/compile/player_unlockDoor.sqf | 2 +- SQF/dayz_code/compile/player_unlockVault.sqf | 4 +- SQF/dayz_code/compile/player_updateGui.sqf | 522 +++++++----------- .../compile/player_updateGuiDark.sqf | 205 +++++++ .../compile/player_updateGuiEpoch.sqf | 228 ++++++++ SQF/dayz_code/compile/ui_changeDisplay.sqf | 6 +- SQF/dayz_code/config.cpp | 73 ++- SQF/dayz_code/configVariables.sqf | 2 + SQF/dayz_code/gui/status_epoch/status_bg.paa | Bin 0 -> 5625 bytes .../{ => status_epoch}/status_bleeding_ca.paa | Bin .../status_epoch/status_blood_border_CA.paa | Bin 0 -> 5625 bytes .../status_blood_border_down1_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_down1_sick_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_down2_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_down2_sick_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_down3_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_down3_sick_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_sick_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_up1_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_up1_sick_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_up2_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_up2_sick_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_up3_ca.paa | Bin 0 -> 5625 bytes .../status_blood_border_up3_sick_ca.paa | Bin 0 -> 5625 bytes .../status_blood_inside_1_ca.paa | Bin .../status_blood_inside_2_ca.paa | Bin .../status_blood_inside_3_ca.paa | Bin .../status_blood_inside_4_ca.paa | Bin .../status_blood_inside_5_ca.paa | Bin .../status_blood_inside_6_ca.paa | Bin .../status_blood_type_AB_neg_ca.paa | Bin 0 -> 5625 bytes .../status_blood_type_AB_pos_ca.paa | Bin 0 -> 5625 bytes .../status_blood_type_A_neg_ca.paa | Bin 0 -> 5625 bytes .../status_blood_type_A_pos_ca.paa | Bin 0 -> 5625 bytes .../status_blood_type_B_neg_ca.paa | Bin 0 -> 5625 bytes .../status_blood_type_B_pos_ca.paa | Bin 0 -> 5625 bytes .../status_blood_type_O_neg_ca.paa | Bin 0 -> 5625 bytes .../status_blood_type_O_pos_ca.paa | Bin 0 -> 5625 bytes .../status_epoch/status_combat_border_CA.paa | Bin 0 -> 5625 bytes .../status_combat_inside_ca.paa | Bin .../status_connection_ca.paa | Bin .../gui/{ => status_epoch}/status_dont_ca.paa | Bin .../gui/{ => status_epoch}/status_ear_ca.paa | Bin .../status_epoch/status_effect_brokenleg.paa | Bin 0 -> 5625 bytes .../gui/status_epoch/status_effect_weight.paa | Bin 0 -> 5625 bytes .../gui/{ => status_epoch}/status_eye_ca.paa | Bin .../status_epoch/status_food_border_CA.paa | Bin 0 -> 5625 bytes .../status_food_inside_0_ca.paa | Bin .../status_food_inside_1_ca.paa | Bin .../status_food_inside_2_ca.paa | Bin .../status_food_inside_3_ca.paa | Bin .../status_food_inside_4_ca.paa | Bin .../{ => status_epoch}/status_fracture_CA.paa | Bin .../gui/status_epoch/status_noise.paa | Bin 0 -> 5625 bytes .../{ => status_epoch}/status_temp_0_ca.paa | Bin .../{ => status_epoch}/status_temp_1_ca.paa | Bin .../{ => status_epoch}/status_temp_2_ca.paa | Bin .../{ => status_epoch}/status_temp_3_ca.paa | Bin .../{ => status_epoch}/status_temp_4_ca.paa | Bin .../status_temp_outside_ca.paa | Bin .../status_epoch/status_thirst_border_CA.paa | Bin 0 -> 5625 bytes .../status_thirst_inside_0_ca.paa | Bin .../status_thirst_inside_1_ca.paa | Bin .../status_thirst_inside_2_ca.paa | Bin .../status_thirst_inside_3_ca.paa | Bin .../status_thirst_inside_4_ca.paa | Bin .../gui/status_epoch/status_visible.paa | Bin 0 -> 5625 bytes .../{ => status_epoch}/status_waiting_CA.paa | Bin .../gui/{ => status_epoch}/val_1_ca.paa | Bin .../gui/{ => status_epoch}/val_2_ca.paa | Bin .../gui/{ => status_epoch}/val_3_ca.paa | Bin .../gui/{ => status_epoch}/val_4_ca.paa | Bin .../gui/{ => status_epoch}/val_5_ca.paa | Bin SQF/dayz_code/init/compiles.sqf | 58 +- SQF/dayz_code/init/variables.sqf | 3 - .../medical/transfusion_NoBloodTypes.sqf | 2 - SQF/dayz_code/system/dog_agent.fsm | 35 +- SQF/dayz_code/system/player_monitor.fsm | 1 - SQF/dayz_code/system/scheduler/sched_gui.sqf | 2 +- 122 files changed, 977 insertions(+), 1165 deletions(-) delete mode 100644 SQF/dayz_code/Configs/RscDisplay/RscNewPlayerUI.hpp delete mode 100644 SQF/dayz_code/Configs/RscDisplay/RscOldPlayerUI.hpp create mode 100644 SQF/dayz_code/compile/player_updateGuiDark.sqf create mode 100644 SQF/dayz_code/compile/player_updateGuiEpoch.sqf create mode 100644 SQF/dayz_code/gui/status_epoch/status_bg.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_bleeding_ca.paa (100%) create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_CA.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_down1_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_down1_sick_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_down2_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_down2_sick_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_down3_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_down3_sick_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_sick_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_up1_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_up1_sick_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_up2_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_up2_sick_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_up3_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_border_up3_sick_ca.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_blood_inside_1_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_blood_inside_2_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_blood_inside_3_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_blood_inside_4_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_blood_inside_5_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_blood_inside_6_ca.paa (100%) create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_AB_neg_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_AB_pos_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_A_neg_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_A_pos_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_B_neg_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_B_pos_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_O_neg_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_blood_type_O_pos_ca.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_combat_border_CA.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_combat_inside_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_connection_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_dont_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_ear_ca.paa (100%) create mode 100644 SQF/dayz_code/gui/status_epoch/status_effect_brokenleg.paa create mode 100644 SQF/dayz_code/gui/status_epoch/status_effect_weight.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_eye_ca.paa (100%) create mode 100644 SQF/dayz_code/gui/status_epoch/status_food_border_CA.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_food_inside_0_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_food_inside_1_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_food_inside_2_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_food_inside_3_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_food_inside_4_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_fracture_CA.paa (100%) create mode 100644 SQF/dayz_code/gui/status_epoch/status_noise.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_temp_0_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_temp_1_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_temp_2_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_temp_3_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_temp_4_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_temp_outside_ca.paa (100%) create mode 100644 SQF/dayz_code/gui/status_epoch/status_thirst_border_CA.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_thirst_inside_0_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_thirst_inside_1_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_thirst_inside_2_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_thirst_inside_3_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/status_thirst_inside_4_ca.paa (100%) create mode 100644 SQF/dayz_code/gui/status_epoch/status_visible.paa rename SQF/dayz_code/gui/{ => status_epoch}/status_waiting_CA.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/val_1_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/val_2_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/val_3_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/val_4_ca.paa (100%) rename SQF/dayz_code/gui/{ => status_epoch}/val_5_ca.paa (100%) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 261963ba1..9417684f2 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -1,5 +1,10 @@ [NEW] Fully updated to DayZ 1.8.7 code base @icomrade @ebaydayz + + Some notable changes include (not a full list): - Blood types system is disabled by default. Set DZE_UseBloodTypes = true; in init.sqf to enable + - Bandit heartbeat sound is disabled by default. Set DZE_HeartBeat = true; in init.sqf to enable + - Knife dulling is disabled by default. Set dayz_knifeDulling = true; in init.sqf to enable + - Water bottle breaking is disabled by default. Set dayz_waterBottleBreaking = true; in init.sqf to enable - New loot table format is incompatible with old loot tables. See CfgLoot\README - Mission.sqm and description.ext now use compact format - Keyboard eventhandler updated, dayz_spaceInterupt is no longer used @@ -7,7 +12,9 @@ - Weapon switch hotkeys added (1 = primary, 2 = pistol, 3 = melee) - Journal is now functional for displaying stats - ItemFish, Shotgun ammo and several other item classnames changed. See SQL\1.0.6_Updates + - Status UI icons are toggleable between "vanilla","epoch","dark" set i.e. DZE_UI = "epoch"; in init.sqf - Dupicate functions have been renamed: + - dayz_HungerThirst --> dayz_NutritionSystem - dayz_objectUID3 --> dayz_objectUID2 - object_handleServerKilled --> vehicle_handleServerKilled - object_setFixServer --> fnc_veh_setFixServer @@ -52,12 +59,11 @@ - usecMorphine --> PVCDZ_hlt_Morphine - usecPainK --> PVCDZ_hlt_PainK - usecTransfuse --> PVCDZ_hlt_Transfuse - [NEW] RedRyder BB Gun by @arma2WillRobinson [NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu [NEW] DB Backup script. @RimBlock [NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade -[NEW] UI Update - Graphical and code changes, enable using Dayz_Dark_UI = true; in init.sqf. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ +[NEW] UI Update - Graphical and code changes, enable using DZE_UI = "dark"; in init.sqf. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ [NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false; [NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix [NEW] Auto login when a player joins the server, default 10 seconds, requires description.ext update in the mission (disable in description.ext by setting defValueParam1 = 31;) @icomrade diff --git a/SQF/dayz_code/Configs/RscDisplay/RscNewPlayerUI.hpp b/SQF/dayz_code/Configs/RscDisplay/RscNewPlayerUI.hpp deleted file mode 100644 index a8281765b..000000000 --- a/SQF/dayz_code/Configs/RscDisplay/RscNewPlayerUI.hpp +++ /dev/null @@ -1,319 +0,0 @@ -class RscTitles -{ - titles[] = {"DeathScreen","TitleScreen","RscTitleStructuredText"}; - class DeathScreen - { - idd = -1; - movingEnable = "false"; - duration = 120; - fadein = 0; - name = "DeathScreen"; - controls[] = {"DeathScreen"}; - class DeathScreen: RscPicture - { - x = "0.00001 * safezoneW + safezoneX"; - y = "0.00001 * safezoneH + safezoneY"; - w = "1 * safezoneW"; - h = "1 * safezoneH"; - text = "\z\addons\dayz_epoch\ui\screen_death_ca.paa"; - }; - }; - class TitleScreen - { - idd = -1; - movingEnable = "false"; - duration = 120; - fadein = 0; - name = "TitleScreen"; - controls[] = {"TitleScreen"}; - class TitleScreen: RscPicture - { - x = "0.00001 * safezoneW + safezoneX"; - y = "0.00001 * safezoneH + safezoneY"; - w = "1 * safezoneW"; - h = "1 * safezoneH"; - text = "\dayz\ui\screen_title_ca.paa"; - }; - }; - class Default - { - idd = -1; - movingEnable = 0; - duration = 4; - }; - class playerKillScore { - idd = 6902; - movingEnable = 0; - duration = 5; - name = "playerKillScore"; - onLoad = "uiNamespace setVariable ['DAYZ_GUI_kills', _this select 0];"; - class ControlsBackground { - class RscPicture_1201: RscPictureGUI - { - idc = 1400; - text = "\z\addons\dayz_code\gui\stats_kills_human_ca.paa"; - x = 0.044687 * safezoneW + safezoneX; - y = 0.934779 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1200: RscPictureGUI - { - idc = 1401; - text = "\z\addons\dayz_code\gui\stats_kills_zombie_ca.paa"; - x = 0.044687 * safezoneW + safezoneX; - y = 0.876025 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - }; - class Controls{ - class RscText1: RscStructuredTextGUI - { - idc = 1410; - text = "10"; - x = (0.044687 * safezoneW + safezoneX) - 0.01; - y = 0.934779 * safezoneH + safezoneY; - w = 0.08; - h = 0.08; - }; - class RscText2: RscStructuredTextGUI - { - idc = 1411; - text = "1000"; - x = (0.044687 * safezoneW + safezoneX) - 0.01; - y = 0.876025 * safezoneH + safezoneY; - w = 0.08; - h = 0.08; - }; - }; - }; - - class playerStatusWaiting { - idd = 6901; - movingEnable = 0; - duration = 100000; - name = "playerStatusWaiting"; - onLoad = "uiNamespace setVariable ['DAYZ_GUI_waiting', _this select 0];"; - class ControlsBackground { - class RscText_1402: RscPictureGUI - { - idc = 1402; - text = "#(argb,8,8,3)color(1,1,1,1)"; - x = 0.473572 * safezoneW + safezoneX; - y = 0.418158 * safezoneH + safezoneY; - w = 0.0634286 * safezoneW; - h = 0.136829 * safezoneH; - colorText[] = {1,1,1,1}; - }; - class RscText_1400: RscPictureGUI - { - idc = 1400; - text = "#(argb,8,8,3)color(1,1,1,1)"; - x = 0.473572 * safezoneW + safezoneX; - y = 0.418158 * safezoneH + safezoneY; - w = 0.0634286 * safezoneW; - h = 0; //0.136829 * safezoneH; - colorText[] = {0,0,0,1}; - }; - }; - class Controls { - class RscPicture_1401: RscPictureGUI - { - idc = 1401; - text = "\z\addons\dayz_code\gui\status_waiting_ca.paa"; - x = 0.434999 * safezoneW + safezoneX; - y = 0.392207 * safezoneH + safezoneY; - w = 0.141 * safezoneW; - h = 0.188013 * safezoneH; - colorText[] = {0.38,0.63,0.26,1}; - }; - }; - }; - - class playerStatusGUI { - idd = 6900; - movingEnable = 0; - duration = 100000; - name = "statusBorder"; - onLoad = "uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];"; - class ControlsBackground { - class RscPicture_1901: RscPictureGUI - { - idc = 1901; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.86 * safezoneH + safezoneY;//2 - w = 0.075; - h = 0.10; - }; - class RscPicture_1201: RscPictureGUI - { - idc = 1201; - //text = "\z\addons\dayz_code\gui\status\status_food_border_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.86 * safezoneH + safezoneY;//2 - w = 0.075; - h = 0.10; - }; - class RscPicture_1900: RscPictureGUI - { - idc = 1900; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.79 * safezoneH + safezoneY; //3 - w = 0.075; - h = 0.10; - }; - class RscPicture_1200: RscPictureGUI - { - idc = 1200; - //text = "\z\addons\dayz_code\gui\status\status_blood_border_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.79 * safezoneH + safezoneY; //3 - w = 0.075; - h = 0.10; - }; - class RscPicture_1902: RscPictureGUI - { - idc = 1902; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.93 * safezoneH + safezoneY; //1 - w = 0.075; - h = 0.10; - }; - class RscPicture_1202: RscPictureGUI - { - idc = 1202; - //text = "\z\addons\dayz_code\gui\status\status_thirst_border_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.93 * safezoneH + safezoneY; //1 - w = 0.075; - h = 0.10; - }; - class RscPicture_1908: RscPictureGUI - { - idc = 1908; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.72 * safezoneH + safezoneY; //3 - w = 0.075; - h = 0.10; - }; - class RscPicture_1208: RscPictureGUI - { - idc = 1208; - //text = "\z\addons\dayz_code\gui\status\status_temp_outside_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.72 * safezoneH + safezoneY; //3 - w = 0.075; - h = 0.10; - }; - class RscPicture_1203: RscPictureGUI - { - idc = 1203; - text = "\z\addons\dayz_code\gui\status\status_effect_brokenleg.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.58 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - colorText[] = {1,1,1,1}; - }; - class RscPicture_1204: RscPictureGUI - { - idc = 1204; - text = "\z\addons\dayz_code\gui\status\status_connection_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.51 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - colorText[] = {1,1,1,1}; - }; - class RscPicture_1205: RscPictureGUI - { - idc = 1205; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.30 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - class RscPicture_1206: RscPictureGUI - { - idc = 1206; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.37 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - }; - class Controls { - class RscPicture_1301: RscPictureGUI - { - idc = 1301; - //text = "\z\addons\dayz_code\gui\status\status_food_inside_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.86 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - class RscPicture_1300: RscPictureGUI - { - idc = 1300; - //text = "\z\addons\dayz_code\gui\status\status_blood_inside_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.79 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - class RscPicture_1302: RscPictureGUI - { - idc = 1302; - //text = "\z\addons\dayz_code\gui\status\status_thirst_inside_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.93 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - class RscPicture_1306: RscPictureGUI - { - idc = 1306; - //text = "\z\addons\dayz_code\gui\status\status_temp_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.72 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - class RscPicture_1303: RscPictureGUI - { - idc = 1303; - text = "\z\addons\dayz_code\gui\status\status_bleeding_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.79 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - colorText[] = {1,1,1,0.5}; - }; - class RscPicture_1304: RscPictureGUI - { - idc = 1304; - text = "\z\addons\dayz_code\gui\status\status_noise.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.30 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - class RscPicture_1305: RscPictureGUI - { - idc = 1305; - text = "\z\addons\dayz_code\gui\status\status_visible.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.37 * safezoneH + safezoneY; - w = 0.075; - h = 0.10; - }; - }; - }; -}; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscOldPlayerUI.hpp b/SQF/dayz_code/Configs/RscDisplay/RscOldPlayerUI.hpp deleted file mode 100644 index a475c1588..000000000 --- a/SQF/dayz_code/Configs/RscDisplay/RscOldPlayerUI.hpp +++ /dev/null @@ -1,287 +0,0 @@ -class RscTitles -{ - titles[] = {"DeathScreen","TitleScreen","RscTitleStructuredText"}; - class DeathScreen - { - idd = -1; - movingEnable = "false"; - duration = 120; - fadein = 0; - name = "DeathScreen"; - controls[] = {"DeathScreen"}; - class DeathScreen: RscPicture - { - x = "0.00001 * safezoneW + safezoneX"; - y = "0.00001 * safezoneH + safezoneY"; - w = "1 * safezoneW"; - h = "1 * safezoneH"; - text = "\z\addons\dayz_epoch\ui\screen_death_ca.paa"; - }; - }; - class TitleScreen - { - idd = -1; - movingEnable = "false"; - duration = 120; - fadein = 0; - name = "TitleScreen"; - controls[] = {"TitleScreen"}; - class TitleScreen: RscPicture - { - x = "0.00001 * safezoneW + safezoneX"; - y = "0.00001 * safezoneH + safezoneY"; - w = "1 * safezoneW"; - h = "1 * safezoneH"; - text = "\dayz\ui\screen_title_ca.paa"; - }; - }; - class Default - { - idd = -1; - movingEnable = 0; - duration = 4; - }; - class playerKillScore - { - idd = 6902; - movingEnable = 0; - duration = 5; - name = "playerKillScore"; - onLoad = "uiNamespace setVariable ['DAYZ_GUI_kills', _this select 0];"; - class ControlsBackground { - class RscPicture_1201: RscPictureGUI - { - idc = 1400; - text = "\z\addons\dayz_code\gui\stats_kills_human_ca.paa"; - x = 0.044687 * safezoneW + safezoneX; - y = 0.934779 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1200: RscPictureGUI - { - idc = 1401; - text = "\z\addons\dayz_code\gui\stats_kills_zombie_ca.paa"; - x = 0.044687 * safezoneW + safezoneX; - y = 0.876025 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - }; - class Controls{ - class RscText1: RscStructuredTextGUI - { - idc = 1410; - text = "10"; - x = (0.044687 * safezoneW + safezoneX) - 0.01; - y = 0.934779 * safezoneH + safezoneY; - w = 0.08; - h = 0.08; - }; - class RscText2: RscStructuredTextGUI - { - idc = 1411; - text = "1000"; - x = (0.044687 * safezoneW + safezoneX) - 0.01; - y = 0.876025 * safezoneH + safezoneY; - w = 0.08; - h = 0.08; - }; - }; - }; - - class playerStatusWaiting - { - idd = 6901; - movingEnable = 0; - duration = 100000; - name = "playerStatusWaiting"; - onLoad = "uiNamespace setVariable ['DAYZ_GUI_waiting', _this select 0];"; - class ControlsBackground { - class RscText_1402: RscPictureGUI - { - idc = 1402; - text = "#(argb,8,8,3)color(1,1,1,1)"; - x = 0.473572 * safezoneW + safezoneX; - y = 0.418158 * safezoneH + safezoneY; - w = 0.0634286 * safezoneW; - h = 0.136829 * safezoneH; - colorText[] = {1,1,1,1}; - }; - class RscText_1400: RscPictureGUI - { - idc = 1400; - text = "#(argb,8,8,3)color(1,1,1,1)"; - x = 0.473572 * safezoneW + safezoneX; - y = 0.418158 * safezoneH + safezoneY; - w = 0.0634286 * safezoneW; - h = 0; //0.136829 * safezoneH; - colorText[] = {0,0,0,1}; - }; - }; - class Controls { - class RscPicture_1401: RscPictureGUI - { - idc = 1401; - text = "\z\addons\dayz_code\gui\status_waiting_ca.paa"; - x = 0.434999 * safezoneW + safezoneX; - y = 0.392207 * safezoneH + safezoneY; - w = 0.141 * safezoneW; - h = 0.188013 * safezoneH; - colorText[] = {0.38,0.63,0.26,1}; - }; - }; - }; - - class playerStatusGUI - { - idd = 6900; - movingEnable = 0; - duration = 100000; - name = "statusBorder"; - onLoad = "uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];"; - class ControlsBackground { - class RscStructuredText_1199: RscStructuredText - { - idc = 1199; - x = 0.250001; - y = 0.350001; - w = 0.5; - h = 0.1; - }; - - class RscPicture_1203: RscPictureGUI - { - idc = 1203; - text = "\z\addons\dayz_code\gui\status_fracture_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.58 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - colorText[] = {1,1,1,1}; - }; - class RscPicture_1204: RscPictureGUI - { - idc = 1204; - text = "\z\addons\dayz_code\gui\status_connection_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.51 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - colorText[] = {1,1,1,1}; - }; - class RscPicture_1205: RscPictureGUI - { - idc = 1205; - text = "\z\addons\dayz_code\gui\status_ear_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.30 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1206: RscPictureGUI - { - idc = 1206; - text = "\z\addons\dayz_code\gui\status_eye_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.37 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - - }; - class Controls{ - class RscPicture_1301: RscPictureGUI - { - idc = 1301; - //text = "\z\addons\dayz_code\gui\status_food_inside_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.93 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1300: RscPictureGUI - { - idc = 1300; - //text = "\z\addons\dayz_code\gui\status_blood_inside_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.86 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1302: RscPictureGUI - { - idc = 1302; - //text = "\z\addons\dayz_code\gui\status_thirst_inside_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.79 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1306: RscPictureGUI - { - idc = 1306; - //text = "\z\addons\dayz_code\gui\status_temp_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.72 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1303: RscPictureGUI - { - idc = 1303; - text = "\z\addons\dayz_code\gui\status_bleeding_ca.paa"; - x = 0.955313 * safezoneW + safezoneX; - y = 0.86 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - colorText[] = {1,1,1,0.5}; - }; - class RscPicture_1304: RscPictureGUI - { - idc = 1304; - text = ""; - x = 0.935313 * safezoneW + safezoneX; - y = 0.3 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1305: RscPictureGUI - { - idc = 1305; - text = ""; - x = 0.935313 * safezoneW + safezoneX; - y = 0.37 * safezoneH + safezoneY; - w = 0.06; - h = 0.08; - }; - class RscPicture_1307 : RscPictureGUI { - idc = 1307; - text = "\z\addons\dayz_code\gui\status_combat_inside_ca.paa"; - x = "0.955313 * safezoneW + safezoneX"; - y = "0.65 * safezoneH + safezoneY"; - w = 0.06; - h = 0.08; - }; - class RscPicture_1701: RscPictureGUI - - { - idc = 1701; - //text = "\z\addons\dayz_code\gui\status_food_inside_ca.paa"; - x = 0.945313 * safezoneW + safezoneX; - y = 0.95 * safezoneH + safezoneY; - w = 0.04; - h = 0.053333; - }; - class RscPicture_1702: RscPictureGUI - { - idc = 1702; - //text = "\z\addons\dayz_code\gui\status_thirst_inside_ca.paa"; - x = 0.945313 * safezoneW + safezoneX; - y = 0.816666 * safezoneH + safezoneY; - w = 0.04; - h = 0.053333; - }; - }; - }; -}; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp b/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp index 6455bac8e..ec63a0e2d 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp @@ -119,35 +119,19 @@ class RscTitles name = "statusBorder"; onLoad = "uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];"; class ControlsBackground { - class RscStructuredText_1199: RscStructuredText - { - idc = 1199; - x = 0.250001; - y = 0.350001; - w = 0.5; - h = 0.1; - }; class RscPicture_1901: RscPictureGUI { idc = 1901; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; + text = "\z\addons\dayz_code\gui\status\status_bg.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.86 * safezoneH + safezoneY;//2 w = 0.075; h = 0.10; }; - class RscPicture_1307 : RscPictureGUI { - idc = 1307; - text = "\z\addons\dayz_code\gui\status_combat_inside_ca.paa"; - x = "0.955313 * safezoneW + safezoneX"; - y = "0.65 * safezoneH + safezoneY"; - w = 0.06; - h = 0.08; - }; class RscPicture_1201: RscPictureGUI { idc = 1201; - //text = "\z\addons\dayz_code\gui\status\status_food_border_ca.paa"; + text = "\z\addons\dayz_code\gui\status\status_food_border_ca.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.86 * safezoneH + safezoneY;//2 w = 0.075; @@ -156,7 +140,7 @@ class RscTitles class RscPicture_1900: RscPictureGUI { idc = 1900; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; + text = "\z\addons\dayz_code\gui\status\status_bg.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.79 * safezoneH + safezoneY; //3 w = 0.075; @@ -174,7 +158,7 @@ class RscTitles class RscPicture_1902: RscPictureGUI { idc = 1902; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; + text = "\z\addons\dayz_code\gui\status\status_bg.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.93 * safezoneH + safezoneY; //1 w = 0.075; @@ -183,7 +167,7 @@ class RscTitles class RscPicture_1202: RscPictureGUI { idc = 1202; - //text = "\z\addons\dayz_code\gui\status\status_thirst_border_ca.paa"; + text = "\z\addons\dayz_code\gui\status\status_thirst_border_ca.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.93 * safezoneH + safezoneY; //1 w = 0.075; @@ -192,7 +176,7 @@ class RscTitles class RscPicture_1908: RscPictureGUI { idc = 1908; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; + text = "\z\addons\dayz_code\gui\status\status_bg.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; //3 w = 0.075; @@ -201,7 +185,7 @@ class RscTitles class RscPicture_1208: RscPictureGUI { idc = 1208; - //text = "\z\addons\dayz_code\gui\status\status_temp_outside_ca.paa"; + text = "\z\addons\dayz_code\gui\status\status_temp_outside_ca.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; //3 w = 0.075; @@ -230,7 +214,7 @@ class RscTitles class RscPicture_1205: RscPictureGUI { idc = 1205; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; + text = "\z\addons\dayz_code\gui\status\status_bg.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.30 * safezoneH + safezoneY; w = 0.075; @@ -239,7 +223,7 @@ class RscTitles class RscPicture_1206: RscPictureGUI { idc = 1206; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; + text = "\z\addons\dayz_code\gui\status\status_bg.paa"; x = 0.955313 * safezoneW + safezoneX; y = 0.37 * safezoneH + safezoneY; w = 0.075; @@ -322,4 +306,206 @@ class RscTitles }; }; }; + + class playerStatusGUI_epoch { + idd = 690000; + movingEnable = 0; + duration = 100000; + name = "statusBorder"; + onLoad = "uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];"; + class ControlsBackground { + class RscStructuredText_1199: RscStructuredText + { + idc = 1199; + x = 0.250001; + y = 0.350001; + w = 0.5; + h = 0.1; + }; + class RscPicture_1901: RscPictureGUI + { + idc = 1901; + //text = "\z\addons\dayz_code\gui\status_epoch\status_bg.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.86 * safezoneH + safezoneY;//2 + w = 0.075; + h = 0.10; + }; + class RscPicture_1307 : RscPictureGUI { + idc = 1307; + text = "\z\addons\dayz_code\gui\status_epoch\status_combat_inside_ca.paa"; + x = "0.955313 * safezoneW + safezoneX"; + y = "0.65 * safezoneH + safezoneY"; + w = 0.06; + h = 0.08; + }; + class RscPicture_1201: RscPictureGUI + { + idc = 1201; + //text = "\z\addons\dayz_code\gui\status_epoch\status_food_border_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.86 * safezoneH + safezoneY;//2 + w = 0.075; + h = 0.10; + }; + class RscPicture_1900: RscPictureGUI + { + idc = 1900; + //text = "\z\addons\dayz_code\gui\status_epoch\status_bg.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.79 * safezoneH + safezoneY; //3 + w = 0.075; + h = 0.10; + }; + class RscPicture_1200: RscPictureGUI + { + idc = 1200; + //text = "\z\addons\dayz_code\gui\status_epoch\status_blood_border_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.79 * safezoneH + safezoneY; //3 + w = 0.075; + h = 0.10; + }; + class RscPicture_1902: RscPictureGUI + { + idc = 1902; + //text = "\z\addons\dayz_code\gui\status_epoch\status_bg.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.93 * safezoneH + safezoneY; //1 + w = 0.075; + h = 0.10; + }; + class RscPicture_1202: RscPictureGUI + { + idc = 1202; + //text = "\z\addons\dayz_code\gui\status_epoch\status_thirst_border_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.93 * safezoneH + safezoneY; //1 + w = 0.075; + h = 0.10; + }; + class RscPicture_1908: RscPictureGUI + { + idc = 1908; + //text = "\z\addons\dayz_code\gui\status_epoch\status_bg.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.72 * safezoneH + safezoneY; //3 + w = 0.075; + h = 0.10; + }; + class RscPicture_1208: RscPictureGUI + { + idc = 1208; + //text = "\z\addons\dayz_code\gui\status_epoch\status_temp_outside_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.72 * safezoneH + safezoneY; //3 + w = 0.075; + h = 0.10; + }; + class RscPicture_1203: RscPictureGUI + { + idc = 1203; + text = "\z\addons\dayz_code\gui\status_epoch\status_effect_brokenleg.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.58 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + colorText[] = {1,1,1,1}; + }; + class RscPicture_1204: RscPictureGUI + { + idc = 1204; + text = "\z\addons\dayz_code\gui\status_epoch\status_connection_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.51 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + colorText[] = {1,1,1,1}; + }; + class RscPicture_1205: RscPictureGUI + { + idc = 1205; + //text = "\z\addons\dayz_code\gui\status_epoch\status_bg.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.30 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + class RscPicture_1206: RscPictureGUI + { + idc = 1206; + //text = "\z\addons\dayz_code\gui\status_epoch\status_bg.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.37 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + }; + class Controls { + class RscPicture_1301: RscPictureGUI + { + idc = 1301; + //text = "\z\addons\dayz_code\gui\status_epoch\status_food_inside_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.86 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + class RscPicture_1300: RscPictureGUI + { + idc = 1300; + //text = "\z\addons\dayz_code\gui\status_epoch\status_blood_inside_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.79 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + class RscPicture_1302: RscPictureGUI + { + idc = 1302; + //text = "\z\addons\dayz_code\gui\status_epoch\status_thirst_inside_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.93 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + class RscPicture_1306: RscPictureGUI + { + idc = 1306; + //text = "\z\addons\dayz_code\gui\status_epoch\status_temp_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.72 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + class RscPicture_1303: RscPictureGUI + { + idc = 1303; + text = "\z\addons\dayz_code\gui\status_epoch\status_bleeding_ca.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.79 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + colorText[] = {1,1,1,0.5}; + }; + class RscPicture_1304: RscPictureGUI + { + idc = 1304; + text = "\z\addons\dayz_code\gui\status_epoch\status_noise.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.30 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + class RscPicture_1305: RscPictureGUI + { + idc = 1305; + text = "\z\addons\dayz_code\gui\status_epoch\status_visible.paa"; + x = 0.955313 * safezoneW + safezoneX; + y = 0.37 * safezoneH + safezoneY; + w = 0.075; + h = 0.10; + }; + }; + }; }; diff --git a/SQF/dayz_code/NOTE.txt b/SQF/dayz_code/NOTE.txt index de9ce44bf..0e2c4aa1f 100644 --- a/SQF/dayz_code/NOTE.txt +++ b/SQF/dayz_code/NOTE.txt @@ -1,14 +1,7 @@ -NEW VAR DZE_HeartBeat -USE TO ENABLE HEARTBEAT SOUND WHEN LOOKING AT BANDIT PLAYER (less than -5000 humanity), DISABLED BY DEFAULT - -player_updateGui.sqf - Convert traders + loot (if old system) to ItemBloodbag REMOVE TOOL BREAKING, IT'S STUPID - player_craftItem_DZV = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItem.sqf"; - trap_monitor.fsm is no more! //////////////////////////////////////// diff --git a/SQF/dayz_code/actions/fill_nearestVehicle.sqf b/SQF/dayz_code/actions/fill_nearestVehicle.sqf index dc1c8384c..c1dc5c6ef 100644 --- a/SQF/dayz_code/actions/fill_nearestVehicle.sqf +++ b/SQF/dayz_code/actions/fill_nearestVehicle.sqf @@ -54,7 +54,7 @@ if(_IsNearVehicle >= 1) then { _finished = false; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/fill_startGenerator.sqf b/SQF/dayz_code/actions/fill_startGenerator.sqf index 86bb25ad2..3273fb168 100644 --- a/SQF/dayz_code/actions/fill_startGenerator.sqf +++ b/SQF/dayz_code/actions/fill_startGenerator.sqf @@ -9,7 +9,7 @@ s_player_fillgen = 1; // Use target from addaction _vehicle = _this select 3; -[1,1] call dayz_HungerThirst; +["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/fire_light.sqf b/SQF/dayz_code/actions/fire_light.sqf index ffaaa68d7..e3ca97083 100644 --- a/SQF/dayz_code/actions/fire_light.sqf +++ b/SQF/dayz_code/actions/fire_light.sqf @@ -6,7 +6,7 @@ _isOk = count (_location isFlatEmpty [0.5,0,0,4,0,false,player]) > 0; if (_isOk) then { _dir = getDir player; _classname = "Land_Fire"; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; uiSleep 6; dayz_hasFire = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; diff --git a/SQF/dayz_code/actions/jerry_fill.sqf b/SQF/dayz_code/actions/jerry_fill.sqf index ca42c8497..668fa8356 100644 --- a/SQF/dayz_code/actions/jerry_fill.sqf +++ b/SQF/dayz_code/actions/jerry_fill.sqf @@ -26,7 +26,7 @@ _qty = count _fuelCans; cutText [format[(localize "str_siphon_preparing"),_displayName], "PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; // Play sound && alert zombies diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index 76f91d041..e01e01b16 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -463,7 +463,7 @@ if (_hasrequireditem) then { while {_isOk} do { //publish phase - [10,10] call dayz_HungerThirst; + ["Working",0,[100,15,10,0]] call dayz_NutritionSystem; player playActionNow "Medic"; //animation //alert zombies diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index 1418e8f0e..7544da3dd 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -412,7 +412,7 @@ if (_hasrequireditem) then { while {_isOk} do { - [10,10] call dayz_HungerThirst; + ["Working",0,[100,15,10,0]] call dayz_NutritionSystem; player playActionNow "Medic"; _dis=20; diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index 8601fc933..c8366df05 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -84,7 +84,7 @@ if ((count _upgrade) > 0) then { _newclassname = _upgrade select 0; _refund = _upgrade select 1; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,20,true,(getPosATL player)] spawn player_alertZombies; diff --git a/SQF/dayz_code/actions/player_buildingMaint.sqf b/SQF/dayz_code/actions/player_buildingMaint.sqf index 7ad17dc5f..868789b63 100644 --- a/SQF/dayz_code/actions/player_buildingMaint.sqf +++ b/SQF/dayz_code/actions/player_buildingMaint.sqf @@ -48,7 +48,7 @@ _proceed = true; } forEach _requirements; if (_proceed) then { - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,20,true,(getPosATL player)] spawn player_alertZombies; diff --git a/SQF/dayz_code/actions/player_checkRecipe.sqf b/SQF/dayz_code/actions/player_checkRecipe.sqf index 4aef117f7..2f6ff039c 100644 --- a/SQF/dayz_code/actions/player_checkRecipe.sqf +++ b/SQF/dayz_code/actions/player_checkRecipe.sqf @@ -1,8 +1,6 @@ /* Created by Alby exclusively for DayZMod. Please request permission to use/alter from Alby. - - Included in Epoch with permission by @ebaydayz */ private ["_items","_counts","_config","_isRecipe","_item","_index","_amount","_count","_entry","_input","_array"]; diff --git a/SQF/dayz_code/actions/player_copyKey.sqf b/SQF/dayz_code/actions/player_copyKey.sqf index a75990ae6..44c49bb78 100644 --- a/SQF/dayz_code/actions/player_copyKey.sqf +++ b/SQF/dayz_code/actions/player_copyKey.sqf @@ -25,7 +25,7 @@ call gear_ui_init; // require one tin bar per key _hasTinBar = "ItemTinBar" in magazines player; if (!_hasTinBar) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_59","PLAIN DOWN"]}; -[1,1] call dayz_HungerThirst; +["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,"repair",0,false] call dayz_zombieSpeak; diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index fb9f13349..0dd010780 100644 --- a/SQF/dayz_code/actions/player_craftItem.sqf +++ b/SQF/dayz_code/actions/player_craftItem.sqf @@ -124,7 +124,7 @@ if (_canDo) then { cutText [localize "str_epoch_player_62","PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,_sfx,0,false] call dayz_zombieSpeak; diff --git a/SQF/dayz_code/actions/player_craftitemGUI.sqf b/SQF/dayz_code/actions/player_craftitemGUI.sqf index 3268db33c..5d31444ca 100644 --- a/SQF/dayz_code/actions/player_craftitemGUI.sqf +++ b/SQF/dayz_code/actions/player_craftitemGUI.sqf @@ -1,8 +1,6 @@ /* Created by Alby exclusively for DayZMod. Please request permission to use/alter from Alby. - - Included in Epoch with permission by @ebaydayz */ private["_config","_input","_output","_required","_failChance","_hasInput","_availabeSpace"]; diff --git a/SQF/dayz_code/actions/player_harvestPlant.sqf b/SQF/dayz_code/actions/player_harvestPlant.sqf index a62a8f302..98826f34e 100644 --- a/SQF/dayz_code/actions/player_harvestPlant.sqf +++ b/SQF/dayz_code/actions/player_harvestPlant.sqf @@ -52,7 +52,7 @@ if (count(_findNearestTree) >= 1) then { _proceed = false; while {_isOk} do { - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,20,true,(getPosATL player)] spawn player_alertZombies; diff --git a/SQF/dayz_code/actions/player_loadCrate.sqf b/SQF/dayz_code/actions/player_loadCrate.sqf index cab273c58..60d9ade56 100644 --- a/SQF/dayz_code/actions/player_loadCrate.sqf +++ b/SQF/dayz_code/actions/player_loadCrate.sqf @@ -35,7 +35,7 @@ _classname = "WeaponHolder"; //return empty crate to inventory player addMagazine "bulk_empty"; -[1,1] call dayz_HungerThirst; +["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // Change to optional wait to complete player playActionNow "Medic"; uiSleep 6; diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index e8e40ac7c..4241a04fc 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -98,7 +98,7 @@ if ((count _upgrade) > 0) then { } forEach _requirements; if (_proceed) then { - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,20,true,(getPosATL player)] spawn player_alertZombies; diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index b3f900e70..1cecd23cb 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -92,7 +92,7 @@ while {_isOk} do { _isOk = false; _proceed = false; }; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; _dis=20; [player,_dis,true,(getPosATL player)] spawn player_alertZombies; diff --git a/SQF/dayz_code/actions/stopGenerator.sqf b/SQF/dayz_code/actions/stopGenerator.sqf index 711137c15..62c6f1ac7 100644 --- a/SQF/dayz_code/actions/stopGenerator.sqf +++ b/SQF/dayz_code/actions/stopGenerator.sqf @@ -9,7 +9,7 @@ s_player_fillgen = 1; // Use target from addaction _vehicle = _this select 3; -[1,1] call dayz_HungerThirst; +["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/tow_AttachStraps.sqf b/SQF/dayz_code/actions/tow_AttachStraps.sqf index 07950b6b5..c97ef9eb8 100644 --- a/SQF/dayz_code/actions/tow_AttachStraps.sqf +++ b/SQF/dayz_code/actions/tow_AttachStraps.sqf @@ -39,7 +39,7 @@ if(_IsNearVehicle >= 1) then { _finished = false; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/tow_DetachStraps.sqf b/SQF/dayz_code/actions/tow_DetachStraps.sqf index 70e7c06c3..0be35d60a 100644 --- a/SQF/dayz_code/actions/tow_DetachStraps.sqf +++ b/SQF/dayz_code/actions/tow_DetachStraps.sqf @@ -28,7 +28,7 @@ if(_inTow) then { _finished = false; - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf index e3da5a306..bc91e756a 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf @@ -23,7 +23,7 @@ if(_buy_o_sell == "sell") then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; -[1,1] call dayz_HungerThirst; +["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf index a27d36e45..42711d463 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf @@ -29,7 +29,7 @@ if (_qty >= _qty_in) then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf index 3ee84cbb0..63be580fc 100644 --- a/SQF/dayz_code/actions/trade_any_boat.sqf +++ b/SQF/dayz_code/actions/trade_any_boat.sqf @@ -27,7 +27,7 @@ if(_buy_o_sell == "sell") then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; -[1,1] call dayz_HungerThirst; +["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_boat_old.sqf b/SQF/dayz_code/actions/trade_any_boat_old.sqf index ea301260a..8ac421bdc 100644 --- a/SQF/dayz_code/actions/trade_any_boat_old.sqf +++ b/SQF/dayz_code/actions/trade_any_boat_old.sqf @@ -34,7 +34,7 @@ if (_qty >= _qty_in) then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf index 6f58df68d..50cb447a9 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf @@ -27,7 +27,7 @@ if(_buy_o_sell == "sell") then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; -[1,1] call dayz_HungerThirst; +["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf index 9aa50cce7..dd4037a2c 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf @@ -27,7 +27,7 @@ if(_buy_o_sell == "sell") then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; -[1,1] call dayz_HungerThirst; +["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf index fb7e9ef0a..3ffa42f2e 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf @@ -38,7 +38,7 @@ if (_qty >= _qty_in) then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_backpacks.sqf b/SQF/dayz_code/actions/trade_backpacks.sqf index 97fb4123e..ab03331c7 100644 --- a/SQF/dayz_code/actions/trade_backpacks.sqf +++ b/SQF/dayz_code/actions/trade_backpacks.sqf @@ -26,7 +26,7 @@ cutText [localize "str_epoch_player_105","PLAIN DOWN"]; // force animation player playActionNow "Medic"; -[1,1] call dayz_HungerThirst; +["Working",0,[3,2,8,0]] call dayz_NutritionSystem; r_interrupt = false; _animState = animationState player; diff --git a/SQF/dayz_code/actions/trade_backpacks_old.sqf b/SQF/dayz_code/actions/trade_backpacks_old.sqf index 4de44a52a..963b446f7 100644 --- a/SQF/dayz_code/actions/trade_backpacks_old.sqf +++ b/SQF/dayz_code/actions/trade_backpacks_old.sqf @@ -32,7 +32,7 @@ if (_qty >= _qty_in) then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_items.sqf b/SQF/dayz_code/actions/trade_items.sqf index 0ee3503cb..efebd0bbb 100644 --- a/SQF/dayz_code/actions/trade_items.sqf +++ b/SQF/dayz_code/actions/trade_items.sqf @@ -61,7 +61,7 @@ while {r_autoTrade} do { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; //_dis=20; diff --git a/SQF/dayz_code/actions/trade_items_old.sqf b/SQF/dayz_code/actions/trade_items_old.sqf index f35c677ea..b4c53af7b 100644 --- a/SQF/dayz_code/actions/trade_items_old.sqf +++ b/SQF/dayz_code/actions/trade_items_old.sqf @@ -51,7 +51,7 @@ for "_x" from 1 to _total_trades do { } else { cutText [format[(localize "str_epoch_player_187"),_tradeCounter,_total_trades] , "PLAIN DOWN"]; }; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; //_dis=20; diff --git a/SQF/dayz_code/actions/trade_items_wo_db.sqf b/SQF/dayz_code/actions/trade_items_wo_db.sqf index eea0cdcf9..feabb0996 100644 --- a/SQF/dayz_code/actions/trade_items_wo_db.sqf +++ b/SQF/dayz_code/actions/trade_items_wo_db.sqf @@ -41,7 +41,7 @@ for "_x" from 1 to _total_trades do { } else { cutText [format[(localize "str_epoch_player_187"),_tradeCounter,_total_trades] , "PLAIN DOWN"]; }; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; r_interrupt = false; diff --git a/SQF/dayz_code/actions/trade_weapons.sqf b/SQF/dayz_code/actions/trade_weapons.sqf index b50b02702..1bb10956c 100644 --- a/SQF/dayz_code/actions/trade_weapons.sqf +++ b/SQF/dayz_code/actions/trade_weapons.sqf @@ -77,7 +77,7 @@ cutText [localize "str_epoch_player_105","PLAIN DOWN"]; // force animation player playActionNow "Medic"; -[1,1] call dayz_HungerThirst; +["Working",0,[3,2,8,0]] call dayz_NutritionSystem; r_interrupt = false; _animState = animationState player; diff --git a/SQF/dayz_code/actions/trade_weapons_old.sqf b/SQF/dayz_code/actions/trade_weapons_old.sqf index 434514f0e..11a116a61 100644 --- a/SQF/dayz_code/actions/trade_weapons_old.sqf +++ b/SQF/dayz_code/actions/trade_weapons_old.sqf @@ -28,7 +28,7 @@ if (_qty >= _qty_in) then { cutText [localize "str_epoch_player_105","PLAIN DOWN"]; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/vault_pitch.sqf b/SQF/dayz_code/actions/vault_pitch.sqf index e251cee11..c66b89467 100644 --- a/SQF/dayz_code/actions/vault_pitch.sqf +++ b/SQF/dayz_code/actions/vault_pitch.sqf @@ -120,7 +120,7 @@ if(!_cancel) then { //call dayz_forceSave; _dir = round(direction player); - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; //wait a bit player playActionNow "Medic"; uiSleep 1; diff --git a/SQF/dayz_code/compile/fn_updateCraftUI.sqf b/SQF/dayz_code/compile/fn_updateCraftUI.sqf index 9b9e82b67..b4882b557 100644 --- a/SQF/dayz_code/compile/fn_updateCraftUI.sqf +++ b/SQF/dayz_code/compile/fn_updateCraftUI.sqf @@ -3,8 +3,6 @@ Please request permission to use/alter from ziellos2k. Edited by Alby with permission from ziellos2k. - - Included in Epoch with permission by @ebaydayz */ disableSerialization; diff --git a/SQF/dayz_code/compile/player_countMagazines.sqf b/SQF/dayz_code/compile/player_countMagazines.sqf index 3bc5c2888..3b03e226a 100644 --- a/SQF/dayz_code/compile/player_countMagazines.sqf +++ b/SQF/dayz_code/compile/player_countMagazines.sqf @@ -1,70 +1,58 @@ /* count player magazines with ammo count -value = call player_countMagazines; //must be called from a spawned thread (|| use spawn) +value = call player_countMagazines; return all player magazines with ammo count -Modified to save backpack magazine count by icomrade - Base for fix by Ziellos2k */ -private ["_control","_item","_val","_max","_count","_magazineArray","_dialog"]; +private ["_dialog","_created","_magazineArray"]; disableSerialization; +disableUserInput true; -_magazineArray = [[],[]]; -_dialog = ["0"] call gearDialog_create; -if ((isNull _dialog) || (isNil "_dialog")) exitWith {disableUserInput false; (findDisplay 106) closeDisplay 0; closeDialog 0; _magazineArray}; +_dialog = findDisplay 106; +_created = false; -//Main inventory -for "_i" from 109 to 120 do { +if ( isNull _dialog ) then { + //startLoadingScreen [""]; + createGearDialog [player, "RscDisplayGear"]; + _dialog = findDisplay 106; + _created = true; +}; + +_magazineArray = []; + +for "_i" from 109 to 120 do +{ _control = _dialog displayCtrl _i; _item = gearSlotData _control; _val = gearSlotAmmoCount _control; _max = getNumber (configFile >> "CfgMagazines" >> _item >> "count"); if (_item != "") then { if (_val != _max) then { - (_magazineArray select 0) set [count (_magazineArray select 0),[_item,_val]]; + _magazineArray set [count _magazineArray,[_item,_val]]; } else { - (_magazineArray select 0) set [count (_magazineArray select 0),_item]; + _magazineArray set [count _magazineArray,_item]; }; }; }; -//Pistol/secondary ammo -for "_i" from 122 to 129 do { +for "_i" from 122 to 129 do +{ _control = _dialog displayCtrl _i; _item = gearSlotData _control; _val = gearSlotAmmoCount _control; _max = getNumber (configFile >> "CfgMagazines" >> _item >> "count"); if (_item != "") then { if (_val != _max) then { - (_magazineArray select 0) set [count (_magazineArray select 0),[_item,_val]]; + _magazineArray set [count _magazineArray,[_item,_val]]; } else { - (_magazineArray select 0) set [count (_magazineArray select 0),_item]; + _magazineArray set [count _magazineArray,_item]; }; }; }; -//backpack items -if ((typeOf (unitBackPack player)) != "") then { - _count = getNumber (configFile >> "CfgVehicles" >> (typeOf (unitBackpack Player)) >> "transportMaxMagazines"); - ctrlActivate (_dialog displayCtrl 157); - if (gear_done) then { - waitUntil {ctrlShown (_dialog displayCtrl 159)}; - uiSleep 0.001; - }; - - for "_i" from 5000 to (5000 + _count) do { - _control = _dialog displayCtrl _i; - _item = gearSlotData _control; - _val = gearSlotAmmoCount _control; - _max = getNumber (configFile >> "CfgMagazines" >> _item >> "count"); - if (_item != "") then { - if (_val != _max) then { - (_magazineArray select 1) set [count (_magazineArray select 1),[_item,_val]]; - } else { - (_magazineArray select 1) set [count (_magazineArray select 1),_item]; - }; - }; - }; +if ( _created ) then { + closeDialog 0; + //endLoadingScreen; }; -(findDisplay 106) closeDisplay 0; -if (gear_done) then {uiSleep 0.001;}; -_magazineArray +disableUserInput false; +_magazineArray \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_lockVault.sqf b/SQF/dayz_code/compile/player_lockVault.sqf index 2cee40f6c..b7a972072 100644 --- a/SQF/dayz_code/compile/player_lockVault.sqf +++ b/SQF/dayz_code/compile/player_lockVault.sqf @@ -19,7 +19,7 @@ _text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); // Silently exit if object no longer exists if(isNull _obj) exitWith { DZE_ActionInProgress = false; }; -[1,1] call dayz_HungerThirst; +["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; uiSleep 1; [player,"tentpack",0,false] call dayz_zombieSpeak; diff --git a/SQF/dayz_code/compile/player_packVault.sqf b/SQF/dayz_code/compile/player_packVault.sqf index 58fc70c80..e91c3a627 100644 --- a/SQF/dayz_code/compile/player_packVault.sqf +++ b/SQF/dayz_code/compile/player_packVault.sqf @@ -56,7 +56,7 @@ _pos = _obj getVariable["OEMPos",(getposATL _obj)]; if(!isNull _obj && alive _obj) then { - [1,1] call dayz_HungerThirst; + ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,"tentpack",0,false] call dayz_zombieSpeak; uiSleep 3; diff --git a/SQF/dayz_code/compile/player_unlockDoor.sqf b/SQF/dayz_code/compile/player_unlockDoor.sqf index 431fbba6a..fd4ab4abf 100644 --- a/SQF/dayz_code/compile/player_unlockDoor.sqf +++ b/SQF/dayz_code/compile/player_unlockDoor.sqf @@ -46,7 +46,7 @@ if (!isNull dayz_selectedDoor) then { }; KeyCodeTry = nil; } else { - [10,10] call dayz_HungerThirst; + ["Working",0,[100,15,10,0]] call dayz_NutritionSystem; DZE_Lock_Door = ""; [player,"combo_locked",0,false] call dayz_zombieSpeak; [player,20,true,(getPosATL player)] spawn player_alertZombies; diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index e6cab375a..268671aee 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -66,7 +66,7 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { waitUntil {!isNil "dze_waiting"}; _obj setVariable["packing",1]; - [1,1] call dayz_HungerThirst; + ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; _weapons = _obj getVariable["WeaponCargo",[]]; _magazines = _obj getVariable["MagazineCargo",[]]; _backpacks = _obj getVariable["BackpackCargo",[]]; @@ -130,7 +130,7 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { cutText [format[(localize "str_player_beinglooted"),_text] , "PLAIN DOWN"]; }; } else { - [10,10] call dayz_HungerThirst; + ["Working",0,[100,15,10,0]] call dayz_NutritionSystem; player playActionNow "Medic"; uiSleep 1; [player,"repair",0,false] call dayz_zombieSpeak; diff --git a/SQF/dayz_code/compile/player_updateGui.sqf b/SQF/dayz_code/compile/player_updateGui.sqf index 614b8d147..710b096b6 100644 --- a/SQF/dayz_code/compile/player_updateGui.sqf +++ b/SQF/dayz_code/compile/player_updateGui.sqf @@ -1,348 +1,210 @@ -private ["_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"]; + +//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"]; + +_flash = { + if (ctrlShown _this) then { + _this ctrlShow false; + } else { + _this ctrlShow true; + }; +}; + disableSerialization; -if(Dayz_Dark_UI) then { - _foodVal = 1 - (dayz_hunger / SleepFood); - _thirstVal = 1 - (dayz_thirst / SleepWater); +_foodVal = 1 - (dayz_hunger / SleepFood); +_thirstVal = 1 - (dayz_thirst / SleepWater); +_tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1] - if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith { - _array = [_foodVal,_thirstVal]; - _array - }; - - if(dayz_combat == 1) then { - _combattimeout = player getVariable["combattimeout",0]; - _timeleft = _combattimeout - time; - _combatVal = (_timeleft/30); - } else { - _combatVal = 0; - }; - - - _tempVal = ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1] - _audible = (dayz_disAudial / 50); - _visual = (dayz_disVisual / 100); - _bloodVal = r_player_blood / r_player_bloodTotal; - - _display = uiNamespace getVariable 'DAYZ_GUI_display'; - - _ctrlBlood = _display displayCtrl 1300; - _ctrlBleed = _display displayCtrl 1303; - _ctrlFood = _display displayCtrl 1301; - _ctrlThirst = _display displayCtrl 1302; - _ctrlTemp = _display displayCtrl 1306; //TeeChange - _ctrlEar = _display displayCtrl 1304; - _ctrlEye = _display displayCtrl 1305; - //_ctrlHumanity = _display displayCtrl 1207; - _ctrlCombat = _display displayCtrl 1307; - _ctrlFracture = _display displayCtrl 1203; - - //Food/Water/Blood - _ctrlBlood ctrlSetTextColor [(1 - _bloodVal),(1 - _bloodVal),(1 - _bloodVal), 0.5]; - _ctrlFood ctrlSetTextColor [ _foodVal,_foodVal,_foodVal, 0.5]; - _ctrlThirst ctrlSetTextColor [ _thirstVal, _thirstVal, _thirstVal, 0.5]; - _ctrlTemp ctrlSetTextColor [(1 - _tempVal),(1 - _tempVal), (1 - _tempVal), 0.5]; // Color ranges from iceblue (cold) to red (hot) - _ctrlCombat ctrlSetTextColor [ _combatVal, _combatVal, _combatVal, 0.5]; - _ctrlEye ctrlSetTextColor [ _visual, _visual, _visual, 0.5]; - _ctrlEar ctrlSetTextColor [ _audible, _audible, _audible, 0.5]; - /* - Blood: round((r_player_blood / 2) / 1000) = _bloodLvl (6 = full, 1 = empty) - Thirst: round(_thirstVal / 0.25) = _thirstLvl (4 = full, 0 = empty) - Hunger: round(_foodVal / 0.25) = _foodLvl (4 = full, 0 = empty) - Temp: round(dayz_temperatur) = tempLvl (>= 36 = full <= 28 = empty) - */ - /* - diag_log format["DEBUG: bloodlvl: %1 r_player_blood: %2 bloodval: %3",_bloodLvl, r_player_blood, _bloodVal]; - diag_log format["DEBUG: thirstlvl: %1 dayz_thirst: %2 thirstval: %3",_thirstLvl, dayz_thirst, _thirstVal]; - diag_log format["DEBUG: foodlvl: %1 dayz_hunger: %2 foodval: %3",_foodLvl, dayz_hunger, _foodVal]; - diag_log format["DEBUG: templvl: %1 dayz_temperatur: %2 tempval: %3",_tempLvl, dayz_temperatur, _tempVal]; - */ - - //left naming conventions the same in case other files are re-introduced at a later time - _blood = "\z\addons\dayz_code\gui\status_blood_inside_6_ca.paa"; - _thirst = "\z\addons\dayz_code\gui\status_thirst_inside_4_ca.paa"; - _food = "\z\addons\dayz_code\gui\status_food_inside_4_ca.paa"; - _temp = "\z\addons\dayz_code\gui\status_temp_4_ca.paa"; - _visualtext = "\z\addons\dayz_code\gui\status_eye_ca.paa"; - _audibletext = "\z\addons\dayz_code\gui\status_ear_ca.paa"; - - _ctrlBlood ctrlSetText _blood; - _ctrlThirst ctrlSetText _thirst; - _ctrlFood ctrlSetText _food; - _ctrlTemp ctrlSetText _temp; - _ctrlEye ctrlSetText _visualtext; - _ctrlEar ctrlSetText _audibletext; - - /* - Fracture: - */ - if (!canStand player) then { - if (!(ctrlShown _ctrlFracture)) then { - r_fracture_legs = true; - _ctrlFracture ctrlShow true; - }; - }; - - /* - Flashing: - */ - _ctrl_Array=[]; - if (_combatVal > 0) then { - _ctrl_Array=_ctrl_Array + [_ctrlCombat]; - } else { - _ctrlCombat ctrlShow true; - }; - - - if (_bloodVal < 0.4) then { - _ctrl_Array=_ctrl_Array + [_ctrlBlood]; - } else { - _ctrlBlood ctrlShow true; - }; - - - if (_thirstVal < 0.2) then { - _ctrl_Array=_ctrl_Array + [_ctrlThirst]; - } else { - _ctrlThirst ctrlShow true; - }; - - if (_foodVal < 0.2) then { - _ctrl_Array=_ctrl_Array + [_ctrlFood]; - } else { - _ctrlFood ctrlShow true; - }; - - if (_tempVal < 0.2) then { //TeeChange - _ctrl_Array=_ctrl_Array + [_ctrlTemp]; - } else { - _ctrlTemp ctrlShow true; - }; - - if (r_player_injured) then { - _ctrl_Array=_ctrl_Array + [_ctrlBleed]; - } else { - _ctrlBleed ctrlShow false; - }; - - if ((count _ctrl_Array) > 0) then - { - _ctrl_Array call player_guiControlFlash; - }; -} else { - _foodVal = 1 - (dayz_hunger / SleepFood); - _thirstVal = 1 - (dayz_thirst / SleepWater); - _tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1] - _combatVal = 1 - dayz_combat; // May change later to be a range of red/green to loosely indicate 'time left in combat' - - if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith { - _array = [_foodVal,_thirstVal]; - _array - }; - - _display = uiNamespace getVariable 'DAYZ_GUI_display'; - - _ctrlBlood = _display displayCtrl 1300; - _ctrlBleed = _display displayCtrl 1303; - _bloodVal = r_player_blood / r_player_bloodTotal; - _ctrlFood = _display displayCtrl 1301; - _ctrlThirst = _display displayCtrl 1302; - _ctrlTemp = _display displayCtrl 1306; //TeeChange - _ctrlEar = _display displayCtrl 1304; - _ctrlEye = _display displayCtrl 1305; - //_ctrlHumanity = _display displayCtrl 1207; - _ctrlCombat = _display displayCtrl 1307; - _ctrlFracture = _display displayCtrl 1203; - - //Food/Water/Blood - _ctrlBlood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_bloodVal))),(Dayz_GUI_G * _bloodVal),(Dayz_GUI_B * _bloodVal), 0.5]; - _ctrlFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 0.5]; - _ctrlThirst ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_thirstVal))),(Dayz_GUI_G * _thirstVal),(Dayz_GUI_B * _thirstVal), 0.5]; - _ctrlTemp ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_tempVal))), (Dayz_GUI_G * _tempVal), _tempVal, 0.5]; // Color ranges from iceblue (cold) to red (hot) - _ctrlCombat ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 0.5]; - - /* - Blood: round((r_player_blood / 2) / 1000) = _bloodLvl (6 = full, 1 = empty) - Thirst: round(_thirstVal / 0.25) = _thirstLvl (4 = full, 0 = empty) - Hunger: round(_foodVal / 0.25) = _foodLvl (4 = full, 0 = empty) - Temp: round(dayz_temperatur) = tempLvl (>= 36 = full <= 28 = empty) - */ - - _blood = ""; - _thirst = ""; - _food = ""; - _temp = ""; - _tempImg = 0; - _bloodLvl = round((r_player_blood / 2) / 1000); - _thirstLvl = round(_thirstVal / 0.25); - _foodLvl = round(_foodVal / 0.25); - _tempLvl = round(dayz_temperatur); - - /* - diag_log format["DEBUG: bloodlvl: %1 r_player_blood: %2 bloodval: %3",_bloodLvl, r_player_blood, _bloodVal]; - diag_log format["DEBUG: thirstlvl: %1 dayz_thirst: %2 thirstval: %3",_thirstLvl, dayz_thirst, _thirstVal]; - diag_log format["DEBUG: foodlvl: %1 dayz_hunger: %2 foodval: %3",_foodLvl, dayz_hunger, _foodVal]; - diag_log format["DEBUG: templvl: %1 dayz_temperatur: %2 tempval: %3",_tempLvl, dayz_temperatur, _tempVal]; - */ - - if (_bloodLvl <= 0) then { - _blood = "\z\addons\dayz_code\gui\status_blood_inside_1_ca.paa"; - } else { - _blood = "\z\addons\dayz_code\gui\status_blood_inside_" + str(_bloodLvl) + "_ca.paa"; - }; - - if (_thirstLvl < 0) then { _thirstLvl = 0 }; - _thirst = "\z\addons\dayz_code\gui\status_thirst_inside_" + str(_thirstLvl) + "_ca.paa"; - - if (_foodLvl < 0) then { _foodLvl = 0 }; - _food = "\z\addons\dayz_code\gui\status_food_inside_" + str(_foodLvl) + "_ca.paa"; - - if ( _tempLvl >= 36 ) then { _tempImg = 4 }; - if ( _tempLvl > 33 && _tempLvl < 36 ) then { _tempImg = 3 }; - if ( _tempLvl >= 30 && _tempLvl <= 33 ) then { _tempImg = 2 }; - if ( _tempLvl > 28 && _tempLvl < 30 ) then { _tempImg = 1 }; - if ( _tempLvl <= 28 ) then { _tempImg = 0 }; - - _temp = "\z\addons\dayz_code\gui\status_temp_" + str(_tempImg) + "_ca.paa"; - - _ctrlBlood ctrlSetText _blood; - _ctrlThirst ctrlSetText _thirst; - _ctrlFood ctrlSetText _food; - _ctrlTemp ctrlSetText _temp; - - /* - Visual: - */ - _visualtext = ""; - _visual = (round((dayz_disVisual / 100) * 4)) min 5; - if (_visual > 0) then {_visualtext = "\z\addons\dayz_code\gui\val_" + str(_visual) + "_ca.paa"}; - _ctrlEye ctrlSetText _visualtext; - - /* - Audible: - */ - _audibletext = ""; - _audible = (round((dayz_disAudial / 50) * 4)) min 5; - if (_audible > 0) then {_audibletext = "\z\addons\dayz_code\gui\val_" + str(_audible) + "_ca.paa"}; - _ctrlEar ctrlSetText _audibletext; - - /* - Fracture: - */ - if (!canStand player) then { - if (!(ctrlShown _ctrlFracture)) then { - r_fracture_legs = true; - _ctrlFracture ctrlShow true; - }; - }; - - /* - Flashing: - */ - _ctrl_Array=[]; - if (_combatVal == 0) then { - _ctrl_Array=_ctrl_Array + [_ctrlCombat]; - } else { - _ctrlCombat ctrlShow true; - }; - - - if (_bloodVal < 0.4) then { - _ctrl_Array=_ctrl_Array + [_ctrlBlood]; - } else { - _ctrlBlood ctrlShow true; - }; - - - if (_thirstVal < 0.2) then { - _ctrl_Array=_ctrl_Array + [_ctrlThirst]; - } else { - _ctrlThirst ctrlShow true; - }; - - if (_foodVal < 0.2) then { - _ctrl_Array=_ctrl_Array + [_ctrlFood]; - } else { - _ctrlFood ctrlShow true; - }; - - if (_tempVal > 0.8) then { //TeeChange - _ctrl_Array=_ctrl_Array + [_ctrlTemp]; - } else { - _ctrlTemp ctrlShow true; - }; - - if (r_player_injured) then { - _ctrl_Array=_ctrl_Array + [_ctrlBleed]; - } else { - _ctrlBleed ctrlShow false; - }; - - if((count _ctrl_Array) > 0) then - { - _ctrl_Array call player_guiControlFlash; - }; +if (uiNamespace getVariable ['DZ_displayUI', 0] == 1) exitWith { + _array = [_foodVal,_thirstVal]; + _array }; +_display = uiNamespace getVariable 'DAYZ_GUI_display'; +if (isNil "_display") exitWith { [_foodVal,_thirstVal] }; // not ready + +_ctrlBloodOuter = _display displayCtrl 1200; +_ctrlFoodBorder = _display displayCtrl 1201; +_ctrlThirstBorder = _display displayCtrl 1202; +_ctrlTempBorder = _display displayCtrl 1208; +//Border white +_ctrlBloodOuter ctrlSetTextColor [1,1,1,1]; +_ctrlFoodBorder ctrlSetTextColor [1,1,1,1]; +_ctrlThirstBorder ctrlSetTextColor [1,1,1,1]; +_ctrlTempBorder ctrlSetTextColor [1,1,1,1]; + +_ctrlBlood = _display displayCtrl 1300; +_ctrlBloodType = _display displayCtrl 1307; +_ctrlBleed = _display displayCtrl 1303; +_bloodVal = r_player_blood / r_player_bloodTotal; +_ctrlFood = _display displayCtrl 1301; +_ctrlThirst = _display displayCtrl 1302; +_ctrlTemp = _display displayCtrl 1306; +_ctrlEar = _display displayCtrl 1304; +_ctrlEye = _display displayCtrl 1305; +_ctrlFracture = _display displayCtrl 1203; + +_control = _display displayCtrl 1204; //status_connection_ca.paa ??? +_control ctrlShow false; + + +//Food/Water/Blood /* -Opt-in tag system with friend tagging +NEW SYSTEM SHOULD BE: (EXAMPLE) +if (_bloodVal > 0.5) then { GREEN TO YELLOW } else { YELLOW TO RED}; +Same with Food and Thirst */ -_string = ""; -_humanityTarget = cursorTarget; -if (!isNull _humanityTarget && isPlayer _humanityTarget && alive _humanityTarget) then { +_ctrlTemp ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_tempVal))), (Dayz_GUI_G * _tempVal), _tempVal, 1]; // Color ranges from iceblue (cold) to red (hot) // << Already Done :) - _distance = player distance _humanityTarget; - if (_distance < DZE_HumanityTargetDistance) then { - - _size = (1-(floor(_distance/5)*0.1)) max 0.1; +// OLD SYSTEM +_ctrlBlood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_bloodVal))),(Dayz_GUI_G * _bloodVal),(Dayz_GUI_B * _bloodVal), 1]; +_ctrlFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 1]; +_ctrlThirst ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_thirstVal))),(Dayz_GUI_G * _thirstVal),(Dayz_GUI_B * _thirstVal), 1]; - // Display name if player opt-in || if friend - _friendlies = player getVariable ["friendlies", []]; - _charID = player getVariable ["CharacterID", "0"]; - _rcharID = _humanityTarget getVariable ["CharacterID", "0"]; - _rfriendlies = _humanityTarget getVariable ["friendlies", []]; - _rfriendlyTo = _humanityTarget getVariable ["friendlyTo", []]; +/* //Debugging Stuff would be usefull +diag_log format["DEBUG: bloodlvl: %1 r_player_blood: %2 bloodval: %3",_bloodLvl, r_player_blood, _bloodVal]; +diag_log format["DEBUG: thirstlvl: %1 dayz_thirst: %2 thirstval: %3",_thirstLvl, dayz_thirst, _thirstVal]; +diag_log format["DEBUG: foodlvl: %1 dayz_hunger: %2 foodval: %3",_foodLvl, dayz_hunger, _foodVal]; +diag_log format["DEBUG: templvl: %1 dayz_temperatur: %2 tempval: %3",_tempLvl, dayz_temperatur, _tempVal]; +*/ - if ((_rcharID in _friendlies) && (_charID in _rfriendlies)) then { +_blood = ""; +_thirst = ""; +_food = ""; +_temp = ""; +_tempImg = 0; +_bloodLvl = 6 min (0 max (round((r_player_blood / 2) / 1000 + 0.49))); +_thirstLvl = round(_thirstVal / 0.25); +_foodLvl = round(_foodVal / 0.25); +_tempLvl = round(dayz_temperatur); - if !(_charID in _rfriendlyTo) then { - // diag_log format["IS FRIENDLY: %1", _player]; - _rfriendlyTo set [count _rfriendlyTo, _charID]; - _humanityTarget setVariable ["friendlyTo", _rfriendlyTo, true]; - }; - - //
Humanity: %3 - - _color = "color='#339933'"; - _string = format["%1",(name _humanityTarget),_color,_size]; - - } else { - - // Humanity checks - _humanity = _humanityTarget getVariable ["humanity",0]; - - _color = "color='#ffffff'"; - if(_humanity < -5000) then { - _color = "color='#ff0000'"; - } else { - if(_humanity > 5000) then { - _color = "color='#3333ff'"; - }; - }; - if((_humanityTarget getVariable ["DZE_display_name", false]) || (DZE_ForceNameTagsInTrader && isInTraderCity)) then { - _string = format["%1",(name _humanityTarget),_color,_size]; - }; - }; - }; +// Blood Regen & BloodLoss: +switch true do { + case (r_player_bloodpersec <= -50): { _uiNumber = -3 }; // -3 + case ((r_player_bloodpersec <= -25) and (r_player_bloodpersec > -50)): { _uiNumber = -2 }; // -2 + case ((r_player_bloodpersec < 0) and (r_player_bloodpersec > -25)): { _uiNumber = -1 }; // -1 + case ((r_player_bloodpersec > 5) and (r_player_bloodpersec < 25)): { _uiNumber = 1 }; // 1 + case ((r_player_bloodpersec >= 25) and (r_player_bloodpersec < 50)): { _uiNumber = 2 }; // 2 + case (r_player_bloodpersec >= 50): { _uiNumber = 3 }; // 3 + default { _uiNumber = 0 }; }; -// update gui if changed -if (dayz_humanitytarget != _string) then { - _targetControl = _display displayCtrl 1199; - _targetControl ctrlSetStructuredText (parseText _string); - dayz_humanitytarget = _string; +_bloodText = "\z\addons\dayz_code\gui\status\status_blood_border"; + +if (r_player_infected) then { + switch true do { + case (_uiNumber < 0): { _bloodText = _bloodText + "_down" + str(-_uiNumber) + "_sick_ca.paa" }; + case (_uiNumber > 0): { _bloodText = _bloodText + "_up" + str(_uiNumber) + "_sick_ca.paa" }; + default { _bloodText = _bloodText + "_sick_ca.paa" }; + }; +} else { + //if (r_player_Sepsis select 0) then { + // _bloodText = "\z\addons\dayz_code\gui\status\status_blood_border_sick_ca.paa" + //} else { + switch true do { + case (_uiNumber < 0): { _bloodText = _bloodText + "_down" + str(-_uiNumber) + "_ca.paa" }; + case (_uiNumber > 0): { _bloodText = _bloodText + "_up" + str(_uiNumber) + "_ca.paa" }; + default { _bloodText = _bloodText + "_ca.paa" }; + }; + //}; +}; + +_ctrlBloodOuter ctrlSetText _bloodText; + +if (_bloodLvl <= 0) then { + _blood = "\z\addons\dayz_code\gui\status\status_blood_inside_1_ca.paa"; +} else { + _blood = "\z\addons\dayz_code\gui\status\status_blood_inside_" + str(_bloodLvl) + "_ca.paa"; +}; + + +_bloodTestdone = player getVariable ["blood_testdone", false]; +if (_bloodTestdone) then { + _bloodType = player getVariable ["blood_type", "O"]; + _rhFactor = if (player getVariable ["rh_factor", false]) then { "pos" } else { "neg" }; + _ctrlBloodType ctrlSetText ("\z\addons\dayz_code\gui\status\status_blood_type_"+_bloodType+"_"+_rhFactor+"_ca.paa"); +}; + +if (_thirstLvl < 0) then { _thirstLvl = 0 }; +_thirst = "\z\addons\dayz_code\gui\status\status_thirst_inside_" + str(_thirstLvl) + "_ca.paa"; + +if (_foodLvl < 0) then { _foodLvl = 0 }; +_food = "\z\addons\dayz_code\gui\status\status_food_inside_" + str(_foodLvl) + "_ca.paa"; + +switch true do { + case (_tempLvl >= 36): { _tempImg = 4 }; + case (_tempLvl > 33 and _tempLvl < 36): { _tempImg = 3 }; + case (_tempLvl >= 30 and _tempLvl <= 33): { _tempImg = 2 }; + case (_tempLvl > 28 and _tempLvl < 30): { _tempImg = 1 }; + default { _tempImg = 0 }; +}; + +_temp = "\z\addons\dayz_code\gui\status\status_temp_" + str(_tempImg) + "_ca.paa"; + +_ctrlBlood ctrlSetText _blood; +_ctrlThirst ctrlSetText _thirst; +_ctrlFood ctrlSetText _food; +_ctrlTemp ctrlSetText _temp; + +// Visual: +_visual = (dayz_disVisual / 185) min 1; +if (_visual < 0.2) then {_visual = 0.2;}; +_ctrlEye ctrlSetTextColor [1, 1, 1, _visual]; + +// Audible +_audible = (dayz_disAudial / 40) min 1; +if (_audible < 0.2) then {_audible = 0.2;}; +_ctrlEar ctrlSetTextColor [1, 1, 1, _audible]; + +// Fracture/Broken Legs +if (!(canStand player) and !(ctrlShown _ctrlFracture)) then { + _ctrlFracture ctrlShow true; +} +else { + _ctrlFracture ctrlShow false; +}; + +// Flashing +if (_bloodVal < 0.2) then { + _ctrlBlood call _flash; +} else { + if (!ctrlShown _ctrlBlood) then { + _ctrlBlood ctrlShow true; + }; +}; + +if (_thirstVal < 0.2) then { + _ctrlThirst call _flash; +} else { + if (!ctrlShown _ctrlThirst) then { + _ctrlThirst ctrlShow true; + }; +}; + +if (_foodVal < 0.2) then { + _ctrlFood call _flash; +} else { + if (!ctrlShown _ctrlFood) then { + _ctrlFood ctrlShow true; + }; +}; + +if (_tempVal > 0.8) then { + _ctrlTemp call _flash; +} else { + if (!ctrlShown _ctrlTemp) then { + _ctrlTemp ctrlShow true; + }; +}; + +if (r_player_injured) then { + _ctrlBleed call _flash; +} +else { + _ctrlBleed ctrlShow false; }; _array = [_foodVal,_thirstVal]; diff --git a/SQF/dayz_code/compile/player_updateGuiDark.sqf b/SQF/dayz_code/compile/player_updateGuiDark.sqf new file mode 100644 index 000000000..726dfd28c --- /dev/null +++ b/SQF/dayz_code/compile/player_updateGuiDark.sqf @@ -0,0 +1,205 @@ + + +private ["_flash","_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"]; + +_flash = { + if (ctrlShown _this) then { + _this ctrlShow false; + } else { + _this ctrlShow true; + }; +}; + +disableSerialization; + +_foodVal = 1 - (dayz_hunger / SleepFood); +_thirstVal = 1 - (dayz_thirst / SleepWater); +_tempVal = ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1] + +if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith { + _array = [_foodVal,_thirstVal]; + _array +}; + +if(dayz_combat == 1) then { + _combattimeout = player getVariable["combattimeout",0]; + _timeleft = _combattimeout - time; + _combatVal = (_timeleft/30); +} else { + _combatVal = 0; +}; + + +_audible = (dayz_disAudial / 50); +_visual = (dayz_disVisual / 100); +_bloodVal = r_player_blood / r_player_bloodTotal; + +_display = uiNamespace getVariable 'DAYZ_GUI_display'; +if (isNil "_display") exitWith { [_foodVal,_thirstVal] }; // not ready + +_ctrlBlood = _display displayCtrl 1300; +_ctrlBleed = _display displayCtrl 1303; +_ctrlFood = _display displayCtrl 1301; +_ctrlThirst = _display displayCtrl 1302; +_ctrlTemp = _display displayCtrl 1306; //TeeChange +_ctrlEar = _display displayCtrl 1304; +_ctrlEye = _display displayCtrl 1305; +//_ctrlHumanity = _display displayCtrl 1207; +_ctrlCombat = _display displayCtrl 1307; +_ctrlFracture = _display displayCtrl 1203; + +//Food/Water/Blood +_ctrlBlood ctrlSetTextColor [(1 - _bloodVal),(1 - _bloodVal),(1 - _bloodVal), 0.5]; +_ctrlFood ctrlSetTextColor [ _foodVal,_foodVal,_foodVal, 0.5]; +_ctrlThirst ctrlSetTextColor [ _thirstVal, _thirstVal, _thirstVal, 0.5]; +_ctrlTemp ctrlSetTextColor [(1 - _tempVal),(1 - _tempVal), (1 - _tempVal), 0.5]; // Color ranges from iceblue (cold) to red (hot) +_ctrlCombat ctrlSetTextColor [ _combatVal, _combatVal, _combatVal, 0.5]; +_ctrlEye ctrlSetTextColor [ _visual, _visual, _visual, 0.5]; +_ctrlEar ctrlSetTextColor [ _audible, _audible, _audible, 0.5]; +/* + Blood: round((r_player_blood / 2) / 1000) = _bloodLvl (6 = full, 1 = empty) + Thirst: round(_thirstVal / 0.25) = _thirstLvl (4 = full, 0 = empty) + Hunger: round(_foodVal / 0.25) = _foodLvl (4 = full, 0 = empty) + Temp: round(dayz_temperatur) = tempLvl (>= 36 = full <= 28 = empty) +*/ +/* +diag_log format["DEBUG: bloodlvl: %1 r_player_blood: %2 bloodval: %3",_bloodLvl, r_player_blood, _bloodVal]; +diag_log format["DEBUG: thirstlvl: %1 dayz_thirst: %2 thirstval: %3",_thirstLvl, dayz_thirst, _thirstVal]; +diag_log format["DEBUG: foodlvl: %1 dayz_hunger: %2 foodval: %3",_foodLvl, dayz_hunger, _foodVal]; +diag_log format["DEBUG: templvl: %1 dayz_temperatur: %2 tempval: %3",_tempLvl, dayz_temperatur, _tempVal]; +*/ + +//left naming conventions the same in case other files are re-introduced at a later time +_blood = "\z\addons\dayz_code\gui\status_epoch\status_blood_inside_6_ca.paa"; +_thirst = "\z\addons\dayz_code\gui\status_epoch\status_thirst_inside_4_ca.paa"; +_food = "\z\addons\dayz_code\gui\status_epoch\status_food_inside_4_ca.paa"; +_temp = "\z\addons\dayz_code\gui\status_epoch\status_temp_4_ca.paa"; +_visualtext = "\z\addons\dayz_code\gui\status_epoch\status_eye_ca.paa"; +_audibletext = "\z\addons\dayz_code\gui\status_epoch\status_ear_ca.paa"; + +_ctrlBlood ctrlSetText _blood; +_ctrlThirst ctrlSetText _thirst; +_ctrlFood ctrlSetText _food; +_ctrlTemp ctrlSetText _temp; +_ctrlEye ctrlSetText _visualtext; +_ctrlEar ctrlSetText _audibletext; + +// Fracture/Broken Legs +if (!(canStand player) and !(ctrlShown _ctrlFracture)) then { + _ctrlFracture ctrlShow true; +} +else { + _ctrlFracture ctrlShow false; +}; + +// Flashing +if (_combatVal > 0) then { + _ctrlCombat call _flash; +} else { + if (!ctrlShown _ctrlCombat) then { + _ctrlCombat ctrlShow true; + }; +}; + +if (_bloodVal < 0.4) then { + _ctrlBlood call _flash; +} else { + if (!ctrlShown _ctrlBlood) then { + _ctrlBlood ctrlShow true; + }; +}; + +if (_thirstVal < 0.2) then { + _ctrlThirst call _flash; +} else { + if (!ctrlShown _ctrlThirst) then { + _ctrlThirst ctrlShow true; + }; +}; + +if (_foodVal < 0.2) then { + _ctrlFood call _flash; +} else { + if (!ctrlShown _ctrlFood) then { + _ctrlFood ctrlShow true; + }; +}; + +if (_tempVal < 0.2) then { //TeeChange + _ctrlTemp call _flash; +} else { + if (!ctrlShown _ctrlTemp) then { + _ctrlTemp ctrlShow true; + }; +}; + +if (r_player_injured) then { + _ctrlBleed call _flash; +} +else { + _ctrlBleed ctrlShow false; +}; + +/* +Opt-in tag system with friend tagging +*/ +_string = ""; +_humanityTarget = cursorTarget; +if (!isNull _humanityTarget && {isPlayer _humanityTarget} && {alive _humanityTarget}) then { + + _distance = player distance _humanityTarget; + + if (_distance < DZE_HumanityTargetDistance) then { + + _size = (1-(floor(_distance/5)*0.1)) max 0.1; + + // Display name if player opt-in or if friend + _friendlies = player getVariable ["friendlies", []]; + _charID = player getVariable ["CharacterID", "0"]; + + _rcharID = _humanityTarget getVariable ["CharacterID", "0"]; + _rfriendlies = _humanityTarget getVariable ["friendlies", []]; + _rfriendlyTo = _humanityTarget getVariable ["friendlyTo", []]; + + if ((_rcharID in _friendlies) && (_charID in _rfriendlies)) then { + + if !(_charID in _rfriendlyTo) then { + // diag_log format["IS FRIENDLY: %1", _player]; + _rfriendlyTo set [count _rfriendlyTo, _charID]; + _humanityTarget setVariable ["friendlyTo", _rfriendlyTo, true]; + }; + + //
Humanity: %3 + + _color = "color='#339933'"; + _string = format["%1",(name _humanityTarget),_color,_size]; + + } else { + + // Humanity checks + _humanity = _humanityTarget getVariable ["humanity",0]; + + _color = "color='#ffffff'"; + if(_humanity < -5000) then { + _color = "color='#ff0000'"; + } else { + if(_humanity > 5000) then { + _color = "color='#3333ff'"; + }; + }; + if((_humanityTarget getVariable ["DZE_display_name", false]) || (DZE_ForceNameTagsInTrader && isInTraderCity)) then { + _string = format["%1",(name _humanityTarget),_color,_size]; + }; + }; + }; +}; + +// update gui if changed +if (dayz_humanitytarget != _string) then { + _targetControl = _display displayCtrl 1199; + _targetControl ctrlSetStructuredText (parseText _string); + dayz_humanitytarget = _string; +}; + +_array = [_foodVal,_thirstVal]; +_array diff --git a/SQF/dayz_code/compile/player_updateGuiEpoch.sqf b/SQF/dayz_code/compile/player_updateGuiEpoch.sqf new file mode 100644 index 000000000..4d37b7588 --- /dev/null +++ b/SQF/dayz_code/compile/player_updateGuiEpoch.sqf @@ -0,0 +1,228 @@ + + +private ["_flash","_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"]; + +_flash = { + if (ctrlShown _this) then { + _this ctrlShow false; + } else { + _this ctrlShow true; + }; +}; + +disableSerialization; + +_foodVal = 1 - (dayz_hunger / SleepFood); +_thirstVal = 1 - (dayz_thirst / SleepWater); +_tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1] +_combatVal = 1 - dayz_combat; // May change later to be a range of red/green to loosely indicate 'time left in combat' + +if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith { + _array = [_foodVal,_thirstVal]; + _array +}; + +_display = uiNamespace getVariable 'DAYZ_GUI_display'; +if (isNil "_display") exitWith { [_foodVal,_thirstVal] }; // not ready + +_ctrlBlood = _display displayCtrl 1300; +_ctrlBleed = _display displayCtrl 1303; +_bloodVal = r_player_blood / r_player_bloodTotal; +_ctrlFood = _display displayCtrl 1301; +_ctrlThirst = _display displayCtrl 1302; +_ctrlTemp = _display displayCtrl 1306; //TeeChange +_ctrlEar = _display displayCtrl 1304; +_ctrlEye = _display displayCtrl 1305; +//_ctrlHumanity = _display displayCtrl 1207; +_ctrlCombat = _display displayCtrl 1307; +_ctrlFracture = _display displayCtrl 1203; + +//Food/Water/Blood +_ctrlBlood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_bloodVal))),(Dayz_GUI_G * _bloodVal),(Dayz_GUI_B * _bloodVal), 0.5]; +_ctrlFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 0.5]; +_ctrlThirst ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_thirstVal))),(Dayz_GUI_G * _thirstVal),(Dayz_GUI_B * _thirstVal), 0.5]; +_ctrlTemp ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_tempVal))), (Dayz_GUI_G * _tempVal), _tempVal, 0.5]; // Color ranges from iceblue (cold) to red (hot) +_ctrlCombat ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 0.5]; + +/* + Blood: round((r_player_blood / 2) / 1000) = _bloodLvl (6 = full, 1 = empty) + Thirst: round(_thirstVal / 0.25) = _thirstLvl (4 = full, 0 = empty) + Hunger: round(_foodVal / 0.25) = _foodLvl (4 = full, 0 = empty) + Temp: round(dayz_temperatur) = tempLvl (>= 36 = full <= 28 = empty) +*/ + +_blood = ""; +_thirst = ""; +_food = ""; +_temp = ""; +_tempImg = 0; +_bloodLvl = round((r_player_blood / 2) / 1000); +_thirstLvl = round(_thirstVal / 0.25); +_foodLvl = round(_foodVal / 0.25); +_tempLvl = round(dayz_temperatur); + +/* +diag_log format["DEBUG: bloodlvl: %1 r_player_blood: %2 bloodval: %3",_bloodLvl, r_player_blood, _bloodVal]; +diag_log format["DEBUG: thirstlvl: %1 dayz_thirst: %2 thirstval: %3",_thirstLvl, dayz_thirst, _thirstVal]; +diag_log format["DEBUG: foodlvl: %1 dayz_hunger: %2 foodval: %3",_foodLvl, dayz_hunger, _foodVal]; +diag_log format["DEBUG: templvl: %1 dayz_temperatur: %2 tempval: %3",_tempLvl, dayz_temperatur, _tempVal]; +*/ + +if (_bloodLvl <= 0) then { + _blood = "\z\addons\dayz_code\gui\status_epoch\status_blood_inside_1_ca.paa"; +} else { + _blood = "\z\addons\dayz_code\gui\status_epoch\status_blood_inside_" + str(_bloodLvl) + "_ca.paa"; +}; + +if (_thirstLvl < 0) then { _thirstLvl = 0 }; +_thirst = "\z\addons\dayz_code\gui\status_epoch\status_thirst_inside_" + str(_thirstLvl) + "_ca.paa"; + +if (_foodLvl < 0) then { _foodLvl = 0 }; +_food = "\z\addons\dayz_code\gui\status_epoch\status_food_inside_" + str(_foodLvl) + "_ca.paa"; + +switch true do { + case (_tempLvl >= 36): { _tempImg = 4 }; + case (_tempLvl > 33 and _tempLvl < 36): { _tempImg = 3 }; + case (_tempLvl >= 30 and _tempLvl <= 33): { _tempImg = 2 }; + case (_tempLvl > 28 and _tempLvl < 30): { _tempImg = 1 }; + default { _tempImg = 0 }; +}; + +_temp = "\z\addons\dayz_code\gui\status_epoch\status_temp_" + str(_tempImg) + "_ca.paa"; + +_ctrlBlood ctrlSetText _blood; +_ctrlThirst ctrlSetText _thirst; +_ctrlFood ctrlSetText _food; +_ctrlTemp ctrlSetText _temp; + +// Visual: +_visualtext = ""; +_visual = (round((dayz_disVisual / 100) * 4)) min 5; +if (_visual > 0) then {_visualtext = "\z\addons\dayz_code\gui\status_epoch\val_" + str(_visual) + "_ca.paa"}; +_ctrlEye ctrlSetText _visualtext; + +// Audible +_audibletext = ""; +_audible = (round((dayz_disAudial / 50) * 4)) min 5; +if (_audible > 0) then {_audibletext = "\z\addons\dayz_code\gui\status_epoch\val_" + str(_audible) + "_ca.paa"}; +_ctrlEar ctrlSetText _audibletext; + +// Fracture/Broken Legs +if (!(canStand player) and !(ctrlShown _ctrlFracture)) then { + _ctrlFracture ctrlShow true; +} +else { + _ctrlFracture ctrlShow false; +}; + +// Flashing +if (_combatVal == 0) then { + _ctrlCombat call _flash; +} else { + if (!ctrlShown _ctrlCombat) then { + _ctrlCombat ctrlShow true; + }; +}; + +if (_bloodVal < 0.4) then { + _ctrlBlood call _flash; +} else { + if (!ctrlShown _ctrlBlood) then { + _ctrlBlood ctrlShow true; + }; +}; + +if (_thirstVal < 0.2) then { + _ctrlThirst call _flash; +} else { + if (!ctrlShown _ctrlThirst) then { + _ctrlThirst ctrlShow true; + }; +}; + +if (_foodVal < 0.2) then { + _ctrlFood call _flash; +} else { + if (!ctrlShown _ctrlFood) then { + _ctrlFood ctrlShow true; + }; +}; + +if (_tempVal > 0.8) then { //TeeChange + _ctrlTemp call _flash; +} else { + if (!ctrlShown _ctrlTemp) then { + _ctrlTemp ctrlShow true; + }; +}; + +if (r_player_injured) then { + _ctrlBleed call _flash; +} +else { + _ctrlBleed ctrlShow false; +}; + +/* +Opt-in tag system with friend tagging +*/ +_string = ""; +_humanityTarget = cursorTarget; +if (!isNull _humanityTarget && {isPlayer _humanityTarget} && {alive _humanityTarget}) then { + + _distance = player distance _humanityTarget; + + if (_distance < DZE_HumanityTargetDistance) then { + + _size = (1-(floor(_distance/5)*0.1)) max 0.1; + + // Display name if player opt-in or if friend + _friendlies = player getVariable ["friendlies", []]; + _charID = player getVariable ["CharacterID", "0"]; + + _rcharID = _humanityTarget getVariable ["CharacterID", "0"]; + _rfriendlies = _humanityTarget getVariable ["friendlies", []]; + _rfriendlyTo = _humanityTarget getVariable ["friendlyTo", []]; + + if ((_rcharID in _friendlies) && (_charID in _rfriendlies)) then { + + if !(_charID in _rfriendlyTo) then { + // diag_log format["IS FRIENDLY: %1", _player]; + _rfriendlyTo set [count _rfriendlyTo, _charID]; + _humanityTarget setVariable ["friendlyTo", _rfriendlyTo, true]; + }; + + //
Humanity: %3 + + _color = "color='#339933'"; + _string = format["%1",(name _humanityTarget),_color,_size]; + + } else { + + // Humanity checks + _humanity = _humanityTarget getVariable ["humanity",0]; + + _color = "color='#ffffff'"; + if(_humanity < -5000) then { + _color = "color='#ff0000'"; + } else { + if(_humanity > 5000) then { + _color = "color='#3333ff'"; + }; + }; + if((_humanityTarget getVariable ["DZE_display_name", false]) || (DZE_ForceNameTagsInTrader && isInTraderCity)) then { + _string = format["%1",(name _humanityTarget),_color,_size]; + }; + }; + }; +}; + +// update gui if changed +if (dayz_humanitytarget != _string) then { + _targetControl = _display displayCtrl 1199; + _targetControl ctrlSetStructuredText (parseText _string); + dayz_humanitytarget = _string; +}; + +_array = [_foodVal,_thirstVal]; +_array diff --git a/SQF/dayz_code/compile/ui_changeDisplay.sqf b/SQF/dayz_code/compile/ui_changeDisplay.sqf index e4bd7d1b4..405c735ad 100644 --- a/SQF/dayz_code/compile/ui_changeDisplay.sqf +++ b/SQF/dayz_code/compile/ui_changeDisplay.sqf @@ -3,7 +3,11 @@ disableSerialization; // Hard code the GUI on and the Debug Monitor off if (dayzState != 0) then { - 3 cutRsc ["playerStatusGUI", "PLAIN",0]; + if (toLower DZE_UI == "vanilla") then { + 3 cutRsc ["playerStatusGUI", "PLAIN",0]; + } else { + 3 cutRsc ["playerStatusGUI_epoch", "PLAIN",0]; + }; //Update GUI call player_updateGui; call ui_initDisplay; diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 9ccb426d6..a7f1bbd66 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -1,58 +1,57 @@ #include "Configs\basicDefines.hpp" -#include "Configs\CfgNonAIVehicles.hpp" +#include "Configs\CfgNonAIVehicles.hpp" //Axeman lights -class CfgPatches { - class dayz_code { - units[] = {}; - weapons[] = {}; - requiredVersion = 0.1; - requiredAddons[] = { - "map_eu", - //dayz_anim references all CA addons - "dayz_anim", - - //dayz addons - "dayz", - "dayz_buildings", - "dayz_communityassets", - "dayz_communityweapons", - "dayz_equip", - "dayz_sfx", - "dayz_vehicles", - "dayz_weapons", - "community_crossbow", - - //shacktac addons - "st_bunnyhop", - "st_collision", - "st_evasive", - - //Extra Epoch Addons - "asc_eu_lights", - "gnt_c185", - "usec_ch53" - }; - }; - class DZ_DebriefingRemoved +class CfgPatches +{ + class dayz_code { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - requiredAddons[] = {"CAUI"}; + requiredAddons[] = + { + "map_eu", + + //dayz_anim references all CA addons + "dayz_anim", + + //dayz addons + "dayz", + "dayz_buildings", + "dayz_communityassets", + "dayz_communityweapons", + "dayz_equip", + "dayz_sfx", + "dayz_vehicles", + "dayz_weapons", + "community_crossbow", + + //shacktac addons + "st_bunnyhop", + "st_collision", + "st_evasive", + + //Extra Epoch Addons + "asc_eu_lights", + "gnt_c185", + "usec_ch53" + }; }; }; + class CfgMods { class DayZ { - dir = "@DayZ_Epoch"; + dir = "DayZ_Epoch"; name = "DayZ Epoch"; picture = "z\addons\dayz_code\gui\loadingscreen.paa"; hidePicture = 0; hideName = 0; action = "http://www.dayzepoch.com"; version = "1.0.6"; - hiveVersion = 0.96; //0.93 + hiveVersion = 0.96; + //requiredAddons[] = {"Chernarus"}; // No need to load for other maps }; }; diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index f7faeb46c..3c1d07466 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -24,9 +24,11 @@ DZE_HaloJump = true; // Enable halo jumping out of air vehicles above 400m DZE_NameTags = 1; // Name displays when looking at player up close 0 = Off, 1= On, 2 = Player choice DZE_ForceNameTagsInTrader = false; // Force name display when looking at player up close in traders. Overrides player choice. DZE_HumanityTargetDistance = 25; // Distance to show name tags (red for bandit, blue for hero, green for friend) +DZE_HeartBeat = false; // Enable heartbeat sound when looking at bandit (<= -3000 humanity) up close DZE_HeliLift = true; // Enable Epoch heli lift system DZE_PlayerZed = false; // Enable spawning as a player zombie when players die with infected status DZE_R3F_WEIGHT = false; // Enable R3F weight. Players carrying too much will be overburdened and knocked out. +DZE_UI = "vanilla"; //"vanilla","epoch","dark" UI status icons style. Dark accommodates color blind people. MaxAmmoBoxes = 3; // Max number of random Supply_Crate_DZE to spawn around the map MaxMineVeins = 50; // Max number of random mine veins to spawn around the map timezoneswitch = 0; // Changes murderMenu times with this offset in hours. diff --git a/SQF/dayz_code/gui/status_epoch/status_bg.paa b/SQF/dayz_code/gui/status_epoch/status_bg.paa new file mode 100644 index 0000000000000000000000000000000000000000..fb8de0a7e47caca6a2ee8bf6b5ddd960f8cbce6b GIT binary patch literal 5625 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 O`K!080`sW0;q71C#-f4% literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_down1_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_down1_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..0feecada70492666a878299b7ed82e79d7049bd4 GIT binary patch literal 5625 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 DWIpA; literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_down2_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_down2_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..8a3b384df01126b625e92c988bef8db9e8a9b1f6 GIT binary patch literal 5625 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 Zd?kVEkdcl`;u$kF{L}gp2lc*F+h0f_LJt4{ literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_down3_sick_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_down3_sick_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..9851ab4f373443ed54d27719630e9cc026784ce1 GIT binary patch literal 5625 zcmds*3s6&68h}qOknjqRGzyr+B2N)ec^KEFLZUS!LWGL7>{OSS03s4)xyTpTx{`GmL9z zr*|d;-~8wN|9{T^IOpDgNBQ~kHOuqY%KZ^S=gyr=e9WbCHOr5fhvj^Ep@L-&^JBS0 zp(v6u|2Htdoe>EAN{GIrzv(?PBtwYN@Sle@2>-KxpBF1gO7Ajg5<$NJshSg1 zjS0Zu!w;6}(p|?(L-6{;j`yUyjMmN{%6h~1QTiNegA3NfCo=_Ezt_eC*U-hMy3(zu zfJr*wAga>D0$1CP@?FQRmx2G^^I?vS(x0xpj`MdOo8MGqGWh?JLt&C`zOVy0Z^&%D z{EPK?fBe2u=nhd8n0M3rt-(P%%VB&NsX#Ahti$r>y&v*n)_*;YSHKa5?begvkGFje zxmKG>@v(p82Md`Y5x9Ri=f3b`jewU1^Mlqg@nuv3d+W=lYpW9sI&2>~SM%QTi%o5BHEP41tDjB*&uTV3ynIAL13R;>wyM7wRRJ$M zsk%aR7mot_@~;i4EPYH%gz?UWqhY%nXKH{+q|z=$1g@8;$NjU}ALPFDPgfpu>#QzU zQTr|EpLK7rJu0~nub0R$>Dwt?7RW0vm9N}Ub2b8)L>VsblW`gamDb*W4$8|0m#Ei>X&q=`aA2>*LuC> zu{W;j?ogXWpg&;3cu)T82RDIBz8z{=S9hQnm_$W;{0EytfyE;eV?*gs?i0ErwbsOjRa`Zy%(b7hI9-c(p?Xs9XhhRJpDdUp2y6fRg*o^JQNTD3$ud)5s zXvO*Hy`JeZm#M!5kNOL_K4lso*z5=P0>2Cw(@Y8gONJGuMO5_{z+$pPa?%)C2h3SQ z#N}ji@%Xi`487U%`WNkf%D|eN|)>JArxG z)Q0FD$!TC!@cC-dD-tX(3@-}$bN8bhkY}NHE+m$A;(S1X2!#b&I3Q1VRP8#vvh5hK z#J05=nI(9CqmYuhPrCEPd;fg#aQ*24XA72bivQAr&%@k)_3&Y7IreWh-F=`-)ril#{WQf_ zswq9pcV_NSl8v6gjOa}+syqbeyU@loJEMF3&wG8o^m9?nQ}vepbE(!d9-(B%s6W>o z-~Bd&##3&ajnF|tjPt34RBH1*;z^?O7SH^PdB*zowVv-=KG(z~zsGvNZ~L(*79sWv z!;=Tn&=;R#j+yP|yizpo~)A{{Wx@%|DZO~uWKXX&d!g;B{pQBz=VpUHPaOQcb z_6v_|8uw!7QfJ4g0p!fJf+-ULzV>+glfR4c*WBIPiW`741sPD z@PcP-Tb#58ooAcKZ8cVSa&X(=1=`|12D$3MX|26ULB~d#cx~uW?TG{#&~?YN-DEUT*vu1tfA3QpFW?U6?%dBH@NJ&i9gIeJK2Ic z)GI83%ymGegfE5uOh;w* SlPDZ_2sgYt6NWw6t$zdVbs5V5 literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_sick_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_sick_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..eb39a362ef57d657578e793099df3db2cc4e08fd GIT binary patch literal 5625 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 e*z^8b;Z#!HJhr2<`3!$~*Y#d$Ngt@)&(Z8q literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_up2_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_up2_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..2cd4140d31a6684a55558f1450da3c430bd33208 GIT binary patch literal 5625 zcmeHLeN0nV6hG}NA4Tih3dT_|Aceso8_w`_qZ@Rv(oT?>ZH$ePKr8auVU~qpj2k6> zjLaw$aTx=hO4PlVEP(F)v1J+JoEtHqnajZHro?44lW1JF_{WC3ul3x%+yo1MsG0GF zhW>KSJ?H$+J?Ea=7j~IfJ48VEvncI^Kxd6n%?MHTq-{t=g@!iRX01mI&;idVF_v2RcgPLzs zfUgGm36Q1-Zb1g(NWs%P?zsBE@?RuK^+~*o^2-t1E{t!9_aXmzqRp8tRZ$FrO0RAk zqWQv}ME(C8&Js#~H`{-pe6(*4=zNkp$oDoOI@_9B5BWCRhpl#<8^&XVl1jF``!{y_MS^ZF0097ofZI8zFD|+s3Jw$)aJFoxT zIF0^ve-z&+JhY6)A9Xh8pRr9t@1b17oZsof>a9oT9jEa=A`U$3;~OSWKNR1nK>q1| zCy0`3qf|-zMS%6K$+=5c&emQif2>^hqODHZpUa_`%qwFi`b#@;voT9ipW*pO4Q2hc z*(euaNS!srT}G^hyjIH^Z!%&wU#$Pfh1D0$>zvi7&&oy6xKbnDzBrSd)t@Woj!ABl z#2irQ2*UWo6L)(}A7j zbJ&b>Ha>ma&dvmm_Yt!TF=^>E7o87w(+@}JNKe})30goHXjMrU;e3`|Bj7q zlg0k~qM=)^PZi}SLi774?FZ<25l)I_d@%kv>Mw%g9!uiF8TqmCMv{Jb+PXgl*NYJ0 zOnrg7YxQqTwKXW~pN%IK(z=!V6TVog%~tfMMfAjc(RSc0#v9qF&X^E-Uq{S=)tjN% zU$wvA+i5-`z`p0Q!`p}Yecf}3C(%M%?}VqE=9`W0eq(Z8cXQu&T*mlK;^0bd zUoXvv?vt(MBi0HUzbcvZTS)`O+rcrNv&y>|*UuN5Ci{xozeAkj@1L3b<9_pJ{Vx^l z&J~LK&kwrJXb!fzRJ(XXhwU9 zwPfr|mDz|tg%byoYl34bbGt--#s$Y@-Y!Y!8<_pIH*A_5gM3Xo+K)Sxa{i}lR{xxp zW6SZpyFhFTT##*GrFG z)4}y?zbTnApuKRg4_a0pp<`I{0q;sz@V7KKRdn*Tov6?HV{zD|^wx4dI2LX|`m|j! zCU?V?p6hMhEokp~m1ELU)Jm@z{xPcEU4`<*F1|XVWInAA*56!lW+(3~Q(Sw^huY&H zs=6NiJ=!I?^IUl&h@`VW98VFhOOBOy|LEvnr>F7^DuLUa?GCB^$%rp_UrwYI8t({pqlTQQB%jgC!V5>vG|<@|@b(}3G6y68 literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_up2_sick_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_up2_sick_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..4b09ce75c44fb20d2683dd990c53a53653aea8ac GIT binary patch literal 5625 zcmds*3s6&68h}qi3;`1$X>6e(E|TynUwlfQ)W$iUq{m?rb~dp;RykK2|S=ZJoMnOJ{7YJMGxV%HH7qC%1QI%P{Ip zr+4N~^3DI>^FPji&iU`1HJO#AUb8G~t(u1r8Xg{2OmV(i@8wDQ@^Y3sN8@DO}Jjf#B=|BqH3w~# zf_xu!t-9UQ)d`&0tNRDHJ#Q3vI)4)zNRy0_pRom_L3?eF8{qjcf^6^8HJt{2d>a3z zv&WXR#|!oQ8|ETS3evm`{4rBS+0~oQh5!?&d3DnBtv7*1 zTGHZYXdr=w%SjQkT*4f%k`#IT#@!%aMAySYtLbUr^bZr)U2Ab(0SWIEfK|!LWfF&$1FRO>A}9Li4+2MYlcpVv{WSjE#CXrJdo9R= zUF4rBp}rTG9nVZzl&vXcuFn*dOP|k@1u*_oXYOuEW#pSrbfqWqa`1y(Pp~Ueg zffu6mZ`XWZ`#az)#64ZN@+&29CXz&S=G*Xj*o*jO8DR&Gf?R;K$uVUPtbaCWPFbZ` zss{O5Z$DA##Pc)Lc-i`^dg<{<(+wD3IdS*G@sT5+13y_y%R9@lz3_AVqpBA-;`$`` z`P}sFLB~O#vzQy1mdwZdqaNi17TCVL1@bUmlu-Je?|jTf6UNlclys1@{TmW-q-wDg z*UuuN)=AmJBSC-O1NKuP*9W#Ny}R!Sj3@h7-0Ry<`p)y^?tT9m8QJ9(PxXu9ewA?t z$-(gnd;j!A#)YOakn>Z?!cd#MA6OSSSt?s4!}6SV0!P&Ud1_WY4kehHlW86R$duU5@RCA}w97zItKjZ#s@aaliO{NQ|b4xjsT&WMP3y zfc+hNB2V~gPYgcq1e>`DV}$bs@K=Y58|_Io?*p$2vQO@iwJio-it@QJ^pXSize>Iw zUlWPz3sJg8?nF%;$Pat#zvJQ6|8)5YCXVgB%-@9by@b$RpKnvX!?^gMUO|1}E>!{VBi!WBPN)syE<#&86C#+H^J&H+9QTW>U0P!nV?GHqQo~%&VGp>zXByw5){m{Ci=PqiqqfH$KLSM{ zej$l11U@eqkW6$Q{tIv^s@<>Db8&vy_LVzn=jk_h&|mkhs?^iw>;diyT+|df z@X9y9&+uCgES+e;uO)NedQK6K47hE5sgEpCsC;crP8})tbjtBD&bH6HL2gb_8SplF z2gTphGLCWS@D;;j8vX{bpUJg<-l4Y_1FJcWm*(H}wUNUp;Gj0{hZc|*S5(P8vx^fdhLM7%~d>w*g;3yPistm{NhCe!y*u zlTcw|ZWBxED$Ps|Y#6*q)%cD5zaNi*+6DW0Z7{-1m_ zux0a4pf7R|ip4es?yjO=>X3U*iLibI(*5kTIDwX1B=#eC8Mkx)8hiH6e#}DFv%V?D0uTTI literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_up3_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_up3_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..c9c1ebe00cef65824baf5f50822fc00541802992 GIT binary patch literal 5625 zcmeHL3rtg27(RVyAJ{@gor88VN<}C0wOD*~P(({BqAqhx$4sPEQA>v=Tca^5#f%Mu zigkc)?ShYpyC+%1Y{zA05!7YCjJi3q^3W-2vSqM2%@P->?B3#kdcA}ILtSFL;imWF ze?QKD&b>prGBVN@r)OlRNfAPqE?pWC!b{S!INZfv9L`9aZ{e_ry*d24#j?=MJ{Pk0 z2T=&^9Dz{zNQ7G1dtjFtnGs?&Jh(W6@XY-_!;dE)46=C>Y+jmQT?iK?JgxbT?T%Lp z@nJMR3Q5#SfaQ$GAF#DQwef2h;?x@*G`>_^ayjt6t_9+cz!v)~vXWwiMN#6CTAD9d zlfeI^@k&AcB0eXs7NQIE*B>L3{cD2tB8^9pQ=@8ORrDs$AkoKSMcHVeXJVH5XgFVw zJN`v)bMZN@gZ+t>?p^G2DqwX(WiXK1`90ts{$M06L}J?CW^D7JlBf&4@;^`j^rUj) zh~?#H65j0(G?bnJdJlU7`N7gP#aI69w5+A|8Pk@k4e&vwU+#H0cS8Hc5W)P) zX598fOPdAg7OW|4JhH6c{UY?A?S~kNqHF}{OZGk4ewZ?wwP$JH3ieS}eI(~2;F-wE z&2zfGCol_&zlb}k^ugj{!Mq>URJ`Nof9`PRLhJpCpnht`XxAIi zK3g3;-?fb+hw^a~+4kO87(Tzv!k&>|mmK^F=<)(_QWN7}3Rr^Dyh*%yAqwTQjOJq~ zvife=yk~&_5VHA}{C17blW1JxZ}Kdo{q(5gkKg%6fr;1e`vmhXeY<5ffB&8;pd-dQ z)KDlkga0x3*mTK$Kh1}#s(4vrT6lda4cvUqr}2~`+x^r`FP$F|jJxenR#`phGYIVs zw%(6fJ|0``$-Mck!qL8je7gkV8H33WV{PJEz)HN2{-I0xy2kM)&eP#x;9@zc2f$y~LHn zd+nNVyU1UgXHEwBa&%35yQaAi@NAK-&6HJ?2w2R;uc%l7_{9oio-BJ9?T^0fkGpQP z^T(_v<&}r9%6rtliB}&(b(t0^^PFI>Tw?RK9y&S$u%b%oYvR?XFZ=&DJ&OAj$bDq& zz95W|?-ExmaTEYfSkC64W=At%A^&N%4BI{{zYFw@NHJWmi8cXVit6_06`w8vER@&z zuiT7x=hI~+b;?br^i_2CpR#JF^8|6G_a>i?>iqn-vGH%ckUNQ2Hu3637aDn3XkU)x z+-FhQe3E-Y&MXEqG1G{yrLcpB{T`a@xOILXJ+#G4J<<`_9bS!6cA~QR9J;9DY(vwq J22j&&?O)UqMvnjh literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_border_up3_sick_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_border_up3_sick_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..91dbf45fd88e45f688d092d159da09dcdad951cf GIT binary patch literal 5625 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 XcMw%k>HW;VZI4<%X)35a-mU)txP>qV literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_blood_inside_1_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_inside_1_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_blood_inside_1_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_blood_inside_1_ca.paa diff --git a/SQF/dayz_code/gui/status_blood_inside_2_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_inside_2_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_blood_inside_2_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_blood_inside_2_ca.paa diff --git a/SQF/dayz_code/gui/status_blood_inside_3_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_inside_3_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_blood_inside_3_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_blood_inside_3_ca.paa diff --git a/SQF/dayz_code/gui/status_blood_inside_4_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_inside_4_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_blood_inside_4_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_blood_inside_4_ca.paa diff --git a/SQF/dayz_code/gui/status_blood_inside_5_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_inside_5_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_blood_inside_5_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_blood_inside_5_ca.paa diff --git a/SQF/dayz_code/gui/status_blood_inside_6_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_inside_6_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_blood_inside_6_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_blood_inside_6_ca.paa diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_type_AB_neg_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_type_AB_neg_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..b15ca49f69743d25ba3930c8da48a60f610a5574 GIT binary patch literal 5625 zcmZSm@9ypx;_M#g$il$D@afYhelS16(HF%34+J2-yQ7aAh|dVbAbzl$o4*5)-2lYx z0t^g&A`A>uMHv|G05NI6fx&@+0cZjgfGh+t_5W|<_4GcZ0^^5-ZsWbN|L<`a-=KY4 zZqB*)e_(v6&~0;BKpY?d>6bpTE%$cg-&-&~NDKr9D_=Sk=-zFK)-dTVBh35%pWXh?VHp4a zbOxgZtRZmo8QM?u{{bSHeCSd4f8fXm3V{6Td=%*U^+PBAsU1I~=0QRLmOe(qV>CQK zAuyUAAm!s|ei+RUqxoU9JQytxN6SN4T`*c63|x7jz@Wguz`~&T!7Sl>S<)U@wiHb^ zD*2%P{{xJ#{juTi<+FFM!1%DJqZZ%g^0Dl__mbsc=DGZluY06SsK{0hp9jO$dicyi9d7WM&8>)plv_x1mYuss>dvoU8n=rl`gXbg_&k69+!QjilJj9s;&t^kCS#U6LfQCim4&2yt g1-W#{VqkCu`VAHgguKZDEKz~ssn9Vq5wnm107`H$^#A|> literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_type_AB_pos_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_type_AB_pos_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..143e42c5b165de90a6b848505774b92a639ca0b8 GIT binary patch literal 5625 zcmeI0&1(}u6u@60r4^c{1$$}HR4DiXVky{54oQe+2`U~;#Dl0wr6A_xBIY2b4G5c) ziGly0U<=(4p%iyJ&SZUSs6r}OsWL+b_P1|m-n@@_ zVWyKxlH2c*&bloC&}cOJn|#iFiZf-6v*bSM<=nwK=QCdKX%~B*W?k+BxV;%Z4r-~wPXd~aMKe;lR6>O1j#1Q`O50jJu9JSvk&cz#tw9t@D2g#&AR{GdW2<)r=| znZM(0r}9vMt(OEHxV}_fYdoOqcI0@$sl9RPuaM=`d`x3MWPj~q;)_H#kmG7vFQ@ku zkqzs&&;GbF9$F^RWz?5dl6o<%Z(0AOLV`EQ71RE}OIo*2HO({fL8iK$t~qgjIhBuT z`5*E3E0k_Xi6xXDAx!^My^Q>)?e`e=n)9csmznQlHPolnZ7QWxru}gxd9##_nBQ++ zk0(H4U&o`LaJ2hi>kZBgi9(MZ8{B6dcxd7#UMcQZvpS|F7dlY8;%-@SY$gbWc zSFgD~P;4sLwlCi{`%kdp0n7*C58)5)0g(?zJrw&v><6(QL_HAoP}D>GFA()$=hTB? z7zVJwK6U)k+V#*JZqtE@v1{sn%8pV-+8$D;^@X<|3dk7Bt@3P@9kcT*>~Qt#ZQxkQ zUwu-k?M3-9&7PTB<{ThJ-CG+|Eo3tEkMMM^kr#KNp#A10_e} literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_type_A_neg_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_type_A_neg_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..a840cab3fd3be3edefc6368298439df1ef7053af GIT binary patch literal 5625 zcmZSm@9ypx;_M#g$il$D@bTkE4lqB$(HF%34+J2-yQ7aAh|dVbAbzl$o4*5)-2lYx z0t^g&A`A>uMHv|G05NI6fx&@+0cZjgfGmWuK{TA-&cHD7LH{2lzC+OepZ0J*A^k&K zzT@(-_y5kl2YDA9KJ6cW9-sfG8P1nt@SLRL*`xxKhk6$genZ^;THd+{(*$RX#C=+AD{_jG<-(G z2Ub>q=+X2rnjS{e10n=Q^TTLMlQotx4YQB| E03xZ|761SM literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_type_A_pos_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_type_A_pos_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..01a0a4fd4f3d1177c2a0a31dd06f7ea91c218b2f GIT binary patch literal 5625 zcmZSm@9ypx;_M#g$il$D@afYhE-*jB(HF%34+J2-yQ7aAh|dVbAbzl$o4*5)-2lYx z0t^g&A`A>uMHv|G05NI6fx&@+0cZjgfGmWuK{TA-&cHD7LH{2lzC+OepZ0J*A^k&K zzWvIv_y5kl2YDA9KJ6cW9-sfG8P1nx@SLRL*`xxKhk6$gel+%f`4O|E*W2=5!|b1a zwDIqa{=YY1d`jIT)$!x}|G)D=#)17Ga`Z?4|8rn2n17VP_mGM={rvBI6zt#IF!!`S zPWku$fBs__|L8~l5C8wy!~I`=w6XT)^jx@lQp020e~(2izEfOa=C>dH-~Z=WK0H4- zU*1@IyS?@%OrBKpDOKOzQI_}EEDzzoqx>Hj_>uB2)PjL>AEo{q)ei}Q(fGqrKaHku za0ra1kJ0o2D=R_tXnGh;52NV;5dx$6VKhG=Qp0HZ2+I!&3L+|5=~V z7QzAJvs2j3-SB8z?(Ji5j>61Cw-25F--Xps;1B~VOug~a4Z63t$RfHqXzoSVA3A+o zvNX_2nEs?kKNrX3<(z=?H*Vy;jUbGhm}1)J~Qh3>=_g(HjhrLN>s0Jyi VLPBZ50xVI1;mH!qn1NZy000*d_p$&0 literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_type_B_neg_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_type_B_neg_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..2469a5334e1830ea15ee51ea2dde8fa1c279ec88 GIT binary patch literal 5625 zcmZSm@9ypx;_M#g$il$D@ZrM;PB1^h(HF%34+J2-yQ7aAh|dVbAbzl$o4*5)-2lYx z0t^g&A`A>uMHv|G05NI6fx&@+0cZjgfGmWuK{SkS(7vrV_vd^N7c4Jzblcv8|34%6 z%eUp;-XMD$CJ!@XxbWLMfS&&`AMW3f$EW-My|`}=^I!SLjkUKo@(x@7|8Hj$U;rYR ze?yM`zy1G2{~s9NU>h*0>lJM#BRX z0;A~xd;4NEe~jjj(fl!5K8%)+qva#4E*LEj=vN*nFeorEfJPV~0G18e4^Nu#zjFR_ z7~h~~8}IFnzI5y6^**gR^!U#?dzk%J4ZvD!W}fg=+z{f8fUGBF_WXKn-< zhQvqr|0o|dJ&cCO@D2|F&`=;FL+3-Ygym&P>ac9XV+PE2TVvtb$eqD+l8Wa96_|YR zWndoS%z?`f^<=`qzyTT-6?~xg<^Xc(kj22@3iKPy+l0Ky0xVI1;mMW4n1Wfz006d) B?4AGs literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_type_B_pos_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_type_B_pos_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..943422dad7c54e154d669b463b0fe941cfb95507 GIT binary patch literal 5625 zcmZSm@9ypx;_M#g$il$D@afYhE-*jB(HF%34+J2-yQ7aAh|dVbAbzl$o4*5)-2lYx z0t^g&A`A>uMHv|G05NI6fx&@+0cZjgfGmWuK{SkS(6OyI_vd^N7c4Jzblcv8|34%6 z%eUp;-XMD$CJ!@XxbWLMe)RwU*$?+`$m7%f|6bg;hxxDkfq?-u!TuMHv|G05NI6fx&@+0cZjgfGmWuK{T9S&cL8?Vn2urmN%Hb?e3xfpW*y8 z2G2<{OHcnB9Nm`mdRtyIEWF!~dVc!T!&snPT>njS{e10n=Q^TWX82L%QN z1_saw0|daLLFH-N9{bw+;C?*fX=uAKk9vdr3Wf@eE-@MzxzI6wF@Fb{F&z(+s07&<2+j}{EIWWd3| o0U8$NyQcT%0CMS&#lYYS^b0Il2ziSISfT>MlOusK1+x$V0M8rn#Q*>R literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_blood_type_O_pos_ca.paa b/SQF/dayz_code/gui/status_epoch/status_blood_type_O_pos_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..ee8da7b34260894231f4a0ddf9f2a9131abff44d GIT binary patch literal 5625 zcmZSm@9ypx;_M#g$il$D@bTkEE-*jB(HF%34+J2-yQ7aAh|dVbAbzl$o4*5)-2lYx z0t^g&A`A>uMHv|G05NI6fx&@+0cZjgfGmWuK{T9S&cL8?Vn2urmN%Hb?e3xfpW*y; z2G2<ANfE0|6dRHfBBKd+MCmJ;pz#Qk1j9$_|N|TC-T3-%>N(C7ywlB0>*bb zy3zOc2J+2Ew~u6gy93`72R=l8J<9)qfgdUVLJfqumsIoh89XPb0JAt;e~2d72socY z^GS8jsCq~UjD|ms`f4;if*rB( z%fTm)u6~pc2?1F6j)uq33J(F$P#_~i(si>m^|B;$STq_i_&2F|9D-*%Yw&2_1UTRI z{5IX2oIE#S>bV#?C!&lNK+^$Cey}GC4h9a;uqfX(y*CGtN(aFS+j3Zt_=LQ{0xVI1 N;mMM~n1NY{008yS2UP$7 literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_epoch/status_combat_border_CA.paa b/SQF/dayz_code/gui/status_epoch/status_combat_border_CA.paa new file mode 100644 index 0000000000000000000000000000000000000000..f3580cb19a1ae5d4c481688558c347848d68efcf GIT binary patch literal 5625 zcmeHLeN0Ri-e7!o%8LjyAJG|q_WLidN$C2p};*w8V@R&c-wQK8oRfOGqJ3t@FbFz%%< z?XTzDbAIRCd(OS@EedC5nm1)+=9;AlpA~%O0vsiLW zpaLc9phJ3hus0dl7r>8K$?SM(TZ?ALsA0r`Nopd?=ccKpYl_Ni;C`JpV|!k-t1}7 z`478)0(?zA)Fx#w`G8y=d?3-=s?!3#Mt|y$g({D^tJ3~?rTq)aZ!mRGoLUn{v4Foi zz}gPrXIE0WLROM5E74Od&|hfzkWJK|M+$r;4KWTca-;*!YcSS%jpJUxLjHjf)^)MO zbrIyT%u(I#Eeg7xWXMeF+e7P1IDWpdbPaZTaRH6jFq+#KHV*k|Jb7`6{uU>VN67ce z2nn87{|RX0hs-18bi7c1p<$60+XHN*KizTl>#iSOtEz|iXXAU%K#6N5E};1_{MZ^g z5iT32;|;{Zb~WvHnkA(FX4$Cz5^nvW8oEA2MDBfqm+xOW1~r_yiStERuwMwVl9R`J z(m;PU{zCckaIS4Neojlr_eh=>#SN+`o*FPCK50_wi4K*Y$r%oNq!cH0W)Fu^q~9iW zTBl)jhG3rlvW}bt{`%|iAzOf?5bPft_PEk{d}GJTbpF~=l_roa%pdYQj8`ZzFv!}S1Ee?Wz=J%EjfzST=e5u!AyA~JF zdgu%83i;m(E!h4hYa-2`$-ny+Xy~xHD~~< z`YQ_>Em!FJu?9)-WeRHlM(1m;$3M~ZoxPW}(fLC=h(~e+h4@N$aLr_S17LXt*UTgG zxYED=kdZAA%k_T{!$;RE3B|>0sGs|P2UFd_9zEVS)8XqezWr-PG$=;*nBQeL(= z+IaRJci^-R9+o3H_gZw_L%6!;(?}SyM{&1>Es}wo^%+@({OZX>dzxgv$e~+GIx5Mh Q=5FTUbjEInVUz6s2B#N8?*IS* literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_combat_inside_ca.paa b/SQF/dayz_code/gui/status_epoch/status_combat_inside_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_combat_inside_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_combat_inside_ca.paa diff --git a/SQF/dayz_code/gui/status_connection_ca.paa b/SQF/dayz_code/gui/status_epoch/status_connection_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_connection_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_connection_ca.paa diff --git a/SQF/dayz_code/gui/status_dont_ca.paa b/SQF/dayz_code/gui/status_epoch/status_dont_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_dont_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_dont_ca.paa diff --git a/SQF/dayz_code/gui/status_ear_ca.paa b/SQF/dayz_code/gui/status_epoch/status_ear_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_ear_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_ear_ca.paa diff --git a/SQF/dayz_code/gui/status_epoch/status_effect_brokenleg.paa b/SQF/dayz_code/gui/status_epoch/status_effect_brokenleg.paa new file mode 100644 index 0000000000000000000000000000000000000000..46695ca57b903bc5f634dce4f5afa1e6f61145ba GIT binary patch literal 5625 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 GA@onzoY83j literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_eye_ca.paa b/SQF/dayz_code/gui/status_epoch/status_eye_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_eye_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_eye_ca.paa diff --git a/SQF/dayz_code/gui/status_epoch/status_food_border_CA.paa b/SQF/dayz_code/gui/status_epoch/status_food_border_CA.paa new file mode 100644 index 0000000000000000000000000000000000000000..7b9d3192987d7de7d0912e0fa8cc2d5b72bf3ec4 GIT binary patch literal 5625 zcmeI0drXs86u?g(l=7$pEXb>fw50f6BQ_FYf{(Tzh~jj_Wy(r<$keKX$egGH#!Cc* z0t$#IuMAsFP-p)d8KOhoaL)M%teE*A+cKABxJ>6};_in#xAjX*$6~TA^Glodmvinp z_ndpbbI$taVp$uvRKqfld|6(p(JYT8|MSVW z)C-_W3Q+G0FigJVyJ8_0fLQqRVjbdt_V)$9$j5(SKe))OMw>NtI__6-6X9;zbKAdW zV0@xVvu~n(%*kKnka~80>lCQ(Qm?Tnn1wv#1MYGU=-Wr-?)BZWp$ol~{edwlm_o{2 z{}Vg!>wQyhx}d!-iMXm)T+xfn)gLcgn1Jn4?Uq$&Pts+T*gljEB6ID9?6Dg2tOhz? zNmW8!?{T9I^Xk4yhHk?HWeZVT5=6@)CM`S$}AZk zxHv%f6Z$~;cv)`Il?Zi3LL8saRbDw*c8tbf0j?|Ooe|LeAPQ1v$?vbPMtv#h`V`CU z>+Q_H3oz9kOhX5bSHj&ZG5tC7kQH^BtRnJ34m6YC9pc|y6;b)g`iko)cjnKT+%lQx z=gIT-LVJfHw(8r&&*}QiuV|DF)!6Gn08bToN7X|2ue0^$`WKM`3~ow%ZWah z7K8q0)M_%*lSgR13$Q#Le@k+YpWFIdWO3fo(_S=w%0o{EHL zpI^MOdTyfYEeKO*PVeV0!SSM$LW!+AgVxu2D3V7z)RPHaPp|))R*#oB>Xz9~*ylI3EjeAOHqdy(50U<$@gVIN1mb>!&AOJx;|5Tz zU`&hAo**7J+N{S^$cQTbc?NMwO$rk5GTodj&ncDI2xOhegV*J_XWzWUfCh>rIP}UJE>S8TIpc zr|*R4RE;1@VSS+@(Ozc!NE^`M@EEa6z&u!eX_U4F(5w??>RoejJl7wWC+=T*QGB$Q zmeC10r0toTBzV?%A<6eyra_4Et)fe#t6zFRkF_PWDYslgZuz2|>yOKl_M^S$_k2Xh zdzYT_4k|u9gySWFWWBpD)*%M~voBcXN!w(PiY@wU-`F36wUsIQ6@D2>sL%Dsjz07m{{nPBl zz6#_)^w@1Gjs!-j;NO|1?Im#{~|9S(=b z&VCQD=cEqcLp{LIeEg~?3o$j>$LznqbQ@gCVSqp1&G~CUt2WChp!ZQU`Q;b^ zUQ^8s$@p=rEcU}Dk}ozsnn8$|g^>{1S2=u7YbM!XAY9Gj-Q9j#=FdA7p!@X63 z3&pnV`9zAa(q4qdh(;Ub`GMg689irt{Ey%liA_Gi@tN@{{a*aW&?>i!mI4X0hPHuI7aXHiC_I^y;bse|3UH_{r*K(zebj_r2i1B z@42X#$Lq3G-(oM%k0()^PHT5%NWN9-7dF2v{-xXZ+EqnU?`!e-2-R`^qu7 zb8fh1o^T_EXD3|0SO~NJr7J0Gm+$uxLpZ{*0mJe6XbtCQqy5QOUo%SmxtHhn5ez3% zLY&vD)XzSZ#m}jT=TqqLS=^uT_?BM_c(Ye>=YxFh*=+erbop3+Gg7=wc$M*y%U_l+ zBfECw?iWWFabzk7*@keUoApXyGD$8a@$A-K8o#+ z=8jQ?>NgCEy_2GUlJp_8OoduLUnHEVc>7EBOymOL+8>9#+2s0dW7Rmac=LrG?r--( z=5p#{ZvE}^#};o~Pp3$Kq5dl8Kf{i7@?$;ozfx0w&P@6SF>p}c=9Tk{9qXh|fzn6D zl|gR7DTY(;ze%|6RaRE-jn5KZC9jxY{zm()oBNKBl6+14yTzV|EI$!mYrZ)-*faiY zXo}=7z^|{HU&`b5pXe#?V@hcLNyX_)sb2#c>9gpA9p8HLFy{=hJZfv^5YrMA}!h{R_oh&qe?M literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_temp_0_ca.paa b/SQF/dayz_code/gui/status_epoch/status_temp_0_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_temp_0_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_temp_0_ca.paa diff --git a/SQF/dayz_code/gui/status_temp_1_ca.paa b/SQF/dayz_code/gui/status_epoch/status_temp_1_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_temp_1_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_temp_1_ca.paa diff --git a/SQF/dayz_code/gui/status_temp_2_ca.paa b/SQF/dayz_code/gui/status_epoch/status_temp_2_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_temp_2_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_temp_2_ca.paa diff --git a/SQF/dayz_code/gui/status_temp_3_ca.paa b/SQF/dayz_code/gui/status_epoch/status_temp_3_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_temp_3_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_temp_3_ca.paa diff --git a/SQF/dayz_code/gui/status_temp_4_ca.paa b/SQF/dayz_code/gui/status_epoch/status_temp_4_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_temp_4_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_temp_4_ca.paa diff --git a/SQF/dayz_code/gui/status_temp_outside_ca.paa b/SQF/dayz_code/gui/status_epoch/status_temp_outside_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_temp_outside_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_temp_outside_ca.paa diff --git a/SQF/dayz_code/gui/status_epoch/status_thirst_border_CA.paa b/SQF/dayz_code/gui/status_epoch/status_thirst_border_CA.paa new file mode 100644 index 0000000000000000000000000000000000000000..aecad93b27aedb574def5a35080c3063028f6671 GIT binary patch literal 5625 zcmeHL|8G-O6u+?I=(cW6SK_|#4C|W0Vy0V^C$ZJEc5C-wUld5QIG4S(vM;hGitsf4 zv@vy{=~7D+5k>|Z89$(D$GBNS)(a#?S^P3cOv=g_dl~1pyu@^GsA~*2 zed+t;o_p@+oO|wh=iYS>yk6ICx7X*=A%tdUXA2(UR#y|l4`^f9>uU5cyoNpu@A7zB zob5B>pz`!wEut1bMb$KV| zfsc{gMoCH;uvWe`ND5Pba{m$J+~*i5cC1vN*7>!{SCG)m_zrg&@beOENJ^77z@u#a zHhjbFnPPY@6(4lHBR3K10r`4@Lt7;qUvHTl7Un-&xB>lI`Tg7S1l9Yk-hJG@BGvkt z1-U0Z9tw+lJJYe6-_m}1<1W~{nH&>t3hGZ;z?I)--Qc-291io7BHy_1;a=gb5ZMtNnEUhc`;$Phos1!8!Jq)^dLqwZ)o}li6$kheYX`5CfdAR{Qgb z*fWL$e7y-ee7|JJ{Q~fZR(=1qyg;zOGL3&LYPoK0JjnB5Mn0r}?H2k2d#mC~-q8D9 zUced0KN46i`SxjQJnk-s`M)4hK})_8kK^~c#Xi2jjYN4@=ezYI=*xEdpM8<#uT;Hb zCIdp^)Xb&j@^`7~$2QWu_;V%C0tQBIostk}=vp@h{#$3~{WANwQJS$Krkx3nJi zTN}dMUj#L=5;>7tFuKAzYo5>%m-M*M&V@%|K_oD2TBKa}bfm%(bj9Y}w&|7zF_^Q-$UwX|l&y>{p?JGf@yn&q|M0ITJ- zV#B1^b206+t{yM#!GX54vi+H(qvx)i{hlA&)bd*KwgWgo?c-@wW@W|pR9W!>EgN-G z_%7I+J8>v9KU&R?;acZY%bQfkxR=jNwI|O8>tR0Qw=6!-b6hiaL`X(c@u1fCq`0U< zd@OAi$ojtYw5nCVkzEC{OU9)JX1&e6##hbT0Gs#HJ=P>22dtJ?W5-8@y@}6*{Iss? zkn#q7-3OLCzQFgxy@YM?SCD@T-G0te8hHV*dOkH?=l1k%#@&3I?ne5Zj>fd$Iab)@1?(<>mh G#O^PmJG8_A literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status_thirst_inside_0_ca.paa b/SQF/dayz_code/gui/status_epoch/status_thirst_inside_0_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_thirst_inside_0_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_thirst_inside_0_ca.paa diff --git a/SQF/dayz_code/gui/status_thirst_inside_1_ca.paa b/SQF/dayz_code/gui/status_epoch/status_thirst_inside_1_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_thirst_inside_1_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_thirst_inside_1_ca.paa diff --git a/SQF/dayz_code/gui/status_thirst_inside_2_ca.paa b/SQF/dayz_code/gui/status_epoch/status_thirst_inside_2_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_thirst_inside_2_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_thirst_inside_2_ca.paa diff --git a/SQF/dayz_code/gui/status_thirst_inside_3_ca.paa b/SQF/dayz_code/gui/status_epoch/status_thirst_inside_3_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_thirst_inside_3_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_thirst_inside_3_ca.paa diff --git a/SQF/dayz_code/gui/status_thirst_inside_4_ca.paa b/SQF/dayz_code/gui/status_epoch/status_thirst_inside_4_ca.paa similarity index 100% rename from SQF/dayz_code/gui/status_thirst_inside_4_ca.paa rename to SQF/dayz_code/gui/status_epoch/status_thirst_inside_4_ca.paa diff --git a/SQF/dayz_code/gui/status_epoch/status_visible.paa b/SQF/dayz_code/gui/status_epoch/status_visible.paa new file mode 100644 index 0000000000000000000000000000000000000000..b77a52d67360523bb0bcd4a2629324cb3a85f34e GIT binary patch literal 5625 zcmeHLOGs2v82%l{Qqp|nlwpeEb!x!qp&4b7gEo5eRhDK*;LKoYs7MRfItJxN#@mb3 z2_r#T1im^Dwy@Wt7EvukohZ`ZMGHY(L_0f2`_CO_qhestJ#d-(@t^xYzWbeX|2bhx z1qJpCc?FerGXTuZ%~_UlmAypZB|Zc$uopW74&j%;=N*o+Tz=omubVLdo$&y7EdXEm zwZ4%Hxd7b5pCJO$z4$e-!H1y-odIJ#80$e-!`k;p1XWYiJ=;k?0{1`GpU2&5xfZbB zCLrW$>MN^0zwEFTw#fbX1hPi|VA6ZCQ%;+O&n?%dnJK;nnKSc@rVvI5g}(6-9b3R_ z+G5Sr- zNhhqF9*XjhM9KQ25}4D^8gs~Q!D5%v@>%NT6b>a#zUzHM_KnuB;Ln=9Ep8b<6KlAh zO)?(B_-m!aBl8W8XB}nkF`hEzgU`i`7^!FE=vS2~j_gOVSj#Wz9Vfg83VA$TPv1D7 znN6N7vS)Ms+=wWa{(XaC*UKz4FDmN8P_pxQvD}B$dm5^DUJdH=gZ*zd-i}4CEOu4C4~!m-22;!! z)zgpca)|m_)_)Y)grdfo$i5GYv>Oj}z1y&jueX1<-p%IQh`+)B>Br#1;6pHA=wWUB zdJ3cfh!cjDVbHcV+LFJDHn8mo@l_!{`{0#r$u5D1eUW5eFTWRq+G-PKU&*?5PqzIH z6F&~$chonNe;caK+J$l(VT5FFRoSBa%p#O}(!9pC-I*O068sC(|gbw;Lr83Mtd26 z^McyO)$0A(r#XEy!n?ArA+na7nS*G?eU;NYIN%H?l%rDaaJ?wnT zH5Kq0zrzRnz>j-U#<6`J)wQ+;* 300) exitWith {}; - }; - if (gear_done) then {uiSleep 0.001;}; - _dialog = findDisplay 106; - if ((parseNumber(_this select 0)) != 0) then { - ctrlActivate (_dialog displayCtrl 157); - if (gear_done) then { - waitUntil {ctrlShown (_dialog displayCtrl 159)}; - uiSleep 0.001; - }; - }; - _dialog - }; - - dayz_HungerThirst = { - dayz_hunger = dayz_hunger + (_this select 0); - dayz_thirst = dayz_thirst + (_this select 1); - }; - dayz_NutritionSystem = { private ["_type","_baseRegen","_nutrition","_calorieCount","_hungerCount","_thirstCount","_tempCount","_Thirst","_Hunger","_bloodregen","_golbalNutrition"]; //["type",regen,[NutritionTable,thirst(Working Class),hunger(Working Class)]] diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 526ad4146..c3efc3acc 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -503,7 +503,6 @@ DZE_isWreck = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck DZE_isWreckBuilding = ["Land_wreck_cinder","Land_wood_wreck_quarter","Land_wood_wreck_floor","Land_wood_wreck_third","Land_wood_wreck_frame","Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gold_vein_wreck","Land_ammo_supply_wreck"]; DZE_isNewStorage = ["VaultStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ"]; DZE_typedBags = ["bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; -gear_done = false; helperDetach = false; isInTraderCity = false; PlayerDeaths = []; @@ -517,7 +516,6 @@ s_player_combi = []; s_player_lockunlock = []; s_player_lockUnlockInside = []; s_player_parts = []; -if(isNil "Dayz_Dark_UI") then {Dayz_Dark_UI = false;}; if(isNil "DayZ_UseSteamID") then {DayZ_UseSteamID = true;}; if(isNil "DZE_SelfTransfuse") then {DZE_SelfTransfuse = false;}; if(isNil "DZE_GodModeBase") then {DZE_GodModeBase = false;}; @@ -537,7 +535,6 @@ if(isNil "DZE_RestrictSkins") then {DZE_RestrictSkins = [];}; if(isNil "DZE_BackpackAntiTheft") then {DZE_BackpackAntiTheft = false;}; if(isNil "DZE_PlotPole") then {DZE_PlotPole = [30,45];}; if(isNil "DZE_maintainRange") then {DZE_maintainRange = ((DZE_PlotPole select 0)+20);}; -if(isNil "DZE_HeartBeat") then {DZE_HeartBeat = false;}; if(isNil "DZE_UseBloodTypes") then {DZE_UseBloodTypes = false;}; if(isNil "DZE_slowZombies") then {DZE_slowZombies = false;}; if ((toLower worldName) in ["napf","sauerland","tavi"]) then { diff --git a/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf b/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf index 152b0db3b..c2bce0d6e 100644 --- a/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf +++ b/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf @@ -16,8 +16,6 @@ if (vehicle player != player) exitWith { }; player playActionNow "Medic"; -[1,1] call dayz_HungerThirst; - r_interrupt = false; _animState = animationState player; r_doLoop = true; diff --git a/SQF/dayz_code/system/dog_agent.fsm b/SQF/dayz_code/system/dog_agent.fsm index abbae6ba3..29dada766 100644 --- a/SQF/dayz_code/system/dog_agent.fsm +++ b/SQF/dayz_code/system/dog_agent.fsm @@ -768,15 +768,15 @@ class FSM " _handle setFSMVariable [""_thirst"",0];" \n " _handle setFSMVariable [""_hunger"",0];" \n " " \n - " _display = uiNamespace getVariable 'DAYZ_GUI_display';" \n - " _ctrlDogFood = _display displayCtrl 1701;" \n - " _ctrlDogFood ctrlShow true;" \n - " _ctrlDogFoodBorder = _display displayCtrl 1501;" \n - " _ctrlDogFoodBorder ctrlShow true;" \n - " _ctrlDogWater = _display displayCtrl 1702;" \n - " _ctrlDogWater ctrlShow true;" \n - " _ctrlDogWaterBorder = _display displayCtrl 1502;" \n - " _ctrlDogWaterBorder ctrlShow true;" \n + " //_display = uiNamespace getVariable 'DAYZ_GUI_display';" \n + " //_ctrlDogFood = _display displayCtrl 1701;" \n + " //_ctrlDogFood ctrlShow true;" \n + " //_ctrlDogFoodBorder = _display displayCtrl 1501;" \n + " //_ctrlDogFoodBorder ctrlShow true;" \n + " //_ctrlDogWater = _display displayCtrl 1702;" \n + " //_ctrlDogWater ctrlShow true;" \n + " //_ctrlDogWaterBorder = _display displayCtrl 1502;" \n + " //_ctrlDogWaterBorder ctrlShow true;" \n " " \n " while {alive _dog} do {" \n " _vel = velocity _dog;" \n @@ -788,15 +788,16 @@ class FSM " _foodVal = 1 - (_hunger / SleepFood);" \n " _thirstVal = 1 - (_thirst / SleepWater);" \n " " \n - " _ctrlDogFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 0.5];" \n - " _ctrlDogWater ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_thirstVal))),(Dayz_GUI_G * _thirstVal),(Dayz_GUI_B * _thirstVal), 0.5];" \n + " //_ctrlDogFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 0.5];" \n + " //_ctrlDogWater ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_thirstVal))),(Dayz_GUI_G * _thirstVal),(Dayz_GUI_B * _thirstVal), 0.5];" \n " " \n - " if (_foodVal < 0.2) then {" \n - " _ctrlDogFood call player_guiControlFlash;" \n - " };" \n - " if (_thirstVal < 0.2) then {" \n - " _ctrlDogWater call player_guiControlFlash;" \n - " };" \n + " //_flash = {if (ctrlShown _this) then {_this ctrlShow false;} else {_this ctrlShow true;};};" \n + " //if (_foodVal < 0.2) then {" \n + " //_ctrlDogFood call _flash;" \n + " //};" \n + " //if (_thirstVal < 0.2) then {" \n + " //_ctrlDogWater call _flash;" \n + " //};" \n "" \n " if (_foodVal <= 0 || _thirstVal <= 0) then {" \n " _cantSee = [player, _dog] call dayz_losCheck;" \n diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 17fef4c9f..a95801270 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -622,7 +622,6 @@ class FSM "" \n "_model call player_switchModel;" \n "" \n - "gear_done= true;" \n "player allowDamage false;" \n "_lastAte = _survival select 1;" \n "_lastDrank = _survival select 2;" \n diff --git a/SQF/dayz_code/system/scheduler/sched_gui.sqf b/SQF/dayz_code/system/scheduler/sched_gui.sqf index 455b59462..e55a40c1b 100644 --- a/SQF/dayz_code/system/scheduler/sched_gui.sqf +++ b/SQF/dayz_code/system/scheduler/sched_gui.sqf @@ -9,7 +9,7 @@ sched_gui = { _initDone = _this select 0; if ((!_initDone and !isNil 'Dayz_loginCompleted') and {(Dayz_loginCompleted)}) then { - 3 cutRsc ['playerStatusGUI', 'PLAIN',3]; // show the whole HUD + if (toLower DZE_UI == "vanilla") then {3 cutRsc ['playerStatusGUI','PLAIN',3];} else {3 cutRsc ['playerStatusGUI_epoch','PLAIN',3];}; _initDone = true; }; //else {