thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-01 20:52:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'poverty' into 'master'

Browse source 
Less free rings (resolves #1517)

Closes #1517

See merge request kart-krew-dev/ring-racers-internal!2546
This commit is contained in:
Oni VelocitOni 2025-05-18 18:13:20 +00:00
commit 7d0f97b8a1
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/k_kart.c
View file

@ -9463,7 +9463,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
// UINT16 oldringboost = player->ringboost;
if (player->superring == 0)
if (player->superring == 0 || player->stunned)
player->ringboost -= max((player->ringboost / roller), 1);
else
player->ringboost -= min(K_GetFullKartRingPower(player, false) - 1, max(player->ringboost / 2 / roller, 1));
@ -9750,6 +9750,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
UINT8 ringrate = 3 - min(2, (player->superring + existing) / fastringscaler); // Used to consume fat stacks of cash faster.
if (player->stunned)
ringrate = 6;
if (player->nextringaward >= ringrate)
{
if (player->instaWhipCharge)

2
src/k_roulette.c
View file

@ -927,7 +927,7 @@ static void K_AddItemToReel(const player_t *player, itemroulette_t *const roulet
// If we're in ring debt, pad out the reel with
// a BUNCH of Super Rings.
if (K_ItemEnabled(KITEM_SUPERRING) == true
&& player->rings <= 0
&& player->rings <= -10
&& player->position == 1
&& (gametyperules & GTR_SPHERES) == 0)
{

1
src/p_mobj.c
View file

@ -12740,6 +12740,7 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
switch (i)
{
case MT_RING:
case MT_RANDOMITEM:
if (modeattacking & ATTACKING_SPB)
return false;
break;