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

Lightning cooldown change

Browse source 
- Lightning cooldown reduced to 20 seconds
- You can no longer mash to get an item quicker
This commit is contained in:
TehRealSalt 2018-06-05 21:45:54 -04:00
parent 09fa365bb1
commit 441f0f8abf
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_kart.c
View file

@ -476,7 +476,7 @@ static void K_KartGetItemResult(player_t *player, fixed_t getitem, boolean retro
player->kartstuff[k_blueshell] = 1; player->kartstuff[k_blueshell] = 1;
else else
player->kartstuff[k_bobomb] |= 2; player->kartstuff[k_bobomb] |= 2;
lightningcooldown = 30*TICRATE; lightningcooldown = 20*TICRATE;
break; break;
case 16: // Fire Flower - or - Deton (Blue Shell) case 16: // Fire Flower - or - Deton (Blue Shell)
if (retrokart) if (retrokart)
@ -492,7 +492,7 @@ static void K_KartGetItemResult(player_t *player, fixed_t getitem, boolean retro
break; break;
case 18: // Lightning case 18: // Lightning
player->kartstuff[k_lightning] = 1; player->kartstuff[k_lightning] = 1;
lightningcooldown = 30*TICRATE; lightningcooldown = 20*TICRATE;
break; break;
case 19: // Feather case 19: // Feather
player->kartstuff[k_feather] |= 1; player->kartstuff[k_feather] |= 1;
@ -535,7 +535,7 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
{ {
INT32 i; INT32 i;
INT32 pingame = 0, pexiting = 0; INT32 pingame = 0, pexiting = 0;
INT32 roulettestop; //INT32 roulettestop;
INT32 prandom; INT32 prandom;
INT32 pdis = 0, useodds = 0; INT32 pdis = 0, useodds = 0;
INT32 spawnchance[NUMKARTITEMS * NUMKARTODDS]; INT32 spawnchance[NUMKARTITEMS * NUMKARTODDS];
@ -554,13 +554,12 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player)) if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player))
S_StartSound(NULL,sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8)); S_StartSound(NULL,sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8));
roulettestop = (TICRATE*1) + (3*(pingame - player->kartstuff[k_position])); //roulettestop = (TICRATE*1) + (3*(pingame - player->kartstuff[k_position]));
// If the roulette finishes or the player presses BT_ATTACK, stop the roulette and calculate the item. // If the roulette finishes or the player presses BT_ATTACK, stop the roulette and calculate the item.
// I'm returning via the exact opposite, however, to forgo having another bracket embed. Same result either way, I think. // I'm returning via the exact opposite, however, to forgo having another bracket embed. Same result either way, I think.
// Finally, if you get past this check, now you can actually start calculating what item you get. // Finally, if you get past this check, now you can actually start calculating what item you get.
if (!(player->kartstuff[k_itemroulette] >= (TICRATE*3) if (!(player->kartstuff[k_itemroulette] >= (TICRATE*3))) //|| ((cmd->buttons & BT_ATTACK) && player->kartstuff[k_itemroulette] >= roulettestop)))
|| ((cmd->buttons & BT_ATTACK) && player->kartstuff[k_itemroulette] >= roulettestop)))
return; return;
if (cmd->buttons & BT_ATTACK) if (cmd->buttons & BT_ATTACK)