Holocaust Cog HQ clerks

toontown/toon/DistributedNPCClerk.py

@@ -27,21 +27,6 @@ class DistributedNPCClerk(DistributedNPCToonBase):
             self.purchaseGui.unload()
             self.purchaseGui = None
     
-    def initToonState(self):
-        if self.name in NPCToons.ClerkPositions:
-            self.putOnSuit(ToontownGlobals.cogHQZoneId2deptIndex(self.zoneId), rental=True)
-
-        self.setAnimState('neutral', 0.9, None, None)
-        self.updatePosition()
-    
-    def updatePosition(self):
-        if self.name in NPCToons.ClerkPositions:
-            pos = NPCToons.ClerkPositions[self.name]
-            self.setPos(*pos[0])
-            self.setH(pos[1])
-        else:
-            DistributedNPCToonBase.initToonState(self)
-    
     def freeAvatar(self):
         base.localAvatar.posCamera(0, 0)
         base.cr.playGame.getPlace().fsm.request('walk')
@@ -83,7 +68,7 @@ class DistributedNPCClerk(DistributedNPCToonBase):
         elif state == ToontownGlobals.CLERK_TOOKTOOLONG:
             self.setChatAbsolute(TTLocalizer.STOREOWNER_TOOKTOOLONG, CFSpeech | CFTimeout)
 
-        self.updatePosition()
+        self.initToonState()
    
     def popupPurchaseGUI(self, task):
         self.clearChat()

toontown/toon/NPCToons.py

@@ -11580,62 +11580,24 @@ NPCToonDict = {20000: (-1,
          'f',
          0,
          NPC_LAFF_RESTOCK),
- 10002: (10000,
-         lnames[10002],
-         ('fss',
-         'md',
-         'l',
-         'f',
-         11,
-         0,
-         11,
-         11,
-         0,
-         3,
-         0,
-         3,
-         4,
-         7,
-         0),
-         'f',
-         0,
-         NPC_CLERK),
  11001: (11000,
          lnames[11001],
          'r',
          'm',
          0,
          NPC_LAFF_RESTOCK),
- 11002: (11000,
-         lnames[11002],
-         'r',
-         'm',
-         0,
-         NPC_CLERK),
  12001: (12000,
          lnames[12001],
          'r',
          'm',
          0,
          NPC_LAFF_RESTOCK),
- 12002: (12000,
-         lnames[12002],
-         'r',
-         'm',
-         0,
-         NPC_CLERK),
  13001: (13000,
          lnames[13001],
          'r',
          'f',
          0,
-         NPC_LAFF_RESTOCK),
- 13002: (13000,
-         lnames[13002],
-         'r',
-         'f',
-         0,
-         NPC_CLERK)}
+         NPC_LAFF_RESTOCK)}
 
 if config.GetBool('want-new-toonhall', 1):
     NPCToonDict[2001] = (2513,
@@ -11682,10 +11644,6 @@ LaffRestockPositions = {lnames[11001]: ((-27.0, -170.0, -19.6), 215.0),
                         lnames[12001]: ((361.9, -394.4, -23.5), 120.0),
                         lnames[13001]: ((143.7, -381.4, -68.4), 0.0),
                         lnames[10001]: ((135.0, 128.8, 0.025), -212.8)}
-ClerkPositions = {lnames[11002]: ((37.3, -167.5, -19.6), 130.0),
-                  lnames[12002]: ((361.9, -460.4, -23.5), 60.0),
-                  lnames[13002]: ((38.3, -389.5, -68.4), 0.0),
-                  lnames[10002]: ((84, 127.8, 0.025), -180.0)}
 GlovePositions = {lnames[2021]: ((101, -14, 4), -305)}
 del lnames
 zone2NpcDict = {}

toontown/toonbase/TTLocalizerEnglish.py

@@ -6248,13 +6248,9 @@ NPCToonNames = {20000: 'Tutorial Tom',
  7010: 'Jaymo',
  7011: 'Donald',
  10001: 'Healer Sara',
- 10002: 'Clerk Barbra',
  11001: 'Healer Gabriel',
- 11002: 'Clerk Brendan',
  12001: 'Healer Bill',
- 12002: 'Clerk John',
- 13001: 'Healer Clover',
- 13002: 'Clerk Audrey'}
+ 13001: 'Healer Clover'}
 zone2TitleDict = {2513: ('Toon Hall', ''),
  2514: ('Toontown Bank', ''),
  2516: ('Toontown School House', ''),