From 60d2b6e37d5ceed45478d47e9cd399c5a6dcbe46 Mon Sep 17 00:00:00 2001 From: Sryder Date: Sat, 9 Mar 2019 23:54:40 +0000 Subject: [PATCH 1/2] Item roulette code proves once again to be one of the most fragile pieces of code I've seen I assume we just need to move these other places to match the super ring ID moving. --- src/k_kart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 644ca20cd..3c3b5d976 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -507,7 +507,6 @@ UINT8 K_GetKartColorByName(const char *name) void K_RegisterKartStuff(void) { - CV_RegisterVar(&cv_superring); CV_RegisterVar(&cv_sneaker); CV_RegisterVar(&cv_rocketsneaker); CV_RegisterVar(&cv_invincibility); @@ -523,6 +522,7 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_thundershield); CV_RegisterVar(&cv_hyudoro); CV_RegisterVar(&cv_pogospring); + CV_RegisterVar(&cv_superring); CV_RegisterVar(&cv_kitchensink); CV_RegisterVar(&cv_triplesneaker); @@ -607,7 +607,7 @@ boolean K_IsPlayerWanted(player_t *player) // Less ugly 2D arrays static INT32 K_KartItemOddsRace[NUMKARTRESULTS][8] = { - //P-Odds 0 1 2 3 4 5 6 7 + //P-Odds 0 1 2 3 4 5 6 7 /*Super Ring*/ { 2, 1, 1, 0, 0, 0, 0, 0 }, // Super Ring /*Sneaker*/ { 0, 0, 4, 6, 7, 0, 0, 0 }, // Sneaker /*Rocket Sneaker*/ { 0, 0, 0, 0, 1, 4, 5, 3 }, // Rocket Sneaker @@ -734,7 +734,6 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp SINT8 first = -1, second = -1; INT32 secondist = 0; boolean itemenabled[NUMKARTRESULTS-1] = { - cv_superring.value, cv_sneaker.value, cv_rocketsneaker.value, cv_invincibility.value, @@ -750,6 +749,7 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp cv_thundershield.value, cv_hyudoro.value, cv_pogospring.value, + cv_superring.value, cv_kitchensink.value, cv_triplesneaker.value, cv_triplebanana.value, @@ -8930,7 +8930,6 @@ static void K_drawDistributionDebugger(void) { patch_t *items[NUMKARTRESULTS] = { kp_sadface[1], - kp_superring[1], kp_sneaker[1], kp_rocketsneaker[1], kp_invincibility[7], @@ -8946,6 +8945,7 @@ static void K_drawDistributionDebugger(void) kp_thundershield[1], kp_hyudoro[1], kp_pogospring[1], + kp_superring[1], kp_kitchensink[1], kp_sneaker[1], From 662bee1b4e68200cb4a03c9059f01986ddad4fcd Mon Sep 17 00:00:00 2001 From: Sryder Date: Sun, 10 Mar 2019 00:04:09 +0000 Subject: [PATCH 2/2] Roulette Code: Electric Boogaloo --- src/k_kart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 3c3b5d976..37cc80b82 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -608,7 +608,6 @@ boolean K_IsPlayerWanted(player_t *player) static INT32 K_KartItemOddsRace[NUMKARTRESULTS][8] = { //P-Odds 0 1 2 3 4 5 6 7 - /*Super Ring*/ { 2, 1, 1, 0, 0, 0, 0, 0 }, // Super Ring /*Sneaker*/ { 0, 0, 4, 6, 7, 0, 0, 0 }, // Sneaker /*Rocket Sneaker*/ { 0, 0, 0, 0, 1, 4, 5, 3 }, // Rocket Sneaker /*Invincibility*/ { 0, 0, 0, 0, 1, 4, 6,10 }, // Invincibility @@ -624,6 +623,7 @@ static INT32 K_KartItemOddsRace[NUMKARTRESULTS][8] = /*Thunder Shield*/ { 1, 2, 0, 0, 0, 0, 0, 0 }, // Thunder Shield /*Hyudoro*/ { 0, 0, 0, 1, 2, 1, 0, 0 }, // Hyudoro /*Pogo Spring*/ { 0, 0, 0, 0, 0, 0, 0, 0 }, // Pogo Spring + /*Super Ring*/ { 2, 1, 1, 0, 0, 0, 0, 0 }, // Super Ring /*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0, 0, 0 }, // Kitchen Sink /*Sneaker x3*/ { 0, 0, 0, 3, 7, 9, 2, 0 }, // Sneaker x3 /*Banana x3*/ { 0, 1, 1, 0, 0, 0, 0, 0 }, // Banana x3 @@ -636,7 +636,6 @@ static INT32 K_KartItemOddsRace[NUMKARTRESULTS][8] = static INT32 K_KartItemOddsBattle[NUMKARTRESULTS][6] = { //P-Odds 0 1 2 3 4 5 - /*Super Ring*/ { 0, 0, 0, 0, 0, 0 }, // Super Ring /*Sneaker*/ { 3, 2, 2, 2, 0, 2 }, // Sneaker /*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 0 }, // Rocket Sneaker /*Invincibility*/ { 0, 1, 2, 3, 4, 2 }, // Invincibility @@ -652,6 +651,7 @@ static INT32 K_KartItemOddsBattle[NUMKARTRESULTS][6] = /*Thunder Shield*/ { 0, 0, 0, 0, 0, 0 }, // Thunder Shield /*Hyudoro*/ { 1, 1, 0, 0, 0, 0 }, // Hyudoro /*Pogo Spring*/ { 1, 1, 0, 0, 0, 0 }, // Pogo Spring + /*Super Ring*/ { 0, 0, 0, 0, 0, 0 }, // Super Ring /*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0 }, // Kitchen Sink /*Sneaker x3*/ { 0, 0, 0, 2, 4, 2 }, // Sneaker x3 /*Banana x3*/ { 1, 2, 1, 0, 0, 0 }, // Banana x3