diff --git a/toontown/coghq/DistributedFactoryAI.py b/toontown/coghq/DistributedFactoryAI.py index 26350389..2b1c4f95 100644 --- a/toontown/coghq/DistributedFactoryAI.py +++ b/toontown/coghq/DistributedFactoryAI.py @@ -1,16 +1,10 @@ -from otp.level import DistributedLevelAI from direct.directnotify import DirectNotifyGlobal -import cPickle -import LevelSuitPlannerAI -import FactoryBase from direct.task import Task -import FactoryEntityCreatorAI -import FactorySpecs -from otp.level import LevelSpec -import CogDisguiseGlobals +from otp.level import DistributedLevelAI, LevelSpec from toontown.suit import DistributedFactorySuitAI from toontown.toonbase import ToontownGlobals, ToontownBattleGlobals from toontown.coghq import DistributedBattleFactoryAI +import FactoryBase, FactoryEntityCreatorAI, FactorySpecs, LevelSuitPlannerAI class DistributedFactoryAI(DistributedLevelAI.DistributedLevelAI, FactoryBase.FactoryBase): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedFactoryAI') diff --git a/toontown/coghq/DistributedGolfGreenGame.py b/toontown/coghq/DistributedGolfGreenGame.py index e16fb483..9e9dbfbf 100644 --- a/toontown/coghq/DistributedGolfGreenGame.py +++ b/toontown/coghq/DistributedGolfGreenGame.py @@ -4,7 +4,6 @@ from direct.particles import ParticleEffect from StomperGlobals import * from direct.distributed import ClockDelta from direct.showbase.PythonUtil import lerp -import math from otp.level import DistributedEntity from direct.directnotify import DirectNotifyGlobal from pandac.PandaModules import NodePath @@ -17,19 +16,14 @@ from toontown.toonbase import ToontownBattleGlobals from direct.distributed.ClockDelta import * from toontown.golf import BuildGeometry from direct.gui.DirectGui import * -import random from direct.showbase import RandomNumGen -import GameSprite3D -from math import pi -import math -import random -import cPickle from toontown.distributed import DelayDelete from toontown.toon import ToonHeadFrame from toontown.battle import BattleParticles from toontown.battle import MovieUtil -import time from toontown.toonbase import ToontownTimer +from math import pi +import GameSprite3D, math, random class DistributedGolfGreenGame(BattleBlocker.BattleBlocker): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedGolfGreenGame') diff --git a/toontown/coghq/DistributedLawOfficeAI.py b/toontown/coghq/DistributedLawOfficeAI.py index c7d01617..1e54fb41 100644 --- a/toontown/coghq/DistributedLawOfficeAI.py +++ b/toontown/coghq/DistributedLawOfficeAI.py @@ -1,10 +1,3 @@ -import cPickle - -import CogDisguiseGlobals -import FactoryEntityCreatorAI -import FactorySpecs -import LawOfficeBase -import LevelSuitPlannerAI from direct.directnotify import DirectNotifyGlobal from direct.distributed.DistributedObjectAI import * from direct.showbase import PythonUtil @@ -13,13 +6,10 @@ from otp.level import DistributedLevelAI from otp.level import LevelSpec from toontown.ai.ToonBarrier import * from toontown.building import DistributedElevatorFloorAI -from toontown.coghq import DistributedBattleFactoryAI -from toontown.coghq import DistributedLawOfficeElevatorIntAI -from toontown.coghq import DistributedLawOfficeFloorAI -from toontown.coghq import LawOfficeLayout +from toontown.coghq import DistributedBattleFactoryAI, DistributedLawOfficeElevatorIntAI, DistributedLawOfficeFloorAI, LawOfficeLayout from toontown.suit import DistributedFactorySuitAI from toontown.toonbase import ToontownGlobals, ToontownBattleGlobals - +import FactoryEntityCreatorAI, FactorySpecs, LawOfficeBase, LevelSuitPlannerAI class DistributedLawOfficeAI(DistributedObjectAI, LawOfficeBase.LawOfficeBase): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedLawOfficeAI') diff --git a/toontown/coghq/DistributedLawOfficeFloorAI.py b/toontown/coghq/DistributedLawOfficeFloorAI.py index 0a5fb334..6385d28b 100644 --- a/toontown/coghq/DistributedLawOfficeFloorAI.py +++ b/toontown/coghq/DistributedLawOfficeFloorAI.py @@ -1,22 +1,12 @@ -import cPickle - -import CogDisguiseGlobals -import FactoryEntityCreatorAI -import FactorySpecs -import LawOfficeBase -import LevelSuitPlannerAI from direct.directnotify import DirectNotifyGlobal from direct.distributed import DistributedObjectAI from direct.task import Task -from otp.level import DistributedLevelAI -from otp.level import LevelSpec +from otp.level import DistributedLevelAI, LevelSpec from toontown.ai.ToonBarrier import * -from toontown.coghq import DistributedBattleFactoryAI -from toontown.coghq import DistributedLawOfficeElevatorIntAI -from toontown.coghq import LawOfficeLayout +from toontown.coghq import DistributedBattleFactoryAI, DistributedLawOfficeElevatorIntAI, LawOfficeLayout from toontown.suit import DistributedFactorySuitAI from toontown.toonbase import ToontownGlobals, ToontownBattleGlobals - +import FactoryEntityCreatorAI, FactorySpecs, LawOfficeBase, LevelSuitPlannerAI class DistributedLawOfficeFloorAI(DistributedLevelAI.DistributedLevelAI, LawOfficeBase.LawOfficeBase): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedLawOfficeAI') @@ -134,4 +124,4 @@ class DistributedLawOfficeFloorAI(DistributedLevelAI.DistributedLevelAI, LawOffi suitIds = [] for suit in self.reserveSuits: suitIds.append(suit[0].doId) - return suitIds + return suitIds \ No newline at end of file diff --git a/toontown/estate/DistributedGarden.py b/toontown/estate/DistributedGarden.py index f7b1263e..3af35d34 100644 --- a/toontown/estate/DistributedGarden.py +++ b/toontown/estate/DistributedGarden.py @@ -1,22 +1,9 @@ from pandac.PandaModules import * -from toontown.toonbase.ToonBaseGlobal import * -from direct.gui.DirectGui import * -from pandac.PandaModules import * -from direct.distributed.ClockDelta import * -from toontown.toonbase import ToontownGlobals from direct.distributed import DistributedObject +from direct.distributed.ClockDelta import * from direct.directnotify import DirectNotifyGlobal -from direct.fsm import ClassicFSM -from direct.fsm import State -from toontown.toon import Toon -from direct.showbase import RandomNumGen -from toontown.toonbase import TTLocalizer -import random -import random -import cPickle -from direct.showbase import PythonUtil -from toontown.hood import Place -import Estate +from direct.gui.DirectGui import * +from toontown.toonbase.ToonBaseGlobal import * import HouseGlobals class DistributedGarden(DistributedObject.DistributedObject): diff --git a/toontown/estate/GardenProgressMeter.py b/toontown/estate/GardenProgressMeter.py index ff9917ce..0a092012 100644 --- a/toontown/estate/GardenProgressMeter.py +++ b/toontown/estate/GardenProgressMeter.py @@ -1,26 +1,13 @@ from pandac.PandaModules import * -from toontown.toonbase.ToonBaseGlobal import * -from direct.gui.DirectGui import * -from pandac.PandaModules import * -from direct.gui.DirectScrolledList import * -from direct.distributed.ClockDelta import * -from toontown.toontowngui import TTDialog -import math -from toontown.toonbase import ToontownGlobals from direct.distributed import DistributedObject from direct.directnotify import DirectNotifyGlobal -from direct.fsm import ClassicFSM -from direct.fsm import State -from toontown.toon import Toon -from direct.showbase import RandomNumGen -from toontown.toonbase import TTLocalizer -import random -import random -import cPickle -from direct.showbase import PythonUtil -import GameSprite -from math import pi +from direct.distributed.ClockDelta import * +from direct.gui.DirectScrolledList import * +from direct.gui.DirectGui import * +from toontown.toonbase.ToonBaseGlobal import * +from toontown.toonbase import ToontownGlobals, TTLocalizer from toontown.estate import GardenGlobals + SHOVEL = 0 WATERINGCAN = 1 GAMEWIN = 2