diff --git a/audio/Fight_Club/5_rounds.wav b/audio/Fight_Club/5_rounds.wav new file mode 100644 index 00000000..c4ca41bd Binary files /dev/null and b/audio/Fight_Club/5_rounds.wav differ diff --git a/audio/Fight_Club/Defender_high_score.wav b/audio/Fight_Club/Defender_high_score.wav new file mode 100644 index 00000000..640e0f43 Binary files /dev/null and b/audio/Fight_Club/Defender_high_score.wav differ diff --git a/audio/Fight_Club/defender_lead.wav b/audio/Fight_Club/defender_lead.wav new file mode 100644 index 00000000..38d7123c Binary files /dev/null and b/audio/Fight_Club/defender_lead.wav differ diff --git a/audio/Fight_Club/defender_winning.wav b/audio/Fight_Club/defender_winning.wav new file mode 100644 index 00000000..09734cb9 Binary files /dev/null and b/audio/Fight_Club/defender_winning.wav differ diff --git a/audio/Fight_Club/game_over.wav b/audio/Fight_Club/game_over.wav new file mode 100644 index 00000000..66346759 Binary files /dev/null and b/audio/Fight_Club/game_over.wav differ diff --git a/audio/Fight_Club/last_round.wav b/audio/Fight_Club/last_round.wav new file mode 100644 index 00000000..73bbb846 Binary files /dev/null and b/audio/Fight_Club/last_round.wav differ diff --git a/audio/Fight_Club/tie_game.wav b/audio/Fight_Club/tie_game.wav new file mode 100644 index 00000000..55fb63ac Binary files /dev/null and b/audio/Fight_Club/tie_game.wav differ diff --git a/audio/Menu/menu FightClub.wav b/audio/Menu/menu FightClub.wav new file mode 100644 index 00000000..1f52a5d9 Binary files /dev/null and b/audio/Menu/menu FightClub.wav differ diff --git a/audio/Menu/menu NonStopJoust.wav b/audio/Menu/menu NonStopJoust.wav new file mode 100644 index 00000000..f9853821 Binary files /dev/null and b/audio/Menu/menu NonStopJoust.wav differ diff --git a/games/fight_club.py b/games/fight_club.py index cba1ddb6..d5466acd 100644 --- a/games/fight_club.py +++ b/games/fight_club.py @@ -242,6 +242,8 @@ def __init__(self, moves, command_queue, ns, music): self.explosion = Audio('audio/Joust/sounds/Explosion34.wav') self.revive = Audio('audio/Commander/sounds/revive.wav') + + end = False self.audio = music #self.change_time = self.get_change_time(speed_up = True) @@ -387,7 +389,9 @@ def alive_move_count(self): #more than one tied winner, have them face off def face_off(self): #print(self.winning_moves) - os.popen('espeak -ven -p 70 -a 200 "Tie game..... Face off"') + #os.popen('espeak -ven -p 70 -a 200 "Tie game..... Face off"') + + Audio('audio/Fight_Club/tie_game.wav').start_effect() for move in self.move_serials: self.dead_moves[move].value = 0 for move in self.winning_moves: @@ -433,9 +437,11 @@ def check_end_game(self): if self.round_counter >= self.round_num: self.check_winner() if self.round_counter == self.round_num - 5: - os.popen('espeak -ven -p 70 -a 200 "5 rounds remain"') + Audio('audio/Fight_Club/5_rounds.wav').start_effect() + #os.popen('espeak -ven -p 70 -a 200 "5 rounds remain"') if self.round_counter == self.round_num - 1: - os.popen('espeak -ven -p 70 -a 200 "last round"') + Audio('audio/Fight_Club/last_round.wav').start_effect() + #os.popen('espeak -ven -p 70 -a 200 "last round"') def stop_tracking_moves(self): @@ -451,7 +457,8 @@ def end_game(self): h_value = 0 for move in self.move_serials: self.dead_moves[move].value = 0 - os.popen('espeak -ven -p 70 -a 200 "winner"') + Audio('audio/Fight_Club/game_over.wav').start_effect() + #os.popen('espeak -ven -p 70 -a 200 "winner"') while (time.time() < end_time): time.sleep(0.01) @@ -551,11 +558,14 @@ def reset_round_timer(self): self.current_winner = self.chosen_defender saying = random.randint(0,2) if saying == 0: - os.popen('espeak -ven -p 70 -a 200 "Defender has taken the lead"') + Audio('audio/Fight_Club/defender_lead.wav').start_effect() + #os.popen('espeak -ven -p 70 -a 200 "Defender has taken the lead"') elif saying == 1: - os.popen('espeak -ven -p 70 -a 200 "Defender is now winning"') + Audio('audio/Fight_Club/defender_winning.wav').start_effect() + #os.popen('espeak -ven -p 70 -a 200 "Defender is now winning"') elif saying == 2: - os.popen('espeak -ven -p 70 -a 200 "Defender has the high score"') + Audio('audio/Fight_Club/Defender_high_score.wav').start_effect() + #os.popen('espeak -ven -p 70 -a 200 "Defender has the high score"') self.check_end_game() diff --git a/piparty.py b/piparty.py index 36f5dd14..5f5e36db 100644 --- a/piparty.py +++ b/piparty.py @@ -365,9 +365,9 @@ def game_mode_announcement(self): if self.game_mode == common.Games.Random: Audio('audio/Menu/menu Random.wav').start_effect() if self.game_mode == common.Games.FightClub: - os.popen('espeak -ven -p 70 -a 200 "Fight Club"') + Audio('audio/Menu/menu FightClub.wav').start_effect() if self.game_mode == common.Games.NonStop: - os.popen('espeak -ven -p 70 -a 200 "Non stop joust"') + Audio('audio/Menu/menu NonStopJoust.wav').start_effect() def check_change_mode(self): change_mode = False