thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-24 00:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Battle: Overtime music

Browse source 
- Fade out level music for 1.5 seconds when "Hurry up!"
  plays.
- Play SHWDWN when level music finishes fading out.
- Switch to SHWDN2 when there are 2 players left and the
  Overtime Barrier has reached its smallest size.
  - Plays a loud noise to mask the transition.
This commit is contained in:
James R 2024-01-03 04:31:27 -08:00
parent b7c9c92749
commit c192e57426
2 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/k_battle.c
View file

@ -21,6 +21,10 @@
#include "p_spec.h"
#include "k_objects.h"
#include "k_rank.h"
#include "music.h"
#include "hu_stuff.h"
#define BARRIER_MIN_RADIUS (768 * mapobjectscale)
// Battle overtime info
struct battleovertime battleovertime;
@ -142,6 +146,12 @@ void K_CheckBumpers(void)
}
}
if (numingame <= 2 && battleovertime.enabled && battleovertime.radius <= BARRIER_MIN_RADIUS)
{
Music_Stop("battle_overtime");
S_StartSound(NULL, sfx_kc4b); // Loud noise helps mask transition
}
if (K_Cooperative())
{
if (nobumpers > 0 && nobumpers >= numingame)
@ -678,19 +688,36 @@ void K_RunBattleOvertime(void)
{
battleovertime.enabled++;
if (battleovertime.enabled == TICRATE)
{
S_StartSound(NULL, sfx_bhurry);
if (battleovertime.enabled == 10*TICRATE)
Music_DelayEnd("level", 0);
}
else if (battleovertime.enabled == 10*TICRATE)
S_StartSound(NULL, sfx_kc40);
if (!Music_Playing("level") && !Music_Playing("battle_overtime"))
{
Music_Play("battle_overtime");
Music_Play("battle_overtime_stress");
// Sync approximately with looping section of
// battle_overtime. (This is file dependant.)
Music_Seek("battle_overtime_stress", 1756);
}
}
else if (battleovertime.radius > 0)
{
const fixed_t minradius = 768 * mapobjectscale;
const fixed_t minradius = BARRIER_MIN_RADIUS;
const fixed_t oldradius = battleovertime.radius;
if (battleovertime.radius > minradius)
battleovertime.radius -= (battleovertime.initial_radius / (30*TICRATE));
if (battleovertime.radius < minradius)
if (battleovertime.radius <= minradius && oldradius > minradius)
{
battleovertime.radius = minradius;
K_CheckBumpers();
}
// Subtract the 10 second grace period of the barrier
if (battleovertime.enabled < 25*TICRATE)

16
src/music.cpp
View file

@ -28,6 +28,8 @@ void Music_Init(void)
Tune& tune = g_tunes.insert("level");
tune.priority = 1;
tune.fade_out = 1500;
tune.fade_out_inclusive = false;
tune.resume_fade_in = 750;
tune.sync = true;
tune.credit = true;
@ -48,6 +50,20 @@ void Music_Init(void)
tune.fade_out = 3500;
}
{
Tune& tune = g_tunes.insert("battle_overtime", g_tunes.find("level"));
tune.song = "shwdwn";
tune.priority = 11;
}
{
Tune& tune = g_tunes.insert("battle_overtime_stress", g_tunes.find("battle_overtime"));
tune.song = "shwdn2";
tune.priority = 10;
}
{
Tune& tune = g_tunes.insert("grow");