restructured targets

src/InputHandler.py

@@ -14,4 +14,4 @@ class EventHandler:
             self.targets[event].hit()
 
     def stop(self):
-        self.isRunning = False
+        self.isRunning = False

src/events/LeftFlapEvent.py

@@ -0,0 +1,7 @@
+from src.events.FlapEvent import FlapEvent
+from src.solenoids.RightFlapSolenoid import RightFlapSolenoid
+
+
+class RightFlapEvent(FlapEvent):
+    def __init__(self):
+        super(RightFlapSolenoid())

src/factories/GameFactory.py

@@ -1,11 +1,13 @@
 from src.config import *
 from src.networking.Networking import Networking
 
+from src.PlayerState import PlayerState
+
 from src.displays.PlayerDisplay import PlayerDisplay
 from src.displays.SpecialDisplay import SpecialDisplay
 
-from src.targets import *
 from src.EventHandler import EventHandler
+from src.targets import *
 
 from src.events.PointEvent import PointEvent
 

src/targets/Bank.py

@@ -1,7 +1,8 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class Bank(Target):
-    def __init__(self, targets):
+    def __init__(self, points, name, targets):
+        super(points, name)
         self.targets = targets
         self.__register_targets__()
 

src/targets/BankTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class BankTarget(Target):
     def __init__(self, points):

src/targets/FifthFixedTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class FifthFixedTarget(Target):
-    def __init__(self):
-        super(100, 'Fixed Target #5')
-
-    def hit(self):
-        super.hit()

src/targets/FirstFixedTarget.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class FirstFixedTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()

src/targets/FourthFixedTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class FourthFixedTarget(Target):
-    def __init__(self):
-        super(100, 'Fixed Target #4')
-
-    def hit(self):
-        super.hit()

src/targets/LeftDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class LeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Left Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/LeftLaneButton2Target.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton2Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #2")
-
-    def hit(self):
-        super.hit()

src/targets/LeftLaneButton3Target.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton3Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #3")
-
-    def hit(self):
-        super.hit()

src/targets/LeftLaneButton4Target.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton4Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #4")
-
-    def hit(self):
-        super.hit()

src/targets/LeftLaneButton5Target.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton5Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #5")
-
-    def hit(self):
-        super.hit()

src/targets/LeftPopBumperTarget.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftPopBumperTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()

