80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

Add BGMs for Elly's Scythe and Baryon phases

Browse source
This commit is contained in:
Andrei Alexeyev 2017-12-31 17:15:36 +02:00
parent f16d8e7db6
commit 47af998066
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
6 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/bgm/stage6/boss_phase1.ogg Normal file
View file

Binary file not shown.

BIN
resources/bgm/stage6/boss_phase2.ogg Normal file
View file

Binary file not shown.

3
resources/bgm/stage6boss_phase1.bgm Normal file
View file

@ -0,0 +1,3 @@
title = Cosmological Battle ~ The Vacuum Catastrophe
artist = Tuck V
loop = res/bgm/stage6/boss_phase1.ogg

4
resources/bgm/stage6boss_phase2.bgm Normal file
View file

@ -0,0 +1,4 @@
title = Deified Emergent Property ~ Ambivalent Soul
artist = Tuck V
loop = res/bgm/stage6/boss_phase2.ogg
loop_point = 1.6

14
src/stages/stage6.c
View file

@ -236,7 +236,12 @@ static void stage6_start(void) {
}
static void stage6_preload(void) {
preload_resources(RES_BGM, RESF_OPTIONAL, "stage6", "stage6boss", NULL);
preload_resources(RES_BGM, RESF_OPTIONAL,
"stage6",
"stage6boss_phase1",
"stage6boss_phase2",
"stage6boss_phase3",
NULL);
preload_resources(RES_TEXTURE, RESF_DEFAULT,
"stage6/baryon_connector",
"stage6/baryon",
@ -285,19 +290,22 @@ static void stage6_spellpractice_events(void) {
if(STG6_SPELL_NEEDS_SCYTHE(s)) {
boss_add_attack(global.boss, AT_Move, "Catch the Scythe", 1.5, 0, elly_intro, NULL);
go = false;
stage_start_bgm("stage6boss_phase1");
} else if(STG6_SPELL_NEEDS_BARYON(s)) {
create_enemy3c(BOSS_DEFAULT_GO_POS, ENEMY_IMMUNE, Scythe, scythe_reset, 0, 1+0.2*I, 1);
boss_add_attack(global.boss, AT_Move, "Unbound", 3, 0, elly_unbound, NULL);
go = false;
stage_start_bgm("stage6boss_phase2");
} else if(s == &stage6_spells.final.theory_of_everything) {
start_fall_over();
skip_background_anim(&stage_3d_context, stage6_update, 300, &global.timer, &global.frames);
stage_start_bgm("stage6boss_phase3");
} else {
stage_start_bgm("stage6boss_phase2");
}
boss_add_attack_from_info(global.boss, global.stage->spell, go);
boss_start_attack(global.boss, global.boss->attacks);
stage_start_bgm("stage6boss");
}
if(!global.boss) {

15
src/stages/stage6_events.c
View file

@ -42,7 +42,7 @@ Dialog *stage6_dialog(void) {
dadd_msg(d,Right, "Pitiful servant of the dead. You’ll never be able to stop my life’s work from being fulfilled! I’ll simply unravel that nonsense behind your half-and-half existence!");
}
dadd_msg(d, BGM, "stage6boss");
dadd_msg(d, BGM, "stage6boss_phase1");
return d;
}
@ -759,8 +759,9 @@ int scythe_explode(Enemy *e, int t) {
void elly_unbound(Boss *b, int t) {
if(global.stage->type == STAGE_SPELL) {
// t += 100;
GO_TO(b, BOSS_DEFAULT_GO_POS, 0.1)
} else if(t == 0) {
play_sound("bossdeath");
}
TIMER(&t);
@ -772,7 +773,17 @@ void elly_unbound(Boss *b, int t) {
elly_clap(b,150);
}
if(global.stage->type != STAGE_SPELL) {
AT(70) {
fade_bgm(0.5);
}
}
AT(100) {
if(global.stage->type != STAGE_SPELL) {
stage_start_bgm("stage6boss_phase2");
}
int i;
Enemy *e, *last = NULL, *first = NULL, *middle = NULL;