From 92f6e61243b7da1885930900bf6b047daa76404c Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 13 Jan 2024 16:59:12 -0800
Subject: [PATCH] Battle: downscale hitlag VFX and Gahabom explosion (not in
 Prisons)

- Hitlag VFX: 3/4x
- Gachabom explosion: 1/2x
---
 src/k_hitlag.c                   | 6 ++++++
 src/objects/gachabom-rebound.cpp | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/k_hitlag.c b/src/k_hitlag.c
index 3f1a3afad..e211e90c0 100644
--- a/src/k_hitlag.c
+++ b/src/k_hitlag.c
@@ -14,6 +14,7 @@
 
 #include "doomdef.h"
 #include "doomstat.h"
+#include "k_battle.h"
 #include "k_kart.h"
 #include "m_random.h"
 #include "p_local.h"
@@ -195,6 +196,11 @@ static void K_SpawnHitLagEFX(mobj_t *victim, mobj_t *inflictor, mobj_t *source,
 		newScale = 3 * victim->destscale;
 	}
 
+	if ((gametyperules & GTR_BUMPERS) && battleprisons == false)
+	{
+		newScale = 3 * newScale / 4;
+	}
+
 	if (P_MobjWasRemoved(source) == false)
 	{
 		color = (source->player != NULL) ? source->player->skincolor : source->color;
diff --git a/src/objects/gachabom-rebound.cpp b/src/objects/gachabom-rebound.cpp
index 9c12ba0ad..91e1f23c5 100644
--- a/src/objects/gachabom-rebound.cpp
+++ b/src/objects/gachabom-rebound.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 
 #include "../d_player.h"
+#include "../k_battle.h"
 #include "../k_objects.h"
 #include "../m_fixed.h"
 #include "../info.h"
@@ -230,7 +231,10 @@ void Obj_SpawnGachaBomRebound(mobj_t* source, mobj_t* target)
 		x->color = target->color;
 		x->angle = angle;
 
-		P_InstaScale(x, 2 * x->scale);
+		if (!(gametyperules & GTR_BUMPERS) || battleprisons)
+		{
+			P_InstaScale(x, 2 * x->scale);
+		}
 
 		rebound_mode(x) = static_cast<int>(mode);
 		rebound_timer(x) = kReboundAcceptPause;