Merge pull request #2092 from jokoho48/repair

Add New Model for Repair

addons/medical/ACE_Medical_Treatments.hpp

@@ -140,6 +140,7 @@ class ACE_Medical_Actions {
         class PackingBandage: fieldDressing {
             displayName = CSTRING(Actions_PackingBandage);
             items[] = {"ACE_packingBandage"};
+            litter[] = { {"All", "", {"ACE_MedicalLitter_packingBandage"}}};
         };
         class ElasticBandage: fieldDressing {
             displayName = CSTRING(Actions_ElasticBandage);
@@ -148,6 +149,7 @@ class ACE_Medical_Actions {
         class QuikClot: fieldDressing {
             displayName = CSTRING(Actions_QuikClot);
             items[] = {"ACE_quikclot"};
+            litter[] = { {"All", "", {"ACE_MedicalLitter_QuickClot"}}};
         };
         class Tourniquet: fieldDressing {
             displayName = CSTRING(Apply_Tourniquet);
@@ -262,7 +264,11 @@ class ACE_Medical_Actions {
             animationCallerProne = "AinvPpneMstpSlayW[wpn]Dnon_medicOther";
             animationCallerSelf = "";
             animationCallerSelfProne = "";
-            litter[] = { {"All", "", {"ACE_MedicalLitter_gloves"}},  {"All", "", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}} }, {"All", "", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}} };
+            litter[] = { {"All", "", {"ACE_MedicalLitter_gloves"}},
+                {"All", "_previousDamage > 0", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}} },
+                {"All", "_previousDamage > 0", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
+                {"All", "_previousDamage <= 0", {"ACE_MedicalLitter_clean"}}
+            };
         };
         class CheckPulse: fieldDressing {
             displayName = CSTRING(Actions_CheckPulse);
@@ -299,6 +305,7 @@ class ACE_Medical_Actions {
             callbackSuccess = QUOTE(DFUNC(actionRemoveTourniquet));
             condition = QUOTE([ARR_2(_this select 1, _this select 2)] call FUNC(hasTourniquetAppliedTo));
             displayNameProgress = CSTRING(RemovingTourniquet);
+            litter[] = {};
         };
         class CPR: fieldDressing {
             displayName = CSTRING(Actions_CPR);

addons/repair/CfgVehicles.hpp

@@ -112,15 +112,15 @@ class CfgVehicles {
 
     class ACE_Track: ACE_RepairItem_Base {
         author = "Hawkins";
-        //scope = 2;
-        model = QUOTE(PATHTOF(ace_track.p3d));
+        scope = 2;
+        model = QUOTE(PATHTOF(data\ace_track.p3d));
         displayName = "$STR_ACE_Repair_SpareTrack";
     };
 
     class ACE_Wheel: ACE_RepairItem_Base {
         author = "Hawkins";
         scope = 2;
-        model = QUOTE(PATHTOF(ace_wheel.p3d));
+        model = QUOTE(PATHTOF(data\ace_wheel.p3d));
         displayName = "$STR_ACE_Repair_SpareWheel";
         picture = QUOTE(PATHTOF(ui\tire_ca.paa));
     };

addons/repair/data/track.rvmat

@@ -1,92 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={1,1,1,1};
-forcedDiffuse[]={0,0,0,0};
-emmisive[]={0,0,0,1};
-specular[]={0.0099999998,0.0099999998,0.0099999998,1};
-specularPower=500;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage1
-{
-	texture="z\ace\addons\repair\data\default_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="z\ace\addons\repair\data\default_as.paa";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,1};
-	};
-};
-class Stage5
-{
-	texture="z\ace\addons\repair\data\default_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,64,64,1)fresnel(4.7,1.2)";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,0};
-	};
-};
-class Stage7
-{
-	texture="a3\data_f\env_land_ca.paa";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,0};
-	};
-};

addons/repair/data/trailObjects.rvmat

@@ -0,0 +1,99 @@
+#define _ARMA_
+
+class StageTI
+{
+	texture = "a3\data_f\default_ti_ca.paa";
+};
+ambient[] = {1,1,1,1};
+diffuse[] = {1,1,1,1};
+forcedDiffuse[] = {0,0,0,0};
+emmisive[] = {0,0,0,0};
+specular[] = {0.0099999998,0.0099999998,0.0099999998,0.0099999998};
+specularPower = 500;
+PixelShaderID = "Super";
+VertexShaderID = "Super";
+class Stage1
+{
+	texture = "z\ace\addons\repair\data\trailObjects_nohq.paa";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,1};
+		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,1};
+		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,1};
+		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,1};
+		pos[] = {0,0,0};
+	};
+};
+class Stage5
+{
+	texture = "#(argb,8,8,3)color(0,0.6,1,1,SMDI)";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,1};
+		pos[] = {0,0,0};
+	};
+};
+class Stage6
+{
+	texture = "#(ai,64,64,1)fresnelGlass(2)";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,1};
+		pos[] = {0,0,0};
+	};
+};
+class Stage7
+{
+	useWorldEnvMap = "true";
+	texture = "a3\data_f\env_land_ca.paa";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,1};
+		pos[] = {0,0,0};
+	};
+};

addons/repair/data/wheel.rvmat

@@ -1,92 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={1,1,1,1};
-forcedDiffuse[]={0,0,0,0};
-emmisive[]={0,0,0,1};
-specular[]={0.0099999998,0.0099999998,0.0099999998,1};
-specularPower=500;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage1
-{
-	texture="z\ace\addons\repair\data\wheel_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="z\ace\addons\repair\data\default_as.paa";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,1};
-	};
-};
-class Stage5
-{
-	texture="z\ace\addons\repair\data\default_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,64,64,1)fresnel(4.7,1.2)";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,0};
-	};
-};
-class Stage7
-{
-	texture="a3\data_f\env_land_ca.paa";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,0};
-	};
-};