diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp index f6b15dd60..2a2507692 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp @@ -414,7 +414,8 @@ class CfgBuildingLoot { { "","generic" }, { "","food" }, { "","trash" }, - { "Binocular","weapon" } + { "Binocular","weapon" }, + { "ItemMixOil", "magazine"} }; itemChanceSmall[] = { 0.01, @@ -429,7 +430,8 @@ class CfgBuildingLoot { 0.04, 0.21, 0.24, - 0.18, + 0.16, + 0.02, 0.02 }; }; diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp index cb59abfdc..c7b25072e 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp @@ -518,7 +518,8 @@ class CfgLoot { "ItemHeatPack", "FoodMRE", "FoodNutmix", - "ItemDocument" + "ItemDocument", + "ItemMixOil" }, { 0.4, @@ -530,7 +531,8 @@ class CfgLoot { 0.02, 0.01, 0.02, - 0.02 + 0.01, + 0.01 } }; diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 628ecd5b7..36c99d8bb 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -268,8 +268,8 @@ class CfgMagazines { count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_ORP; - model = "\z\addons\dayz_epoch\models\doc_generic.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa"; + model = "\z\addons\dayz_epoch\models\doc_Up1.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_docup1_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_ORP_DESC; weight = 0.1; sfx = "document"; @@ -290,8 +290,8 @@ class CfgMagazines { count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_AVE; - model = "\z\addons\dayz_epoch\models\doc_generic.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa"; + model = "\z\addons\dayz_epoch\models\doc_Up2.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_docup2_ca.paa"; descriptionShort = STR_EPOCH_VEHUP_AVE_DESC; weight = 0.1; sfx = "document"; @@ -312,8 +312,8 @@ class CfgMagazines { count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_LRK; - model = "\z\addons\dayz_epoch\models\doc_generic.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa"; + model = "\z\addons\dayz_epoch\models\doc_Up3.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_docup3_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_LRK_DESC; weight = 0.1; sfx = "document"; @@ -334,8 +334,8 @@ class CfgMagazines { count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_TNK; - model = "\z\addons\dayz_epoch\models\doc_generic.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa"; + model = "\z\addons\dayz_epoch\models\doc_Up4.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_docup4_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_TNK_DESC; weight = 0.1; sfx = "document"; diff --git a/SQF/dayz_epoch/models/doc_Up1.p3d b/SQF/dayz_epoch/models/doc_Up1.p3d new file mode 100644 index 000000000..4df505141 Binary files /dev/null and b/SQF/dayz_epoch/models/doc_Up1.p3d differ diff --git a/SQF/dayz_epoch/models/doc_Up2.p3d b/SQF/dayz_epoch/models/doc_Up2.p3d new file mode 100644 index 000000000..f4e0df82b Binary files /dev/null and b/SQF/dayz_epoch/models/doc_Up2.p3d differ diff --git a/SQF/dayz_epoch/models/doc_Up3.p3d b/SQF/dayz_epoch/models/doc_Up3.p3d new file mode 100644 index 000000000..4f7e09004 Binary files /dev/null and b/SQF/dayz_epoch/models/doc_Up3.p3d differ diff --git a/SQF/dayz_epoch/models/doc_Up4.p3d b/SQF/dayz_epoch/models/doc_Up4.p3d new file mode 100644 index 000000000..e1de0d94b Binary files /dev/null and b/SQF/dayz_epoch/models/doc_Up4.p3d differ diff --git a/SQF/dayz_epoch/pictures/equip_docup1_ca.paa b/SQF/dayz_epoch/pictures/equip_docup1_ca.paa new file mode 100644 index 000000000..93ba340be Binary files /dev/null and b/SQF/dayz_epoch/pictures/equip_docup1_ca.paa differ diff --git a/SQF/dayz_epoch/pictures/equip_docup2_ca.paa b/SQF/dayz_epoch/pictures/equip_docup2_ca.paa new file mode 100644 index 000000000..73adb6bea Binary files /dev/null and b/SQF/dayz_epoch/pictures/equip_docup2_ca.paa differ diff --git a/SQF/dayz_epoch/pictures/equip_docup3_ca.paa b/SQF/dayz_epoch/pictures/equip_docup3_ca.paa new file mode 100644 index 000000000..dfda1c991 Binary files /dev/null and b/SQF/dayz_epoch/pictures/equip_docup3_ca.paa differ diff --git a/SQF/dayz_epoch/pictures/equip_docup4_ca.paa b/SQF/dayz_epoch/pictures/equip_docup4_ca.paa new file mode 100644 index 000000000..d660afcac Binary files /dev/null and b/SQF/dayz_epoch/pictures/equip_docup4_ca.paa differ diff --git a/SQF/dayz_epoch/textures/Doc_upgrades_co.paa b/SQF/dayz_epoch/textures/Doc_upgrades_co.paa new file mode 100644 index 000000000..333eae264 Binary files /dev/null and b/SQF/dayz_epoch/textures/Doc_upgrades_co.paa differ diff --git a/SQF/dayz_epoch/textures/Doc_upgrades_nohq.paa b/SQF/dayz_epoch/textures/Doc_upgrades_nohq.paa new file mode 100644 index 000000000..f566b606f Binary files /dev/null and b/SQF/dayz_epoch/textures/Doc_upgrades_nohq.paa differ diff --git a/SQF/dayz_epoch/textures/Doc_upgrades_smdi.paa b/SQF/dayz_epoch/textures/Doc_upgrades_smdi.paa new file mode 100644 index 000000000..737e2dc03 Binary files /dev/null and b/SQF/dayz_epoch/textures/Doc_upgrades_smdi.paa differ diff --git a/SQF/dayz_epoch/textures/doc_upgrades.rvmat b/SQF/dayz_epoch/textures/doc_upgrades.rvmat new file mode 100644 index 000000000..35d85545e --- /dev/null +++ b/SQF/dayz_epoch/textures/doc_upgrades.rvmat @@ -0,0 +1,92 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.40392157,0.40392157,0.40392157,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\Doc_upgrades_nohq.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="#(argb,8,8,3)color(1,1,1,1,AS)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\Doc_upgrades_smdi.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,32,128,1)fresnel(1.3,1.3)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage7 +{ + texture="ca\data\env_land_co.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +};