diff --git a/otp/avatar/Avatar.py b/otp/avatar/Avatar.py index 4834033..61a8f0e 100644 --- a/otp/avatar/Avatar.py +++ b/otp/avatar/Avatar.py @@ -1,6 +1,6 @@ from pandac.PandaModules import * -from libotp import Nametag, NametagGroup -from libotp import CFSpeech, CFThought, CFTimeout, CFPageButton, CFNoQuitButton, CFQuitButton +from panda3d.otp import Nametag, NametagGroup +from panda3d.otp import CFSpeech, CFThought, CFTimeout, CFPageButton, CFNoQuitButton, CFQuitButton from otp.otpbase import OTPGlobals from otp.otpbase import OTPLocalizer from direct.actor.Actor import Actor diff --git a/otp/avatar/DistributedAvatar.py b/otp/avatar/DistributedAvatar.py index 8b3d057..a8b978e 100644 --- a/otp/avatar/DistributedAvatar.py +++ b/otp/avatar/DistributedAvatar.py @@ -6,7 +6,7 @@ from direct.actor.DistributedActor import DistributedActor from direct.interval.IntervalGlobal import * from direct.task import Task from direct.showbase import PythonUtil -from libotp import Nametag +from panda3d.otp import Nametag from otp.otpbase import OTPGlobals from otp.otpbase import OTPLocalizer from otp.speedchat import SCDecoders diff --git a/otp/avatar/DistributedPlayer.py b/otp/avatar/DistributedPlayer.py index ab65518..dbfa9c5 100644 --- a/otp/avatar/DistributedPlayer.py +++ b/otp/avatar/DistributedPlayer.py @@ -1,6 +1,6 @@ from pandac.PandaModules import * -from libotp import WhisperPopup -from libotp import CFQuicktalker, CFPageButton, CFQuitButton, CFSpeech, CFThought, CFTimeout +from panda3d.otp import WhisperPopup +from panda3d.otp import CFQuicktalker, CFPageButton, CFQuitButton, CFSpeech, CFThought, CFTimeout from otp.chat import ChatGarbler import string from direct.task import Task diff --git a/otp/avatar/LocalAvatar.py b/otp/avatar/LocalAvatar.py index 32ec2b5..4f89053 100644 --- a/otp/avatar/LocalAvatar.py +++ b/otp/avatar/LocalAvatar.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import Nametag, WhisperPopup +from panda3d.otp import Nametag, WhisperPopup from direct.gui.DirectGui import * from direct.showbase.PythonUtil import * from direct.interval.IntervalGlobal import * diff --git a/otp/chat/TalkAssistant.py b/otp/chat/TalkAssistant.py index 160cd99..866eaf7 100644 --- a/otp/chat/TalkAssistant.py +++ b/otp/chat/TalkAssistant.py @@ -10,7 +10,7 @@ from otp.chat.TalkHandle import TalkHandle import time from otp.chat.TalkGlobals import * from otp.chat.ChatGlobals import * -from libotp import CFSpeech, CFTimeout, CFThought +from panda3d.otp import CFSpeech, CFTimeout, CFThought ThoughtPrefix = '.' class TalkAssistant(DirectObject.DirectObject): diff --git a/otp/friends/FriendSecret.py b/otp/friends/FriendSecret.py index 295f906..9a441ce 100644 --- a/otp/friends/FriendSecret.py +++ b/otp/friends/FriendSecret.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.gui.DirectGui import * from direct.directnotify import DirectNotifyGlobal from direct.fsm import StateData diff --git a/otp/movement/Mover.py b/otp/movement/Mover.py index 8d26f3b..74f2343 100644 --- a/otp/movement/Mover.py +++ b/otp/movement/Mover.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import CMover +from panda3d.otp import CMover from direct.directnotify import DirectNotifyGlobal from otp.movement.PyVec3 import PyVec3 from direct.showbase import PythonUtil diff --git a/toontown/ai/CrashedLeaderBoardDecorator.py b/toontown/ai/CrashedLeaderBoardDecorator.py index f8db4ff..e61bb2f 100644 --- a/toontown/ai/CrashedLeaderBoardDecorator.py +++ b/toontown/ai/CrashedLeaderBoardDecorator.py @@ -4,7 +4,7 @@ from direct.interval.IntervalGlobal import * from . import HolidayDecorator from toontown.toonbase import ToontownGlobals from pandac.PandaModules import Vec4, CSDefault, TransformState, NodePath, TransparencyAttrib -from libtoontown import loadDNAFile +from panda3d.toontown import loadDNAFile from toontown.hood import GSHood class CrashedLeaderBoardDecorator(HolidayDecorator.HolidayDecorator): diff --git a/toontown/ai/HalloweenHolidayDecorator.py b/toontown/ai/HalloweenHolidayDecorator.py index 4430093..9204663 100644 --- a/toontown/ai/HalloweenHolidayDecorator.py +++ b/toontown/ai/HalloweenHolidayDecorator.py @@ -7,7 +7,7 @@ from toontown.safezone import Playground from toontown.town import Street from toontown.estate import Estate from pandac.PandaModules import Vec4, CSDefault, TransformState, NodePath, TransparencyAttrib -from libtoontown import loadDNAFile +from panda3d.toontown import loadDNAFile class HalloweenHolidayDecorator(HolidayDecorator.HolidayDecorator): notify = DirectNotifyGlobal.directNotify.newCategory('HalloweenHolidayDecorator') diff --git a/toontown/ai/HolidayDecorator.py b/toontown/ai/HolidayDecorator.py index 391890d..9513c4a 100644 --- a/toontown/ai/HolidayDecorator.py +++ b/toontown/ai/HolidayDecorator.py @@ -1,7 +1,7 @@ from toontown.toonbase import ToontownGlobals from direct.interval.IntervalGlobal import Parallel, Sequence, Func, Wait from pandac.PandaModules import Vec4, CSDefault, TransformState, NodePath, TransparencyAttrib -from libtoontown import loadDNAFile +from panda3d.toontown import loadDNAFile class HolidayDecorator: diff --git a/toontown/ai/ToontownAIRepository.py b/toontown/ai/ToontownAIRepository.py index fe70c56..122949b 100644 --- a/toontown/ai/ToontownAIRepository.py +++ b/toontown/ai/ToontownAIRepository.py @@ -1,7 +1,7 @@ from direct.directnotify import DirectNotifyGlobal from panda3d.core import * +from panda3d.toontown import * -from libtoontown import * from otp.ai.AIZoneData import AIZoneDataStore from otp.ai.TimeManagerAI import TimeManagerAI from otp.distributed.OtpDoGlobals import * diff --git a/toontown/battle/DistributedBattle.py b/toontown/battle/DistributedBattle.py index eb62d0b..a36e6ab 100644 --- a/toontown/battle/DistributedBattle.py +++ b/toontown/battle/DistributedBattle.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from .BattleBase import * from toontown.toonbase import ToontownGlobals diff --git a/toontown/battle/DistributedBattleBldg.py b/toontown/battle/DistributedBattleBldg.py index 13ce44b..2614a43 100644 --- a/toontown/battle/DistributedBattleBldg.py +++ b/toontown/battle/DistributedBattleBldg.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from .BattleBase import * from direct.actor import Actor diff --git a/toontown/battle/DistributedBattleFinal.py b/toontown/battle/DistributedBattleFinal.py index 22ff258..3cbc2de 100644 --- a/toontown/battle/DistributedBattleFinal.py +++ b/toontown/battle/DistributedBattleFinal.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from .BattleBase import * from direct.actor import Actor diff --git a/toontown/battle/MovieNPCSOS.py b/toontown/battle/MovieNPCSOS.py index 49c7270..97d4c1f 100644 --- a/toontown/battle/MovieNPCSOS.py +++ b/toontown/battle/MovieNPCSOS.py @@ -1,4 +1,4 @@ -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from .BattleProps import * from .BattleSounds import * diff --git a/toontown/battle/MovieSuitAttacks.py b/toontown/battle/MovieSuitAttacks.py index a3a2472..13d3d73 100644 --- a/toontown/battle/MovieSuitAttacks.py +++ b/toontown/battle/MovieSuitAttacks.py @@ -1,4 +1,4 @@ -from libotp import * +from panda3d.otp import * from toontown.toonbase.ToontownGlobals import * from .SuitBattleGlobals import * from direct.interval.IntervalGlobal import * diff --git a/toontown/battle/MovieToonVictory.py b/toontown/battle/MovieToonVictory.py index 66fa420..c54a942 100644 --- a/toontown/battle/MovieToonVictory.py +++ b/toontown/battle/MovieToonVictory.py @@ -1,4 +1,4 @@ -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.showbase.DirectObject import DirectObject from .RewardPanel import * diff --git a/toontown/building/DistributedElevatorExt.py b/toontown/building/DistributedElevatorExt.py index d12f815..a4f2a48 100644 --- a/toontown/building/DistributedElevatorExt.py +++ b/toontown/building/DistributedElevatorExt.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.distributed.ClockDelta import * from direct.interval.IntervalGlobal import * from .ElevatorConstants import * diff --git a/toontown/building/DistributedGagshopInterior.py b/toontown/building/DistributedGagshopInterior.py index b9f2261..27a9fa1 100644 --- a/toontown/building/DistributedGagshopInterior.py +++ b/toontown/building/DistributedGagshopInterior.py @@ -1,6 +1,6 @@ from toontown.toonbase.ToonBaseGlobal import * from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.toonbase.ToontownGlobals import * import random from direct.distributed import DistributedObject diff --git a/toontown/building/DistributedHQInterior.py b/toontown/building/DistributedHQInterior.py index d11ea96..187e037 100644 --- a/toontown/building/DistributedHQInterior.py +++ b/toontown/building/DistributedHQInterior.py @@ -1,6 +1,6 @@ from toontown.toonbase.ToonBaseGlobal import * from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.toonbase.ToontownGlobals import * import random from direct.task.Task import Task diff --git a/toontown/building/DistributedKnockKnockDoor.py b/toontown/building/DistributedKnockKnockDoor.py index d760b50..7b9120a 100644 --- a/toontown/building/DistributedKnockKnockDoor.py +++ b/toontown/building/DistributedKnockKnockDoor.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.distributed.ClockDelta import * from .KnockKnockJokes import * diff --git a/toontown/building/DistributedPetshopInterior.py b/toontown/building/DistributedPetshopInterior.py index d2e39a4..bf8b7d3 100644 --- a/toontown/building/DistributedPetshopInterior.py +++ b/toontown/building/DistributedPetshopInterior.py @@ -1,6 +1,6 @@ from toontown.toonbase.ToonBaseGlobal import * from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.toonbase.ToontownGlobals import * import random from direct.distributed import DistributedObject diff --git a/toontown/building/DistributedToonHallInterior.py b/toontown/building/DistributedToonHallInterior.py index fe245bc..cfbee85 100644 --- a/toontown/building/DistributedToonHallInterior.py +++ b/toontown/building/DistributedToonHallInterior.py @@ -1,4 +1,4 @@ -from libtoontown import * +from panda3d.toontown import * from toontown.toonbase.ToonBaseGlobal import * from direct.interval.IntervalGlobal import * from direct.distributed.ClockDelta import * diff --git a/toontown/building/DistributedToonInterior.py b/toontown/building/DistributedToonInterior.py index d683c68..1efcdfd 100644 --- a/toontown/building/DistributedToonInterior.py +++ b/toontown/building/DistributedToonInterior.py @@ -1,6 +1,6 @@ from toontown.toonbase.ToonBaseGlobal import * from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from direct.interval.IntervalGlobal import * from direct.distributed.ClockDelta import * from toontown.toonbase import ToontownGlobals diff --git a/toontown/char/Char.py b/toontown/char/Char.py index 8e8b6f8..1af94f2 100644 --- a/toontown/char/Char.py +++ b/toontown/char/Char.py @@ -1,6 +1,6 @@ from otp.avatar import Avatar from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.task import Task import random from pandac.PandaModules import * diff --git a/toontown/classicchars/DistributedCCharBase.py b/toontown/classicchars/DistributedCCharBase.py index 1702d17..89a3f08 100644 --- a/toontown/classicchars/DistributedCCharBase.py +++ b/toontown/classicchars/DistributedCCharBase.py @@ -1,8 +1,8 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from otp.avatar import Avatar -from libotp import CFQuicktalker +from panda3d.otp import CFQuicktalker from toontown.char import CharDNA from toontown.char import DistributedChar from direct.directnotify import DirectNotifyGlobal diff --git a/toontown/cogdominium/DistributedCogdoInterior.py b/toontown/cogdominium/DistributedCogdoInterior.py index 703a2b1..10092db 100644 --- a/toontown/cogdominium/DistributedCogdoInterior.py +++ b/toontown/cogdominium/DistributedCogdoInterior.py @@ -4,7 +4,7 @@ from direct.distributed.ClockDelta import * from toontown.building.ElevatorConstants import * from toontown.toon import NPCToons from pandac.PandaModules import NodePath -from libotp import * +from panda3d.otp import * from toontown.building import ElevatorUtils from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownBattleGlobals diff --git a/toontown/coghq/CogHQBossBattle.py b/toontown/coghq/CogHQBossBattle.py index 76be0b9..5622894 100644 --- a/toontown/coghq/CogHQBossBattle.py +++ b/toontown/coghq/CogHQBossBattle.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.directnotify import DirectNotifyGlobal from toontown.hood import Place diff --git a/toontown/coghq/CogHQExterior.py b/toontown/coghq/CogHQExterior.py index 5d269b1..1628219 100644 --- a/toontown/coghq/CogHQExterior.py +++ b/toontown/coghq/CogHQExterior.py @@ -5,8 +5,8 @@ from direct.fsm import State from toontown.toonbase import ToontownGlobals from toontown.hood import ZoneUtil from pandac.PandaModules import * -from libotp import * -from libtoontown import * +from panda3d.otp import * +from panda3d.toontown import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs class CogHQExterior(BattlePlace.BattlePlace): diff --git a/toontown/coghq/CogHQLobby.py b/toontown/coghq/CogHQLobby.py index e685a6b..1276da5 100644 --- a/toontown/coghq/CogHQLobby.py +++ b/toontown/coghq/CogHQLobby.py @@ -5,7 +5,7 @@ from toontown.hood import Place from toontown.building import Elevator from toontown.toonbase import ToontownGlobals from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs class CogHQLobby(Place.Place): diff --git a/toontown/coghq/CountryClubInterior.py b/toontown/coghq/CountryClubInterior.py index 7ed9f85..3f6a920 100644 --- a/toontown/coghq/CountryClubInterior.py +++ b/toontown/coghq/CountryClubInterior.py @@ -4,7 +4,7 @@ from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.showbase import BulletinBoardWatcher from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs from toontown.toon import Toon from toontown.toonbase import ToontownGlobals diff --git a/toontown/coghq/DistributedBattleFactory.py b/toontown/coghq/DistributedBattleFactory.py index 0da3bec..aae1397 100644 --- a/toontown/coghq/DistributedBattleFactory.py +++ b/toontown/coghq/DistributedBattleFactory.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from toontown.battle.BattleBase import * from toontown.coghq import DistributedLevelBattle diff --git a/toontown/coghq/DistributedCashbotBossCrane.py b/toontown/coghq/DistributedCashbotBossCrane.py index 0eb63cd..3420b97 100644 --- a/toontown/coghq/DistributedCashbotBossCrane.py +++ b/toontown/coghq/DistributedCashbotBossCrane.py @@ -1,6 +1,6 @@ from direct.gui.DirectGui import * from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.distributed.ClockDelta import * from direct.fsm import FSM diff --git a/toontown/coghq/DistributedCountryClubBattle.py b/toontown/coghq/DistributedCountryClubBattle.py index 4aa916c..37595c7 100644 --- a/toontown/coghq/DistributedCountryClubBattle.py +++ b/toontown/coghq/DistributedCountryClubBattle.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from toontown.battle.BattleBase import * from toontown.coghq import DistributedLevelBattle diff --git a/toontown/coghq/DistributedLawbotCannon.py b/toontown/coghq/DistributedLawbotCannon.py index 4d844c7..e05231a 100644 --- a/toontown/coghq/DistributedLawbotCannon.py +++ b/toontown/coghq/DistributedLawbotCannon.py @@ -9,7 +9,7 @@ from toontown.estate import DistributedCannon from toontown.estate import CannonGlobals from direct.gui.DirectGui import * from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from toontown.toon import NPCToons from toontown.toon import ToonHead from toontown.toonbase import TTLocalizer diff --git a/toontown/coghq/DistributedLevelBattle.py b/toontown/coghq/DistributedLevelBattle.py index 43f174d..28d5c39 100644 --- a/toontown/coghq/DistributedLevelBattle.py +++ b/toontown/coghq/DistributedLevelBattle.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from toontown.battle.BattleBase import * from toontown.battle import DistributedBattle diff --git a/toontown/coghq/DistributedMintBattle.py b/toontown/coghq/DistributedMintBattle.py index 87a9e53..032942a 100644 --- a/toontown/coghq/DistributedMintBattle.py +++ b/toontown/coghq/DistributedMintBattle.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from toontown.battle.BattleBase import * from toontown.coghq import DistributedLevelBattle diff --git a/toontown/coghq/DistributedStageBattle.py b/toontown/coghq/DistributedStageBattle.py index afce9fb..add435f 100644 --- a/toontown/coghq/DistributedStageBattle.py +++ b/toontown/coghq/DistributedStageBattle.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from toontown.battle.BattleBase import * from toontown.coghq import DistributedLevelBattle diff --git a/toontown/coghq/FactoryExterior.py b/toontown/coghq/FactoryExterior.py index d32b34c..fc2cab9 100644 --- a/toontown/coghq/FactoryExterior.py +++ b/toontown/coghq/FactoryExterior.py @@ -7,8 +7,8 @@ from toontown.toonbase import ToontownGlobals from toontown.hood import ZoneUtil from toontown.building import Elevator from pandac.PandaModules import * -from libotp import * -from libtoontown import * +from panda3d.otp import * +from panda3d.toontown import * class FactoryExterior(BattlePlace.BattlePlace): notify = DirectNotifyGlobal.directNotify.newCategory('FactoryExterior') diff --git a/toontown/coghq/FactoryInterior.py b/toontown/coghq/FactoryInterior.py index 43d4d8d..c841630 100644 --- a/toontown/coghq/FactoryInterior.py +++ b/toontown/coghq/FactoryInterior.py @@ -3,7 +3,7 @@ from toontown.battle import BattlePlace from direct.fsm import ClassicFSM, State from direct.fsm import State from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs from toontown.toon import Toon from toontown.toonbase import ToontownGlobals diff --git a/toontown/coghq/MintInterior.py b/toontown/coghq/MintInterior.py index da57194..21d75f9 100644 --- a/toontown/coghq/MintInterior.py +++ b/toontown/coghq/MintInterior.py @@ -4,7 +4,7 @@ from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.showbase import BulletinBoardWatcher from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs from toontown.toon import Toon from toontown.toonbase import ToontownGlobals diff --git a/toontown/coghq/StageInterior.py b/toontown/coghq/StageInterior.py index 2bb4902..672c0d6 100644 --- a/toontown/coghq/StageInterior.py +++ b/toontown/coghq/StageInterior.py @@ -4,7 +4,7 @@ from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.showbase import BulletinBoardWatcher from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs from toontown.toon import Toon from toontown.toonbase import ToontownGlobals diff --git a/toontown/distributed/PlayGame.py b/toontown/distributed/PlayGame.py index 3ec5141..c25cb9c 100644 --- a/toontown/distributed/PlayGame.py +++ b/toontown/distributed/PlayGame.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.toonbase.ToonBaseGlobal import * from direct.directnotify import DirectNotifyGlobal from direct.fsm import StateData diff --git a/toontown/friends/FriendsListManager.py b/toontown/friends/FriendsListManager.py index 597d11e..ed04311 100644 --- a/toontown/friends/FriendsListManager.py +++ b/toontown/friends/FriendsListManager.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from . import FriendsListPanel from . import FriendInviter from . import FriendInvitee diff --git a/toontown/hood/GSHoodDataAI.py b/toontown/hood/GSHoodDataAI.py index 4ab00cb..ea15ccc 100644 --- a/toontown/hood/GSHoodDataAI.py +++ b/toontown/hood/GSHoodDataAI.py @@ -3,7 +3,7 @@ from . import HoodDataAI, ZoneUtil from toontown.toonbase import ToontownGlobals from toontown.racing import DistributedStartingBlockAI from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.racing.RaceGlobals import * from toontown.classicchars import DistributedGoofySpeedwayAI if __debug__: diff --git a/toontown/hood/GZHoodDataAI.py b/toontown/hood/GZHoodDataAI.py index f69a49b..6e8f756 100644 --- a/toontown/hood/GZHoodDataAI.py +++ b/toontown/hood/GZHoodDataAI.py @@ -3,7 +3,7 @@ from . import HoodDataAI, ZoneUtil from toontown.toonbase import ToontownGlobals from toontown.racing import DistributedStartingBlockAI from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.racing.RaceGlobals import * from toontown.classicchars import DistributedGoofySpeedwayAI from toontown.safezone import DistributedGolfKartAI diff --git a/toontown/hood/HoodDataAI.py b/toontown/hood/HoodDataAI.py index 139a4d7..72d75d1 100644 --- a/toontown/hood/HoodDataAI.py +++ b/toontown/hood/HoodDataAI.py @@ -5,7 +5,7 @@ from toontown.suit import DistributedSuitPlannerAI from toontown.safezone import ButterflyGlobals from toontown.safezone import DistributedButterflyAI from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.toon import NPCToons class HoodDataAI: diff --git a/toontown/hood/OZHoodDataAI.py b/toontown/hood/OZHoodDataAI.py index 7ec8a97..2371cbc 100644 --- a/toontown/hood/OZHoodDataAI.py +++ b/toontown/hood/OZHoodDataAI.py @@ -4,7 +4,7 @@ from toontown.toonbase import ToontownGlobals from toontown.safezone import OZTreasurePlannerAI from toontown.racing import DistributedStartingBlockAI from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.racing.RaceGlobals import * from toontown.classicchars import DistributedGoofySpeedwayAI from toontown.safezone import DistributedPicnicBasketAI diff --git a/toontown/minigame/DistributedPhotoGame.py b/toontown/minigame/DistributedPhotoGame.py index a8c65dd..852c890 100644 --- a/toontown/minigame/DistributedPhotoGame.py +++ b/toontown/minigame/DistributedPhotoGame.py @@ -1,6 +1,6 @@ from direct.directnotify import DirectNotifyGlobal from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from toontown.toonbase.ToonBaseGlobal import * from .DistributedMinigame import * from direct.distributed.ClockDelta import * diff --git a/toontown/minigame/Purchase.py b/toontown/minigame/Purchase.py index f562e22..1c7b987 100644 --- a/toontown/minigame/Purchase.py +++ b/toontown/minigame/Purchase.py @@ -1,4 +1,4 @@ -from libotp import * +from panda3d.otp import * from .PurchaseBase import * from direct.task.Task import Task from toontown.toon import ToonHead diff --git a/toontown/pets/PetBrain.py b/toontown/pets/PetBrain.py index 6f938d9..29fce9b 100644 --- a/toontown/pets/PetBrain.py +++ b/toontown/pets/PetBrain.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from direct.showbase.PythonUtil import weightedChoice, randFloat, Functor from direct.showbase.PythonUtil import list2dict from direct.showbase import DirectObject diff --git a/toontown/pets/PetWander.py b/toontown/pets/PetWander.py index 733fd42..4c95cec 100644 --- a/toontown/pets/PetWander.py +++ b/toontown/pets/PetWander.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from direct.showbase.PythonUtil import reduceAngle, randFloat, normalDistrib from direct.showbase import DirectObject from toontown.pets import PetChase diff --git a/toontown/racing/DistributedRace.py b/toontown/racing/DistributedRace.py index d3cb3e5..e62586d 100644 --- a/toontown/racing/DistributedRace.py +++ b/toontown/racing/DistributedRace.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from direct.distributed.ClockDelta import * from direct.distributed import DistributedObject from direct.directnotify import DirectNotifyGlobal diff --git a/toontown/racing/DistributedVehicle.py b/toontown/racing/DistributedVehicle.py index 63c4406..7668356 100644 --- a/toontown/racing/DistributedVehicle.py +++ b/toontown/racing/DistributedVehicle.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.distributed.ClockDelta import * from direct.interval.IntervalGlobal import * from direct.gui.DirectGui import * diff --git a/toontown/shtiker/ShtikerBook.py b/toontown/shtiker/ShtikerBook.py index 7c5ed23..7d5728d 100644 --- a/toontown/shtiker/ShtikerBook.py +++ b/toontown/shtiker/ShtikerBook.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from toontown.toonbase import ToontownGlobals from direct.showbase import DirectObject from direct.fsm import StateData diff --git a/toontown/spellbook/MagicWordIndex.py b/toontown/spellbook/MagicWordIndex.py index c30c42c..46c2be9 100644 --- a/toontown/spellbook/MagicWordIndex.py +++ b/toontown/spellbook/MagicWordIndex.py @@ -14,7 +14,7 @@ import collections, types from direct.distributed.ClockDelta import * from direct.interval.IntervalGlobal import * -from libotp import NametagGroup, WhisperPopup +from panda3d.otp import NametagGroup, WhisperPopup from otp.otpbase import OTPLocalizer from otp.otpbase import OTPGlobals diff --git a/toontown/spellbook/ToontownMagicWordManager.py b/toontown/spellbook/ToontownMagicWordManager.py index 04ef3fd..915ae08 100644 --- a/toontown/spellbook/ToontownMagicWordManager.py +++ b/toontown/spellbook/ToontownMagicWordManager.py @@ -12,7 +12,7 @@ from direct.directnotify import DirectNotifyGlobal from direct.distributed import DistributedObject -from libotp import WhisperPopup +from panda3d.otp import WhisperPopup from otp.otpbase.OTPGlobals import * from toontown.friends import FriendHandle diff --git a/toontown/suit/BossCog.py b/toontown/suit/BossCog.py index c9a5b4b..89028c4 100644 --- a/toontown/suit/BossCog.py +++ b/toontown/suit/BossCog.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.actor import Actor from otp.avatar import Avatar diff --git a/toontown/suit/DistributedBossCog.py b/toontown/suit/DistributedBossCog.py index 5525f20..d3759fc 100644 --- a/toontown/suit/DistributedBossCog.py +++ b/toontown/suit/DistributedBossCog.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.distributed.ClockDelta import * from direct.directnotify import DirectNotifyGlobal diff --git a/toontown/suit/DistributedBossbotBoss.py b/toontown/suit/DistributedBossbotBoss.py index f49698d..00769eb 100644 --- a/toontown/suit/DistributedBossbotBoss.py +++ b/toontown/suit/DistributedBossbotBoss.py @@ -1,7 +1,7 @@ import math import random from pandac.PandaModules import VBase3, CollisionPlane, CollisionNode, CollisionSphere, CollisionTube, NodePath, Plane, Vec3, Vec2, Point3, BitMask32, CollisionHandlerEvent, TextureStage, VBase4, BoundingSphere -from libotp import NametagGroup, CFSpeech +from panda3d.otp import NametagGroup, CFSpeech from direct.interval.IntervalGlobal import Sequence, Wait, Func, LerpHprInterval, Parallel, LerpPosInterval, Track, ActorInterval, ParallelEndTogether, LerpFunctionInterval, LerpScaleInterval, LerpPosHprInterval, SoundInterval from direct.task import Task from direct.fsm import FSM diff --git a/toontown/suit/DistributedCashbotBoss.py b/toontown/suit/DistributedCashbotBoss.py index 30f7f5a..346a14c 100644 --- a/toontown/suit/DistributedCashbotBoss.py +++ b/toontown/suit/DistributedCashbotBoss.py @@ -19,7 +19,7 @@ from toontown.distributed import DelayDelete from toontown.chat import ResistanceChat from toontown.coghq import CogDisguiseGlobals from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * import random import math import functools diff --git a/toontown/suit/DistributedLawbotBoss.py b/toontown/suit/DistributedLawbotBoss.py index bb7ca2b..81e7748 100644 --- a/toontown/suit/DistributedLawbotBoss.py +++ b/toontown/suit/DistributedLawbotBoss.py @@ -6,7 +6,7 @@ from direct.showbase.PythonUtil import Functor from direct.showbase.PythonUtil import StackTrace from direct.gui.DirectGui import * from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.fsm import FSM from direct.fsm import ClassicFSM from direct.fsm import State diff --git a/toontown/suit/DistributedSellbotBoss.py b/toontown/suit/DistributedSellbotBoss.py index c8082ec..c0b2263 100644 --- a/toontown/suit/DistributedSellbotBoss.py +++ b/toontown/suit/DistributedSellbotBoss.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from toontown.battle.BattleProps import * from direct.distributed.ClockDelta import * diff --git a/toontown/suit/DistributedSuit.py b/toontown/suit/DistributedSuit.py index 6b917de..f8163b3 100644 --- a/toontown/suit/DistributedSuit.py +++ b/toontown/suit/DistributedSuit.py @@ -1,6 +1,6 @@ from pandac.PandaModules import * -from libotp import * -from libtoontown import * +from panda3d.otp import * +from panda3d.toontown import * from direct.interval.IntervalGlobal import * from direct.distributed.ClockDelta import * from direct.directtools.DirectGeometry import CLAMP diff --git a/toontown/suit/DistributedSuitAI.py b/toontown/suit/DistributedSuitAI.py index 3895962..838461c 100644 --- a/toontown/suit/DistributedSuitAI.py +++ b/toontown/suit/DistributedSuitAI.py @@ -1,6 +1,6 @@ from otp.ai.AIBaseGlobal import * from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from direct.distributed.ClockDelta import * from otp.avatar import DistributedAvatarAI from . import SuitTimings diff --git a/toontown/suit/DistributedSuitBase.py b/toontown/suit/DistributedSuitBase.py index e2f75a3..369a1fa 100644 --- a/toontown/suit/DistributedSuitBase.py +++ b/toontown/suit/DistributedSuitBase.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.distributed.ClockDelta import * from direct.directtools.DirectGeometry import CLAMP diff --git a/toontown/suit/DistributedSuitPlannerAI.py b/toontown/suit/DistributedSuitPlannerAI.py index 4e1357b..f1620a2 100644 --- a/toontown/suit/DistributedSuitPlannerAI.py +++ b/toontown/suit/DistributedSuitPlannerAI.py @@ -1,4 +1,4 @@ -from libtoontown import * +from panda3d.toontown import * from otp.ai.AIBaseGlobal import * from direct.distributed import DistributedObjectAI from . import SuitPlannerBase, DistributedSuitAI diff --git a/toontown/suit/Suit.py b/toontown/suit/Suit.py index bdda76c..644b2b3 100644 --- a/toontown/suit/Suit.py +++ b/toontown/suit/Suit.py @@ -3,7 +3,7 @@ from otp.avatar import Avatar from . import SuitDNA from toontown.toonbase import ToontownGlobals from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from toontown.battle import SuitBattleGlobals from direct.task.Task import Task from toontown.battle import BattleProps diff --git a/toontown/suit/SuitBase.py b/toontown/suit/SuitBase.py index 4f0511e..9413f26 100644 --- a/toontown/suit/SuitBase.py +++ b/toontown/suit/SuitBase.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from direct.distributed.ClockDelta import * import math import random diff --git a/toontown/suit/SuitPlannerBase.py b/toontown/suit/SuitPlannerBase.py index ebc08f0..a88c0cc 100644 --- a/toontown/suit/SuitPlannerBase.py +++ b/toontown/suit/SuitPlannerBase.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * import random import string from direct.directnotify import DirectNotifyGlobal diff --git a/toontown/toon/DistributedNPCPartyPerson.py b/toontown/toon/DistributedNPCPartyPerson.py index 2064bc7..efcda55 100644 --- a/toontown/toon/DistributedNPCPartyPerson.py +++ b/toontown/toon/DistributedNPCPartyPerson.py @@ -5,7 +5,7 @@ from toontown.toonbase import TTLocalizer from direct.task.Task import Task from direct.distributed import ClockDelta from pandac.PandaModules import Point3 -from libotp import CFSpeech, CFTimeout +from panda3d.otp import CFSpeech, CFTimeout from toontown.toontowngui import TTDialog from otp.otpbase import OTPLocalizer from toontown.parties import PartyGlobals diff --git a/toontown/toon/DistributedNPCToonBase.py b/toontown/toon/DistributedNPCToonBase.py index 0e92863..81f248a 100644 --- a/toontown/toon/DistributedNPCToonBase.py +++ b/toontown/toon/DistributedNPCToonBase.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.directnotify import DirectNotifyGlobal from direct.fsm import ClassicFSM from direct.fsm import State diff --git a/toontown/toon/DistributedToon.py b/toontown/toon/DistributedToon.py index 35f1572..15366ac 100644 --- a/toontown/toon/DistributedToon.py +++ b/toontown/toon/DistributedToon.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from toontown.toonbase.ToontownGlobals import * from direct.distributed.ClockDelta import * from direct.interval.IntervalGlobal import * diff --git a/toontown/toon/NPCToons.py b/toontown/toon/NPCToons.py index 7cc3745..f56e0fc 100644 --- a/toontown/toon/NPCToons.py +++ b/toontown/toon/NPCToons.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from toontown.toonbase import ToontownGlobals import random from toontown.hood import ZoneUtil diff --git a/toontown/toon/TTEmote.py b/toontown/toon/TTEmote.py index 7f863b7..ed7c193 100644 --- a/toontown/toon/TTEmote.py +++ b/toontown/toon/TTEmote.py @@ -5,7 +5,7 @@ from toontown.toonbase import TTLocalizer from otp.otpbase import OTPLocalizer from direct.showbase import PythonUtil from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from otp.avatar import Emote from direct.directnotify import DirectNotifyGlobal EmoteSleepIndex = 4 diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py index 3b33df7..ea017e2 100644 --- a/toontown/toon/Toon.py +++ b/toontown/toon/Toon.py @@ -7,7 +7,7 @@ from direct.actor import Actor import string from .ToonHead import * from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from direct.interval.IntervalGlobal import * from direct.directnotify import DirectNotifyGlobal from toontown.toonbase import ToontownGlobals diff --git a/toontown/toon/ToonHeadFrame.py b/toontown/toon/ToonHeadFrame.py index e08d5c8..53f1ca1 100644 --- a/toontown/toon/ToonHeadFrame.py +++ b/toontown/toon/ToonHeadFrame.py @@ -1,6 +1,6 @@ from direct.gui.DirectGui import * from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from . import ToonHead from toontown.distributed import DelayDelete from toontown.toonbase import ToontownGlobals diff --git a/toontown/toonbase/DisplayOptions.py b/toontown/toonbase/DisplayOptions.py index 30d19f5..c6bf3e4 100644 --- a/toontown/toonbase/DisplayOptions.py +++ b/toontown/toonbase/DisplayOptions.py @@ -155,8 +155,8 @@ class DisplayOptions: base.closeWindow(base.win) return 0 base.disableShowbaseMouse() - if 'libotp' in sys.modules: - from libotp import NametagGlobals + if 'panda3d.otp' in sys.modules: + from panda3d.otp import NametagGlobals NametagGlobals.setCamera(base.cam) NametagGlobals.setMouseWatcher(base.mouseWatcherNode) else: diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py index 355231a..9055e93 100644 --- a/toontown/toonbase/ToonBase.py +++ b/toontown/toonbase/ToonBase.py @@ -9,7 +9,7 @@ from . import ToontownLoader from direct.gui import DirectGuiGlobals from direct.gui.DirectGui import * from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * import sys import os import math diff --git a/toontown/toonbase/ToontownLoader.py b/toontown/toonbase/ToontownLoader.py index dd9a91f..1f76fc7 100644 --- a/toontown/toonbase/ToontownLoader.py +++ b/toontown/toonbase/ToontownLoader.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libtoontown import * +from panda3d.toontown import * from direct.directnotify.DirectNotifyGlobal import * from direct.showbase import Loader from toontown.toontowngui import ToontownLoadingScreen diff --git a/toontown/town/Street.py b/toontown/town/Street.py index 2a3d954..975b65f 100644 --- a/toontown/town/Street.py +++ b/toontown/town/Street.py @@ -1,5 +1,5 @@ from pandac.PandaModules import * -from libotp import * +from panda3d.otp import * from toontown.battle.BattleProps import * from toontown.battle.BattleSounds import * from toontown.distributed.ToontownMsgTypes import * diff --git a/toontown/uberdog/DistributedPartyManager.py b/toontown/uberdog/DistributedPartyManager.py index 80e1642..30a2c7e 100644 --- a/toontown/uberdog/DistributedPartyManager.py +++ b/toontown/uberdog/DistributedPartyManager.py @@ -1,6 +1,6 @@ from direct.distributed.DistributedObject import DistributedObject from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal -from libotp import CFSpeech, CFTimeout +from panda3d.otp import CFSpeech, CFTimeout from toontown.toonbase import ToontownGlobals from toontown.toonbase import TTLocalizer from toontown.toon import ToonDNA