diff --git a/src/k_pwrlv.c b/src/k_pwrlv.c index 75acf4d65..c7959365e 100644 --- a/src/k_pwrlv.c +++ b/src/k_pwrlv.c @@ -560,7 +560,7 @@ void K_SetPowerLevelScrambles(SINT8 powertype) case PWRLV_RACE: if (cv_kartspeed.value == -1 || cv_kartencore.value == -1) { - UINT8 speed = KARTSPEED_NORMAL; + UINT8 speed = KARTSPEED_EASY; boolean encore = false; INT16 avg = 0, min = 0; UINT8 i, t = 1; @@ -601,10 +601,10 @@ void K_SetPowerLevelScrambles(SINT8 powertype) else if (avg >= 4000) // Getting into it, likely experienced but just building power t = 2; - else if (avg < 2000 || (avg <= 2500 && min < 600)) // Baby Room, mandatory first impressions; or if mostly new & 1 guy is really coping + else if (avg < 3300 || (avg <= 4000 && min < 2000)) // Casual group, mandatory first impressions; or if mostly new & 1 guy is really coping t = 0; - else if (avg >= 2000) // Transition point + else if (avg >= 3300) // Transition point t = 1; @@ -617,23 +617,23 @@ void K_SetPowerLevelScrambles(SINT8 powertype) encore = true; break; case 5: - speed = KARTSPEED_HARD; - encore = P_RandomChance(PR_RULESCRAMBLE, FRACUNIT>>1); - break; - case 4: speed = P_RandomChance(PR_RULESCRAMBLE, (7<>1); break; - case 3: + case 4: speed = P_RandomChance(PR_RULESCRAMBLE, (3<>2); break; - case 2: + case 3: speed = KARTSPEED_NORMAL; encore = P_RandomChance(PR_RULESCRAMBLE, FRACUNIT>>3); break; + case 2: + speed = P_RandomChance(PR_RULESCRAMBLE, (3<>5); + break; case 1: default: - speed = KARTSPEED_NORMAL; + speed = KARTSPEED_EASY; encore = false; break; case 0: diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 3a67cd3a1..e03af669f 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -7743,7 +7743,7 @@ static void P_InitLevelSettings(void) if (multi_speed) { if (cv_kartspeed.value == KARTSPEED_AUTO) - gamespeed = ((speedscramble == -1) ? KARTSPEED_NORMAL : (UINT8)speedscramble); + gamespeed = ((speedscramble == -1) ? KARTSPEED_EASY : (UINT8)speedscramble); else gamespeed = (UINT8)cv_kartspeed.value; }