diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index de0271100..c7d25e934 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -1009,8 +1009,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Canvas"; - model = "\dayz_equip\models\cloth_parcel.p3d"; - picture = "\dayz_equip\textures\equip_cloth_parcel_ca.paa"; + model = "\dayz_equip\models\canvas.p3d"; + picture = "\dayz_equip\textures\equip_canvas_ca.paa"; descriptionShort = "Canvas Parcel"; class ItemActions { @@ -1067,8 +1067,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Burlap"; - model = "\dayz_equip\models\sandbags.p3d"; - picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; + model = "\dayz_equip\models\burlap.p3d"; + picture = "\dayz_equip\textures\equip_burlap_ca.paa"; descriptionShort = "Burlap: A strong cloth like material used for building sandbags"; class ItemActions { diff --git a/dayz_equip/models/burlap.p3d b/dayz_equip/models/burlap.p3d new file mode 100644 index 000000000..6bfb65993 Binary files /dev/null and b/dayz_equip/models/burlap.p3d differ diff --git a/dayz_equip/models/canvas.p3d b/dayz_equip/models/canvas.p3d new file mode 100644 index 000000000..49d61f844 Binary files /dev/null and b/dayz_equip/models/canvas.p3d differ diff --git a/dayz_equip/models/keykit.p3d b/dayz_equip/models/keykit.p3d index 3a2358dfe..00e8a8cc5 100644 Binary files a/dayz_equip/models/keykit.p3d and b/dayz_equip/models/keykit.p3d differ diff --git a/dayz_equip/textures/burlap.rvmat b/dayz_equip/textures/burlap.rvmat new file mode 100644 index 000000000..8dae227a7 --- /dev/null +++ b/dayz_equip/textures/burlap.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.50196081,0.34901962,0.074509807,7.4505806e-008}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="dayz_equip\textures\burlap_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="dayz_equip\textures\burlap_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_equip/textures/burlap_diffuse.paa b/dayz_equip/textures/burlap_diffuse.paa new file mode 100644 index 000000000..3612a7615 Binary files /dev/null and b/dayz_equip/textures/burlap_diffuse.paa differ diff --git a/dayz_equip/textures/burlap_norm.paa b/dayz_equip/textures/burlap_norm.paa new file mode 100644 index 000000000..9ca5c775d Binary files /dev/null and b/dayz_equip/textures/burlap_norm.paa differ diff --git a/dayz_equip/textures/burlap_spec.paa b/dayz_equip/textures/burlap_spec.paa new file mode 100644 index 000000000..b819c90bf Binary files /dev/null and b/dayz_equip/textures/burlap_spec.paa differ diff --git a/dayz_equip/textures/canvas.rvmat b/dayz_equip/textures/canvas.rvmat new file mode 100644 index 000000000..9a93f52d8 --- /dev/null +++ b/dayz_equip/textures/canvas.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.24313726,0.33333334,0.24705882,0}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="dayz_equip\textures\canvas_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="dayz_equip\textures\canvas_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_equip/textures/canvas_diffuse.paa b/dayz_equip/textures/canvas_diffuse.paa new file mode 100644 index 000000000..cfaae360c Binary files /dev/null and b/dayz_equip/textures/canvas_diffuse.paa differ diff --git a/dayz_equip/textures/canvas_norm.paa b/dayz_equip/textures/canvas_norm.paa new file mode 100644 index 000000000..cd568bf4d Binary files /dev/null and b/dayz_equip/textures/canvas_norm.paa differ diff --git a/dayz_equip/textures/canvas_spec.paa b/dayz_equip/textures/canvas_spec.paa new file mode 100644 index 000000000..e87efe27b Binary files /dev/null and b/dayz_equip/textures/canvas_spec.paa differ diff --git a/dayz_equip/textures/equip_burlap_ca.paa b/dayz_equip/textures/equip_burlap_ca.paa new file mode 100644 index 000000000..489851280 Binary files /dev/null and b/dayz_equip/textures/equip_burlap_ca.paa differ diff --git a/dayz_equip/textures/equip_canvas_ca.paa b/dayz_equip/textures/equip_canvas_ca.paa new file mode 100644 index 000000000..5da96067f Binary files /dev/null and b/dayz_equip/textures/equip_canvas_ca.paa differ