From 3056946f040450a2e35a86cf073b18564958cdca Mon Sep 17 00:00:00 2001
From: Zach <zachgatestech@gmail.com>
Date: Wed, 27 May 2015 02:08:39 -0500
Subject: [PATCH] laff restock npc's suits fixed

---
 otp/distributed/DCClassImports.py            |  2 +-
 toontown/toon/DistributedNPCLaffRestock.py   | 10 +++++++++-
 toontown/toon/DistributedNPCLaffRestockAI.py | 12 ------------
 toontown/toon/NPCToons.py                    |  8 ++++----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py
index 2c53823a..605fda21 100644
--- a/otp/distributed/DCClassImports.py
+++ b/otp/distributed/DCClassImports.py
@@ -2,7 +2,7 @@
 from pandac.PandaModules import *
 
 
-hashVal = 2068698464
+hashVal = 4186269798L
 
 
 from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot
diff --git a/toontown/toon/DistributedNPCLaffRestock.py b/toontown/toon/DistributedNPCLaffRestock.py
index f6963d48..8f60c236 100755
--- a/toontown/toon/DistributedNPCLaffRestock.py
+++ b/toontown/toon/DistributedNPCLaffRestock.py
@@ -10,6 +10,13 @@ from LaffShopGui import *
 
 class DistributedNPCLaffRestock(DistributedNPCToonBase):
 
+    zone2id = {
+        10000: 0,
+        13000: 1,
+        12000: 2,
+        11000: 3,
+    }
+
     def __init__(self, cr):
         DistributedNPCToonBase.__init__(self, cr)
         self.isLocalToon = 0
@@ -30,9 +37,10 @@ class DistributedNPCLaffRestock(DistributedNPCToonBase):
             pos = NPCToons.LaffRestockPositions[self.name]
             self.setPos(*pos[0])
             self.setH(pos[1])
+        self.putOnSuit(self.zone2id.get(self.zoneId, -1), rental=True)
 
     def getCollSphereRadius(self):
-        return 1.25
+        return 3.0
 
     def handleCollisionSphereEnter(self, collEntry):
         base.cr.playGame.getPlace().fsm.request('purchase')
diff --git a/toontown/toon/DistributedNPCLaffRestockAI.py b/toontown/toon/DistributedNPCLaffRestockAI.py
index 0b7ac462..5f267a36 100755
--- a/toontown/toon/DistributedNPCLaffRestockAI.py
+++ b/toontown/toon/DistributedNPCLaffRestockAI.py
@@ -6,14 +6,6 @@ from toontown.toonbase import TTLocalizer
 from direct.task import Task
 import LaffRestockGlobals
 from toontown.toon import NPCToons
-from DistributedToonAI import DistributedToonAI
-
-zone2id = {
-    10000: 0,
-    13000: 1,
-    12000: 2,
-    11000: 3,
-}
 
 class DistributedNPCLaffRestockAI(DistributedNPCToonBaseAI):
 
@@ -22,10 +14,6 @@ class DistributedNPCLaffRestockAI(DistributedNPCToonBaseAI):
         self.givesQuests = 0
         self.busy = 0
 
-    def generate(self):
-        DistributedToonAI.generate(self)
-        self.b_setCogIndex(zone2id[self.zoneId])
-
     def delete(self):
         taskMgr.remove(self.uniqueName('clearMovie'))
         self.ignoreAll()
diff --git a/toontown/toon/NPCToons.py b/toontown/toon/NPCToons.py
index 27504fbf..07d4b4ab 100755
--- a/toontown/toon/NPCToons.py
+++ b/toontown/toon/NPCToons.py
@@ -11695,10 +11695,10 @@ else:
      1,
      NPC_REGULAR)
 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)}
+LaffRestockPositions = {lnames[11001]: ((-27.0, -170.0, -19.6), 215.0),
+                        lnames[12001]: ((361.9, -394.4, -23.5), 113.5),
+                        lnames[13001]: ((143.7, -381.4, -68.4), 0.0),
+                        lnames[10001]: ((135.0, 128.8, 0.025), -212.8)}
 del lnames
 zone2NpcDict = {}