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

Merge branch 'spb-attack-thunderdome' into 'master'

Browse source 
Use only Ring Box in SPB Attack

See merge request KartKrew/Kart!1321
This commit is contained in:
Oni 2023-07-02 02:03:53 +00:00
commit 161dde2a98
2 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

@ -10869,7 +10869,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->ringboxdelay--; player->ringboxdelay--;
if (player->ringboxdelay == 0) if (player->ringboxdelay == 0)
{ {
// TODO
UINT32 behind = K_GetItemRouletteDistance(player, player->itemRoulette.playing); UINT32 behind = K_GetItemRouletteDistance(player, player->itemRoulette.playing);
UINT32 behindMulti = behind / 1000; UINT32 behindMulti = behind / 1000;
behindMulti = min(behindMulti, 20); behindMulti = min(behindMulti, 20);
@ -10879,6 +10878,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
award = 3 * award / 2; award = 3 * award / 2;
award = award * (behindMulti + 10) / 10; award = award * (behindMulti + 10) / 10;
// SPB Attack is hard, but we're okay with that.
if (modeattacking & ATTACKING_SPB)
award = award / 2;
K_AwardPlayerRings(player, award, true); K_AwardPlayerRings(player, award, true);
player->ringboxaward = 0; player->ringboxaward = 0;
} }

3
src/objects/random-item.c
View file

@ -114,7 +114,8 @@ void Obj_RandomItemVisuals(mobj_t *mobj)
// the player's cleared out a good portion of the map. // the player's cleared out a good portion of the map.
// //
// Then extraval1 starts ticking up and triggers the transformation from Ringbox to Random Item. // Then extraval1 starts ticking up and triggers the transformation from Ringbox to Random Item.
if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING) && !cv_thunderdome.value) if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING)
&& !cv_thunderdome.value && !(modeattacking & ATTACKING_SPB))
{ {
mobj->extravalue1++; mobj->extravalue1++;
if (mobj->extravalue1 == RINGBOX_TIME) if (mobj->extravalue1 == RINGBOX_TIME)