diff --git a/SQF/dayz_code/Configs/CfgArma.hpp b/SQF/dayz_code/Configs/CfgArma.hpp index 25a1f695b..eed6f1282 100644 --- a/SQF/dayz_code/Configs/CfgArma.hpp +++ b/SQF/dayz_code/Configs/CfgArma.hpp @@ -771,7 +771,6 @@ class CfgSurvival { sex = "male"; playerModel = "INS_Worker2_DZ"; }; - //new Epoch 1.06 class Skin_USMC_Soldier_Officer_DZ: Default { sex = "male"; playerModel = "USMC_Soldier_Officer_DZ"; @@ -911,6 +910,26 @@ class CfgSurvival { class Skin_FR_Sapper_DZ: Default { sex = "male"; playerModel = "FR_Sapper_DZ"; + }; + class Skin_CamoWinter_DZ: Default { + sex = "male"; + playerModel = "CamoWinter_DZ"; }; + class Skin_CamoWinterW_DZ: Default { + sex = "male"; + playerModel = "CamoWinterW_DZ"; + }; + class Skin_Sniper1W_DZ: Default { + sex = "male"; + playerModel = "Sniper1W_DZ"; + }; + class Skin_Nac_Soldier_DZ: Default { + sex = "male"; + playerModel = "Nac_Soldier_DZ"; + }; + class Skin_Tamika_DZ: Default { + sex = "female"; + playerModel = "Tamika_DZ"; + }; }; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp index 049c093be..c1ffafd9b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp @@ -422,3 +422,28 @@ class Skin_FR_Sapper_DZ: SkinBase { displayName = $STR_EPOCH_SKINS_FRSAPPER; descriptionShort = $STR_EPOCH_SKINS_FRSAPPER; }; +class Skin_CamoWinter_DZ: SkinBase { + scope = public; + displayName = $STR_EPOCH_SKINS_CAMOWINTER; + descriptionShort = $STR_EPOCH_SKINS_CAMOWINTER; +}; +class Skin_CamoWinterW_DZ: SkinBase { + scope = public; + displayName = $STR_EPOCH_SKINS_CAMOWINTERW; + descriptionShort = $STR_EPOCH_SKINS_CAMOWINTERW; +}; +class Skin_Sniper1W_DZ: SkinBase { + scope = public; + displayName = $STR_EPOCH_SKINS_SNIPER1W; + descriptionShort = $STR_EPOCH_SKINS_SNIPER1W; +}; +class Skin_Nac_Soldier_DZ: SkinBase { + scope = public; + displayName = $STR_EPOCH_SKINS_NACSOLDIER; + descriptionShort = $STR_EPOCH_SKINS_NACSOLDIER; +}; +class Skin_Tamika_DZ: SkinBase { + scope = public; + displayName = $STR_EPOCH_SKINS_TAMIKA; + descriptionShort = $STR_EPOCH_SKINS_TAMIKA; +}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Skins/Female.hpp b/SQF/dayz_code/Configs/CfgVehicles/Skins/Female.hpp index 668e5d0b1..4a058fade 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Skins/Female.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Skins/Female.hpp @@ -258,3 +258,8 @@ class SurvivorWurban_DZ: SurvivorW2_DZ hiddenSelections[] = {"Camo"}; hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\UrbanGirl.paa"}; }; + +class Tamika_DZ: SurvivorW2_DZ +{ + model = "\nst\ns_fraction\ns\ns_tamika.p3d"; +}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp b/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp index 5dad8e4a7..ab32b1072 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp @@ -104,8 +104,6 @@ class Survivor3_DZ : Survivor2_DZ { HiddenSelectionsTextures[] = {"ca\characters_pmc\pmc_soldier\data\bauer_co.paa", "ca\characters_pmc\pmc_soldier\data\bauer_gear_co.paa", "ca\characters_pmc\pmc_soldier\data\headgear_co.paa"}; }; -//See DZE\Females.hpp for female characters - //Bandit1_DZ moved to DZE section below class Rocket_DZ: Survivor_DZ { //BAF_Soldier_Officer_W @@ -1174,3 +1172,37 @@ class FR_Sapper_DZ: FR_Sapper { canHideBodies = 1; canCarryBackPack = 1; }; + +class CamoWinter_DZ: Survivor_DZ { + side = 1; + scope = public; + displayName = "Camo Winter"; + model = "\nst\ns_dayz\characters\cw\camowinter_dzn.p3d"; + faceType = "HeadMask1Black"; + camouflage = 1.4; + class Wounds + { + tex[] = {}; + mat[] = {"ca\characters2\rus\data\soldier_specnaz_partizan.rvmat","ca\characters2\rus\data\soldier_specnaz_partizan_w1.rvmat","ca\characters2\rus\data\soldier_specnaz_partizan_w2.rvmat","ca\characters2\rus\data\soldier_specnaz_back_partizan.rvmat","ca\characters2\rus\data\soldier_specnaz_back_partizan_w1.rvmat","ca\characters2\rus\data\soldier_specnaz_back_partizan_w2.rvmat","ca\characters2\rus\data\soldier_specnaz_back_partizan.rvmat","ca\characters2\rus\data\soldier_specnaz_back_partizan_w1.rvmat","ca\characters2\rus\data\soldier_specnaz_back_partizan_w2.rvmat","ca\characters2\rus\data\soldier_speccom.RVmat","ca\characters2\rus\data\soldier_speccom_w1.RVmat","ca\characters2\rus\data\soldier_speccom_w2.RVmat"}; + }; +}; + +class CamoWinterW_DZ: CamoWinter_DZ { + side = 1; + displayName = "Camo Winter"; + model = "\nst\ns_dayz\characters\cw\camowinterw_dzn.p3d"; +}; + +class Sniper1W_DZ: Sniper1_DZ { + side = 1; + displayName = "Winter Sniper"; + hiddenSelections[] = {"Camo"}; + hiddenSelectionsTextures[] = {"\nst\ns_dayz\characters\gw\data\ghillie_overall1w_co.paa"}; +}; + +class Nac_Soldier_DZ: Survivor_DZ { + scope = public; + side = 1; + displayName = "NAC Soldier"; + model = "\nst\ns_fraction\nac\nac_soldier_1"; +}; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 0cbb99ee5..9027c54b2 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -16,7 +16,7 @@ dayz_traps_trigger = []; USEC_typeOfWounds = ["Pelvis","aimpoint","lelbow","relbow","RightFoot","LeftFoot","neck","pilot"]; // Player classes -AllPlayers = ["Survivor_DZ","Survivor1_DZ","SurvivorW2_DZ","Survivor2_DZ","Sniper1_DZ","Soldier1_DZ","Camo1_DZ","BanditW1_DZ","Bandit1_DZ","Survivor3_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWsequishaD_DZ","SurvivorWsequisha_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","Bandit2_DZ","BanditW2_DZ","Soldier_Crew_PMC","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ","TK_Special_Forces_MG_EP1_DZ","TK_Soldier_Sniper_EP1_DZ","TK_Commander_EP1_DZ","RU_Soldier_Crew_DZ","INS_Lopotev_DZ","INS_Soldier_AR_DZ","INS_Soldier_CO_DZ","INS_Bardak_DZ","INS_Worker2_DZ","USMC_Soldier_Officer_DZ","USMC_Soldier_MG_DZ","USMC_Soldier_Pilot_DZ","FR_TL_DZ","FR_R_DZ","FR_Marksman_DZ","FR_Assault_R_DZ","RU_Soldier_DZ","RU_Soldier_Officer_DZ","RUS_Soldier1_DZ","RUS_Commander_DZ","MVD_Soldier_DZ","Ins_Soldier_2_DZ","Ins_Commander_DZ","Ins_Soldier_Crew_DZ","CDF_Soldier_DZ","Doctor_DZ","Assistant_DZ","Worker1_DZ","Worker3_DZ","Worker4_DZ","TK_CIV_Takistani01_EP1_DZ","TK_CIV_Takistani03_EP1_DZ","TK_CIV_Takistani04_EP1_DZ","TK_CIV_Takistani06_EP1_DZ","TK_INS_Soldier_AR_EP1_DZ","TK_GUE_Soldier_EP1_DZ","CZ_Soldier_SL_DES_EP1_DZ","US_Soldier_EP1_DZ","UN_CDF_Soldier_Guard_EP1_DZ","UN_CDF_Soldier_EP1_DZ","GER_Soldier_TL_EP1_DZ","BAF_Soldier_Officer_MTP_DZ","BAF_Soldier_N_MTP_DZ","FR_Sapper_DZ"]; +AllPlayers = ["Survivor_DZ","Survivor1_DZ","SurvivorW2_DZ","Survivor2_DZ","Sniper1_DZ","Soldier1_DZ","Camo1_DZ","BanditW1_DZ","Bandit1_DZ","Survivor3_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWsequishaD_DZ","SurvivorWsequisha_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","Bandit2_DZ","BanditW2_DZ","Soldier_Crew_PMC","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ","TK_Special_Forces_MG_EP1_DZ","TK_Soldier_Sniper_EP1_DZ","TK_Commander_EP1_DZ","RU_Soldier_Crew_DZ","INS_Lopotev_DZ","INS_Soldier_AR_DZ","INS_Soldier_CO_DZ","INS_Bardak_DZ","INS_Worker2_DZ","USMC_Soldier_Officer_DZ","USMC_Soldier_MG_DZ","USMC_Soldier_Pilot_DZ","FR_TL_DZ","FR_R_DZ","FR_Marksman_DZ","FR_Assault_R_DZ","RU_Soldier_DZ","RU_Soldier_Officer_DZ","RUS_Soldier1_DZ","RUS_Commander_DZ","MVD_Soldier_DZ","Ins_Soldier_2_DZ","Ins_Commander_DZ","Ins_Soldier_Crew_DZ","CDF_Soldier_DZ","Doctor_DZ","Assistant_DZ","Worker1_DZ","Worker3_DZ","Worker4_DZ","TK_CIV_Takistani01_EP1_DZ","TK_CIV_Takistani03_EP1_DZ","TK_CIV_Takistani04_EP1_DZ","TK_CIV_Takistani06_EP1_DZ","TK_INS_Soldier_AR_EP1_DZ","TK_GUE_Soldier_EP1_DZ","CZ_Soldier_SL_DES_EP1_DZ","US_Soldier_EP1_DZ","UN_CDF_Soldier_Guard_EP1_DZ","UN_CDF_Soldier_EP1_DZ","GER_Soldier_TL_EP1_DZ","BAF_Soldier_Officer_MTP_DZ","BAF_Soldier_N_MTP_DZ","FR_Sapper_DZ","CamoWinter_DZ","CamoWinterW_DZ","Sniper1W_DZ","Nac_Soldier_DZ","Tamika_DZ"]; // Epoch Additions dayz_activeInvites = []; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 4e22dff7f..3d52c191e 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -17247,6 +17247,25 @@ Camo Sapper Tarn Pionier + + Warm Clothes + Warme Kleiung + + + Warm Clothes (white) + Warme Kleiung (weiß) + + + Winter Ghillie + Winter-Ghillie + + + NAC Soldier + NAC-Soldat + + + Tamika + Armor Panzerung