Merge pull request #712 from vbawol/File-System-Cleanup

Cleanup Files, sort files etc.

SQF/dayz_code/Configs/CfgArma.hpp

@@ -0,0 +1,438 @@
+class CfgActions {
+	class None; // External class reference
+
+	class Rearm : None {
+		show = 0;
+	};
+	class Heal : None {
+		show = 0;
+	};
+	class HealSoldier : None {
+		show = 0;
+	};
+	class FirstAid : None {
+		show = 0;
+	};
+	/*
+	class TakeBag : None {
+		show = 0;
+	};
+	*/
+};
+
+class CfgLoadingTexts {
+	titlesDefault[] = {""};
+};
+
+class CfgAISkill {
+	aimingaccuracy[] = {0, 0, 1, 1};
+	aimingshake[] = {0, 0, 1, 1};
+	aimingspeed[] = {0, 0, 1, 1};
+	commanding[] = {0, 0, 1, 1};
+	courage[] = {0, 1, 1, 1};
+	endurance[] = {0, 0, 1, 1};
+	general[] = {0, 0, 1, 1};
+	reloadspeed[] = {0, 0, 1, 1};
+	spotdistance[] = {0, 0, 1, 0.6};
+	spottime[] = {0, 0, 1, 1};
+};
+
+class CfgInGameUI
+{
+    class PeripheralVision
+    {
+        cueColor[] = {0,0,0,0};
+        cueFriendlyColor[] = {0,0,0,0};
+        cueEnemyColor[] = {0,0,0,0};
+    };
+
+	class IslandMap
+    {
+        colorFriendly[] = {0,0.5,0,0}; //{0,0.5,0,1}; 
+        colorEnemy[] = {0.5,0,0,0};    //{0.5,0,0,1};	  
+        colorNeutral[] = {1.0,0.5,0,0};//{1.0,0.5,0,1};
+        colorCivilian[] = {0,0,1,0};   //{0,0,1,0};
+        colorUnknown[] = {1.0,0.5,0,0};//{1.0,0.5,0,0.8};
+        shadow = 2;
+        iconPlayer = "\ca\ui\data\map_player_ca.paa";
+        iconPlayerDirection = "\ca\ui\data\map_dir_ca.paa";
+        iconCheckpoint = "\ca\ui\data\map_target_ca.paa";
+        iconCamera = "\ca\ui\data\map_camera_ca.paa";
+        iconSelect = "\ca\ui\data\map_select_ca.paa";
+        iconSensor = "\ca\ui\data\map_trigger_ca.paa";
+        sizeLeader = 24;
+        size = 26;
+        sizePlayer = 26;
+        colorTracks[] = {0.2,0.13,0,1};
+        colorRoads[] = {0.2,0.13,0,1};
+        colorMainRoads[] = {0,0,0,1};
+        colorTracksFill[] = {0,0,0,0};
+        colorRoadsFill[] = {1,0.88,0.65,1};
+        colorMainRoadsFill[] = {0.94,0.69,0.2,1};
+        cursorLineWidth = 1;
+        colorGrid[] = {0.05,0.1,0,0.6};
+        colorGridMap[] = {0.05,0.1,0,0.4};
+    };
+	
+	class MPTable
+	{
+		color[] = {0,0,0,0}; //{0.7,0.7,0.7,1};
+		colorTitleBg[] = {0,0,0,0}; //{0.1,0.15,0.15,1};
+		colorBg[] = {0,0,0,0}; //{0.1,0.15,0.1,0.9};
+		colorSelected[] = {0,0,0,0}; //{0.7,0.7,0.7,0.4};
+		colorWest[] = {0,0,0,0}; //{0.7,0.95,0.7,1};
+		colorEast[] = {0,0,0,0}; //{0.95,0.7,0.7,1};
+		colorCiv[] = {0,0,0,0}; //{0.8,0.8,0.8,1};
+		colorRes[] = {0,0,0,0}; //{0.7,0.7,0.95,1};
+		font = "EtelkaNarrowMediumPro";
+		size = "0"; //"( 21 / 408 )";
+		class Columns
+		{
+			class Order
+			{
+				width = 0; //0.046;
+				colorBg[] = {0,0,0,0}; //{0.1,0.27,0.1,0.8};
+				doubleLine = 0;
+			};
+			class Player
+			{
+				width = 0; //0.25;
+				colorBg[] = {0,0,0,0}; //{0.1,0.23,0.1,0.8};
+				doubleLine = 0;
+			};
+			class KillsInfantry
+			{
+				width = 0; //0.11;
+				doubleLine = 0;
+				colorBg[] = {0,0,0,0}; //{0.1,0.15,0.1,0.8};
+				picture = ""; //"\ca\ui\data\stats_infantry_ca.paa";
+			};
+			class KillsSoft
+			{
+				width = 0; //0.1;
+				doubleLine = 0;
+				colorBg[] = {0,0,0,0}; //{0.1,0.15,0.1,0.8};
+				picture = ""; //"\ca\ui\data\stats_soft_ca.paa";
+			};
+			class KillsArmor
+			{
+				width = 0; //0.11;
+				doubleLine = 0;
+				colorBg[] = {0,0,0,0}; //{0.1,0.15,0.1,0.8};
+				picture = ""; //"\ca\ui\data\stats_armored_ca.paa";
+			};
+			class KillsAir
+			{
+				width = 0; //0.1;
+				doubleLine = 0;
+				colorBg[] = {0,0,0,0}; //{0.1,0.15,0.1,0.8};
+				picture = ""; //"\ca\ui\data\stats_air_ca.paa";
+			};
+			class Killed
+			{
+				width = 0; //0.1;
+				doubleLine = 0;
+				colorBg[] = {0,0,0,0}; //{0.1,0.15,0.1,0.8};
+				picture = ""; //"\ca\ui\data\stats_killed_ca.paa";
+			};
+			class KillsTotal
+			{
+				width = 0; //0.1;
+				doubleLine = 0;
+				colorBg[] = {0,0,0,0}; //{0.1,0.35,0.1,0.9};
+				picture = ""; //"\ca\ui\data\stats_total_ca.paa";
+			};
+		};
+	};
+};
+
+
+class CfgSurvival {
+	class Inventory {
+		class Default {
+			//weapons[] = {"Makarov"};
+			magazines[] = {"ItemBandage","ItemPainkiller"};
+			weapons[] = {"ItemFlashlight"};
+			backpackWeapon = "";
+			backpack = "DZ_Patrol_Pack_EP1";
+		};
+	};
+	class Meat {
+		class Default {
+			yield = 2;
+			rawfoodtype = "FoodmeatRaw";
+		};
+		class Cow: Default {
+			yield = 6;
+			rawfoodtype = "FoodbeefRaw";
+		};
+		class Cow01: Cow{};
+		class Cow02: Cow{};
+		class Cow03: Cow{};
+		class Cow04: Cow{};
+		class Cow01_EP1: Cow{};
+		class Goat: Default {
+			yield = 4;
+			rawfoodtype = "FoodmuttonRaw";
+		};
+		class Goat01_EP1: Goat{};
+		class Goat02_EP1: Goat{};
+		class Sheep: Default {
+			yield = 4;
+			rawfoodtype = "FoodmuttonRaw";
+		};
+		class Sheep01_EP1: Sheep{};
+		class Sheep02_EP1: Sheep{};
+		class WildBoar: Default {
+			yield = 4;
+			rawfoodtype = "FoodbaconRaw";
+		};
+		class Hen: Default {
+			yield = 2;
+			rawfoodtype = "FoodchickenRaw";
+		};
+		class Cock: Hen{};
+		class DZ_Fin: Default {
+			yield = 0;
+			rawfoodtype = "FoodSteakRaw";
+		};
+		class DZ_Pastor: DZ_Fin{};
+		class Rabbit: Default {
+			yield = 1;
+			rawfoodtype = "FoodrabbitRaw";
+		};
+
+	};
+	class Skins {
+		class Default {
+			sex = "male";
+			playerModel = "Survivor2_DZ";
+		};
+		class Skin_Survivor2_DZ: Default {
+			sex = "male";
+			playerModel = "Survivor2_DZ";
+		};
+		class Skin_Sniper1_DZ: Default {
+			sex = "male";
+			playerModel = "Sniper1_DZ";
+		};
+		class Skin_Camo1_DZ: Default {
+			sex = "male";
+			playerModel = "Camo1_DZ";
+		};
+		class Skin_Rocket_DZ: Default {
+			sex = "male";
+			playerModel = "Rocket_DZ";
+		};
+		class Skin_Soldier1_DZ: Default {
+			sex = "male";
+			playerModel = "Soldier1_DZ";
+		};
+		class Skin_RU_Policeman_DZ: Default {
+			sex = "male";
+			playerModel = "RU_Policeman_DZ";
+		};
+		class Skin_Pilot_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "Pilot_EP1_DZ";
+		};
+		class Skin_Haris_Press_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "Haris_Press_EP1_DZ";
+		};
+		class Skin_Ins_Soldier_GL_DZ: Default {
+			sex = "male";
+			playerModel = "Ins_Soldier_GL_DZ";
+		};
+		class Skin_GUE_Commander_DZ: Default {
+			sex = "male";
+			playerModel = "GUE_Commander_DZ";
+		};
+		class Skin_Functionary1_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "Functionary1_EP1_DZ";
+		};
+		class Skin_Priest_DZ: Default {
+			sex = "male";
+			playerModel = "Priest_DZ";
+		};
+		class Skin_Rocker1_DZ: Default {
+			sex = "male";
+			playerModel = "Rocker1_DZ";
+		};
+		class Skin_Rocker2_DZ: Default {
+			sex = "male";
+			playerModel = "Rocker2_DZ";
+		};
+		class Skin_Rocker3_DZ: Default {
+			sex = "male";
+			playerModel = "Rocker3_DZ";
+		};
+		class Skin_Rocker4_DZ: Default {
+			sex = "male";
+			playerModel = "Rocker4_DZ";
+		};
+		class Skin_Bandit1_DZ: Default {
+			sex = "male";
+			playerModel = "Bandit1_DZ";
+		};
+		class Skin_Bandit2_DZ: Default {
+			sex = "male";
+			playerModel = "Bandit2_DZ";
+		};
+		class Skin_GUE_Soldier_MG_DZ: Default {
+			sex = "male";
+			playerModel = "GUE_Soldier_MG_DZ";
+		};
+		class Skin_GUE_Soldier_Sniper_DZ: Default {
+			sex = "male";
+			playerModel = "GUE_Soldier_Sniper_DZ";
+		};
+		class Skin_GUE_Soldier_Crew_DZ: Default {
+			sex = "male";
+			playerModel = "GUE_Soldier_Crew_DZ";
+		};
+		class Skin_GUE_Soldier_CO_DZ: Default {
+			sex = "male";
+			playerModel = "GUE_Soldier_CO_DZ";
+		};
+		class Skin_GUE_Soldier_2_DZ: Default {
+			sex = "male";
+			playerModel = "GUE_Soldier_2_DZ";
+		};
+		class Skin_BanditW1_DZ: Default {
+			sex = "female";
+			playerModel = "BanditW1_DZ";
+		};
+		class Skin_BanditW2_DZ: Default {
+			sex = "female";
+			playerModel = "BanditW2_DZ";
+		};
+		class Skin_SurvivorW2_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorW2_DZ";
+		};
+		class Skin_SurvivorWpink_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWpink_DZ";
+		};
+		class Skin_SurvivorWsequisha_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWsequisha_DZ";
+		};
+		class Skin_SurvivorWsequishaD_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWsequishaD_DZ";
+		};
+		class Skin_SurvivorWcombat_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWcombat_DZ";
+		};
+		class Skin_SurvivorWdesert_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWdesert_DZ";
+		};
+		class Skin_SurvivorWurban_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWurban_DZ";
+		};
+		class Skin_SurvivorW3_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorW3_DZ";
+		};
+		class Skin_Soldier_TL_PMC_DZ: Default {
+			sex = "male";
+			playerModel = "Soldier_TL_PMC_DZ";
+		};
+		
+		class Skin_Soldier_Sniper_PMC_DZ: Default {
+			sex = "male";
+			playerModel = "Soldier_Sniper_PMC_DZ";
+		};
+		
+		class Skin_Soldier_Bodyguard_AA12_PMC_DZ: Default {
+			sex = "male";
+			playerModel = "Soldier_Bodyguard_AA12_PMC_DZ";
+		};
+
+		class Skin_FR_OHara_DZ: Default
+		{
+			sex = "male";
+			playerModel = "FR_OHara_DZ";
+		};
+		class Skin_FR_Rodriguez_DZ: Default
+		{
+			sex = "male";
+			playerModel = "FR_Rodriguez_DZ";
+		};
+		class Skin_CZ_Soldier_Sniper_EP1_DZ: Default
+		{
+			sex = "male";
+			playerModel = "CZ_Soldier_Sniper_EP1_DZ";
+		};
+		class Skin_Graves_Light_DZ: Default
+		{
+			sex = "male";
+			playerModel = "Graves_Light_DZ";
+		};
+		
+		class Skin_Drake_Light_DZ: Default {
+			sex = "male";
+			playerModel = "Drake_Light_DZ";
+		};
+		
+		class Skin_CZ_Special_Forces_GL_DES_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "CZ_Special_Forces_GL_DES_EP1_DZ";
+		};
+		
+		class Skin_TK_INS_Soldier_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_INS_Soldier_EP1_DZ";
+		};
+		
+		class Skin_TK_INS_Warlord_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_INS_Warlord_EP1_DZ";
+		};
+
+
+		
+		class Skin_TK_Special_Forces_MG_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_Special_Forces_MG_EP1_DZ";
+		};
+		class Skin_TK_Soldier_Sniper_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_Soldier_Sniper_EP1_DZ";
+		};
+		class Skin_TK_Commander_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_Commander_EP1_DZ";
+		};
+		class Skin_RU_Soldier_Crew_DZ: Default {
+			sex = "male";
+			playerModel = "RU_Soldier_Crew_DZ";
+		};
+		class Skin_INS_Lopotev_DZ: Default {
+			sex = "male";
+			playerModel = "INS_Lopotev_DZ";
+		};
+		class Skin_INS_Soldier_AR_DZ: Default {
+			sex = "male";
+			playerModel = "INS_Soldier_AR_DZ";
+		};		
+		class Skin_INS_Soldier_CO_DZ: Default {
+			sex = "male";
+			playerModel = "INS_Soldier_CO_DZ";
+		};
+		class Skin_INS_Bardak_DZ: Default {
+			sex = "male";
+			playerModel = "INS_Bardak_DZ";
+		};
+		class Skin_INS_Worker2_DZ: Default {
+			sex = "male";
+			playerModel = "INS_Worker2_DZ";
+		};
+	};
+};

