From 5cdedd53bafaf12f062c5b93c703d6610e41967f Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 22 Oct 2023 17:16:04 -0700 Subject: [PATCH] Prisons: respond to game difficulty --- src/k_battle.c | 14 +++++++++++++- src/k_kart.c | 2 +- src/p_inter.c | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/k_battle.c b/src/k_battle.c index 8b8918d3d..f4ed87c7a 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -40,7 +40,19 @@ UINT8 numtargets = 0; // Capsules busted INT32 K_StartingBumperCount(void) { if (battleprisons) - return 0; // always 1 hit in Prison Break + { + if (grandprixinfo.gp == true && grandprixinfo.masterbots == true) + return 0; + switch (gamespeed) + { + case KARTSPEED_HARD: + return 1; + case KARTSPEED_NORMAL: + return 2; + case KARTSPEED_EASY: + return 3; + } + } return cv_kartbumpers.value; } diff --git a/src/k_kart.c b/src/k_kart.c index 182e0a7cb..490faec6f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -12445,7 +12445,7 @@ tic_t K_TimeLimitForGametype(void) { if (battleprisons) { - return 20*TICRATE; + return (gamespeed == KARTSPEED_EASY) ? 30*TICRATE : 20*TICRATE; } return gametypeDefault; diff --git a/src/p_inter.c b/src/p_inter.c index 740ecc28f..689ffdc2d 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1082,7 +1082,7 @@ static void P_AddBrokenPrison(mobj_t *target, mobj_t *inflictor, mobj_t *source) S_StartSound(NULL, sfx_s221); if (timelimitintics) { - extratimeintics += 10*TICRATE; + extratimeintics += (gamespeed == KARTSPEED_EASY) ? 15*TICRATE : 10*TICRATE; secretextratime = TICRATE/2; }