Helmet cleanup and painkillers

addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -7,7 +7,7 @@ class CfgPatches
 {
 	class macro_patch_name(aviation_helmets)
 	{
-		author=DANKAUTHORS
+		author=RD501
 		addonRootClass= macro_patch_name(helmets)
 		requiredAddons[]=
 		{
@@ -66,13 +66,11 @@ class CfgWeapons
 	NEW_501_Pilot_HELM(keryl,Keryl,pilots\keryl.paa)
 	NEW_501_Pilot_HELM(kaj,Kaj,pilots\Kaj.paa)
 	NEW_501_Pilot_HELM(kitty,Kitty,pilots\kitty.paa)
-	NEW_501_Pilot_HELM(koop,Koop,pilots\Koop.paa)
 	NEW_501_Pilot_HELM(kushiban,Kushiban,pilots\Kushiban.paa)
 	NEW_501_Pilot_HELM(orange,Orange,pilots\orange.paa)
 	NEW_501_Pilot_HELM(nocturnal,Warbird,pilots\Nocturnal.paa)
 	NEW_501_Pilot_HELM(aspect,Aspect,pilots\Aspect.paa)
 	NEW_501_Pilot_HELM(Galaxy,Galaxy,pilots\Galaxy.paa)
-	NEW_501_Pilot_HELM(Halligan,Halligan,pilots\Halligan.paa)
 	NEW_501_Pilot_HELM(Floff,Floff,pilots\Floff.paa)
 	NEW_501_Pilot_HELM(Gothic,Gothic,pilots\Gothic.paa)
 	NEW_501_Pilot_HELM(Shnuffles,Shnuffles,pilots\Shnuffles.paa)
@@ -118,66 +116,6 @@ class CfgWeapons
 			"\501st_Helmets\AB\data\red_glow.rvmat"//"swop_clones\data\helmpilot.rvmat"//  \501st_Helmets\AB\data\white_glow.rvmat
 		};
 	};
-	class macro_new_helmet(pilot,lord_krayt): macro_new_helmet(pilot,base)
-	{
-		scope = 2;
-		displayName = "Clone pilot helmet (501st legion) Lord Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\LordKrayt.paa};
-		subItems[] = {"G_B_Diving"};
-
-		#include "memenai.hpp"
-
-	};
-
-	class macro_new_helmet(pilot,king_krayt): macro_new_helmet(pilot,lum_base)
-	{
-		scope = 2;
-		displayName = "Clone pilot helmet (501st legion) King Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\KingKrayt.paa};
-		subItems[] = {"G_B_Diving"};
-		#include "memenai.hpp"
-
-		hiddenSelectionsMaterials[]=
-		{
-			"",
-			"\501st_Helmets\AB\data\white_glow.rvmat"//"swop_clones\data\helmpilot.rvmat"//  \501st_Helmets\AB\data\white_glow.rvmat
-		};
-	};
-
-	class macro_new_helmet(pilot,royal_krayt): macro_new_helmet(pilot,king_krayt)
-	{
-		displayName = "Clone pilot helmet (501st legion) Royal Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\purple.paa};
-	}
-
-	class macro_new_helmet(pilot,cold_krayt): macro_new_helmet(pilot,king_krayt)
-	{
-			displayName = "Clone pilot helmet (501st legion) Ice Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\blue.paa};
-	}
-
-	class macro_new_helmet(pilot,angrr_krayt): macro_new_helmet(pilot,king_krayt)
-	{
-		displayName = "Clone pilot helmet (501st legion) Angrr Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\red.paa};
-	}
-
-	//gollddd
-	// class macro_new_helmet(pilot,midas_lrayt): macro_new_helmet(pilot,lum_base)
-	// {
-	// 	scope = 2;
-	// 	displayName = "Clone pilot helmet (501st legion) Midas Krayt";
-	// 	hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\KingKrayt.paa};
-	// 	subItems[] = {"G_B_Diving"};
-	// 	#include "memenai.hpp"
-
-	// 	hiddenSelectionsMaterials[]=
-	// 	{
-	// 		"", //RD501_Laat\textures\gold.rvmat
-	// 		"RD501_Helmets\_materials\gold.rvmat",//"\501st_Helmets\AB\data\white_glow.rvmat"//"swop_clones\data\helmpilot.rvmat"//  \501st_Helmets\AB\data\white_glow.rvmat
-	// 	};
-	// };
-
 
 
 	class 212th_Engineer_Helmet_501st;

addons - Copy/RD501_Helmets/aviation/memenai.hpp

@@ -1,24 +0,0 @@
-class ItemInfo: ItemInfo
-{
-    mass = 30;
-    uniformmodel = "\501st_helmets\AB\AB_helmet_p1.p3d";//"SWOP_clones\helmet\CloneHelmetPilot.p3d";
-    modelSides[] = {6};
-    hiddenSelections[] = {
-        "camo1",
-        "mat"
-    };
-    material = -1;
-    explosionShielding = 200.2;
-    minimalHit = 550.01;
-    passThrough = 0.001;
-    armor=100000;
-    class HitpointsProtectionInfo
-    {
-        class Head
-        {
-            hitpointName = "HitHead";
-            armor = 10000;
-            passThrough = 0.6;
-        };
-    };
-};

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -29,12 +29,8 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Pilot,Pilot,Pilot.paa)
 	
 	NEW_501_Inf_Helm_JLTS(Archaic,Archaic,Archaic.paa)
