From d32ba6cf64f10155f54ac5b5a9391af0913b1634 Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Sun, 5 May 2024 13:57:18 -0700
Subject: [PATCH] Vicious difficulty

---
 src/command.c                          | 2 +-
 src/cvars.cpp                          | 2 +-
 src/k_menudraw.c                       | 2 +-
 src/m_cond.c                           | 6 +++---
 src/menus/play-local-race-difficulty.c | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/command.c b/src/command.c
index 413acdabe..b42b73a5c 100644
--- a/src/command.c
+++ b/src/command.c
@@ -98,7 +98,7 @@ CV_PossibleValue_t dummykartspeed_cons_t[] = {
 CV_PossibleValue_t gpdifficulty_cons_t[] = {
 	{KARTSPEED_EASY, "Relaxed"},
 	{KARTSPEED_NORMAL, "Intense"},
-	{KARTSPEED_HARD, "Extreme"},
+	{KARTSPEED_HARD, "Vicious"},
 	{KARTGP_MASTER, "Master"},
 	{0, NULL}
 };
diff --git a/src/cvars.cpp b/src/cvars.cpp
index 6a29bc26c..83c360eb2 100644
--- a/src/cvars.cpp
+++ b/src/cvars.cpp
@@ -943,7 +943,7 @@ consvar_t cv_dummyextraspassword = MenuDummy("dummyextraspassword", "");
 
 extern CV_PossibleValue_t gpdifficulty_cons_t[];
 void Dummygpdifficulty_OnChange(void);
-consvar_t cv_dummygpdifficulty = MenuDummy("dummygpdifficulty", "Relaxed").values(gpdifficulty_cons_t).onchange(Dummygpdifficulty_OnChange);
+consvar_t cv_dummygpdifficulty = MenuDummy("dummygpdifficulty", "Intense").values(gpdifficulty_cons_t).onchange(Dummygpdifficulty_OnChange);
 consvar_t cv_dummygpencore = MenuDummy("dummygpencore", "Off").on_off();
 
 consvar_t cv_dummyip = MenuDummy("dummyip", "");
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 03c98ddba..a9f48161f 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -5689,7 +5689,7 @@ static char *M_GetGameplayMode(void)
 		if (grandprixinfo.masterbots)
 			return va("Master");
 		if (grandprixinfo.gamespeed == KARTSPEED_HARD)
-			return va("Extreme");
+			return va("Vicious");
 		if (grandprixinfo.gamespeed == KARTSPEED_NORMAL)
 			return va("Intense");
 		return va("Relaxed");
diff --git a/src/m_cond.c b/src/m_cond.c
index 816104528..8a27efaa4 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -2378,7 +2378,7 @@ static const char *M_GetConditionString(condition_t *cn)
 			}
 			else if (cn->extrainfo2 == KARTSPEED_HARD)
 			{
-				speedtext = " on Extreme";
+				speedtext = " on Vicious";
 			}
 			else if (cn->extrainfo2 == KARTGP_MASTER)
 			{
@@ -2424,7 +2424,7 @@ static const char *M_GetConditionString(condition_t *cn)
 			else*/
 			if (cn->requirement == KARTSPEED_HARD)
 			{
-				speedtext = " on Extreme";
+				speedtext = " on Vicious";
 			}
 			else if (cn->requirement == KARTGP_MASTER)
 			{
@@ -2690,7 +2690,7 @@ static const char *M_GetConditionString(condition_t *cn)
 			}
 			else if (cn->requirement == KARTSPEED_HARD)
 			{
-				speedtext = "on Extreme";
+				speedtext = "on Vicious";
 			}
 			else if (cn->requirement == KARTGP_MASTER)
 			{
diff --git a/src/menus/play-local-race-difficulty.c b/src/menus/play-local-race-difficulty.c
index c27366eb7..40dabe34f 100644
--- a/src/menus/play-local-race-difficulty.c
+++ b/src/menus/play-local-race-difficulty.c
@@ -134,6 +134,11 @@ void M_SetupDifficultyOptions(INT32 choice)
 		CV_SetValue(&cv_dummygpdifficulty, KARTSPEED_NORMAL);
 		CV_SetValue(&cv_dummykartspeed, KARTSPEED_NORMAL);
 	}
+	else
+	{
+		CV_SetValue(&cv_dummygpdifficulty, KARTSPEED_EASY);
+		CV_SetValue(&cv_dummykartspeed, KARTSPEED_EASY);
+	}
 
 	interceptedDefaultDifficulty = true;