Skip to content
This repository was archived by the owner on Apr 19, 2022. It is now read-only.

334 #335

Merged
jaygarcia merged 2 commits into from
Dec 18, 2017
Merged

334 #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e89218
Removed clear from cal.sh so we can see the space used in the sketch
jaygarcia Dec 18, 2017
5df3417
Re-did the intro song and moved the old intro to stage4 track. stage …
jaygarcia Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Evade2/Game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ UBYTE Game::kills;
const BYTE alert_top = 5;

const BYTE getStageSong() {
if (Game::wave % 4 == 0) {
return INTRO_SONG;
if (Game::wave % 5 == 0) {
return STAGE_5_SONG;
}
else if (Game::wave % 4 == 0) {
return STAGE_4_SONG;
}
else if (Game::wave % 3 == 0) {
return STAGE_3_SONG;
Expand Down
19 changes: 10 additions & 9 deletions Evade2/Sound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ static Arduboy2Audio audio;

// Todo change to <ATMLib.h> once we publish
#include "sound/SFX.h"
#include "sound/evade2_00_intro.h"
// #include "sound/evade2_01_stage_1.h"
#include "sound/evade2_00_intro_alt_smaller.h"
#include "sound/evade2_01_stage_1_alt_smaller.h"
#include "sound/evade2_02_stage_1_boss.h"
#include "sound/evade2_03_stage_2_alt_smaller.h"
#include "sound/evade2_04_stage_2_boss.h"

#include "sound/evade2_05_stage_3.h"
#include "sound/evade2_06_stage_3_boss.h"
// #include "sound/evade2_07_stage_4.h"
// #include "sound/evade2_08_stage_4_boss_new.h"
#include "sound/evade2_07_stage_4.h"
#include "sound/evade2_08_stage_5.h"
#include "sound/evade2_10_game_over.h"
#include "sound/evade2_11_get_ready.h"
#include "sound/evade2_12_next_wave.h"
Expand Down Expand Up @@ -69,16 +67,19 @@ void Sound::stfu() {

void Sound::play_score(BYTE id) {
static const PROGMEM UBYTE *const songs[] = {
(UBYTE *)&evade2_00_intro, // 0 INTRO_SONG
// (UBYTE *)&evade2_00_intro, // 0 INTRO_SONG
(UBYTE *)&evade2_00_intro_alt_smaller, // 0 INTRO_SONG
(UBYTE *)&evade2_01_stage_1_alt_smaller, // 1 STAGE_1_SONG
(UBYTE *)&evade2_02_stage_1_boss, // 2 STAGE_1_BOSS_SONG
(UBYTE *)&evade2_03_stage_2_alt_smaller, // 3 STAGE_2_SONG
(UBYTE *)&evade2_04_stage_2_boss, // 4 STAGE_2_BOSS_SONG
(UBYTE *)&evade2_05_stage_3, // 5 STAGE_3_SONG
(UBYTE *)&evade2_06_stage_3_boss, // 6 STAGE_3_BOSS_SONG
(UBYTE *)&evade2_10_game_over, // 7 GAME_OVER_SONG
(UBYTE *)&evade2_11_get_ready, // 8 GET_READY_SONG
(UBYTE *)&evade2_12_next_wave, // 9 NEXT_WAVE_SONG
(UBYTE *)&evade2_07_stage_4, // 7 STAGE_4_SONG
(UBYTE *)&evade2_08_stage_5, // 7 STAGE_4_SONG
(UBYTE *)&evade2_10_game_over, // 8 GAME_OVER_SONG
(UBYTE *)&evade2_11_get_ready, // 9 GET_READY_SONG
(UBYTE *)&evade2_12_next_wave, // 10 NEXT_WAVE_SONG
};

if (current_song == id) {
Expand Down
8 changes: 5 additions & 3 deletions Evade2/Sound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ const BYTE STAGE_2_SONG = 3;
const BYTE STAGE_2_BOSS_SONG = 4;
const BYTE STAGE_3_SONG = 5;
const BYTE STAGE_3_BOSS_SONG = 6;
const BYTE GAME_OVER_SONG = 7;
const BYTE GET_READY_SONG = 8;
const BYTE NEXT_WAVE_SONG = 9;
const BYTE STAGE_4_SONG = 7;
const BYTE STAGE_5_SONG = 8;
const BYTE GAME_OVER_SONG = 9;
const BYTE GET_READY_SONG = 10;
const BYTE NEXT_WAVE_SONG = 11;

class Sound {
public:
Expand Down
Loading