-	NEW_501_Inf_Helm_JLTS(Blade,Blade,Blade.paa)
-	NEW_501_Inf_Helm_JLTS(Delaney,Delaney,Delaney.paa)
-	NEW_501_Inf_Helm_JLTS(Fallout,Fallout,Fallout.paa)
 	NEW_501_Inf_Helm_JLTS(Hosed,Hosed,Hosed.paa)
 	NEW_501_Inf_Helm_JLTS(Kestrel,Kestrel,Kestrel.paa)
-	NEW_501_Inf_Helm_JLTS(Lantern,Lantern,Lantern.paa)
 	NEW_501_Inf_Helm_JLTS(Odin,Odin,Odin.paa)
 	NEW_501_Inf_Helm_JLTS(Player,Player,Player.paa)
 	NEW_501_Inf_Helm_JLTS(Roster,Roster,Roster.paa)
@@ -57,23 +53,16 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Chaser,Chaser,Chaser.paa)
 	NEW_501_Inf_Helm_JLTS(Reck,Reck,Reck.paa)
 	NEW_501_Inf_Helm_JLTS(Cursed,Cursed,Cursed.paa)
-	NEW_501_Inf_Helm_JLTS(Kahn,Kahn,Kahn.paa)
-	NEW_501_Inf_Helm_JLTS(Weaver,Weaver,Weaver.paa)
 	NEW_501_Inf_Helm_JLTS(Alistair,Alistair,Alistair.paa)
 	NEW_501_Inf_Helm_JLTS(Dimitri,Dimitri,Dimitri.paa)
-	NEW_501_Inf_Helm_JLTS(Loki,Loki,Loki.paa)
 	NEW_501_Inf_Helm_JLTS(Money,Money,Money.paa)
-	NEW_501_Inf_Helm_JLTS(Nightingale,Nightingale,Nightingale.paa)
-	NEW_501_Inf_Helm_JLTS(Point,Point,Point.paa)
 	NEW_501_Inf_Helm_JLTS(Tee,Tee,Tee.paa)
 	NEW_501_Inf_Helm_JLTS(Tideend,Tideend,Tideend.paa)
 	NEW_501_Inf_Helm_JLTS(Dadecoy,Dadecoy,Dadecoy.paa)
 	NEW_501_Inf_Helm_JLTS(Muzzer,Muzzer,Muzzer.paa)
 	NEW_501_Inf_Helm_JLTS(Biscuit,Biscuit,Biscuit.paa)
 	NEW_501_Inf_Helm_JLTS(Goldarp,Goldarp,Goldarp.paa)
-	NEW_501_Inf_Helm_JLTS(Strill,Strill,Strill.paa)
 	NEW_501_Inf_Helm_JLTS(Husky,Husky,Husky.paa)
-	NEW_501_Inf_Helm_JLTS(Parrott,Parrott,Parrott.paa)
 	NEW_501_Inf_Helm_JLTS(Jay,Jay,Jay.paa)
 	NEW_501_Inf_Helm_JLTS(Drifter,Drifter,Drifter.paa)
 	NEW_501_Inf_Helm_JLTS(Weiss,Weiss,Weiss.paa)
@@ -84,9 +73,7 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Delta,Delta,Delta.paa)
 	NEW_501_Inf_Helm_JLTS(Moist,Moist,Moist.paa)
 	NEW_501_Inf_Helm_JLTS(Richard,Richard,Richard.paa)
-	NEW_501_Inf_Helm_JLTS(Zen,Zen,Zen.paa)
 	NEW_501_Inf_Helm_JLTS(Zulu,Zulu,Zulu.paa)
-	NEW_501_Inf_Helm_JLTS(Bronson,Bronson,Bronson.paa)
 	NEW_501_Inf_Helm_JLTS(Chan,Chan,Chan.paa)
 	NEW_501_Inf_Helm_JLTS(Guide,Guide,Guide.paa)
 	NEW_501_Inf_Helm_JLTS(Ford,Ford,Ford.paa)