src/targets/MiddleDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class MiddleDropTarget(Target):
-    def __init__(self):
-        super(100, 'Middle Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/MiddleLeftDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class MiddleLeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Middle Left Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/MiddleRightDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class MiddleRightDropTarget(Target):
-    def __init__(self):
-        super(100, 'Middle Right Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/ReboundContactTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class ReboundContactTarget(Target):
     def __init__(self):

src/targets/RightDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class RightDropTarget(Target):
-    def __init__(self):
-        super(100, 'Right Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/RightPopBumperTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class RightPopBumperTarget(Target):
-    def __init__(self):
-        super(100, 'Right Pop Bumper')
-
-    def hit(self):
-        super.hit()

src/targets/SecondFixedTarget.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class SecondFixedTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()

src/targets/ThirdFixedTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class ThirdFixedTarget(Target):
-    def __init__(self):
-        super(100, 'Fixed Target #3')
-
-    def hit(self):
-        super.hit()

src/targets/UPLeftDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPLeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Left Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/UPMiddleDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPMiddleDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Middle Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/UPMiddleLeftDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPMiddleLeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Middle Left Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/UPMiddleRightDropTarget.py

@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPMiddleRightDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Middle Right Drop Target')
-
-    def hit(self):
-        super.hit()

src/targets/UPRightDropTarget.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class UPRightDropTarget(Target):
-    def __init__(self):
-        super(100000, "Upper Playfield Right Drop Target")
-
-    def hit(self):
-        super.hit()

src/targets/UpperPlayfieldRollUnderTarget.py

@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class UpperPlayfieldRollUnderTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()

src/targets/__init__.py

@@ -3,6 +3,8 @@ __all__ = []
 import pkgutil
 import inspect
 
+__path__ = pkgutil.extend_path(__path__, __name__)
+
 for loader, name, is_pkg in pkgutil.walk_packages(__path__):
     module = loader.find_module(name).load_module(name)
 

src/targets/bottom_lanes/LeftInlaneTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftInlaneTarget(Target):
     def __init__(self):

src/targets/bottom_lanes/LeftOutlaneTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftOutlaneTarget(Target):
     def __init__(self):

src/targets/bottom_lanes/RightInlaneTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightInlaneTarget(Target):

src/targets/bottom_lanes/RightOutlaneKickerTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightOutlaneKickerTarget(Target):

src/targets/bottom_lanes/RightOutlaneTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightOutlaneTarget(Target):

src/targets/canal/CanalButtonBottomTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class CanalButtonTopTarget(Target):
+    def __init__(self):
+        super(20000, "Canal Button Bottom")
+
+    def hit(self):
+        super.hit()

src/targets/canal/CanalButtonMiddleBottomTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftLaneButton4Target(Target):
+    def __init__(self):
+        super(20000, "Canal Button Middle Bottom")
+
+    def hit(self):
+        super.hit()

src/targets/canal/CanalButtonMiddleTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftLaneButton3Target(Target):
+    def __init__(self):
+        super(20000, "Canal Button Middle")
+
+    def hit(self):
+        super.hit()

src/targets/canal/CanalButtonMiddleTopTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftLaneButton2Target(Target):
+    def __init__(self):
+        super(20000, "Canal Button Middle Top")
+
+    def hit(self):
+        super.hit()

src/targets/canal/CanalButtonTopTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftLaneButton1Target(Target):
     def __init__(self):

src/targets/fixed_targets/FixedTarget1.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget1(Target):
+    def __init__(self):
+        super(0, "Fixed Target 1")
+
+    def hit(self):
+        super.hit()

src/targets/fixed_targets/FixedTarget2.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget2(Target):
+    def __init__(self):
+        super(0, "Fixed Target 2")
+
+    def hit(self):
+        super.hit()

src/targets/fixed_targets/FixedTarget3.py

@@ -0,0 +1,8 @@
+from src.targets.Target import Target
+
+class FixedTarget3(Target):
+    def __init__(self):
+        super(100, 'Fixed Target 3')
+
+    def hit(self):
+        super.hit()

src/targets/fixed_targets/FixedTarget4.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget4(Target):
+    def __init__(self):
+        super(100, 'Fixed Target 4')
+
+    def hit(self):
+        super.hit()

src/targets/fixed_targets/FixedTarget5.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget5(Target):
+    def __init__(self):
+        super(100, 'Fixed Target 5')
+
+    def hit(self):
+        super.hit()

src/targets/left_bank/LeftBankLeft.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class LeftBankLeft(BankTarget):
+    def __init__(self):
+        super(100, 'Left Bank Left')
+
+    def hit(self):
+        super.hit()

src/targets/left_bank/LeftBankMiddleLeft.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class LeftBankMiddleLeft(BankTarget):
+    def __init__(self):
+        super(100, 'Left Bank Middle Left')
+
+    def hit(self):
+        super.hit()

src/targets/left_bank/LeftBankMiddleRight.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class LeftBankMiddleRight(BankTarget):
+    def __init__(self):
+        super(100, 'Left Bank Middle Right')
+
+    def hit(self):
+        super.hit()

src/targets/left_bank/LeftBankRight.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftBankLeft(Target):
+    def __init__(self):
+        super(100, 'Left Bank Right')
+
+    def hit(self):
+        super.hit()

src/targets/left_bank/LeftBankTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Bank import Bank
+
+
+class LeftBankTarget(Bank):
+    def __init__(self):
+        super()
+
+    def hit(self):
+        super.hit()

src/targets/pop_bumpers/LeftPopTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftPopTarget(Target):
+    def __init__(self):
+        super(0, "Left Pop")
+
+    def hit(self):
+        super.hit()

src/targets/pop_bumpers/RightPopTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class RightPopTarget(Target):
+    def __init__(self):
+        super(100, 'Right Pop')
+
+    def hit(self):
+        super.hit()

src/targets/right_bank/RightBank.py

@@ -0,0 +1,12 @@
+from src.targets.Bank import Bank
+from src.targets.right_bank import RightBankLeft
+from src.targets.right_bank import RightBankMiddle
+from src.targets.right_bank import RightBankRight
+
+class RightBank(Bank):
+    def __init__(self):
+        targets = [RightBankLeft(), RightBankMiddle(), RightBankRight]
+        super(0, "Right Bank", targets)
+
+    def hit(self):
+        super.hit()

src/targets/right_bank/RightBankLeft.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class RightBankLeft(BankTarget):
+    def __init__(self):
+        super(100, "Right Bank Left")
+
+    def hit(self):
+        super.hit()

src/targets/right_bank/RightBankMiddle.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class MiddleDropTarget(BankTarget):
+    def __init__(self):
+        super(100, 'Right Bank Middle')
+
+    def hit(self):
+        super.hit()

src/targets/right_bank/RightBankRight.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class RightBankRight(BankTarget):
+    def __init__(self):
+        super(100, "Right Bank Right")
+
+    def hit(self):
+        super.hit()

src/targets/slingshots/LeftSlingshotTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftSlingshotTarget(Target):
     def __init__(self):

src/targets/slingshots/RightSlingshotTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightSlingshotTarget(Target):

src/targets/specials/SpecialOrangeTarget.py

@@ -1,11 +1,12 @@
-from src.Target import Target
+from src.targets.Target import Target
+
 
 # A standup target. When lit, it scores the Orange Special (operator
 # adjustable) for Nothing, Extra Ball, Replay, Super Bonus, or 300,000
 # points. Scores 100,000 points when not lit.
 class FixedSpecialOrangeTarget(Target):
     def __init__(self):
-        super(100000, "Fixed Special Orange")
+        super(100000, "Special Orange")
 
     def hit(self):
         super.hit()

src/targets/specials/SpecialRedTarget.py

@@ -1,11 +1,12 @@
-from src.Target import Target
+from src.targets.Target import Target
+
 
 # A standup target. When lit, it scores the Red Special (operator
 # adjustable) for Nothing, Extra Ball, Replay, Super Bonus, or 1,000,000
 # points. Scores 10,000 points when not lit.
 class FixedSpecialRedTarget(Target):
     def __init__(self):
-        super(10000, "Fixed Special Red")
+        super(10000, "Special Red")
 
     def hit(self):
         super.hit()

src/targets/specials/SpinnerTarget.py

@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class SpinnerTarget(Target):
     def __init__(self):

src/targets/technical/CreditTarget.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class CreditTarget(Target):
+    def __init__(self):
+        super(0, 'Credit')
+
+    def hit(self):
+        super.hit()

src/targets/technical/OutholeTarget.py

@@ -1,8 +1,8 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class OutholeTarget(Target):
     def __init__(self):
-        super(100, 'Outhole Target')
+        super(100, 'Outhole')
 
     def hit(self):
         super.hit()

src/targets/technical/RisingBall.py

@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class RisingBall(Target):
+    def __init__(self):
+        super(0, "Rising Ball")
+
+    def hit(self):
+        super.hit()

src/targets/top_bank/TopBank.py

@@ -0,0 +1,9 @@
+from Target import Target
+
+
+class TopBank(Target):
+    def __init__(self):
+        super()
+
+    def hit(self):
+        super.hit()

src/targets/top_bank/TopBankLeft.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankLeft(BankTarget):
+    def __init__(self):
+        super(100, 'Top Bank Left')
+
+    def hit(self):
+        super.hit()

src/targets/top_bank/TopBankMiddle.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankMiddle(BankTarget):
+    def __init__(self):
+        super(100, "Top Bank Middle")
+
+    def hit(self):
+        super.hit()

src/targets/top_bank/TopBankMiddleLeft.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankMiddleLeft(BankTarget):
+    def __init__(self):
+        super(100, "Top Bank Middle Left")
+
+    def hit(self):
+        super.hit()

src/targets/top_bank/TopBankMiddleRight.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankMiddleRight(BankTarget):
+    def __init__(self):
+        super(100, "Top Bank Middle Right")
+
+    def hit(self):
+        super.hit()

src/targets/top_bank/TopBankRight.py

@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankRight(BankTarget):
+    def __init__(self):
+        super(100000, "Top Bank Right")
+
+    def hit(self):
+        super.hit()