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 'no-explosion-thrust' into 'master'

Browse source 
Battle polish mk.420

Closes #1041 and #1050

See merge request KartKrew/Kart!1922
This commit is contained in:
Oni 2024-02-18 01:22:01 +00:00
commit 8649e34ccd
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/objects/battle-ufo.cpp
View file

@ -123,6 +123,8 @@ public:
ufo->sprzoff(ofs * spawner->scale());
ufo->spawner(spawner);
ufo->extravalue1 = 0; // Lifetime
}
};
@ -134,6 +136,8 @@ void Obj_BattleUFOThink(mobj_t *mobj)
{
UFO* ufo = static_cast<UFO*>(mobj);
ufo->extravalue1++;
ufo->bob();
if ((leveltime/2) & 1)
@ -141,7 +145,12 @@ void Obj_BattleUFOThink(mobj_t *mobj)
ufo->spawn_beam();
}
if (!battleovertime.enabled)
if ((ufo->extravalue1 % (TICRATE*2)) == 0)
{
S_StartSound(ufo, sfx_s3ka5);
}
if (!battleovertime.enabled && ufo->extravalue1 <= 5*TICRATE)
{
Obj_PointPlayersToXY(mobj->x, mobj->y);
}

4
src/p_inter.c
View file

@ -3163,6 +3163,10 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
Obj_EndBungee(player);
K_BumperInflate(target->player);
// Explosions are explicit combo setups.
if (damagetype & DMG_EXPLODE)
player->bumperinflate = 0;
if (player->spectator == false && !(player->charflags & SF_IRONMAN))
{
UINT32 skinflags = (demo.playback)

2
src/sounds.c
View file

@ -566,7 +566,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3ka2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"},
{"s3ka3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising charge"},
{"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
{"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s3ka5", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // bufo x8away
{"s3ka6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction fizzle"},
{"s3ka7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Countdown beep"},
{"s3ka8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"},