@@ -95,26 +82,18 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Crisis,Crisis,Crisis.paa)
 	NEW_501_Inf_Helm_JLTS(Deus,Deus,Deus.paa)
 	NEW_501_Inf_Helm_JLTS(Osprey,Osprey,Osprey.paa)
-	NEW_501_Inf_Helm_JLTS(Shade,Shade,Shade.paa)
 	NEW_501_Inf_Helm_JLTS(Clock,Clock,Clock.paa)
 	NEW_501_Inf_Helm_JLTS(Habas,Habas,Habas.paa)
 	NEW_501_Inf_Helm_JLTS(Koda,Koda,Koda.paa)
 	NEW_501_Inf_Helm_JLTS(Nuwisha,Nuwisha,Nuwisha.paa)
 	NEW_501_Inf_Helm_JLTS(Swanny,Swanny,Swanny.paa)
 	NEW_501_Inf_Helm_JLTS(Fluorite,Fluorite,Fluorite.paa)
-	NEW_501_Inf_Helm_JLTS(Jupiter,Jupiter,Jupiter.paa)
 	NEW_501_Inf_Helm_JLTS(Slyder,Slyder,Slyder.paa)
-	NEW_501_Inf_Helm_JLTS(Tim,Tim,Tim.paa)
 	NEW_501_Inf_Helm_JLTS(Sticks,Sticks,Sticks.paa)
-	NEW_501_Inf_Helm_JLTS(Weepier,Weepier,Weepier.paa)
-	NEW_501_Inf_Helm_JLTS(Sense,Sense,Sense.paa)
 	NEW_501_Inf_Helm_JLTS(Twine,Twine,Twine.paa)
-	NEW_501_Inf_Helm_JLTS(Toast,Toast,Toast.paa)
 	NEW_501_Inf_Helm_JLTS(Bishop,Bishop,Bishop.paa)
-	NEW_501_Inf_Helm_JLTS(Fancy,Fancy,Fancy.paa)
 	NEW_501_Inf_Helm_JLTS(Pro,Pro,Pro.paa)
 	NEW_501_Inf_Helm_JLTS(Shape,Shape,Shape.paa)
-	NEW_501_Inf_Helm_JLTS(Klown,Klown,Klown.paa)
 	NEW_501_Inf_Helm_JLTS(Drammon,Drammon,Drammon.paa)
 	NEW_501_Inf_Helm_JLTS(Spectre,Spectre,Spectre.paa)
 	NEW_501_Inf_Helm_JLTS(Andromeda,Andromeda,Andromeda.paa)
@@ -122,34 +101,21 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Flux,Flux,Flux.paa)
 	NEW_501_Inf_Helm_JLTS(Goddest,Goddest,Goddest.paa)
 	NEW_501_Inf_Helm_JLTS(Dusty,Dusty,Dusty.paa)
-	NEW_501_Inf_Helm_JLTS(Chaser,Chaser,Chaser.paa)
-	NEW_501_Inf_Helm_JLTS(Parrot,Parrot,Parrot.paa)
-	NEW_501_Inf_Helm_JLTS(Strill,Strill,Strill.paa)
 	NEW_501_Inf_Helm_JLTS(Bjorn,Bjorn,Bjorn.paa)
 	NEW_501_Inf_Helm_JLTS(Doug,Doug,Doug.paa)
 	NEW_501_Inf_Helm_JLTS(Dragon,Dragon,Dragon.paa)
 	NEW_501_Inf_Helm_JLTS(Fixit,Fixit,Fixit.paa)
 	NEW_501_Inf_Helm_JLTS(Legia,Legia,Legia.paa)
-	NEW_501_Inf_Helm_JLTS(Scruff,Scruff,Scruff.paa)
 	NEW_501_Inf_Helm_JLTS(Shadow,Shadow,Shadow.paa)
 	NEW_501_Inf_Helm_JLTS(Simon,Simon,Simon.paa)
 	NEW_501_Inf_Helm_JLTS(Sour,Sour,Sour.paa)
 	NEW_501_Inf_Helm_JLTS(Adhock,Adhock,Adhock.paa)
-	NEW_501_Inf_Helm_JLTS(Akaan,Akaan,Akaan.paa)
-	NEW_501_Inf_Helm_JLTS(Corey,Corey,Corey.paa)
 	NEW_501_Inf_Helm_JLTS(Koda,Koda,Koda.paa)
