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

Merge branch 'fast-rc6-balance' into 'master'

Browse source 
Fast rc6 balance

See merge request kart-krew-dev/ring-racers-internal!2926
This commit is contained in:
AJ Martinez 2025-10-10 22:37:37 +00:00
commit 22c145ac28
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/objects/stone-shoe.cpp
View file

@ -115,7 +115,7 @@ struct Shoe : Mobj
shoe->dir(0); shoe->dir(0);
shoe->fuse = 15 * TICRATE; shoe->fuse = 15 * TICRATE;
INT32 numLinks = 8; INT32 numLinks = 5;
Chain* link = nullptr; Chain* link = nullptr;
for (INT32 i = 0; i < numLinks; ++i) for (INT32 i = 0; i < numLinks; ++i)

3
src/objects/toxomister.cpp
View file

@ -311,6 +311,7 @@ struct Cloud : Mobj
if (leveltime % (TICRATE/3) == 0 && follow()->player->rings > -20) // toxomister ring drain if (leveltime % (TICRATE/3) == 0 && follow()->player->rings > -20) // toxomister ring drain
{ {
follow()->player->rings--; follow()->player->rings--;
K_DefensiveOverdrive(follow()->player);
S_StartSound(follow()->player->mo, sfx_antiri); S_StartSound(follow()->player->mo, sfx_antiri);
} }
@ -321,7 +322,7 @@ struct Cloud : Mobj
if (fuse < kMaxFuse && (kMaxFuse - fuse) % 20 == 0 && Mobj::valid(target()) && target()->player && follow()->player) if (fuse < kMaxFuse && (kMaxFuse - fuse) % 20 == 0 && Mobj::valid(target()) && target()->player && follow()->player)
{ {
K_SpawnAmps(target()->player, K_PvPAmpReward(3, target()->player, follow()->player), this); K_SpawnAmps(target()->player, K_PvPAmpReward(2, target()->player, follow()->player), this);
} }
follow()->player->stunned = fuse; // stunned as long as cloud is here follow()->player->stunned = fuse; // stunned as long as cloud is here