From a51a341d4a6b8ac2f590629dab5183b439c2df99 Mon Sep 17 00:00:00 2001
From: cypress <motolegacy@proton.me>
Date: Wed, 15 May 2024 20:11:52 -0700
Subject: [PATCH] SERVER: Make Power-Up sparkle flash after pick-up

---
 source/server/entities/powerups.qc | 34 ++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/source/server/entities/powerups.qc b/source/server/entities/powerups.qc
index 0eab68c..b6cd5b5 100644
--- a/source/server/entities/powerups.qc
+++ b/source/server/entities/powerups.qc
@@ -34,8 +34,11 @@
 #define PU_CARPENTER		3
 #define PU_MAXAMMO			4
 
-#define PU_OFFSET_QK		'0 0 13'
-#define PU_OFFSET_HL		'0 0 16'
+#define PU_OFFSET_QK		'0 0 12'
+#define PU_OFFSET_HL		'0 0 14'
+
+#define PU_BBOX_MINS		'-2 -2 -16'
+#define PU_BBOX_MAXS		'2 2 16'
 
 var struct powerup_struct
 {
@@ -644,7 +647,7 @@ void() PU_Flash =
 #endif // FTE
 
 	// Re-set the size after relink.
-	setsize(self, '-8 -8 -16', '8 8 16');
+	setsize(self, PU_BBOX_MINS, PU_BBOX_MAXS);
 
 	// Too late, free the Power-Up
 	if (self.hitcount >= 40) {
@@ -664,6 +667,21 @@ void() PU_PlayVO =
 	PU_FreeEnt(self);
 };
 
+//
+// PU_SparkleShrink()
+// Called on Power-Up contact, makes the Sparkle shrink
+// until eventually disappearing.
+//
+void() PU_SparkleShrink =
+{
+	self.scale -= frametime;
+
+	if (self.scale <= 0)
+		PU_FreeEnt(self);
+	else
+		self.nextthink = time + 0.01;
+};
+
 //
 // PU_Touch()
 // Run assigned functions and prep for Deletion
@@ -687,8 +705,12 @@ void() PU_Touch =
 
 #endif // FTE
 
-		// Free the Power-Up sparkle, slight cleanup
-		PU_FreeEnt(self.owner);
+		// Prepare to shrink the Power-Up sparkle
+		self.owner.think = PU_SparkleShrink;
+		self.owner.nextthink = time + 0.01;
+		self.owner.scale = 1;
+
+		// slight cleaup
 		setmodel(self, "");
 		Light_None(self);
 		self.touch = SUB_Null;
@@ -765,7 +787,7 @@ void(vector where, float type) Spawn_Powerup =
 	powerup.solid = SOLID_TRIGGER;
 	powerup.classname = "item_powerup";
 
-	setsize(powerup, '-8 -8 -16', '8 8 16');
+	setsize(powerup, PU_BBOX_MINS, PU_BBOX_MAXS);
 	powerup.movetype = MOVETYPE_NONE;
 
     Light_Green(powerup);