diff --git a/toontown/building/DistributedElevatorIntAI.py b/toontown/building/DistributedElevatorIntAI.py index 791336e..2cbc789 100644 --- a/toontown/building/DistributedElevatorIntAI.py +++ b/toontown/building/DistributedElevatorIntAI.py @@ -2,7 +2,8 @@ from otp.ai.AIBase import * from toontown.toonbase import ToontownGlobals from direct.distributed.ClockDelta import * from .ElevatorConstants import * -import copy, DistributedElevatorAI +import copy +from . import DistributedElevatorAI from direct.fsm import ClassicFSM from direct.fsm import State from direct.task import Task diff --git a/toontown/building/DistributedSuitInteriorAI.py b/toontown/building/DistributedSuitInteriorAI.py index 3359c20..1b7c1f3 100644 --- a/toontown/building/DistributedSuitInteriorAI.py +++ b/toontown/building/DistributedSuitInteriorAI.py @@ -9,7 +9,8 @@ from direct.fsm import State from toontown.battle import DistributedBattleBldgAI from toontown.battle import BattleBase from direct.task import Timer -import DistributedElevatorIntAI, copy +from . import DistributedElevatorIntAI +import copy class DistributedSuitInteriorAI(DistributedObjectAI.DistributedObjectAI): diff --git a/toontown/building/SuitPlannerInteriorAI.py b/toontown/building/SuitPlannerInteriorAI.py index 811c4ce..ab2f6a3 100644 --- a/toontown/building/SuitPlannerInteriorAI.py +++ b/toontown/building/SuitPlannerInteriorAI.py @@ -3,7 +3,7 @@ import random from toontown.suit import SuitDNA from direct.directnotify import DirectNotifyGlobal from toontown.suit import DistributedSuitAI -import SuitBuildingGlobals, types +from . import SuitBuildingGlobals class SuitPlannerInteriorAI: notify = DirectNotifyGlobal.directNotify.newCategory('SuitPlannerInteriorAI') diff --git a/toontown/classicchars/DistributedDonaldDockAI.py b/toontown/classicchars/DistributedDonaldDockAI.py index 411bbac..75763ea 100644 --- a/toontown/classicchars/DistributedDonaldDockAI.py +++ b/toontown/classicchars/DistributedDonaldDockAI.py @@ -4,7 +4,7 @@ from direct.directnotify import DirectNotifyGlobal from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.task import Task -import random, CharStateDatasAI +from . import CharStateDatasAI from toontown.toonbase import ToontownGlobals from toontown.toonbase import TTLocalizer diff --git a/toontown/classicchars/DistributedPlutoAI.py b/toontown/classicchars/DistributedPlutoAI.py index 667b40d..c55026f 100644 --- a/toontown/classicchars/DistributedPlutoAI.py +++ b/toontown/classicchars/DistributedPlutoAI.py @@ -4,7 +4,7 @@ from direct.directnotify import DirectNotifyGlobal from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.task import Task -import random, CharStateDatasAI, CCharChatter +from . import CharStateDatasAI, CCharChatter from toontown.toonbase import ToontownGlobals from toontown.toonbase import TTLocalizer diff --git a/toontown/cogdominium/CogdoBarrelRoomAI.py b/toontown/cogdominium/CogdoBarrelRoomAI.py index 0a27174..462df1b 100644 --- a/toontown/cogdominium/CogdoBarrelRoomAI.py +++ b/toontown/cogdominium/CogdoBarrelRoomAI.py @@ -1,5 +1,4 @@ import random -from sets import Set from direct.directnotify import DirectNotifyGlobal from direct.distributed import DistributedObjectAI from direct.showbase import PythonUtil @@ -111,9 +110,9 @@ class CogdoBarrelRoomAI: return not toon.isToonedUp() def __allBarrelsCollected(self): - toonsNeedingLaff = Set([toon for toon in self.cogdoInteriorAI.toons if self.__toonIdNeedsLaff(toon)]) + toonsNeedingLaff = set([toon for toon in self.cogdoInteriorAI.toons if self.__toonIdNeedsLaff(toon)]) for barrel in self.spawnedBarrels: - if not toonsNeedingLaff.issubset(Set(barrel.grabbedBy)): + if not toonsNeedingLaff.issubset(set(barrel.grabbedBy)): return False return True diff --git a/toontown/cogdominium/DistCogdoGameAI.py b/toontown/cogdominium/DistCogdoGameAI.py index 0cb1625..027ab1e 100644 --- a/toontown/cogdominium/DistCogdoGameAI.py +++ b/toontown/cogdominium/DistCogdoGameAI.py @@ -1,4 +1,3 @@ -import new from direct.directnotify.DirectNotifyGlobal import directNotify from direct.distributed.ClockDelta import globalClockDelta from direct.distributed.DistributedObjectAI import DistributedObjectAI diff --git a/toontown/coghq/DistributedFactoryAI.py b/toontown/coghq/DistributedFactoryAI.py index fe596e7..548ec18 100644 --- a/toontown/coghq/DistributedFactoryAI.py +++ b/toontown/coghq/DistributedFactoryAI.py @@ -1,6 +1,6 @@ from otp.level import DistributedLevelAI from direct.directnotify import DirectNotifyGlobal -import pickle, LevelSuitPlannerAI, FactoryBase +from . import LevelSuitPlannerAI, FactoryBase from direct.task import Task from . import FactoryEntityCreatorAI, FactorySpecs from otp.level import LevelSpec diff --git a/toontown/coghq/DistributedLawOfficeAI.py b/toontown/coghq/DistributedLawOfficeAI.py index 7fc3119..2516d69 100644 --- a/toontown/coghq/DistributedLawOfficeAI.py +++ b/toontown/coghq/DistributedLawOfficeAI.py @@ -1,6 +1,6 @@ from otp.level import DistributedLevelAI from direct.directnotify import DirectNotifyGlobal -import pickle, LevelSuitPlannerAI, LawOfficeBase +from . import LevelSuitPlannerAI, LawOfficeBase from direct.task import Task from . import FactoryEntityCreatorAI, FactorySpecs from otp.level import LevelSpec diff --git a/toontown/coghq/DistributedLawOfficeFloorAI.py b/toontown/coghq/DistributedLawOfficeFloorAI.py index 7b08713..7fc7414 100644 --- a/toontown/coghq/DistributedLawOfficeFloorAI.py +++ b/toontown/coghq/DistributedLawOfficeFloorAI.py @@ -1,6 +1,6 @@ from otp.level import DistributedLevelAI from direct.directnotify import DirectNotifyGlobal -import pickle, LevelSuitPlannerAI, LawOfficeBase +from . import LevelSuitPlannerAI, LawOfficeBase from direct.task import Task from . import FactoryEntityCreatorAI, FactorySpecs from otp.level import LevelSpec diff --git a/toontown/coghq/LevelSuitPlannerAI.py b/toontown/coghq/LevelSuitPlannerAI.py index 974b46f..7776508 100644 --- a/toontown/coghq/LevelSuitPlannerAI.py +++ b/toontown/coghq/LevelSuitPlannerAI.py @@ -2,7 +2,8 @@ from pandac.PandaModules import * from direct.showbase import DirectObject from toontown.suit import SuitDNA from direct.directnotify import DirectNotifyGlobal -import LevelBattleManagerAI, types, random +from . import LevelBattleManagerAI +import random class LevelSuitPlannerAI(DirectObject.DirectObject): notify = DirectNotifyGlobal.directNotify.newCategory('LevelSuitPlannerAI') diff --git a/toontown/racing/DistributedRaceAI.py b/toontown/racing/DistributedRaceAI.py index 2af7280..b54873f 100644 --- a/toontown/racing/DistributedRaceAI.py +++ b/toontown/racing/DistributedRaceAI.py @@ -4,7 +4,8 @@ from toontown.toonbase import ToontownGlobals from otp.otpbase.PythonUtil import nonRepeatingRandomList from . import DistributedGagAI, DistributedProjectileAI from direct.task import Task -import random, time, Racer, RaceGlobals +import random +from . import Racer, RaceGlobals from direct.distributed.ClockDelta import * class DistributedRaceAI(DistributedObjectAI.DistributedObjectAI): diff --git a/toontown/safezone/DistributedButterflyAI.py b/toontown/safezone/DistributedButterflyAI.py index 73b9b05..1c9001b 100644 --- a/toontown/safezone/DistributedButterflyAI.py +++ b/toontown/safezone/DistributedButterflyAI.py @@ -5,7 +5,8 @@ from direct.distributed import DistributedObjectAI from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.task import Task -import ButterflyGlobals, random +from . import ButterflyGlobals +import random class DistributedButterflyAI(DistributedObjectAI.DistributedObjectAI): diff --git a/toontown/suit/DistributedBossCogAI.py b/toontown/suit/DistributedBossCogAI.py index 5d386c6..094a7fb 100644 --- a/toontown/suit/DistributedBossCogAI.py +++ b/toontown/suit/DistributedBossCogAI.py @@ -9,7 +9,8 @@ from toontown.building import SuitPlannerInteriorAI from toontown.battle import BattleBase from toontown.coghq import CogDisguiseGlobals from pandac.PandaModules import * -import SuitDNA, random +from . import SuitDNA +import random AllBossCogs = [] class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI): diff --git a/toontown/suit/DistributedCashbotBossAI.py b/toontown/suit/DistributedCashbotBossAI.py index 6b20075..4de3775 100644 --- a/toontown/suit/DistributedCashbotBossAI.py +++ b/toontown/suit/DistributedCashbotBossAI.py @@ -8,7 +8,8 @@ from toontown.coghq import DistributedCashbotBossTreasureAI from toontown.battle import BattleExperienceAI from toontown.chat import ResistanceChat from direct.fsm import FSM -import DistributedBossCogAI, SuitDNA, random, math +from . import DistributedBossCogAI +import random, math class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FSM): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedCashbotBossAI') diff --git a/toontown/suit/DistributedCashbotBossGoonAI.py b/toontown/suit/DistributedCashbotBossGoonAI.py index f45f173..1438fbc 100644 --- a/toontown/suit/DistributedCashbotBossGoonAI.py +++ b/toontown/suit/DistributedCashbotBossGoonAI.py @@ -8,7 +8,8 @@ from toontown.toonbase import ToontownGlobals from otp.otpbase import OTPGlobals from toontown.coghq import DistributedCashbotBossObjectAI from direct.showbase import PythonUtil -import DistributedGoonAI, math, random +from . import DistributedGoonAI +import math, random class DistributedCashbotBossGoonAI(DistributedGoonAI.DistributedGoonAI, DistributedCashbotBossObjectAI.DistributedCashbotBossObjectAI): legLength = 10 diff --git a/toontown/suit/DistributedLawbotBossAI.py b/toontown/suit/DistributedLawbotBossAI.py index a24b457..16ae157 100644 --- a/toontown/suit/DistributedLawbotBossAI.py +++ b/toontown/suit/DistributedLawbotBossAI.py @@ -12,7 +12,8 @@ from toontown.toonbase import TTLocalizer from toontown.battle import BattleBase from toontown.toon import NPCToons from toontown.building import SuitBuildingGlobals -import SuitDNA, random +from . import SuitDNA +import random from toontown.coghq import DistributedLawbotBossGavelAI from toontown.suit import DistributedLawbotBossSuitAI from toontown.coghq import DistributedLawbotCannonAI diff --git a/toontown/suit/DistributedLawbotBossSuitAI.py b/toontown/suit/DistributedLawbotBossSuitAI.py index 3a0b1cb..1311f94 100644 --- a/toontown/suit/DistributedLawbotBossSuitAI.py +++ b/toontown/suit/DistributedLawbotBossSuitAI.py @@ -3,7 +3,8 @@ from direct.distributed.ClockDelta import * from direct.directnotify import DirectNotifyGlobal from toontown.battle import SuitBattleGlobals from toontown.toonbase import ToontownGlobals -import DistributedSuitBaseAI, random +from . import DistributedSuitBaseAI +import random from direct.fsm import ClassicFSM, State from direct.fsm import State diff --git a/toontown/suit/DistributedSellbotBossAI.py b/toontown/suit/DistributedSellbotBossAI.py index 8294faf..2a2b87c 100644 --- a/toontown/suit/DistributedSellbotBossAI.py +++ b/toontown/suit/DistributedSellbotBossAI.py @@ -12,7 +12,8 @@ from toontown.toonbase import TTLocalizer from toontown.battle import BattleBase from toontown.toon import NPCToons from toontown.suit import SellbotBossGlobals -import SuitDNA, random +from . import SuitDNA +import random class DistributedSellbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FSM): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedSellbotBossAI')