From d372c1f07aa66a5f2f595ba4db735e792be7115a Mon Sep 17 00:00:00 2001
From: GenericHeroGuy <genericheroguy@noreply.codeberg.org>
Date: Mon, 22 Dec 2025 13:59:39 +0100
Subject: [PATCH] Forgot about condition sets!

---
 src/d_main.cpp |  5 +----
 src/m_cond.c   | 46 ----------------------------------------------
 src/m_cond.h   |  1 -
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index a10f1fa63..46650a482 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -93,7 +93,7 @@
 #define ASSET_HASH_TEXTURES_KART       0xb4211b2f32b6a291
 #define ASSET_HASH_CHARS_KART          0x1e68a3e01aa5c68b
 #define ASSET_HASH_MAPS_KART           0x38558ed00da41ce9
-#define ASSET_HASH_MAIN_PK3            0x5ae5830da34ceb41
+#define ASSET_HASH_MAIN_PK3            0x0bb244e3e53dc163
 #define ASSET_HASH_MAPPATCH_PK3        0x6ad99efcfaafb70f
 #define ASSET_HASH_BONUSCHARS_KART     0x60e6f13d822a7461
 #ifdef USE_PATCH_FILE
@@ -1664,9 +1664,6 @@ void D_SRB2Main(void)
 	I_InitializeTime();
 	CON_SetLoadingProgress(LOADED_ISTARTUPTIMER);
 
-	// Setup default unlockable conditions
-	M_SetupDefaultConditionSets();
-
 	D_RegisterServerCommands();
 	D_RegisterClientCommands(); // be sure that this is called before D_CheckNetGame
 	R_RegisterEngineStuff();
diff --git a/src/m_cond.c b/src/m_cond.c
index 4e8309c0a..08c761108 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -44,52 +44,6 @@ unlockable_t unlockables[MAXUNLOCKABLES] = {0};
 INT32 numemblems = 0;
 INT32 numextraemblems = 0;
 
-// DEFAULT CONDITION SETS FOR SRB2KART:
-void M_SetupDefaultConditionSets(void)
-{
-	memset(conditionSets, 0, sizeof(conditionSets));
-
-	// UNLOCKABLES
-	// -- 1: Collect 5 medals OR play 25 matches
-	M_AddRawCondition(1, 1, UC_TOTALEMBLEMS, 5, 0, 0);
-	M_AddRawCondition(1, 2, UC_MATCHESPLAYED, 25, 0, 0);
-
-	// -- 2: Collect 15 medals OR play 50 matches
-	M_AddRawCondition(2, 1, UC_TOTALEMBLEMS, 15, 0, 0);
-	M_AddRawCondition(2, 2, UC_MATCHESPLAYED, 50, 0, 0);
-
-	// -- 3: Collect 30 medals OR play 150 matches
-	M_AddRawCondition(3, 1, UC_TOTALEMBLEMS, 30, 0, 0);
-	M_AddRawCondition(3, 2, UC_MATCHESPLAYED, 150, 0, 0);
-
-	// -- 4: Collect 50 medals OR play 200 matches
-	M_AddRawCondition(4, 1, UC_TOTALEMBLEMS, 50, 0, 0);
-	M_AddRawCondition(4, 2, UC_MATCHESPLAYED, 200, 0, 0);
-
-	// -- 5: Collect 70 medals OR play 300 matches
-	M_AddRawCondition(5, 1, UC_TOTALEMBLEMS, 70, 0, 0);
-	M_AddRawCondition(5, 2, UC_MATCHESPLAYED, 300, 0, 0);
-
-	// -- 6: Collect 110 medals ONLY
-	M_AddRawCondition(6, 1, UC_TOTALEMBLEMS, 110, 0, 0);
-
-	// MILESTONES
-	// -- 10: Play 100 matches
-	M_AddRawCondition(10, 1, UC_MATCHESPLAYED, 100, 0, 0);
-
-	// -- 11: Play 250 matches
-	M_AddRawCondition(11, 1, UC_MATCHESPLAYED, 250, 0, 0);
-
-	// -- 12: Play 500 matches
-	M_AddRawCondition(12, 1, UC_MATCHESPLAYED, 500, 0, 0);
-
-	// -- 13: Play 750 matches
-	M_AddRawCondition(13, 1, UC_MATCHESPLAYED, 750, 0, 0);
-
-	// -- 14: Play 1000 matches
-	M_AddRawCondition(14, 1, UC_MATCHESPLAYED, 1000, 0, 0);
-}
-
 void M_AddRawCondition(UINT8 set, UINT8 id, conditiontype_t c, INT32 r, INT16 x1, INT16 x2)
 {
 	condition_t *cond;
diff --git a/src/m_cond.h b/src/m_cond.h
index 2b88baa0f..7de462934 100644
--- a/src/m_cond.h
+++ b/src/m_cond.h
@@ -153,7 +153,6 @@ extern INT32 numextraemblems;
 extern UINT32 unlocktriggers;
 
 // Condition set setup
-void M_SetupDefaultConditionSets(void);
 void M_AddRawCondition(UINT8 set, UINT8 id, conditiontype_t c, INT32 r, INT16 x1, INT16 x2);
 
 // Clearing secrets