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

Merge branch 'rings' of https://git.magicalgirl.moe/KartKrew/Kart into rings

Browse source
This commit is contained in:
TehRealSalt 2019-03-10 06:15:30 -04:00
commit f0cf1bb39b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_kart.c
View file

@ -507,7 +507,6 @@ UINT8 K_GetKartColorByName(const char *name)
void K_RegisterKartStuff(void) void K_RegisterKartStuff(void)
{ {
CV_RegisterVar(&cv_superring);
CV_RegisterVar(&cv_sneaker); CV_RegisterVar(&cv_sneaker);
CV_RegisterVar(&cv_rocketsneaker); CV_RegisterVar(&cv_rocketsneaker);
CV_RegisterVar(&cv_invincibility); CV_RegisterVar(&cv_invincibility);
@ -523,6 +522,7 @@ void K_RegisterKartStuff(void)
CV_RegisterVar(&cv_thundershield); CV_RegisterVar(&cv_thundershield);
CV_RegisterVar(&cv_hyudoro); CV_RegisterVar(&cv_hyudoro);
CV_RegisterVar(&cv_pogospring); CV_RegisterVar(&cv_pogospring);
CV_RegisterVar(&cv_superring);
CV_RegisterVar(&cv_kitchensink); CV_RegisterVar(&cv_kitchensink);
CV_RegisterVar(&cv_triplesneaker); CV_RegisterVar(&cv_triplesneaker);
@ -608,7 +608,6 @@ boolean K_IsPlayerWanted(player_t *player)
static INT32 K_KartItemOddsRace[NUMKARTRESULTS][8] = 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 /*Sneaker*/ { 0, 0, 4, 6, 7, 0, 0, 0 }, // Sneaker
/*Rocket Sneaker*/ { 0, 0, 0, 0, 1, 4, 5, 3 }, // Rocket Sneaker /*Rocket Sneaker*/ { 0, 0, 0, 0, 1, 4, 5, 3 }, // Rocket Sneaker
/*Invincibility*/ { 0, 0, 0, 0, 1, 4, 6,10 }, // Invincibility /*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 /*Thunder Shield*/ { 1, 2, 0, 0, 0, 0, 0, 0 }, // Thunder Shield
/*Hyudoro*/ { 0, 0, 0, 1, 2, 1, 0, 0 }, // Hyudoro /*Hyudoro*/ { 0, 0, 0, 1, 2, 1, 0, 0 }, // Hyudoro
/*Pogo Spring*/ { 0, 0, 0, 0, 0, 0, 0, 0 }, // Pogo Spring /*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 /*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0, 0, 0 }, // Kitchen Sink
/*Sneaker x3*/ { 0, 0, 0, 3, 7, 9, 2, 0 }, // Sneaker x3 /*Sneaker x3*/ { 0, 0, 0, 3, 7, 9, 2, 0 }, // Sneaker x3
/*Banana x3*/ { 0, 1, 1, 0, 0, 0, 0, 0 }, // Banana 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] = static INT32 K_KartItemOddsBattle[NUMKARTRESULTS][6] =
{ {
//P-Odds 0 1 2 3 4 5 //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 /*Sneaker*/ { 3, 2, 2, 2, 0, 2 }, // Sneaker
/*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 0 }, // Rocket Sneaker /*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 0 }, // Rocket Sneaker
/*Invincibility*/ { 0, 1, 2, 3, 4, 2 }, // Invincibility /*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 /*Thunder Shield*/ { 0, 0, 0, 0, 0, 0 }, // Thunder Shield
/*Hyudoro*/ { 1, 1, 0, 0, 0, 0 }, // Hyudoro /*Hyudoro*/ { 1, 1, 0, 0, 0, 0 }, // Hyudoro
/*Pogo Spring*/ { 1, 1, 0, 0, 0, 0 }, // Pogo Spring /*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 /*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0 }, // Kitchen Sink
/*Sneaker x3*/ { 0, 0, 0, 2, 4, 2 }, // Sneaker x3 /*Sneaker x3*/ { 0, 0, 0, 2, 4, 2 }, // Sneaker x3
/*Banana x3*/ { 1, 2, 1, 0, 0, 0 }, // Banana x3 /*Banana x3*/ { 1, 2, 1, 0, 0, 0 }, // Banana x3
@ -734,7 +734,6 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp
SINT8 first = -1, second = -1; SINT8 first = -1, second = -1;
INT32 secondist = 0; INT32 secondist = 0;
boolean itemenabled[NUMKARTRESULTS-1] = { boolean itemenabled[NUMKARTRESULTS-1] = {
cv_superring.value,
cv_sneaker.value, cv_sneaker.value,
cv_rocketsneaker.value, cv_rocketsneaker.value,
cv_invincibility.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_thundershield.value,
cv_hyudoro.value, cv_hyudoro.value,
cv_pogospring.value, cv_pogospring.value,
cv_superring.value,
cv_kitchensink.value, cv_kitchensink.value,
cv_triplesneaker.value, cv_triplesneaker.value,
cv_triplebanana.value, cv_triplebanana.value,
@ -8972,7 +8972,6 @@ static void K_drawDistributionDebugger(void)
{ {
patch_t *items[NUMKARTRESULTS] = { patch_t *items[NUMKARTRESULTS] = {
kp_sadface[1], kp_sadface[1],
kp_superring[1],
kp_sneaker[1], kp_sneaker[1],
kp_rocketsneaker[1], kp_rocketsneaker[1],
kp_invincibility[7], kp_invincibility[7],
@ -8988,6 +8987,7 @@ static void K_drawDistributionDebugger(void)
kp_thundershield[1], kp_thundershield[1],
kp_hyudoro[1], kp_hyudoro[1],
kp_pogospring[1], kp_pogospring[1],
kp_superring[1],
kp_kitchensink[1], kp_kitchensink[1],
kp_sneaker[1], kp_sneaker[1],