From 28849c31a8bed7854f1f28cdd37cb3fad0623287 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Sat, 15 Jul 2023 11:26:13 +0200
Subject: [PATCH] Update (U)ZB config with hitbox tweaks

---
 extras/conf/SRB2-22.cfg                    | 15 ++++++++++-----
 extras/conf/udb/Includes/SRB222_things.cfg | 21 ++++++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index dd5cdb46b..bcb6e6241 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -4367,7 +4367,6 @@ thingtypes
 	{
 		color = 14; // Yellow
 		title = "Rings and Weapon Panels";
-		width = 24;
 		height = 24;
 		flags8height = 24;
 		flags8text = "[8] Float";
@@ -4377,7 +4376,6 @@ thingtypes
 		{
 			title = "Ring";
 			sprite = "RINGA0";
-			width = 16;
 		}
 		301
 		{
@@ -4393,6 +4391,7 @@ thingtypes
 		{
 			title = "Infinity Ring";
 			sprite = "RNGIA0";
+			width = 24;
 		}
 		304
 		{
@@ -4418,43 +4417,48 @@ thingtypes
 		{
 			title = "CTF Team Ring (Red)";
 			sprite = "internal:TRNGA0R";
-			width = 16;
 		}
 		309
 		{
 			title = "CTF Team Ring (Blue)";
 			sprite = "internal:TRNGA0B";
-			width = 16;
 		}
 		330
 		{
 			title = "Bounce Ring Panel";
 			sprite = "PIKBA0";
+			width = 24;
+			height = 40;
 		}
 		331
 		{
 			title = "Rail Ring Panel";
 			sprite = "PIKRA0";
+			width = 24;
 		}
 		332
 		{
 			title = "Automatic Ring Panel";
 			sprite = "PIKAA0";
+			width = 24;
 		}
 		333
 		{
 			title = "Explosion Ring Panel";
 			sprite = "PIKEA0";
+			width = 24;
 		}
 		334
 		{
 			title = "Scatter Ring Panel";
 			sprite = "PIKSA0";
+			width = 24;
 		}
 		335
 		{
 			title = "Grenade Ring Panel";
 			sprite = "PIKGA0";
+			width = 24;
 		}
 	}
 
@@ -4463,7 +4467,7 @@ thingtypes
 		color = 10; // Light Green
 		title = "Other Collectibles";
 		width = 16;
-		height = 32;
+		height = 24;
 		sort = 1;
 		sprite = "CEMGA0";
 
@@ -4529,6 +4533,7 @@ thingtypes
 		{
 			title = "Emerald Hunt Location";
 			sprite = "SHRDA0";
+			height = 32;
 			flags8height = 24;
 			flags8text = "[8] Float";
 		}
diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index df08e3ac5..9eb227974 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -1185,7 +1185,7 @@ udmf
 	{
 		color = 14; // Yellow
 		title = "Rings and Weapon Panels";
-		width = 24;
+		width = 16;
 		height = 24;
 		sprite = "RINGA0";
 
@@ -1193,7 +1193,6 @@ udmf
 		{
 			title = "Ring";
 			sprite = "RINGA0";
-			width = 16;
 			arg0
 			{
 				title = "Float?";
@@ -1227,6 +1226,7 @@ udmf
 		{
 			title = "Infinity Ring";
 			sprite = "RNGIA0";
+			width = 24;
 			arg0
 			{
 				title = "Float?";
@@ -1282,7 +1282,6 @@ udmf
 		{
 			title = "CTF Team Ring (Red)";
 			sprite = "internal:TRNGA0R";
-			width = 16;
 			arg0
 			{
 				title = "Float?";
@@ -1294,7 +1293,6 @@ udmf
 		{
 			title = "CTF Team Ring (Blue)";
 			sprite = "internal:TRNGA0B";
-			width = 16;
 			arg0
 			{
 				title = "Float?";
@@ -1306,6 +1304,8 @@ udmf
 		{
 			title = "Bounce Ring Panel";
 			sprite = "PIKBA0";
+			width = 24;
+			height = 40;
 			arg0
 			{
 				title = "Float?";
@@ -1317,6 +1317,8 @@ udmf
 		{
 			title = "Rail Ring Panel";
 			sprite = "PIKRA0";
+			width = 24;
+			height = 40;
 			arg0
 			{
 				title = "Float?";
@@ -1328,6 +1330,8 @@ udmf
 		{
 			title = "Automatic Ring Panel";
 			sprite = "PIKAA0";
+			width = 24;
+			height = 40;
 			arg0
 			{
 				title = "Float?";
@@ -1339,6 +1343,8 @@ udmf
 		{
 			title = "Explosion Ring Panel";
 			sprite = "PIKEA0";
+			width = 24;
+			height = 40;
 			arg0
 			{
 				title = "Float?";
@@ -1350,6 +1356,8 @@ udmf
 		{
 			title = "Scatter Ring Panel";
 			sprite = "PIKSA0";
+			width = 24;
+			height = 40;
 			arg0
 			{
 				title = "Float?";
@@ -1361,6 +1369,8 @@ udmf
 		{
 			title = "Grenade Ring Panel";
 			sprite = "PIKGA0";
+			width = 24;
+			height = 40;
 			arg0
 			{
 				title = "Float?";
@@ -1375,7 +1385,7 @@ udmf
 		color = 10; // Light_Green
 		title = "Other Collectibles";
 		width = 16;
-		height = 32;
+		height = 24;
 		sort = 1;
 		sprite = "CEMGA0";
 
@@ -1445,6 +1455,7 @@ udmf
 		{
 			title = "Emerald Hunt Location";
 			sprite = "SHRDA0";
+			height = 32;
 			arg0
 			{
 				title = "Float?";