From 85406a5a52188c79c4b0b4bd1edcf047820ef41a Mon Sep 17 00:00:00 2001 From: DenialMC Date: Mon, 11 May 2015 20:06:27 +0300 Subject: [PATCH] Preparations --- toontown/hood/CogHQAI.py | 14 +++++++++----- toontown/toon/DistributedNPCLaffRestock.py | 2 +- toontown/toon/NPCToons.py | 20 ++++++++++++++++++++ toontown/toonbase/TTLocalizerEnglish.py | 1 + 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/toontown/hood/CogHQAI.py b/toontown/hood/CogHQAI.py index 92d333f5..0863b8c5 100644 --- a/toontown/hood/CogHQAI.py +++ b/toontown/hood/CogHQAI.py @@ -1,10 +1,8 @@ from toontown.building import DoorTypes from toontown.building.DistributedBoardingPartyAI import DistributedBoardingPartyAI -from toontown.coghq import DistributedCogHQDoorAI -from toontown.coghq import LobbyManagerAI -from toontown.toonbase import TTLocalizer -from toontown.toonbase import ToontownGlobals - +from toontown.coghq import DistributedCogHQDoorAI, LobbyManagerAI +from toontown.toonbase import TTLocalizer, ToontownGlobals +from toontown.toon import NPCToons class CogHQAI: notify = directNotify.newCategory('CogHQAI') @@ -41,6 +39,12 @@ class CogHQAI: self.extDoor = self.makeCogHQDoor(self.lobbyZoneId, 0, 0, self.lobbyFADoorCode) if simbase.config.GetBool('want-boarding-groups', True): self.createBoardingParty() + self.npcs = NPCToons.createNpcsInZone(self.air, self.zoneId) + + def shutdown(self): + for npc in self.npcs: + npc.requestDelete() + del self.npcs def createLobbyManager(self): self.lobbyMgr = LobbyManagerAI.LobbyManagerAI(self.air, self.bossCtor) diff --git a/toontown/toon/DistributedNPCLaffRestock.py b/toontown/toon/DistributedNPCLaffRestock.py index 9adb7474..4bfac9c6 100644 --- a/toontown/toon/DistributedNPCLaffRestock.py +++ b/toontown/toon/DistributedNPCLaffRestock.py @@ -18,7 +18,7 @@ class DistributedNPCLaffRestock(DistributedNPCToonBase): if hasattr(self, 'dialog'): self.dialog.cleanup() del self.dialog - + def getCollSphereRadius(self): return 1.0 diff --git a/toontown/toon/NPCToons.py b/toontown/toon/NPCToons.py index 34401231..1d20e003 100644 --- a/toontown/toon/NPCToons.py +++ b/toontown/toon/NPCToons.py @@ -11572,6 +11572,26 @@ NPCToonDict = {20000: (-1, 'm', 0, NPC_REGULAR), + 11001: (11000, + lnames[11001], + ('dll', + 'ls', + 's', + 'm', + 6, + 0, + 6, + 6, + 9, + 3, + 9, + 3, + 2, + 4, + 0), + 'm', + 0, + NPC_LAFF_RESTOCK), # Magic Cat SOS # 5 Stars, Sound SOS, Bikehorn 255 damage. "The Bikehorn of Death". 91917: (-1, diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 35b57ded..555ca01d 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -6217,6 +6217,7 @@ NPCToonNames = {20000: 'Tutorial Tom', 7009: 'Jimmy Thelock', 7010: 'Little Blinky', 7011: 'Donald', + 11001: 'Healer Gabriel', 91917: 'Magic Cat'} zone2TitleDict = {2513: ('Toon Hall', ''), 2514: ('Toontown Bank', ''),