Merge branch 'prison-difficulty' into 'master'

Prison difficulty modes

See merge request KartKrew/Kart!1583

src/cvars.cpp

@@ -802,7 +802,7 @@ consvar_t cv_kartdebugwaypoints = OnlineCheat("debugwaypoints", "Off").values({{
 
 extern CV_PossibleValue_t numlaps_cons_t[];
 void NumLaps_OnChange(void);
-consvar_t cv_numlaps = OnlineCheat("numlaps", "Map default").values(numlaps_cons_t).onchange(NumLaps_OnChange).save().description("Race maps always have the same number of laps");
+consvar_t cv_numlaps = OnlineCheat("numlaps", "Map default").values(numlaps_cons_t).onchange(NumLaps_OnChange).description("Race maps always have the same number of laps");
 
 consvar_t cv_restrictskinchange = OnlineCheat("restrictskinchange", "Yes").yes_no().description("Don't let players change their skin in the middle of gameplay");
 consvar_t cv_spbtest = OnlineCheat("spbtest", "Off").on_off().description("SPB can never target a player");

src/k_battle.c

@@ -40,7 +40,23 @@ UINT8 numtargets = 0; // Capsules busted
 INT32 K_StartingBumperCount(void)
 {
 	if (battleprisons)
-		return 0; // always 1 hit in Prison Break
+	{
+		if (grandprixinfo.gp)
+		{
+			switch (grandprixinfo.gamespeed)
+			{
+				case KARTSPEED_HARD:
+					return (grandprixinfo.masterbots == true) ? 0 : 1;
+				case KARTSPEED_NORMAL:
+					return 2;
+				case KARTSPEED_EASY:
+					return 3;
+			}
+
+		}
+
+		return 2; // Normal
+	}
 
 	return cv_kartbumpers.value;
 }

src/k_kart.c

@@ -12445,6 +12445,13 @@ tic_t K_TimeLimitForGametype(void)
 	{
 		if (battleprisons)
 		{
+			if (grandprixinfo.gp)
+			{
+				if (grandprixinfo.masterbots)
+					return 15*TICRATE;
+				else if (grandprixinfo.gamespeed == KARTSPEED_EASY)
+					return 30*TICRATE;
+			}
 			return 20*TICRATE;
 		}
 

src/p_inter.c

@@ -1082,7 +1082,17 @@ static void P_AddBrokenPrison(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		S_StartSound(NULL, sfx_s221);
 		if (timelimitintics)
 		{
-			extratimeintics += 10*TICRATE;
+			UINT16 bonustime = 10*TICRATE;
+			
+			if (grandprixinfo.gp)
+			{
+				if (grandprixinfo.masterbots)
+					bonustime = 8*TICRATE;
+				else if (grandprixinfo.gamespeed == KARTSPEED_EASY)
+					bonustime = 15*TICRATE;
+			}
+
+			extratimeintics += bonustime;
 			secretextratime = TICRATE/2;
 		}