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

UFO polish

Browse source
This commit is contained in:
AJ Martinez 2024-02-12 18:12:17 -07:00
parent 796e2b9517
commit 0a5baa5d39
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->sprzoff(ofs * spawner->scale());
ufo->spawner(spawner); ufo->spawner(spawner);
ufo->extravalue1 = 0; // Lifetime
} }
}; };
@ -134,6 +136,8 @@ void Obj_BattleUFOThink(mobj_t *mobj)
{ {
UFO* ufo = static_cast<UFO*>(mobj); UFO* ufo = static_cast<UFO*>(mobj);
ufo->extravalue1++;
ufo->bob(); ufo->bob();
if ((leveltime/2) & 1) if ((leveltime/2) & 1)
@ -141,7 +145,12 @@ void Obj_BattleUFOThink(mobj_t *mobj)
ufo->spawn_beam(); ufo->spawn_beam();
} }
if (!battleovertime.enabled) if ((ufo->extravalue1 % (TICRATE*2)) == 0)
{
S_StartSound(ufo, sfx_gbrk); // for debug because it's loud af, use s3k95 probably
}
if (!battleovertime.enabled && ufo->extravalue1 <= 5*TICRATE)
{ {
Obj_PointPlayersToXY(mobj->x, mobj->y); 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); Obj_EndBungee(player);
K_BumperInflate(target->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)) if (player->spectator == false && !(player->charflags & SF_IRONMAN))
{ {
UINT32 skinflags = (demo.playback) UINT32 skinflags = (demo.playback)

2
src/sounds.c
View file

@ -550,7 +550,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k92", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ghost"}, {"s3k92", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ghost"},
{"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gas release"}, {"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gas release"},
{"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"}, {"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"},
{"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lava burst"}, {"s3k95", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, "Lava burst"}, // Also used for bufo
{"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Landing"}, {"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Landing"},
{"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind"}, {"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind"},
{"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling spike"}, {"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling spike"},