SQF/dayz_code/Configs/RscDisplay/RscMap.hpp

@@ -0,0 +1,45 @@
+class RscDisplayMainMap
+{
+	class controls
+	{
+		delete CA_MainBackground;
+		delete CA_CurrentTaskLabel;
+		delete CA_CurrentTask;
+		delete CA_PlayerName;
+		delete CA_TopicsBackground;
+		delete CA_PlayerRank;
+		delete CA_MissionName;
+		class CA_SubTopicsBackground: IGUIBack
+		{
+			idc=1022;
+			x = "0.16*SafeZoneW + SafeZoneX";
+			y = "SafeZoneY + 0.117";
+			w = "0.283*SafeZoneW";
+			h = "0.53";
+			colorBackground[] = {0.30,0.30,0.30,0.85};
+		};
+		class CA_ContentBackground: IGUIBack
+		{
+			idc = 1023;
+			x = "0.446*SafeZoneW + SafeZoneX";
+			y = "SafeZoneY + 0.117";
+			w = "SafeZoneW * 0.272";
+			h = "0.832";
+			colorBackground[] = {0.30,0.30,0.30,0.85};
+		};
+		
+		
+		class DiaryList: RscIGUIListBox
+		{
+			idc = 1001;
+			colorText[] = {0.30,0.30,0.30,1};
+			colorSelectBackground[]={0.60,0.60,0.60,1};
+			colorSelectBackground2[]={0.60,0.60,0.60,1};
+			onLBSelChanged = " [ _this select 0 , _this select 1 , 'List' ] call compile preprocessFileLineNumbers 'ca\Warfare2\Scripts\Client\GUI\GUI_logEH.sqf'; ";
+			onLoad = "((_this select 0) displayCtrl 1001) ctrlShow false";
+			default = 1;
+			w = "0";
+			h = "0";
+		};
+	};
+};

SQF/dayz_code/Configs/rscTitles.hpp

@@ -1642,3 +1642,5 @@ class DZ_ItemInteraction {
 #ifdef SpawnSelecter
 #include "RscDisplay\RscDisplaySpawnSelecter.hpp"
 #endif
+
+#include "RscDisplay\RscMap.hpp"