Random dunno
This commit is contained in:
@@ -2,10 +2,10 @@ from Event import Event
|
||||
|
||||
|
||||
class BankEvent(Event):
|
||||
def __init__(self, bankSolenoid, name, playerState):
|
||||
def __init__(self, bankSolenoid, name, gameState):
|
||||
self.bankSolenoid = bankSolenoid
|
||||
super().__init__(name)
|
||||
self.playerState = playerState
|
||||
self.gameState = gameState
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
|
||||
@@ -3,9 +3,9 @@ from Event import Event
|
||||
|
||||
class BonusEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
self.gameState = playerState
|
||||
super().__init__("Bonus Event")
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
self.playerState.advanceBonus()
|
||||
self.gameState.advanceBonus()
|
||||
|
||||
@@ -2,10 +2,10 @@ from Event import Event
|
||||
|
||||
|
||||
class BonusTimeEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
def __init__(self, gameState):
|
||||
self.gameState = gameState
|
||||
super().__init__("Bonus Time Event")
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
self.playerState.addBonusTimeSecond()
|
||||
self.gameState.playerState.addBonusTimeSecond()
|
||||
|
||||
@@ -3,11 +3,11 @@ from solenoids.BottomLeftBankSolenoid import BottomLeftBankSolenoid
|
||||
|
||||
|
||||
class BottomLeftBankEvent(BankEvent):
|
||||
def __init__(self, playerState):
|
||||
super().__init__(BottomLeftBankSolenoid(), "Bottom Left Bank Event", playerState)
|
||||
def __init__(self, gameState):
|
||||
super().__init__(BottomLeftBankSolenoid(), "Bottom Left Bank Event", gameState)
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
playerState = self.playerState
|
||||
playerState = self.gameState.playerState
|
||||
playerState.advanceLeftOrangeSpecial()
|
||||
playerState.advanceUpperPlayfieldTime()
|
||||
|
||||
@@ -3,12 +3,12 @@ from solenoids.BottomRightBankSolenoid import BottomRightBankSolenoid
|
||||
|
||||
|
||||
class BottomRightBankEvent(BankEvent):
|
||||
def __init__(self, playerState):
|
||||
super().__init__(BottomRightBankSolenoid(), "Bottom Right Bank Event", playerState)
|
||||
def __init__(self, gameState):
|
||||
super().__init__(BottomRightBankSolenoid(), "Bottom Right Bank Event", gameState)
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
playerState = self.playerState
|
||||
playerState = self.gameState.playerState
|
||||
playerState.advanceRightOrangeSpecial()
|
||||
if playerState.upperPlayfieldTime < 30:
|
||||
playerState.advanceUpperPlayfieldTime()
|
||||
|
||||
@@ -5,24 +5,24 @@ from events.StartBallEvent import StartBallEvent
|
||||
|
||||
|
||||
class EndBallEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
def __init__(self, gameState):
|
||||
self.gameState = gameState
|
||||
super().__init__("End Of Ball Event")
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
if self.playerState.replayBall or not self.playerState.hasBallScored:
|
||||
if self.gameState.replayBall or not self.gameState.hasBallScored:
|
||||
StartBallEvent().trigger(None)
|
||||
return
|
||||
|
||||
self.playerState.removeBall()
|
||||
self.gameState.playerState.removeBall()
|
||||
|
||||
self.scorePoints()
|
||||
self.playerState.reset()
|
||||
self.gameState.playerState.reset()
|
||||
|
||||
if self.playerState.ballsLeft == 0:
|
||||
if self.gameState.playerState.ballsLeft == 0:
|
||||
EndGameEvent().trigger(None)
|
||||
|
||||
def scorePoints(self):
|
||||
bonus = self.playerState.bonus * self.playerState.bonusMultiplier * 1000
|
||||
self.playerState.addPoints(bonus)
|
||||
bonus = self.gameState.playerState.bonus * self.gameState.playerState.bonusMultiplier * 1000
|
||||
self.gameState.playerState.addPoints(bonus)
|
||||
|
||||
@@ -3,12 +3,12 @@ from solenoids.TopFlipper import TopFlipper
|
||||
|
||||
|
||||
class EnterUpperPlayfieldEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
def __init__(self, gameState):
|
||||
self.gameState = gameState
|
||||
self.flipper = TopFlipper()
|
||||
super().__init__("Enter Upper Playfield Event")
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
self.flipper.activate()
|
||||
self.playerState.startUpperPlayfieldTimer()
|
||||
self.gameState.playerState.startUpperPlayfieldTimer()
|
||||
|
||||
@@ -2,10 +2,10 @@ from Event import Event
|
||||
|
||||
|
||||
class FixedTargetEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
def __init__(self, gameState):
|
||||
super().__init__("Fixed Target Event")
|
||||
self.playerState = playerState
|
||||
self.gameState = gameState
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
self.playerState.advanceTunnel()
|
||||
self.gameState.playerState.advanceTunnel()
|
||||
|
||||
@@ -3,8 +3,8 @@ from solenoids.TopFlipper import TopFlipper
|
||||
|
||||
|
||||
class LeaveUpperPlayfieldEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
def __init__(self, gameState):
|
||||
self.gameState = gameState
|
||||
self.flipper = TopFlipper()
|
||||
super().__init__("Leave Upper Playfield Event")
|
||||
|
||||
|
||||
@@ -4,13 +4,13 @@ import config
|
||||
|
||||
|
||||
class OrangeSpecialEvent(SpecialEvent):
|
||||
def __init__(self, playerState):
|
||||
super().__init__("Orange Special Event", playerState)
|
||||
def __init__(self, gameState):
|
||||
super().__init__("Orange Special Event", gameState)
|
||||
self.points = 200000
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
if self.playerState.orangeSpecialLit:
|
||||
if self.gameState.playerState.orangeSpecialLit:
|
||||
config.ORANGE_SPECIAL(self)
|
||||
self.playerState.resetOrangeSpecial()
|
||||
self.gameState.playerState.resetOrangeSpecial()
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@ from Event import Event
|
||||
|
||||
class PointEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
self.gameState = playerState
|
||||
super().__init__("Point Event")
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
self.playerState.addPoints(target.points)
|
||||
self.gameState.addPoints(target.points)
|
||||
@@ -8,8 +8,8 @@ class RedSpecialEvent(SpecialEvent):
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
if self.playerState.redSpecialLit:
|
||||
if self.gameState.redSpecialLit:
|
||||
config.RED_SPECIAL(self)
|
||||
self.playerState.resetRedSpecial()
|
||||
self.gameState.resetRedSpecial()
|
||||
|
||||
|
||||
|
||||
@@ -4,16 +4,16 @@ from Event import Event
|
||||
class SpecialEvent(Event):
|
||||
def __init__(self, name, playerState):
|
||||
super().__init__(name)
|
||||
self.playerState = playerState
|
||||
self.gameState = playerState
|
||||
|
||||
def replay(self):
|
||||
self.playerState.setReplayBall()
|
||||
self.gameState.setReplayBall()
|
||||
|
||||
def extra_ball(self):
|
||||
self.playerState.addBall()
|
||||
self.gameState.addBall()
|
||||
|
||||
def points(self):
|
||||
self.playerState.addPoints(self.points)
|
||||
self.gameState.addPoints(self.points)
|
||||
|
||||
def super_bonus(self):
|
||||
pass
|
||||
|
||||
@@ -3,9 +3,9 @@ from time import time
|
||||
|
||||
|
||||
class SpinnerEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
def __init__(self, gameState):
|
||||
super().__init__("Spinner Event")
|
||||
self.playerState = playerState
|
||||
self.gameState = gameState
|
||||
self.activationTime = time()
|
||||
|
||||
def trigger(self, target):
|
||||
@@ -17,7 +17,7 @@ class SpinnerEvent(Event):
|
||||
self.scorePoints()
|
||||
|
||||
def scorePoints(self):
|
||||
playerState = self.playerState
|
||||
playerState = self.gameState.playerState
|
||||
timePassed = time() - self.activationTime
|
||||
if 1 <= timePassed < 1.5:
|
||||
playerState.addPoints(100000)
|
||||
|
||||
@@ -5,7 +5,7 @@ from solenoids.MainFlipper import MainFlipper
|
||||
|
||||
class StartGameEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
self.gameState = playerState
|
||||
self.flipper = MainFlipper()
|
||||
self.outHoleSolenoid = OutHoleSolenoid()
|
||||
super().__init__("Start Game Event")
|
||||
@@ -13,5 +13,5 @@ class StartGameEvent(Event):
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
self.flipper.activate()
|
||||
self.playerState.activate()
|
||||
self.gameState.activate()
|
||||
self.outHoleSolenoid.trigger()
|
||||
|
||||
@@ -8,6 +8,6 @@ class TopCentralBankEvent(BankEvent):
|
||||
|
||||
|
||||
def trigger(self, target):
|
||||
self.playerState.advanceRedSpecial()
|
||||
self.gameState.advanceRedSpecial()
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ from Event import Event
|
||||
class TunnelEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
super().__init__("Tunnel Event")
|
||||
self.playerState = playerState
|
||||
self.gameState = playerState
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
@@ -11,10 +11,10 @@ class TunnelEvent(Event):
|
||||
self.scoreBonusTunnelPoints()
|
||||
|
||||
def advanceBonusMultiplier(self):
|
||||
self.playerState.advanceBonusMultiplier()
|
||||
self.gameState.advanceBonusMultiplier()
|
||||
|
||||
def scoreBonusTunnelPoints(self):
|
||||
playerState = self.playerState
|
||||
playerState = self.gameState
|
||||
if playerState.tunnelLit == 2:
|
||||
playerState.addPoints(10000)
|
||||
elif playerState.tunnelLit == 3:
|
||||
|
||||
@@ -3,9 +3,9 @@ from Event import Event
|
||||
|
||||
class UpperPlayfieldTimeEvent(Event):
|
||||
def __init__(self, playerState):
|
||||
self.playerState = playerState
|
||||
self.gameState = playerState
|
||||
super().__init__("Upper Playfield Time Event")
|
||||
|
||||
def trigger(self, target):
|
||||
super().trigger(target)
|
||||
self.playerState.addUpperPlayfieldTime(1)
|
||||
self.gameState.addUpperPlayfieldTime(1)
|
||||
Reference in New Issue
Block a user