From 89544772b39140e15c6493d01c97077f429dd7c3 Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Tue, 13 Aug 2024 17:54:31 -0700
Subject: [PATCH] Amps for checkpoints (and small amp fixes)

---
 src/k_kart.c               | 4 ++--
 src/objects/amps.c         | 2 +-
 src/objects/checkpoint.cpp | 3 +++
 src/p_spec.c               | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 48e06e54d..aa8b7b792 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -4091,7 +4091,7 @@ boolean K_Overdrive(player_t *player)
 	S_StartSound(player->mo, sfx_cdfm35);
 	S_StartSound(player->mo, sfx_cdfm13);
 
-	player->overdrive += (player->amps)*6;
+	player->overdrive += (player->amps)*3;
 	player->overshield += (player->amps)*2;
 	player->overdrivepower = FRACUNIT;
 
@@ -4112,7 +4112,7 @@ boolean K_DefensiveOverdrive(player_t *player)
 	S_StartSound(player->mo, sfx_cdfm35);
 	S_StartSound(player->mo, sfx_cdfm13);
 
-	player->overdrive += (player->amps)*4;
+	player->overdrive += (player->amps)*2;
 	player->overshield += (player->amps)*2 + TICRATE*2;
 	player->overdrivepower = FRACUNIT;
 
diff --git a/src/objects/amps.c b/src/objects/amps.c
index dab90aba2..89d86344f 100644
--- a/src/objects/amps.c
+++ b/src/objects/amps.c
@@ -55,7 +55,7 @@ void Obj_AmpsThink (mobj_t *amps)
 
             amps->extravalue2++;
 
-            speed += amps->extravalue1 * amps->scale/2;
+            speed += amps->extravalue2 * amps->scale/2;
 
             fakez = mo->z + (vert * amps->extravalue1 / AMP_ARCTIME);
             damper = 1;
diff --git a/src/objects/checkpoint.cpp b/src/objects/checkpoint.cpp
index c1170d3c9..3f6753fc1 100644
--- a/src/objects/checkpoint.cpp
+++ b/src/objects/checkpoint.cpp
@@ -674,6 +674,9 @@ void __attribute__((optimize("O0"))) Obj_CrossCheckpoints(player_t* player, fixe
 		{
 			player->lapPoints += 1;
 		}
+
+		K_SpawnAmps(player, 5*(D_NumPlayersInRace() - player->position), static_cast<mobj_t*>(chk));
+		K_SpawnAmps(player, 5*(D_NumPlayersInRace() - player->position), static_cast<mobj_t*>(chk->other()));
 	}
 }
 
diff --git a/src/p_spec.c b/src/p_spec.c
index 50caec45a..ef1427938 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2116,6 +2116,9 @@ static void K_HandleLapIncrement(player_t *player)
 						{
 							player->lapPoints++;
 						}
+
+						if (player->laps <= numlaps)
+							K_SpawnAmps(player, 10*(D_NumPlayersInRace() - player->position), player->mo);
 					}
 
 					if (player->position == 1 && !(gametyperules & GTR_CHECKPOINTS))