mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-01-02 13:12:50 +00:00
Less free rings (resolves #1517)
This commit is contained in:
parent
6b7c112dca
commit
38a92467ee
3 changed files with 6 additions and 2 deletions
|
|
@ -9436,7 +9436,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));
|
||||
|
|
@ -9723,6 +9723,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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12727,6 +12727,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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue