Allow choice of audio speaker between aaron and ivy

HotSake · Aug 18, 2019 · 9da459e · 9da459e
1 parent 7558fcc
commit 9da459e
Show file tree

Hide file tree

Showing 230 changed files with 383 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,12 +61,13 @@ target/
 audio/Joust/music
 audio/Commander/music/
 audio/Zombie/music/
-audio/Menu/
+audio/Menu/music
 !audio/Joust/music/classical.wav
 
 #other stuff
 *.ini
 *.yaml
+*.DS_Store
 apfiles/ap_active
 
 

diff --git a/__init__.py b/__init__.py
diff --git a/audio/Commander/sounds/10 seconds begins.wav → ...Commander/vox/aaron/10 seconds begins.wav b/audio/Commander/sounds/10 seconds begins.wav → ...Commander/vox/aaron/10 seconds begins.wav
diff --git a/audio/Commander/sounds/blue overdrive.wav → audio/Commander/vox/aaron/blue overdrive.wav b/audio/Commander/sounds/blue overdrive.wav → audio/Commander/vox/aaron/blue overdrive.wav
diff --git a/audio/Commander/sounds/blue power ready.wav → .../Commander/vox/aaron/blue power ready.wav b/audio/Commander/sounds/blue power ready.wav → .../Commander/vox/aaron/blue power ready.wav
diff --git a/audio/Commander/sounds/blue revive.wav → audio/Commander/vox/aaron/blue revive.wav b/audio/Commander/sounds/blue revive.wav → audio/Commander/vox/aaron/blue revive.wav
diff --git a/audio/Commander/sounds/blue shift.wav → audio/Commander/vox/aaron/blue shift.wav b/audio/Commander/sounds/blue shift.wav → audio/Commander/vox/aaron/blue shift.wav
diff --git a/audio/Commander/sounds/blue winner.wav → audio/Commander/vox/aaron/blue winner.wav b/audio/Commander/sounds/blue winner.wav → audio/Commander/vox/aaron/blue winner.wav
diff --git a/audio/Commander/sounds/commander intro.wav → ...o/Commander/vox/aaron/commander intro.wav b/audio/Commander/sounds/commander intro.wav → ...o/Commander/vox/aaron/commander intro.wav
diff --git a/audio/Commander/sounds/commanders chosen.wav → ...Commander/vox/aaron/commanders chosen.wav b/audio/Commander/sounds/commanders chosen.wav → ...Commander/vox/aaron/commanders chosen.wav
diff --git a/audio/Commander/sounds/red overdrive.wav → audio/Commander/vox/aaron/red overdrive.wav b/audio/Commander/sounds/red overdrive.wav → audio/Commander/vox/aaron/red overdrive.wav
diff --git a/audio/Commander/sounds/red power ready.wav → ...o/Commander/vox/aaron/red power ready.wav b/audio/Commander/sounds/red power ready.wav → ...o/Commander/vox/aaron/red power ready.wav
diff --git a/audio/Commander/sounds/red revive.wav → audio/Commander/vox/aaron/red revive.wav b/audio/Commander/sounds/red revive.wav → audio/Commander/vox/aaron/red revive.wav
diff --git a/audio/Commander/sounds/red shift.wav → audio/Commander/vox/aaron/red shift.wav b/audio/Commander/sounds/red shift.wav → audio/Commander/vox/aaron/red shift.wav
diff --git a/audio/Commander/sounds/red winner.wav → audio/Commander/vox/aaron/red winner.wav b/audio/Commander/sounds/red winner.wav → audio/Commander/vox/aaron/red winner.wav
diff --git a/audio/Commander/vox/ivy/10 seconds begins.wav b/audio/Commander/vox/ivy/10 seconds begins.wav
diff --git a/audio/Commander/vox/ivy/blue overdrive.wav b/audio/Commander/vox/ivy/blue overdrive.wav
diff --git a/audio/Commander/vox/ivy/blue power ready.wav b/audio/Commander/vox/ivy/blue power ready.wav
diff --git a/audio/Commander/vox/ivy/blue revive.wav b/audio/Commander/vox/ivy/blue revive.wav
diff --git a/audio/Commander/vox/ivy/blue shift.wav b/audio/Commander/vox/ivy/blue shift.wav
diff --git a/audio/Commander/vox/ivy/blue winner.wav b/audio/Commander/vox/ivy/blue winner.wav
diff --git a/audio/Commander/vox/ivy/commander intro.wav b/audio/Commander/vox/ivy/commander intro.wav
diff --git a/audio/Commander/vox/ivy/commanders chosen.wav b/audio/Commander/vox/ivy/commanders chosen.wav
diff --git a/audio/Commander/vox/ivy/red overdrive.wav b/audio/Commander/vox/ivy/red overdrive.wav
diff --git a/audio/Commander/vox/ivy/red power ready.wav b/audio/Commander/vox/ivy/red power ready.wav
diff --git a/audio/Commander/vox/ivy/red revive.wav b/audio/Commander/vox/ivy/red revive.wav
diff --git a/audio/Commander/vox/ivy/red shift.wav b/audio/Commander/vox/ivy/red shift.wav
diff --git a/audio/Commander/vox/ivy/red winner.wav b/audio/Commander/vox/ivy/red winner.wav
diff --git a/audio/Fight_Club/5_rounds.wav → audio/Fight_Club/vox/aaron/5_rounds.wav b/audio/Fight_Club/5_rounds.wav → audio/Fight_Club/vox/aaron/5_rounds.wav
diff --git a/audio/Fight_Club/Defender_high_score.wav → ...ht_Club/vox/aaron/Defender_high_score.wav b/audio/Fight_Club/Defender_high_score.wav → ...ht_Club/vox/aaron/Defender_high_score.wav
diff --git a/audio/Fight_Club/defender_lead.wav → audio/Fight_Club/vox/aaron/defender_lead.wav b/audio/Fight_Club/defender_lead.wav → audio/Fight_Club/vox/aaron/defender_lead.wav
diff --git a/audio/Fight_Club/defender_winning.wav → ...Fight_Club/vox/aaron/defender_winning.wav b/audio/Fight_Club/defender_winning.wav → ...Fight_Club/vox/aaron/defender_winning.wav
diff --git a/audio/Fight_Club/game_over.wav → audio/Fight_Club/vox/aaron/game_over.wav b/audio/Fight_Club/game_over.wav → audio/Fight_Club/vox/aaron/game_over.wav
diff --git a/audio/Fight_Club/last_round.wav → audio/Fight_Club/vox/aaron/last_round.wav b/audio/Fight_Club/last_round.wav → audio/Fight_Club/vox/aaron/last_round.wav
diff --git a/audio/Fight_Club/tie_game.wav → audio/Fight_Club/vox/aaron/tie_game.wav b/audio/Fight_Club/tie_game.wav → audio/Fight_Club/vox/aaron/tie_game.wav
diff --git a/audio/Fight_Club/vox/ivy/5_rounds.wav b/audio/Fight_Club/vox/ivy/5_rounds.wav
diff --git a/audio/Fight_Club/vox/ivy/Defender_high_score.wav b/audio/Fight_Club/vox/ivy/Defender_high_score.wav
diff --git a/audio/Fight_Club/vox/ivy/defender_lead.wav b/audio/Fight_Club/vox/ivy/defender_lead.wav
diff --git a/audio/Fight_Club/vox/ivy/defender_winning.wav b/audio/Fight_Club/vox/ivy/defender_winning.wav
diff --git a/audio/Fight_Club/vox/ivy/game_over.wav b/audio/Fight_Club/vox/ivy/game_over.wav
diff --git a/audio/Fight_Club/vox/ivy/last_round.wav b/audio/Fight_Club/vox/ivy/last_round.wav
diff --git a/audio/Fight_Club/vox/ivy/tie_game.wav b/audio/Fight_Club/vox/ivy/tie_game.wav
diff --git a/audio/Joust/audio_credits.txt b/audio/Joust/audio_credits.txt