change

targets/Bank.py

@@ -1,24 +0,0 @@
-from targets.Target import Target
-
-class Bank(Target):
-    def __init__(self, points, name, targets):
-        super(points, name)
-        self.targets = targets
-        self.__register_targets__()
-
-    def __target_hit__(self, target):
-        if all(target.is_hit for target in self.targets):
-            self.__all_targets_hit__()
-
-    def __all_targets_hit__(self):
-        self.__reset_all_targets__()
-        super.hit()
-        pass
-
-    def __reset_all_targets__(self):
-        for target in self.targets:
-            target.reset()
-
-    def __register_targets__(self):
-        for target in self.targets:
-            target.on(target.hit_key, self.__target_hit__)

targets/BankTarget.py

@@ -1,14 +0,0 @@
-from targets.Target import Target
-
-class BankTarget(Target):
-    def __init__(self, points):
-        super(points)
-        self.is_hit = False
-
-    def hit(self):
-        self.is_hit = True
-        super.hit()
-        #notify Bank
-
-    def reset(self):
-        self.is_hit = False

targets/ReboundContactTarget.py

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

targets/Target.py

@@ -1,15 +0,0 @@
-from observable import Observable
-import logging
-
-class Target(Observable):
-    def __init__(self, points, name):
-        logging.info("Target " + self.name + " created")
-        self.points = points
-        self.name = name
-        self.hit_key = "hit"
-
-    def hit(self):
-        #notify Observers
-        #notify Gamestate
-        logging.info("Target " + self.name + " hit")
-        self.trigger(self.hit_key, self)

targets/bottom_lanes/LeftInlaneTarget.py

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

targets/bottom_lanes/LeftOutlaneTarget.py

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

targets/bottom_lanes/RightInlaneTarget.py

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

targets/bottom_lanes/RightOutlaneKickerTarget.py

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

targets/bottom_lanes/RightOutlaneTarget.py

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

targets/canal/CanalButtonBottomTarget.py

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

targets/canal/CanalButtonMiddleBottomTarget.py

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

targets/canal/CanalButtonMiddleTarget.py

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

targets/canal/CanalButtonMiddleTopTarget.py

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

targets/canal/CanalButtonTopTarget.py

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

targets/fixed_targets/FixedTarget1.py

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

targets/fixed_targets/FixedTarget2.py

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

targets/fixed_targets/FixedTarget3.py

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

targets/fixed_targets/FixedTarget4.py

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

targets/fixed_targets/FixedTarget5.py

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

targets/left_bank/LeftBankLeft.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class LeftBankLeft(BankTarget):

targets/left_bank/LeftBankMiddleLeft.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class LeftBankMiddleLeft(BankTarget):

targets/left_bank/LeftBankMiddleRight.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class LeftBankMiddleRight(BankTarget):

targets/left_bank/LeftBankRight.py

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

targets/left_bank/LeftBankTarget.py

@@ -1,4 +1,4 @@
-from targets.Bank import Bank
+from Bank import Bank
 
 
 class LeftBankTarget(Bank):

targets/pop_bumpers/LeftPopTarget.py

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

targets/pop_bumpers/RightPopTarget.py

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

targets/right_bank/RightBank.py

@@ -1,4 +1,4 @@
-from targets.Bank import Bank
+from Bank import Bank
 from targets.right_bank import RightBankLeft
 from targets.right_bank import RightBankMiddle
 from targets.right_bank import RightBankRight

targets/right_bank/RightBankLeft.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class RightBankLeft(BankTarget):

targets/right_bank/RightBankMiddle.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class MiddleDropTarget(BankTarget):

targets/right_bank/RightBankRight.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class RightBankRight(BankTarget):

targets/slingshots/LeftSlingshotTarget.py

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

targets/slingshots/RightSlingshotTarget.py

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

targets/specials/SpecialOrangeTarget.py

@@ -1,4 +1,4 @@
-from targets.Target import Target
+from Target import Target
 
 
 # A standup target. When lit, it scores the Orange Special (operator

targets/specials/SpecialRedTarget.py

@@ -1,4 +1,4 @@
-from targets.Target import Target
+from Target import Target
 
 
 # A standup target. When lit, it scores the Red Special (operator

targets/specials/SpinnerTarget.py

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

targets/technical/CreditTarget.py

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

targets/technical/OutholeTarget.py

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

targets/technical/RisingBall.py

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

targets/top_bank/TopBankLeft.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class TopBankLeft(BankTarget):

targets/top_bank/TopBankMiddle.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class TopBankMiddle(BankTarget):

targets/top_bank/TopBankMiddleLeft.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class TopBankMiddleLeft(BankTarget):

targets/top_bank/TopBankMiddleRight.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class TopBankMiddleRight(BankTarget):

targets/top_bank/TopBankRight.py

@@ -1,4 +1,4 @@
-from targets.BankTarget import BankTarget
+from BankTarget import BankTarget
 
 
 class TopBankRight(BankTarget):