Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

laff restock npc's suits fixed

Browse source
This commit is contained in:
Zach 2015-05-27 02:08:39 -05:00
parent 2545b2ba37
commit 3056946f04
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otp/distributed/DCClassImports.py
View file

@ -2,7 +2,7 @@
from pandac.PandaModules import * 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 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

10
toontown/toon/DistributedNPCLaffRestock.py
View file

@ -10,6 +10,13 @@ from LaffShopGui import *
class DistributedNPCLaffRestock(DistributedNPCToonBase): class DistributedNPCLaffRestock(DistributedNPCToonBase):
zone2id = {
10000: 0,
13000: 1,
12000: 2,
11000: 3,
}
def __init__(self, cr): def __init__(self, cr):
DistributedNPCToonBase.__init__(self, cr) DistributedNPCToonBase.__init__(self, cr)
self.isLocalToon = 0 self.isLocalToon = 0
@ -30,9 +37,10 @@ class DistributedNPCLaffRestock(DistributedNPCToonBase):
pos = NPCToons.LaffRestockPositions[self.name] pos = NPCToons.LaffRestockPositions[self.name]
self.setPos(*pos[0]) self.setPos(*pos[0])
self.setH(pos[1]) self.setH(pos[1])
self.putOnSuit(self.zone2id.get(self.zoneId, -1), rental=True)
def getCollSphereRadius(self): def getCollSphereRadius(self):
return 1.25 return 3.0
def handleCollisionSphereEnter(self, collEntry): def handleCollisionSphereEnter(self, collEntry):
base.cr.playGame.getPlace().fsm.request('purchase') base.cr.playGame.getPlace().fsm.request('purchase')

12
toontown/toon/DistributedNPCLaffRestockAI.py
View file

@ -6,14 +6,6 @@ from toontown.toonbase import TTLocalizer
from direct.task import Task from direct.task import Task
import LaffRestockGlobals import LaffRestockGlobals
from toontown.toon import NPCToons from toontown.toon import NPCToons
from DistributedToonAI import DistributedToonAI
zone2id = {
10000: 0,
13000: 1,
12000: 2,
11000: 3,
}
class DistributedNPCLaffRestockAI(DistributedNPCToonBaseAI): class DistributedNPCLaffRestockAI(DistributedNPCToonBaseAI):
@ -22,10 +14,6 @@ class DistributedNPCLaffRestockAI(DistributedNPCToonBaseAI):
self.givesQuests = 0 self.givesQuests = 0
self.busy = 0 self.busy = 0
def generate(self):
DistributedToonAI.generate(self)
self.b_setCogIndex(zone2id[self.zoneId])
def delete(self): def delete(self):
taskMgr.remove(self.uniqueName('clearMovie')) taskMgr.remove(self.uniqueName('clearMovie'))
self.ignoreAll() self.ignoreAll()

8
toontown/toon/NPCToons.py
View file

@ -11695,10 +11695,10 @@ else:
1, 1,
NPC_REGULAR) NPC_REGULAR)
BlockerPositions = {TTLocalizer.Flippy: (Point3(207.4, 18.81, -0.475), 90.0)} BlockerPositions = {TTLocalizer.Flippy: (Point3(207.4, 18.81, -0.475), 90.0)}
LaffRestockPositions = {lnames[11001]: ((-36.7, -39.2, 10.096), 540.0), LaffRestockPositions = {lnames[11001]: ((-27.0, -170.0, -19.6), 215.0),
lnames[12001]: ((141.3, -461.6, -23.5), 0.0), lnames[12001]: ((361.9, -394.4, -23.5), 113.5),
lnames[13001]: ((145.7, -389.5, -68.4), 0.0), lnames[13001]: ((143.7, -381.4, -68.4), 0.0),
lnames[10001]: ((38.6, 127.8, 0.025), -180.0)} lnames[10001]: ((135.0, 128.8, 0.025), -212.8)}
del lnames del lnames
zone2NpcDict = {} zone2NpcDict = {}