stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'battle-item-balance' into 'next'

Browse source 
Battle item balance

See merge request KartKrew/Kart-Public!222
This commit is contained in:
Sal 2020-09-11 12:21:06 -04:00
commit b9310c0563
1 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/k_kart.c
View file

@ -666,31 +666,31 @@ static INT32 K_KartItemOddsRace[NUMKARTRESULTS][10] =
/*Jawz x2*/ { 0, 0, 0, 1, 2, 0, 0, 0, 0, 0 } // Jawz x2 /*Jawz x2*/ { 0, 0, 0, 1, 2, 0, 0, 0, 0, 0 } // Jawz x2
}; };
static INT32 K_KartItemOddsBattle[NUMKARTRESULTS][6] = static INT32 K_KartItemOddsBattle[NUMKARTRESULTS][2] =
{ {
//P-Odds 0 1 2 3 4 5 //P-Odds 0 1
/*Sneaker*/ { 3, 2, 2, 2, 0, 2 }, // Sneaker /*Sneaker*/ { 2, 1 }, // Sneaker
/*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 0 }, // Rocket Sneaker /*Rocket Sneaker*/ { 0, 0 }, // Rocket Sneaker
/*Invincibility*/ { 0, 1, 2, 3, 4, 2 }, // Invincibility /*Invincibility*/ { 2, 1 }, // Invincibility
/*Banana*/ { 2, 1, 0, 0, 0, 0 }, // Banana /*Banana*/ { 1, 0 }, // Banana
/*Eggman Monitor*/ { 1, 1, 0, 0, 0, 0 }, // Eggman Monitor /*Eggman Monitor*/ { 1, 0 }, // Eggman Monitor
/*Orbinaut*/ { 6, 2, 1, 0, 0, 0 }, // Orbinaut /*Orbinaut*/ { 8, 0 }, // Orbinaut
/*Jawz*/ { 3, 3, 3, 2, 0, 2 }, // Jawz /*Jawz*/ { 8, 1 }, // Jawz
/*Mine*/ { 2, 3, 3, 1, 0, 2 }, // Mine /*Mine*/ { 4, 1 }, // Mine
/*Ballhog*/ { 0, 1, 2, 1, 0, 2 }, // Ballhog /*Ballhog*/ { 2, 1 }, // Ballhog
/*Self-Propelled Bomb*/ { 0, 0, 0, 0, 0, 0 }, // Self-Propelled Bomb /*Self-Propelled Bomb*/ { 0, 0 }, // Self-Propelled Bomb
/*Grow*/ { 0, 0, 1, 2, 4, 2 }, // Grow /*Grow*/ { 2, 1 }, // Grow
/*Shrink*/ { 0, 0, 0, 0, 0, 0 }, // Shrink /*Shrink*/ { 0, 0 }, // Shrink
/*Thunder Shield*/ { 0, 0, 0, 0, 0, 0 }, // Thunder Shield /*Thunder Shield*/ { 0, 0 }, // Thunder Shield
/*Hyudoro*/ { 1, 1, 0, 0, 0, 0 }, // Hyudoro /*Hyudoro*/ { 2, 0 }, // Hyudoro
/*Pogo Spring*/ { 1, 1, 0, 0, 0, 0 }, // Pogo Spring /*Pogo Spring*/ { 2, 0 }, // Pogo Spring
/*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0 }, // Kitchen Sink /*Kitchen Sink*/ { 0, 0 }, // Kitchen Sink
/*Sneaker x3*/ { 0, 0, 0, 2, 4, 2 }, // Sneaker x3 /*Sneaker x3*/ { 0, 1 }, // Sneaker x3
/*Banana x3*/ { 1, 2, 1, 0, 0, 0 }, // Banana x3 /*Banana x3*/ { 1, 0 }, // Banana x3
/*Banana x10*/ { 0, 0, 1, 1, 0, 2 }, // Banana x10 /*Banana x10*/ { 0, 1 }, // Banana x10
/*Orbinaut x3*/ { 0, 1, 2, 1, 0, 0 }, // Orbinaut x3 /*Orbinaut x3*/ { 2, 0 }, // Orbinaut x3
/*Orbinaut x4*/ { 0, 0, 1, 3, 4, 2 }, // Orbinaut x4 /*Orbinaut x4*/ { 1, 1 }, // Orbinaut x4
/*Jawz x2*/ { 0, 0, 1, 2, 4, 2 } // Jawz x2 /*Jawz x2*/ { 2, 1 } // Jawz x2
}; };
/** \brief Item Roulette for Kart /** \brief Item Roulette for Kart
@ -923,12 +923,15 @@ static INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT3
UINT8 distlen = 0; UINT8 distlen = 0;
boolean oddsvalid[10]; boolean oddsvalid[10];
// Unused now, oops :V
(void)bestbumper;
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
INT32 j; INT32 j;
boolean available = false; boolean available = false;
if (G_BattleGametype() && i > 5) if (G_BattleGametype() && i > 1)
{ {
oddsvalid[i] = false; oddsvalid[i] = false;
break; break;
@ -962,24 +965,20 @@ static INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT3
if (G_BattleGametype()) // Battle Mode if (G_BattleGametype()) // Battle Mode
{ {
if (oddsvalid[0]) SETUPDISTTABLE(0,1); if (player->kartstuff[k_roulettetype] == 1 && oddsvalid[1] == true)
if (oddsvalid[1]) SETUPDISTTABLE(1,1); {
if (oddsvalid[2]) SETUPDISTTABLE(2,1); // 1 is the extreme odds of player-controlled "Karma" items
if (oddsvalid[3]) SETUPDISTTABLE(3,1); useodds = 1;
if (oddsvalid[4]) SETUPDISTTABLE(4,1); }
if (player->kartstuff[k_roulettetype] == 1 && oddsvalid[5]) // 5 is the extreme odds of player-controlled "Karma" items
useodds = 5;
else else
{ {
SINT8 wantedpos = (bestbumper-player->kartstuff[k_bumper]); // 0 is the best player's bumper count, 1 is a bumper below best, 2 is two bumpers below, etc useodds = 0;
if (K_IsPlayerWanted(player))
wantedpos++; if (oddsvalid[0] == false && oddsvalid[1] == true)
if (wantedpos > 4) // Don't run off into karma items {
wantedpos = 4; // try to use karma odds as a fallback
if (wantedpos < 0) // Don't go below somehow useodds = 1;
wantedpos = 0; }
useodds = disttable[(wantedpos * distlen) / 5];
} }
} }
else else