thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set bumpers to 1 in Break the Capsules

Browse source
This commit is contained in:
Sally Cochenour 2020-03-22 14:55:47 -04:00
parent b1ec5654bc
commit 601ab839f0
5 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -2633,7 +2633,7 @@ void G_PlayerReborn(INT32 player)
itemtype = 0; itemtype = 0;
itemamount = 0; itemamount = 0;
growshrinktimer = 0; growshrinktimer = 0;
bumper = (G_BattleGametype() ? cv_kartbumpers.value : 0); bumper = (G_BattleGametype() ? K_StartingBumperCount() : 0);
rings = (G_BattleGametype() ? 0 : 5); rings = (G_BattleGametype() ? 0 : 5);
comebackpoints = 0; comebackpoints = 0;
wanted = 0; wanted = 0;

8
src/k_battle.c
View file

@ -27,6 +27,14 @@ boolean battlecapsules = false;
UINT8 maptargets = 0; // Capsules in map UINT8 maptargets = 0; // Capsules in map
UINT8 numtargets = 0; // Capsules busted UINT8 numtargets = 0; // Capsules busted
INT32 K_StartingBumperCount(void)
{
if (modeattacking)
return 1; // Break the Capsules
return cv_kartbumpers.value;
}
boolean K_IsPlayerWanted(player_t *player) boolean K_IsPlayerWanted(player_t *player)
{ {
UINT8 i; UINT8 i;

1
src/k_battle.h
View file

@ -14,6 +14,7 @@ extern struct battleovertime
extern boolean battlecapsules; extern boolean battlecapsules;
extern UINT8 maptargets, numtargets; extern UINT8 maptargets, numtargets;
INT32 K_StartingBumperCount(void);
boolean K_IsPlayerWanted(player_t *player); boolean K_IsPlayerWanted(player_t *player);
void K_CalculateBattleWanted(void); void K_CalculateBattleWanted(void);
void K_SpawnBattlePoints(player_t *source, player_t *victim, UINT8 amount); void K_SpawnBattlePoints(player_t *source, player_t *victim, UINT8 amount);

18
src/k_kart.c
View file

@ -3036,7 +3036,7 @@ void K_StealBumper(player_t *player, player_t *victim, boolean force)
if (!force) if (!force)
{ {
if (victim->kartstuff[k_bumper] <= 0) // || player->kartstuff[k_bumper] >= cv_kartbumpers.value+2 if (victim->kartstuff[k_bumper] <= 0) // || player->kartstuff[k_bumper] >= K_StartingBumperCount()+2
return; return;
if (player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_spinouttimer] > 0) if (player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_spinouttimer] > 0)
@ -9520,9 +9520,10 @@ static void K_drawKartBumpersOrKarma(void)
} }
else else
{ {
INT32 maxbumper = K_StartingBumperCount();
V_DrawMappedPatch(fx+1, fy-2, V_HUDTRANS|splitflags, kp_rankbumper, colormap); V_DrawMappedPatch(fx+1, fy-2, V_HUDTRANS|splitflags, kp_rankbumper, colormap);
if (stplyr->kartstuff[k_bumper] > 9 || cv_kartbumpers.value > 9) if (stplyr->kartstuff[k_bumper] > 9 || maxbumper > 9)
{ {
UINT8 ln[2]; UINT8 ln[2];
ln[0] = ((abs(stplyr->kartstuff[k_bumper]) / 10) % 10); ln[0] = ((abs(stplyr->kartstuff[k_bumper]) / 10) % 10);
@ -9531,8 +9532,8 @@ static void K_drawKartBumpersOrKarma(void)
V_DrawScaledPatch(fx+13, fy, V_HUDTRANS|splitflags, pingnum[ln[0]]); V_DrawScaledPatch(fx+13, fy, V_HUDTRANS|splitflags, pingnum[ln[0]]);
V_DrawScaledPatch(fx+17, fy, V_HUDTRANS|splitflags, pingnum[ln[1]]); V_DrawScaledPatch(fx+17, fy, V_HUDTRANS|splitflags, pingnum[ln[1]]);
ln[0] = ((abs(cv_kartbumpers.value) / 10) % 10); ln[0] = ((abs(maxbumper) / 10) % 10);
ln[1] = (abs(cv_kartbumpers.value) % 10); ln[1] = (abs(maxbumper) % 10);
V_DrawScaledPatch(fx+27, fy, V_HUDTRANS|splitflags, pingnum[ln[0]]); V_DrawScaledPatch(fx+27, fy, V_HUDTRANS|splitflags, pingnum[ln[0]]);
V_DrawScaledPatch(fx+31, fy, V_HUDTRANS|splitflags, pingnum[ln[1]]); V_DrawScaledPatch(fx+31, fy, V_HUDTRANS|splitflags, pingnum[ln[1]]);
@ -9540,7 +9541,7 @@ static void K_drawKartBumpersOrKarma(void)
else else
{ {
V_DrawScaledPatch(fx+13, fy, V_HUDTRANS|splitflags, kp_facenum[(stplyr->kartstuff[k_bumper]) % 10]); V_DrawScaledPatch(fx+13, fy, V_HUDTRANS|splitflags, kp_facenum[(stplyr->kartstuff[k_bumper]) % 10]);
V_DrawScaledPatch(fx+27, fy, V_HUDTRANS|splitflags, kp_facenum[(cv_kartbumpers.value) % 10]); V_DrawScaledPatch(fx+27, fy, V_HUDTRANS|splitflags, kp_facenum[(maxbumper) % 10]);
} }
} }
} }
@ -9564,11 +9565,14 @@ static void K_drawKartBumpersOrKarma(void)
} }
else else
{ {
if (stplyr->kartstuff[k_bumper] > 9 && cv_kartbumpers.value > 9) INT32 maxbumper = K_StartingBumperCount();
if (stplyr->kartstuff[k_bumper] > 9 && maxbumper > 9)
V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumperstickerwide, colormap); V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumperstickerwide, colormap);
else else
V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumpersticker, colormap); V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumpersticker, colormap);
V_DrawKartString(LAPS_X+47, LAPS_Y+3, V_HUDTRANS|splitflags, va("%d/%d", stplyr->kartstuff[k_bumper], cv_kartbumpers.value));
V_DrawKartString(LAPS_X+47, LAPS_Y+3, V_HUDTRANS|splitflags, va("%d/%d", stplyr->kartstuff[k_bumper], maxbumper));
} }
} }
} }

2
src/p_mobj.c
View file

@ -11323,7 +11323,7 @@ void P_SpawnPlayer(INT32 playernum)
|| (p->jointime <= 1 && pcount <= 1)) || (p->jointime <= 1 && pcount <= 1))
{ {
if (leveltime < 1 || (p->jointime <= 1 && pcount <= 1)) // Start of the map? if (leveltime < 1 || (p->jointime <= 1 && pcount <= 1)) // Start of the map?
p->kartstuff[k_bumper] = cv_kartbumpers.value; // Reset those bumpers! p->kartstuff[k_bumper] = K_StartingBumperCount(); // Reset those bumpers!
if (p->kartstuff[k_bumper]) if (p->kartstuff[k_bumper])
{ {