diff --git a/PlayerState.py b/PlayerState.py index e2031dc..09a53fa 100644 --- a/PlayerState.py +++ b/PlayerState.py @@ -16,6 +16,8 @@ from lamps.LampGroup import BONUS_MULTIPLIER_LAMPS from lamps.LampGroup import BONUS_LAMPS from lamps.LampGroup import PLAYER_LAMPS +from Sound import Sound + from events.LeaveUpperPlayfieldEvent import LeaveUpperPlayfieldEvent from solenoids.BottomLeftBankSolenoid import BottomLeftBankSolenoid from solenoids.BottomRightBankSolenoid import BottomRightBankSolenoid @@ -227,15 +229,22 @@ class PlayerState: self.orangeSpecialLit = self.orangeSpecialRight and self.orangeSpecialLeft if self.orangeSpecialLit: + Sound(21).play() + time.sleep(0.7) + Sound(20).play() Lamp("Special Orange").activate() def advanceRedSpecial(self): if not self.isActive: return + self.redSpecial += 1 CHAMP_LAMPS.activateNext() if self.redSpecial == config.RED_SPECIAL_TIMES: + Sound(21).play() + time.sleep(0.7) + Sound(20).play() self.redSpecialLit = True Lamp("Special Red").activate() diff --git a/targets/canal/CanalButtonBottomTarget.py b/targets/canal/CanalButtonBottomTarget.py index 809f007..57bb77a 100644 --- a/targets/canal/CanalButtonBottomTarget.py +++ b/targets/canal/CanalButtonBottomTarget.py @@ -1,4 +1,5 @@ from Target import Target +from Sound import Sound class CanalButtonTopTarget(Target): @@ -6,4 +7,5 @@ class CanalButtonTopTarget(Target): super().__init__(20000, "Canal Button Bottom") def hit(self): + Sound(2).play() super().hit() \ No newline at end of file diff --git a/targets/canal/CanalButtonMiddleBottomTarget.py b/targets/canal/CanalButtonMiddleBottomTarget.py index 0ca2ae0..bd87416 100644 --- a/targets/canal/CanalButtonMiddleBottomTarget.py +++ b/targets/canal/CanalButtonMiddleBottomTarget.py @@ -1,4 +1,5 @@ from Target import Target +from Sound import Sound class LeftLaneButton4Target(Target): @@ -6,4 +7,5 @@ class LeftLaneButton4Target(Target): super().__init__(20000, "Canal Button Middle Bottom") def hit(self): + Sound(1).play() super().hit() \ No newline at end of file diff --git a/targets/canal/CanalButtonMiddleTarget.py b/targets/canal/CanalButtonMiddleTarget.py index 3b82d6c..5c57239 100644 --- a/targets/canal/CanalButtonMiddleTarget.py +++ b/targets/canal/CanalButtonMiddleTarget.py @@ -1,4 +1,5 @@ from Target import Target +from Sound import Sound class LeftLaneButton3Target(Target): @@ -6,4 +7,5 @@ class LeftLaneButton3Target(Target): super().__init__(20000, "Canal Button Middle") def hit(self): + Sound(2).play() super().hit() \ No newline at end of file diff --git a/targets/canal/CanalButtonMiddleTopTarget.py b/targets/canal/CanalButtonMiddleTopTarget.py index be562e3..fb8a5c7 100644 --- a/targets/canal/CanalButtonMiddleTopTarget.py +++ b/targets/canal/CanalButtonMiddleTopTarget.py @@ -1,4 +1,5 @@ from Target import Target +from Sound import Sound class LeftLaneButton2Target(Target): @@ -6,4 +7,5 @@ class LeftLaneButton2Target(Target): super().__init__(20000, "Canal Button Middle Top") def hit(self): + Sound(1).play() super().hit() \ No newline at end of file diff --git a/targets/canal/CanalButtonTopTarget.py b/targets/canal/CanalButtonTopTarget.py index d8857ad..cd02cc4 100644 --- a/targets/canal/CanalButtonTopTarget.py +++ b/targets/canal/CanalButtonTopTarget.py @@ -1,8 +1,10 @@ from Target import Target +from Sound import Sound class LeftLaneButton1Target(Target): def __init__(self): super().__init__(100, 'Canal Button Top') def hit(self): + Sound(2).play() super().hit() \ No newline at end of file diff --git a/targets/fixed_targets/FixedTarget1.py b/targets/fixed_targets/FixedTarget1.py index 242d5b6..5ba14ae 100644 --- a/targets/fixed_targets/FixedTarget1.py +++ b/targets/fixed_targets/FixedTarget1.py @@ -1,9 +1,10 @@ from Target import Target - +from Sound import Sound class FixedTarget1(Target): def __init__(self): super().__init__(30000, "Fixed Target 1") def hit(self): + Sound(6).play() super().hit() \ No newline at end of file diff --git a/targets/fixed_targets/FixedTarget2.py b/targets/fixed_targets/FixedTarget2.py index e26a65a..d068a91 100644 --- a/targets/fixed_targets/FixedTarget2.py +++ b/targets/fixed_targets/FixedTarget2.py @@ -1,4 +1,5 @@ from Target import Target +from Sound import Sound class FixedTarget2(Target): @@ -6,4 +7,5 @@ class FixedTarget2(Target): super().__init__(30000, "Fixed Target 2") def hit(self): + Sound(6).play() super().hit() \ No newline at end of file diff --git a/targets/fixed_targets/FixedTarget3.py b/targets/fixed_targets/FixedTarget3.py index a7a7825..2cc062a 100644 --- a/targets/fixed_targets/FixedTarget3.py +++ b/targets/fixed_targets/FixedTarget3.py @@ -1,8 +1,10 @@ from Target import Target +from Sound import Sound class FixedTarget3(Target): def __init__(self): super().__init__(30000, 'Fixed Target 3') def hit(self): + Sound(6).play() super().hit() \ No newline at end of file diff --git a/targets/fixed_targets/FixedTarget4.py b/targets/fixed_targets/FixedTarget4.py index 06d6ded..7598bf2 100644 --- a/targets/fixed_targets/FixedTarget4.py +++ b/targets/fixed_targets/FixedTarget4.py @@ -1,4 +1,5 @@ from Target import Target +from Sound import Sound class FixedTarget4(Target): @@ -6,4 +7,5 @@ class FixedTarget4(Target): super().__init__(30000, 'Fixed Target 4') def hit(self): + Sound(6).play() super().hit() \ No newline at end of file diff --git a/targets/fixed_targets/FixedTarget5.py b/targets/fixed_targets/FixedTarget5.py index af3ff58..efea55a 100644 --- a/targets/fixed_targets/FixedTarget5.py +++ b/targets/fixed_targets/FixedTarget5.py @@ -1,4 +1,5 @@ from Target import Target +from Sound import Sound class FixedTarget5(Target): @@ -6,4 +7,5 @@ class FixedTarget5(Target): super().__init__(30000, 'Fixed Target 5') def hit(self): + Sound(6).play() super().hit() \ No newline at end of file