From 11122c2486f8682d09c990ea919893130889985c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 27 Jun 2015 18:56:35 +0300 Subject: [PATCH] RIP unused animated props --- toontown/hood/HydrantOneAnimatedProp.py | 32 -------------------- toontown/hood/HydrantTwoAnimatedProp.py | 32 -------------------- toontown/hood/HydrantZeroAnimatedProp.py | 17 ----------- toontown/hood/MailboxOneAnimatedProp.py | 32 -------------------- toontown/hood/MailboxTwoAnimatedProp.py | 32 -------------------- toontown/hood/MailboxZeroAnimatedProp.py | 17 ----------- toontown/hood/SleepingHydrantAnimatedProp.py | 26 ---------------- toontown/hood/TrashcanOneAnimatedProp.py | 32 -------------------- toontown/hood/TrashcanTwoAnimatedProp.py | 32 -------------------- toontown/hood/TrashcanZeroAnimatedProp.py | 17 ----------- 10 files changed, 269 deletions(-) delete mode 100644 toontown/hood/HydrantOneAnimatedProp.py delete mode 100644 toontown/hood/HydrantTwoAnimatedProp.py delete mode 100644 toontown/hood/HydrantZeroAnimatedProp.py delete mode 100644 toontown/hood/MailboxOneAnimatedProp.py delete mode 100644 toontown/hood/MailboxTwoAnimatedProp.py delete mode 100644 toontown/hood/MailboxZeroAnimatedProp.py delete mode 100755 toontown/hood/SleepingHydrantAnimatedProp.py delete mode 100644 toontown/hood/TrashcanOneAnimatedProp.py delete mode 100644 toontown/hood/TrashcanTwoAnimatedProp.py delete mode 100644 toontown/hood/TrashcanZeroAnimatedProp.py diff --git a/toontown/hood/HydrantOneAnimatedProp.py b/toontown/hood/HydrantOneAnimatedProp.py deleted file mode 100644 index 71f2bdde..00000000 --- a/toontown/hood/HydrantOneAnimatedProp.py +++ /dev/null @@ -1,32 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class HydrantOneAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('HydrantOneAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_ttc_hydrant_firstMoveArmUp1', 40 * PauseTimeMult), - 1: ('tt_a_ara_ttc_hydrant_firstMoveStruggle', 20 * PauseTimeMult), - 2: ('tt_a_ara_ttc_hydrant_firstMoveArmUp2', 10 * PauseTimeMult), - 3: ('tt_a_ara_ttc_hydrant_firstMoveJump', 8 * PauseTimeMult), - 4: ('tt_a_ara_ttc_hydrant_firstMoveJumpBalance', 6 * PauseTimeMult), - 5: ('tt_a_ara_ttc_hydrant_firstMoveArmUp3', 4 * PauseTimeMult), - 6: ('tt_a_ara_ttc_hydrant_firstMoveJumpSpin', 2 * PauseTimeMult)} - PhaseWeStartAnimating = 3 - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'hydrant', self.PhaseInfo, ToontownGlobals.HYDRANT_ZERO_HOLIDAY) - - def startIfNeeded(self): - try: - self.curPhase = self.getPhaseToRun() - if self.curPhase >= self.PhaseWeStartAnimating: - self.request('DoAnim') - except: - pass - - def handleNewPhase(self, newPhase): - if newPhase < self.PhaseWeStartAnimating: - self.request('Off') - else: - self.startIfNeeded() diff --git a/toontown/hood/HydrantTwoAnimatedProp.py b/toontown/hood/HydrantTwoAnimatedProp.py deleted file mode 100644 index c94435ec..00000000 --- a/toontown/hood/HydrantTwoAnimatedProp.py +++ /dev/null @@ -1,32 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class HydrantTwoAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('HydrantTwoAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_ttc_hydrant_firstMoveArmUp1', 40 * PauseTimeMult), - 1: ('tt_a_ara_ttc_hydrant_firstMoveStruggle', 20 * PauseTimeMult), - 2: ('tt_a_ara_ttc_hydrant_firstMoveArmUp2', 10 * PauseTimeMult), - 3: ('tt_a_ara_ttc_hydrant_firstMoveJump', 8 * PauseTimeMult), - 4: ('tt_a_ara_ttc_hydrant_firstMoveJumpBalance', 6 * PauseTimeMult), - 5: ('tt_a_ara_ttc_hydrant_firstMoveArmUp3', 4 * PauseTimeMult), - 6: ('tt_a_ara_ttc_hydrant_firstMoveJumpSpin', 2 * PauseTimeMult)} - PhaseWeStartAnimating = 5 - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'hydrant', self.PhaseInfo, ToontownGlobals.HYDRANT_ZERO_HOLIDAY) - - def startIfNeeded(self): - try: - self.curPhase = self.getPhaseToRun() - if self.curPhase >= self.PhaseWeStartAnimating: - self.request('DoAnim') - except: - pass - - def handleNewPhase(self, newPhase): - if newPhase < self.PhaseWeStartAnimating: - self.request('Off') - else: - self.startIfNeeded() diff --git a/toontown/hood/HydrantZeroAnimatedProp.py b/toontown/hood/HydrantZeroAnimatedProp.py deleted file mode 100644 index 98249ad1..00000000 --- a/toontown/hood/HydrantZeroAnimatedProp.py +++ /dev/null @@ -1,17 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class HydrantZeroAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('HydrantZeroAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_ttc_hydrant_firstMoveArmUp1', 40 * PauseTimeMult), - 1: ('tt_a_ara_ttc_hydrant_firstMoveStruggle', 20 * PauseTimeMult), - 2: ('tt_a_ara_ttc_hydrant_firstMoveArmUp2', 10 * PauseTimeMult), - 3: ('tt_a_ara_ttc_hydrant_firstMoveJump', 8 * PauseTimeMult), - 4: ('tt_a_ara_ttc_hydrant_firstMoveJumpBalance', 6 * PauseTimeMult), - 5: ('tt_a_ara_ttc_hydrant_firstMoveArmUp3', 4 * PauseTimeMult), - 6: ('tt_a_ara_ttc_hydrant_firstMoveJumpSpin', 2 * PauseTimeMult)} - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'hydrant', self.PhaseInfo, ToontownGlobals.HYDRANT_ZERO_HOLIDAY) diff --git a/toontown/hood/MailboxOneAnimatedProp.py b/toontown/hood/MailboxOneAnimatedProp.py deleted file mode 100644 index 26ca187d..00000000 --- a/toontown/hood/MailboxOneAnimatedProp.py +++ /dev/null @@ -1,32 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class MailboxOneAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('MailboxOneAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin1', 40 * PauseTimeMult), - 1: (('tt_a_ara_dod_mailbox_firstMoveStruggle', 'tt_a_ara_dod_mailbox_firstMoveJump'), 20 * PauseTimeMult), - 2: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin2', 10 * PauseTimeMult), - 3: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin3', 8 * PauseTimeMult), - 4: ('tt_a_ara_dod_mailbox_firstMoveJumpSummersault', 6 * PauseTimeMult), - 5: ('tt_a_ara_dod_mailbox_firstMoveJumpFall', 4 * PauseTimeMult), - 6: ('tt_a_ara_dod_mailbox_firstMoveJump3Summersaults', 2 * PauseTimeMult)} - PhaseWeStartAnimating = 3 - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'mailbox', self.PhaseInfo, ToontownGlobals.MAILBOX_ZERO_HOLIDAY) - - def startIfNeeded(self): - try: - self.curPhase = self.getPhaseToRun() - if self.curPhase >= self.PhaseWeStartAnimating: - self.request('DoAnim') - except: - pass - - def handleNewPhase(self, newPhase): - if newPhase < self.PhaseWeStartAnimating: - self.request('Off') - else: - self.startIfNeeded() diff --git a/toontown/hood/MailboxTwoAnimatedProp.py b/toontown/hood/MailboxTwoAnimatedProp.py deleted file mode 100644 index 8c2472a7..00000000 --- a/toontown/hood/MailboxTwoAnimatedProp.py +++ /dev/null @@ -1,32 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class MailboxTwoAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('MailboxTwoAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin1', 40 * PauseTimeMult), - 1: (('tt_a_ara_dod_mailbox_firstMoveStruggle', 'tt_a_ara_dod_mailbox_firstMoveJump'), 20 * PauseTimeMult), - 2: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin2', 10 * PauseTimeMult), - 3: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin3', 8 * PauseTimeMult), - 4: ('tt_a_ara_dod_mailbox_firstMoveJumpSummersault', 6 * PauseTimeMult), - 5: ('tt_a_ara_dod_mailbox_firstMoveJumpFall', 4 * PauseTimeMult), - 6: ('tt_a_ara_dod_mailbox_firstMoveJump3Summersaults', 2 * PauseTimeMult)} - PhaseWeStartAnimating = 5 - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'mailbox', self.PhaseInfo, ToontownGlobals.MAILBOX_ZERO_HOLIDAY) - - def startIfNeeded(self): - try: - self.curPhase = self.getPhaseToRun() - if self.curPhase >= self.PhaseWeStartAnimating: - self.request('DoAnim') - except: - pass - - def handleNewPhase(self, newPhase): - if newPhase < self.PhaseWeStartAnimating: - self.request('Off') - else: - self.startIfNeeded() diff --git a/toontown/hood/MailboxZeroAnimatedProp.py b/toontown/hood/MailboxZeroAnimatedProp.py deleted file mode 100644 index 2ccdf35b..00000000 --- a/toontown/hood/MailboxZeroAnimatedProp.py +++ /dev/null @@ -1,17 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class MailboxZeroAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('MailboxZeroAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin1', 40 * PauseTimeMult), - 1: (('tt_a_ara_dod_mailbox_firstMoveStruggle', 'tt_a_ara_dod_mailbox_firstMoveJump'), 20 * PauseTimeMult), - 2: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin2', 10 * PauseTimeMult), - 3: ('tt_a_ara_dod_mailbox_firstMoveFlagSpin3', 8 * PauseTimeMult), - 4: ('tt_a_ara_dod_mailbox_firstMoveJumpSummersault', 6 * PauseTimeMult), - 5: ('tt_a_ara_dod_mailbox_firstMoveJumpFall', 4 * PauseTimeMult), - 6: ('tt_a_ara_dod_mailbox_firstMoveJump3Summersaults', 2 * PauseTimeMult)} - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'mailbox', self.PhaseInfo, ToontownGlobals.MAILBOX_ZERO_HOLIDAY) diff --git a/toontown/hood/SleepingHydrantAnimatedProp.py b/toontown/hood/SleepingHydrantAnimatedProp.py deleted file mode 100755 index 0b6845b6..00000000 --- a/toontown/hood/SleepingHydrantAnimatedProp.py +++ /dev/null @@ -1,26 +0,0 @@ -import AnimatedProp -from direct.interval.IntervalGlobal import * -from direct.task import Task -import math - -class SleepingHydrantAnimatedProp(AnimatedProp.AnimatedProp): - - def __init__(self, node): - AnimatedProp.AnimatedProp.__init__(self, node) - self.task = None - return - - def bobTask(self, task): - self.node.setSz(1.0 + 0.08 * math.sin(task.time)) - return Task.cont - - def enter(self): - AnimatedProp.AnimatedProp.enter(self) - self.task = taskMgr.add(self.bobTask, self.uniqueName('bobTask')) - - def exit(self): - AnimatedProp.AnimatedProp.exit(self) - if self.task: - taskMgr.remove(self.task) - self.task = None - return diff --git a/toontown/hood/TrashcanOneAnimatedProp.py b/toontown/hood/TrashcanOneAnimatedProp.py deleted file mode 100644 index 68d4331a..00000000 --- a/toontown/hood/TrashcanOneAnimatedProp.py +++ /dev/null @@ -1,32 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class TrashcanOneAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('TrashcanOneAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_dga_trashcan_firstMoveLidFlip1', 40 * PauseTimeMult), - 1: ('tt_a_ara_dga_trashcan_firstMoveStruggle', 20 * PauseTimeMult), - 2: ('tt_a_ara_dga_trashcan_firstMoveLidFlip2', 10 * PauseTimeMult), - 3: ('tt_a_ara_dga_trashcan_firstMoveJump', 8 * PauseTimeMult), - 4: ('tt_a_ara_dga_trashcan_firstMoveLidFlip3', 6 * PauseTimeMult), - 5: ('tt_a_ara_dga_trashcan_firstMoveJumpHit', 4 * PauseTimeMult), - 6: ('tt_a_ara_dga_trashcan_firstMoveJumpJuggle', 2 * PauseTimeMult)} - PhaseWeStartAnimating = 3 - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'trashcan', self.PhaseInfo, ToontownGlobals.TRASHCAN_ZERO_HOLIDAY) - - def startIfNeeded(self): - try: - self.curPhase = self.getPhaseToRun() - if self.curPhase >= self.PhaseWeStartAnimating: - self.request('DoAnim') - except: - pass - - def handleNewPhase(self, newPhase): - if newPhase < self.PhaseWeStartAnimating: - self.request('Off') - else: - self.startIfNeeded() diff --git a/toontown/hood/TrashcanTwoAnimatedProp.py b/toontown/hood/TrashcanTwoAnimatedProp.py deleted file mode 100644 index f0b86cec..00000000 --- a/toontown/hood/TrashcanTwoAnimatedProp.py +++ /dev/null @@ -1,32 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class TrashcanTwoAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('TrashcanTwoAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_dga_trashcan_firstMoveLidFlip1', 40 * PauseTimeMult), - 1: ('tt_a_ara_dga_trashcan_firstMoveStruggle', 20 * PauseTimeMult), - 2: ('tt_a_ara_dga_trashcan_firstMoveLidFlip2', 10 * PauseTimeMult), - 3: ('tt_a_ara_dga_trashcan_firstMoveJump', 8 * PauseTimeMult), - 4: ('tt_a_ara_dga_trashcan_firstMoveLidFlip3', 6 * PauseTimeMult), - 5: ('tt_a_ara_dga_trashcan_firstMoveJumpHit', 4 * PauseTimeMult), - 6: ('tt_a_ara_dga_trashcan_firstMoveJumpJuggle', 2 * PauseTimeMult)} - PhaseWeStartAnimating = 5 - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'trashcan', self.PhaseInfo, ToontownGlobals.TRASHCAN_ZERO_HOLIDAY) - - def startIfNeeded(self): - try: - self.curPhase = self.getPhaseToRun() - if self.curPhase >= self.PhaseWeStartAnimating: - self.request('DoAnim') - except: - pass - - def handleNewPhase(self, newPhase): - if newPhase < self.PhaseWeStartAnimating: - self.request('Off') - else: - self.startIfNeeded() diff --git a/toontown/hood/TrashcanZeroAnimatedProp.py b/toontown/hood/TrashcanZeroAnimatedProp.py deleted file mode 100644 index 7b432ad9..00000000 --- a/toontown/hood/TrashcanZeroAnimatedProp.py +++ /dev/null @@ -1,17 +0,0 @@ -from toontown.hood import ZeroAnimatedProp -from toontown.toonbase import ToontownGlobals -from direct.directnotify import DirectNotifyGlobal - -class TrashcanZeroAnimatedProp(ZeroAnimatedProp.ZeroAnimatedProp): - notify = DirectNotifyGlobal.directNotify.newCategory('TrashcanZeroAnimatedProp') - PauseTimeMult = base.config.GetFloat('zero-pause-mult', 1.0) - PhaseInfo = {0: ('tt_a_ara_dga_trashcan_firstMoveLidFlip1', 40 * PauseTimeMult), - 1: ('tt_a_ara_dga_trashcan_firstMoveStruggle', 20 * PauseTimeMult), - 2: ('tt_a_ara_dga_trashcan_firstMoveLidFlip2', 10 * PauseTimeMult), - 3: ('tt_a_ara_dga_trashcan_firstMoveJump', 8 * PauseTimeMult), - 4: ('tt_a_ara_dga_trashcan_firstMoveLidFlip3', 6 * PauseTimeMult), - 5: ('tt_a_ara_dga_trashcan_firstMoveJumpHit', 4 * PauseTimeMult), - 6: ('tt_a_ara_dga_trashcan_firstMoveJumpJuggle', 2 * PauseTimeMult)} - - def __init__(self, node): - ZeroAnimatedProp.ZeroAnimatedProp.__init__(self, node, 'trashcan', self.PhaseInfo, ToontownGlobals.TRASHCAN_ZERO_HOLIDAY)