Merge pull request #1 from prettyFist/main

Minor QoL during kit application
HDest-Community · Mar 20, 2024 · 7ec7a24 · 7ec7a24
2 parents 4b627b7 + f490350
commit 7ec7a24
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/zscript/BeatCrazed/Items/CrossPulseModKit.zsc b/zscript/BeatCrazed/Items/CrossPulseModKit.zsc
@@ -4,24 +4,26 @@
 // ------------------------------------------------------------
 
 class CrossPulseModificationKit : HDPickup {
-
-    action void A_Activate() {
-        let sacrificeTB = ThunderBuster(self.FindInventory("ThunderBuster"));
-        if (sacrificeTB) {
-            bool garbage;
-            Actor newTB;
-
-            [garbage, newTB] = self.A_SpawnItemEX("CrossPulseThunderBuster");
-
-            let buster = CrossPulseThunderBuster(newTB);
-            buster.weaponstatus[TBS_FLAGS] = sacrificeTB.weaponstatus[TBS_FLAGS];
-            buster.weaponstatus[TBS_BATTERY] = sacrificeTB.weaponstatus[TBS_BATTERY];
-
-            sacrificeTB.destroy();
-            self.TakeInventory("CrossPulseModificationKit", 1);
-        } else {
-            A_Log(StringTable.Localize("$XTK_NO_TB"));
-        }
+    actor newtb;
+	bool garbage;
+	crosspulsethunderbuster buster;
+    action void A_Activate() {		
+		let sacrificeTB = ThunderBuster(player.readyweapon); //checks current weapon in hands instead of scrounging inventory
+		if (!sacrificeTB) {
+			A_Log(StringTable.Localize("$XTK_NO_TB"));
+		}
+		else {
+			[invoker.garbage,invoker.newtb] = self.A_SpawnItemEx("CrossPulseThunderBuster", //spits it out instead of dropping at feet
+						cos(pitch)*12,0,height-8-sin(pitch)*12,
+						cos(pitch)*(random(10,20)*0.1),0.2*randompick(-1,1),-sin(pitch),
+						0,SXF_NOCHECKPOSITION|SXF_TRANSFERPITCH
+					);
+			invoker.buster = crosspulsethunderbuster(invoker.newtb);
+			invoker.buster.weaponstatus[TBS_FLAGS] = sacrificeTB.weaponstatus[TBS_FLAGS];
+			invoker.buster.weaponstatus[TBS_BATTERY] = sacrificetb.weaponstatus[TBS_BATTERY];
+			sacrificetb.destroy();
+			self.takeinventory("crosspulsemodificationkit",1);
+		}
     }
 
     default {