This commit is contained in:
Jonas Zeunert
2022-09-03 14:22:29 +02:00
parent e418fc3b9b
commit 93b5cf3465
11 changed files with 29 additions and 1 deletions

View File

@@ -16,6 +16,8 @@ from lamps.LampGroup import BONUS_MULTIPLIER_LAMPS
from lamps.LampGroup import BONUS_LAMPS from lamps.LampGroup import BONUS_LAMPS
from lamps.LampGroup import PLAYER_LAMPS from lamps.LampGroup import PLAYER_LAMPS
from Sound import Sound
from events.LeaveUpperPlayfieldEvent import LeaveUpperPlayfieldEvent from events.LeaveUpperPlayfieldEvent import LeaveUpperPlayfieldEvent
from solenoids.BottomLeftBankSolenoid import BottomLeftBankSolenoid from solenoids.BottomLeftBankSolenoid import BottomLeftBankSolenoid
from solenoids.BottomRightBankSolenoid import BottomRightBankSolenoid from solenoids.BottomRightBankSolenoid import BottomRightBankSolenoid
@@ -227,15 +229,22 @@ class PlayerState:
self.orangeSpecialLit = self.orangeSpecialRight and self.orangeSpecialLeft self.orangeSpecialLit = self.orangeSpecialRight and self.orangeSpecialLeft
if self.orangeSpecialLit: if self.orangeSpecialLit:
Sound(21).play()
time.sleep(0.7)
Sound(20).play()
Lamp("Special Orange").activate() Lamp("Special Orange").activate()
def advanceRedSpecial(self): def advanceRedSpecial(self):
if not self.isActive: if not self.isActive:
return return
self.redSpecial += 1 self.redSpecial += 1
CHAMP_LAMPS.activateNext() CHAMP_LAMPS.activateNext()
if self.redSpecial == config.RED_SPECIAL_TIMES: if self.redSpecial == config.RED_SPECIAL_TIMES:
Sound(21).play()
time.sleep(0.7)
Sound(20).play()
self.redSpecialLit = True self.redSpecialLit = True
Lamp("Special Red").activate() Lamp("Special Red").activate()

View File

@@ -1,4 +1,5 @@
from Target import Target from Target import Target
from Sound import Sound
class CanalButtonTopTarget(Target): class CanalButtonTopTarget(Target):
@@ -6,4 +7,5 @@ class CanalButtonTopTarget(Target):
super().__init__(20000, "Canal Button Bottom") super().__init__(20000, "Canal Button Bottom")
def hit(self): def hit(self):
Sound(2).play()
super().hit() super().hit()

View File

@@ -1,4 +1,5 @@
from Target import Target from Target import Target
from Sound import Sound
class LeftLaneButton4Target(Target): class LeftLaneButton4Target(Target):
@@ -6,4 +7,5 @@ class LeftLaneButton4Target(Target):
super().__init__(20000, "Canal Button Middle Bottom") super().__init__(20000, "Canal Button Middle Bottom")
def hit(self): def hit(self):
Sound(1).play()
super().hit() super().hit()

View File

@@ -1,4 +1,5 @@
from Target import Target from Target import Target
from Sound import Sound
class LeftLaneButton3Target(Target): class LeftLaneButton3Target(Target):
@@ -6,4 +7,5 @@ class LeftLaneButton3Target(Target):
super().__init__(20000, "Canal Button Middle") super().__init__(20000, "Canal Button Middle")
def hit(self): def hit(self):
Sound(2).play()
super().hit() super().hit()

View File

@@ -1,4 +1,5 @@
from Target import Target from Target import Target
from Sound import Sound
class LeftLaneButton2Target(Target): class LeftLaneButton2Target(Target):
@@ -6,4 +7,5 @@ class LeftLaneButton2Target(Target):
super().__init__(20000, "Canal Button Middle Top") super().__init__(20000, "Canal Button Middle Top")
def hit(self): def hit(self):
Sound(1).play()
super().hit() super().hit()

View File

@@ -1,8 +1,10 @@
from Target import Target from Target import Target
from Sound import Sound
class LeftLaneButton1Target(Target): class LeftLaneButton1Target(Target):
def __init__(self): def __init__(self):
super().__init__(100, 'Canal Button Top') super().__init__(100, 'Canal Button Top')
def hit(self): def hit(self):
Sound(2).play()
super().hit() super().hit()

View File

@@ -1,9 +1,10 @@
from Target import Target from Target import Target
from Sound import Sound
class FixedTarget1(Target): class FixedTarget1(Target):
def __init__(self): def __init__(self):
super().__init__(30000, "Fixed Target 1") super().__init__(30000, "Fixed Target 1")
def hit(self): def hit(self):
Sound(6).play()
super().hit() super().hit()

View File

@@ -1,4 +1,5 @@
from Target import Target from Target import Target
from Sound import Sound
class FixedTarget2(Target): class FixedTarget2(Target):
@@ -6,4 +7,5 @@ class FixedTarget2(Target):
super().__init__(30000, "Fixed Target 2") super().__init__(30000, "Fixed Target 2")
def hit(self): def hit(self):
Sound(6).play()
super().hit() super().hit()

View File

@@ -1,8 +1,10 @@
from Target import Target from Target import Target
from Sound import Sound
class FixedTarget3(Target): class FixedTarget3(Target):
def __init__(self): def __init__(self):
super().__init__(30000, 'Fixed Target 3') super().__init__(30000, 'Fixed Target 3')
def hit(self): def hit(self):
Sound(6).play()
super().hit() super().hit()

View File

@@ -1,4 +1,5 @@
from Target import Target from Target import Target
from Sound import Sound
class FixedTarget4(Target): class FixedTarget4(Target):
@@ -6,4 +7,5 @@ class FixedTarget4(Target):
super().__init__(30000, 'Fixed Target 4') super().__init__(30000, 'Fixed Target 4')
def hit(self): def hit(self):
Sound(6).play()
super().hit() super().hit()

View File

@@ -1,4 +1,5 @@
from Target import Target from Target import Target
from Sound import Sound
class FixedTarget5(Target): class FixedTarget5(Target):
@@ -6,4 +7,5 @@ class FixedTarget5(Target):
super().__init__(30000, 'Fixed Target 5') super().__init__(30000, 'Fixed Target 5')
def hit(self): def hit(self):
Sound(6).play()
super().hit() super().hit()