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

Merge branch 'team-tox' into 'master'

Browse source 
Toxomister respects teams, uses team colors

Closes #1631

See merge request kart-krew-dev/ring-racers-internal!2746
This commit is contained in:
Oni VelocitOni 2025-08-22 06:57:17 +00:00
commit ec6f0582eb
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/objects/toxomister.cpp
View file

@ -301,7 +301,7 @@ struct Cloud : Mobj
bob_in_place(this, 8, 64); bob_in_place(this, 8, 64);
voice_loop(sfx_s3kcfl); voice_loop(sfx_s3kcfl);
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--;
@ -358,6 +358,9 @@ struct Cloud : Mobj
if (K_PuntCollide(this, toucher)) if (K_PuntCollide(this, toucher))
return true; return true;
if (toucher->player && target() && !P_MobjWasRemoved(target()) && target()->player && G_SameTeam(toucher->player, target()->player))
return false;
if (toucher->player) if (toucher->player)
{ {
if (this == toucher->player->toxomisterCloud) // already attached if (this == toucher->player->toxomisterCloud) // already attached
@ -412,6 +415,12 @@ void Pole::spawn_clouds_in_orbit()
cloud->scale_between(1, cloud->scale(), cloud->scale() / 5); cloud->scale_between(1, cloud->scale(), cloud->scale() / 5);
cloud->fuse = 15*TICRATE; cloud->fuse = 15*TICRATE;
if (target()->player && target()->player->team)
{
cloud->colorized = true;
cloud->color = target()->color;
}
a += a_incr; a += a_incr;
} }
} }