From b253e3eddaebd8af715776ceffb3d646e5906667 Mon Sep 17 00:00:00 2001 From: DenialMC Date: Mon, 11 May 2015 23:36:31 +0300 Subject: [PATCH] Add laff restock toons to each HQ --- toontown/toon/DistributedNPCLaffRestock.py | 8 +++ toontown/toon/NPCToons.py | 66 +++++++++++++++++++++- toontown/toonbase/TTLocalizerEnglish.py | 3 + 3 files changed, 76 insertions(+), 1 deletion(-) diff --git a/toontown/toon/DistributedNPCLaffRestock.py b/toontown/toon/DistributedNPCLaffRestock.py index 1892dfac..7e40e400 100644 --- a/toontown/toon/DistributedNPCLaffRestock.py +++ b/toontown/toon/DistributedNPCLaffRestock.py @@ -1,6 +1,7 @@ from toontown.chat.ChatGlobals import CFSpeech, CFTimeout from toontown.toonbase import TTLocalizer, ToontownGlobals from toontown.toontowngui import TTDialog +from toontown.toon import NPCToons from DistributedNPCToonBase import DistributedNPCToonBase import LaffRestockGlobals @@ -18,6 +19,13 @@ class DistributedNPCLaffRestock(DistributedNPCToonBase): if hasattr(self, 'dialog'): self.dialog.cleanup() del self.dialog + + def initToonState(self): + self.setAnimState('neutral', 0.9, None, None) + if self.name in NPCToons.LaffRestockPositions: + pos = NPCToons.LaffRestockPositions[self.name] + self.setPos(*pos[0]) + self.setH(pos[1]) def getCollSphereRadius(self): return 1.0 diff --git a/toontown/toon/NPCToons.py b/toontown/toon/NPCToons.py index 1d20e003..bea7fae7 100644 --- a/toontown/toon/NPCToons.py +++ b/toontown/toon/NPCToons.py @@ -11572,6 +11572,26 @@ NPCToonDict = {20000: (-1, 'm', 0, NPC_REGULAR), + 10001: (10000, + lnames[10001], + ('fss', + 'md', + 'l', + 'f', + 11, + 0, + 11, + 11, + 0, + 3, + 0, + 3, + 4, + 7, + 0), + 'f', + 0, + NPC_LAFF_RESTOCK), 11001: (11000, lnames[11001], ('dll', @@ -11592,6 +11612,46 @@ NPCToonDict = {20000: (-1, 'm', 0, NPC_LAFF_RESTOCK), + 12001: (12000, + lnames[12001], + ('mss', + 'ls', + 's', + 'm', + 8, + 0, + 8, + 8, + 5, + 12, + 5, + 12, + 7, + 16, + 0), + 'm', + 0, + NPC_LAFF_RESTOCK), + 13001: (13000, + lnames[13001], + ('dss', + 'ld', + 's', + 'f', + 17, + 0, + 17, + 17, + 1, + 24, + 1, + 24, + 0, + 9, + 0), + 'f', + 0, + NPC_LAFF_RESTOCK), # Magic Cat SOS # 5 Stars, Sound SOS, Bikehorn 255 damage. "The Bikehorn of Death". 91917: (-1, @@ -11655,8 +11715,12 @@ else: 'm', 1, NPC_REGULAR) -del lnames BlockerPositions = {TTLocalizer.Flippy: (Point3(207.4, 18.81, -0.475), 90.0)} +LaffRestockPositions = {lnames[11001]: ((-36.7, -39.2, 10.096), 540.0), + lnames[12001]: ((141.3, -461.6, -23.5), 0.0), + lnames[13001]: ((145.7, -389.5, -68.4), 0.0), + lnames[10001]: ((38.6, 127.8, 0.025), -180.0)} +del lnames zone2NpcDict = {} def generateZone2NpcDict(): diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 67f42366..08b35c19 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -6217,7 +6217,10 @@ NPCToonNames = {20000: 'Tutorial Tom', 7009: 'Jimmy Thelock', 7010: 'Little Blinky', 7011: 'Donald', + 10001: 'Healer Sara', 11001: 'Healer Gabriel', + 12001: 'Healer Bill', + 13001: 'Healer Clover', 91917: 'Magic Cat'} zone2TitleDict = {2513: ('Toon Hall', ''), 2514: ('Toontown Bank', ''),