thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-05 00:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

M_GetConditionString: Since completing a cup at any difficulty now downpopulates, remove all "or better" for GP difficulty related conditions

Browse source 
In addition, disable the "on Normal difficulty", as it's impossible to get Emeralds on Easy
This commit is contained in:
toaster 2023-06-06 15:36:59 +01:00
parent 2ab046fc30
commit 7d57be18c3
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/m_cond.c
View file

@ -1081,7 +1081,7 @@ static const char *M_GetConditionString(condition_t *cn)
case UC_ALLSUPER: case UC_ALLSUPER:
case UC_ALLEMERALDS: case UC_ALLEMERALDS:
{ {
const char *chaostext, *speedtext = "", *orbetter = ""; const char *chaostext, *speedtext = "";
if (!gamedata->everseenspecial) if (!gamedata->everseenspecial)
return NULL; return NULL;
@ -1093,17 +1093,14 @@ static const char *M_GetConditionString(condition_t *cn)
else else
chaostext = "14"; chaostext = "14";
if (cn->requirement == KARTSPEED_NORMAL) /*if (cn->requirement == KARTSPEED_NORMAL) -- Emeralds can not be collected on Easy
{ {
speedtext = " on Normal difficulty"; speedtext = " on Normal difficulty";
//if (M_SecretUnlocked(SECRET_HARDSPEED, true))
orbetter = " or better";
} }
else if (cn->requirement == KARTSPEED_HARD) else*/
if (cn->requirement == KARTSPEED_HARD)
{ {
speedtext = " on Hard difficulty"; speedtext = " on Hard difficulty";
if (M_SecretUnlocked(SECRET_MASTERMODE, true))
orbetter = " or better";
} }
else if (cn->requirement == KARTGP_MASTER) else if (cn->requirement == KARTGP_MASTER)
{ {
@ -1113,7 +1110,7 @@ static const char *M_GetConditionString(condition_t *cn)
speedtext = " on ???"; speedtext = " on ???";
} }
return va("collect all %s Emeralds%s%s", chaostext, speedtext, orbetter); return va("collect all %s Emeralds%s", chaostext, speedtext);
} }
case UC_TOTALMEDALS: // Requires number of emblems >= x case UC_TOTALMEDALS: // Requires number of emblems >= x
@ -1265,7 +1262,7 @@ static const char *M_GetConditionString(condition_t *cn)
if (cn->requirement == KARTSPEED_NORMAL) if (cn->requirement == KARTSPEED_NORMAL)
{ {
speedtext = "on Normal difficulty or better"; speedtext = "on Normal difficulty";
} }
else if (cn->requirement == KARTSPEED_HARD) else if (cn->requirement == KARTSPEED_HARD)
{ {