From 2d7ef00e29f48faa214ca9efae83434a9b04bc94 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 14 Mar 2023 20:59:51 +0000 Subject: [PATCH] Discoveries while self-reviewing during description creation - Rename "FinishAllPrisons" and correct text to refer to Prisons - Do not hint at greater speeds for UCRP_ISDIFFICULTY --- src/deh_soc.c | 2 +- src/m_cond.c | 16 ++++++---------- src/m_cond.h | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/deh_soc.c b/src/deh_soc.c index 764d08628..13c5b2703 100644 --- a/src/deh_soc.c +++ b/src/deh_soc.c @@ -2694,7 +2694,7 @@ static void readcondition(UINT8 set, UINT32 id, char *word2) ty = UCRP_PODIUMEMERALD + offset; } else if ((offset=0) || fastcmp(params[0], "FINISHCOOL") - || (++offset && fastcmp(params[0], "FINISHALLCAPSULES")) + || (++offset && fastcmp(params[0], "FINISHALLPRISONS")) || (++offset && fastcmp(params[0], "NOCONTEST"))) { //PARAMCHECK(1); diff --git a/src/m_cond.c b/src/m_cond.c index 7404bb0ac..1f0f4f2b8 100644 --- a/src/m_cond.c +++ b/src/m_cond.c @@ -832,7 +832,7 @@ boolean M_CheckCondition(condition_t *cn, player_t *player) && !(player->pflags & PF_NOCONTEST) && M_NotFreePlay(player) && !K_IsPlayerLosing(player)); - case UCRP_FINISHALLCAPSULES: + case UCRP_FINISHALLPRISONS: return (battleprisons && !(player->pflags & PF_NOCONTEST) //&& M_NotFreePlay(player) @@ -1276,19 +1276,15 @@ static const char *M_GetConditionString(condition_t *cn) return va("with engine class %c", 'A' + cn->requirement); case UCRP_ISDIFFICULTY: { - const char *speedtext = "", *orbetter = ""; + const char *speedtext = ""; if (cn->requirement == KARTSPEED_NORMAL) { - speedtext = "on Normal difficulty"; - //if (M_SecretUnlocked(SECRET_HARDSPEED, true)) - orbetter = " or better"; + speedtext = "on Normal difficulty or better"; } else if (cn->requirement == KARTSPEED_HARD) { speedtext = "on Hard difficulty"; - if (M_SecretUnlocked(SECRET_MASTERMODE, true)) - orbetter = " or better"; } else if (cn->requirement == KARTGP_MASTER) { @@ -1298,7 +1294,7 @@ static const char *M_GetConditionString(condition_t *cn) speedtext = "on ???"; } - return va("%s%s", speedtext, orbetter); + return speedtext; } case UCRP_PODIUMCUP: @@ -1356,8 +1352,8 @@ static const char *M_GetConditionString(condition_t *cn) case UCRP_FINISHCOOL: return "finish in good standing"; - case UCRP_FINISHALLCAPSULES: - return "break every capsule"; + case UCRP_FINISHALLPRISONS: + return "break every prison"; case UCRP_NOCONTEST: return "NO CONTEST"; case UCRP_FINISHPLACE: diff --git a/src/m_cond.h b/src/m_cond.h index 9483810b1..354721407 100644 --- a/src/m_cond.h +++ b/src/m_cond.h @@ -81,7 +81,7 @@ typedef enum UCRP_PODIUMPRIZE, // Get to podium sequence with that cup's bonus (alternate string version of UCRP_PODIUMEMERALD UCRP_FINISHCOOL, // Finish in good standing - UCRP_FINISHALLCAPSULES, // Break all capsules + UCRP_FINISHALLPRISONS, // Break all prisons UCRP_NOCONTEST, // No Contest UCRP_FINISHPLACE, // Finish at least [place]