-	NEW_501_Inf_Helm_JLTS(Duke,Duke,Duke.paa)
 	NEW_501_Inf_Helm_JLTS(Rebellion,Rebellion,Rebellion.paa)
 	NEW_501_Inf_Helm_JLTS(Dadecoy,Dadecoy,Dadecoy.paa)
-	NEW_501_Inf_Helm_JLTS(Juggernaut,Juggernaut,Juggernaut.paa)
-	NEW_501_Inf_Helm_JLTS(Reck,Reck,Reck.paa)
-	NEW_501_Inf_Helm_JLTS(Archaic,Archaic,Archaic.paa)
-	NEW_501_Inf_Helm_JLTS(Kahn,Kahn,Kahn.paa)
 	NEW_501_Inf_Helm_JLTS(Cursed,Cursed,Cursed.paa)
-	NEW_501_Inf_Helm_JLTS(Zulu,Zulu,Zulu.paa)
 	NEW_501_Inf_Helm_JLTS(Compo,Compo,Compo.paa)
 	NEW_501_Inf_Helm_JLTS(Shape,Shape,Shape.paa)
-	NEW_501_Inf_Helm_JLTS(Klown,Klown,Klown.paa)
 	NEW_501_Inf_Helm_JLTS(Drammon,Drammon,Drammon.paa)
 	NEW_501_Inf_Helm_JLTS(Spectre,Spectre,Spectre.paa)
 	NEW_501_Inf_Helm_JLTS(Hackett,Hackett,Hackett.paa)
@@ -168,6 +134,15 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Bacon,Bacon,Bacon.paa)
 	NEW_501_Inf_Helm_JLTS(Aedan,Aedan,Aedan.paa)
 	NEW_501_Inf_Helm_JLTS(Midnight,Midnight,Midnight.paa)
+	NEW_501_Inf_Helm_JLTS(Versa,Versa,Versa.paa)
+	NEW_501_Inf_Helm_JLTS(Dakota,Dakota,Dakota.paa)
+	NEW_501_Inf_Helm_JLTS(Narrator,Narrator,Narrator.paa)
+	NEW_501_Inf_Helm_JLTS(Silver,Silver,Silver.paa)
+	NEW_501_Inf_Helm_JLTS(Sunshine,Sunshine,Sunshine.paa)
+	NEW_501_Inf_Helm_JLTS(Fenrir,Fenrir,Fenrir.paa)
+	NEW_501_Inf_Helm_JLTS(Kyrie,Kyrie,Kyrie.paa)
+	NEW_501_Inf_Helm_JLTS(Power,Power,Power.paa)
+	NEW_501_Inf_Helm_JLTS(Vulpes,Vulpes,Vulpes.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
 	NEW_501_ARC_Helm_JLTS(Bronson,Bronson,Bronson.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)

addons - Copy/RD501_Weapons/Consumables/config.cpp

@@ -0,0 +1,61 @@
+class cfgPatches
+{
+    class newacestuff
+    {
+        requiredAddons[] = 
+        {
+            "ace_medical_engine",
+            "ace_medical_treatment",
+        };
+    };
+};
+class cfgweapons
+{
+    class ACE_Morphine;
+	class CBA_MiscItem_ItemInfo;
+    class RD501_Painkiller: ACE_Morphine
+    {
+        scope = 2;
+		displayName = "Painkiller Autoinjector";
+		picture = "\z\ace\addons\medical_treatment\ui\morphine_ca.paa";
+		model = "\z\ace\addons\medical_treatment\data\morphine.p3d";
+		descriptionShort = "Drink some water and Rest";
+		descriptionUse = "Inbuilt Clone Armor injector for easy pain relief";
+		class ItemInfo: CBA_MiscItem_ItemInfo
+		{
+			mass = 0.1;
+		};
+	};  
+};
+class ACE_Medical_Treatment
+{
+    class Morphine;
+    
+    class Medication
+    {
+        class RD501_Painkiller: Morphine
+        {
+            painReduce = 0.3;
+            hrIncreaseLow[] = {-2,-4};
+            hrIncreaseNormal[] = {-2,-6};
+            hrIncreaseHigh[] = {-2,-7};
+            timeInSystem = 600;
+            timeTillMaxEffect = 30;
+            maxDose = 10;
+            incompatibleMedication[] = {};
+            viscosityChange = -2;
+        };
+    };
+};
+class ACE_Medical_Treatment_Actions
+{
+    class Morphine;
+    class RD501_Painkiller:Morphine
+    {
+        displayName = "Painkiller Autoinjector";
+        displayNameProgress = "Injecting Painkillers";
+        allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
+        items[] = {"RD501_Painkiller"};
+        treatmentTime = 1;
+    };
+};