Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Teleport button fixed

Browse source
This commit is contained in:
John 2015-08-12 20:17:34 +03:00
parent 7a8552c10e
commit b3efea4a6d
5 changed files with 30 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toontown/building/DistributedBuildingQueryMgrAI.py
View file

@ -11,7 +11,7 @@ class DistributedBuildingQueryMgrAI(DistributedObjectAI.DistributedObjectAI):
def isSuit(self, context, zoneId): def isSuit(self, context, zoneId):
avId = self.air.getAvatarIdFromSender() avId = self.air.getAvatarIdFromSender()
building = self.buildings.get(zoneId) if zoneId not in self.buildings:
if building is None: self.sendUpdateToAvatarId(avId, 'response', [context, False])
return else:
self.sendUpdateToAvatarId(avId, 'response', [context, building.isSuitBlock()]) self.sendUpdateToAvatarId(avId, 'response', [context, self.buildings[zoneId].isSuitBlock()])

4
toontown/building/ToonInterior.py
View file

@ -176,7 +176,9 @@ class ToonInterior(Place.Place):
def enterTeleportIn(self, requestStatus): def enterTeleportIn(self, requestStatus):
modelType = DistributedToonInterior.DistributedToonInterior(base.cr).getModelType(self.getZoneId()) modelType = DistributedToonInterior.DistributedToonInterior(base.cr).getModelType(self.getZoneId())
if ZoneUtil.isPetshop(self.zoneId): if ZoneUtil.isHQ(self.zoneId):
base.localAvatar.setPosHpr(-5.5, -1.5, ToontownGlobals.FloorOffset, 0.0, 0.0, 0.0)
elif ZoneUtil.isPetshop(self.zoneId):
base.localAvatar.setPosHpr(0, 0, ToontownGlobals.FloorOffset, 45.0, 0.0, 0.0) base.localAvatar.setPosHpr(0, 0, ToontownGlobals.FloorOffset, 45.0, 0.0, 0.0)
else: else:
if modelType in InteriorTypes: if modelType in InteriorTypes:

2
toontown/quest/QuestParser.py
View file

@ -137,7 +137,7 @@ class NPCMoviePlayer(DirectObject.DirectObject):
elif varName in globalVarDict: elif varName in globalVarDict:
return globalVarDict[varName] return globalVarDict[varName]
elif varName.find('tomDialogue') > -1 or varName.find('harryDialogue') > -1: elif varName.find('tomDialogue') > -1 or varName.find('harryDialogue') > -1:
notify.warning('%s getting referenced. Tutorial Ack: %d Place: %s' % (varName, base.localAvatar.tutorialAck, base.cr.playGame.hood)) notify.warning('%s getting referenced. Tutorial Ack: %d Place: %s' % (varName, base.localAvatar.tutorialAck, base.cr.playGame.hood))
return None return None
else: else:
notify.error('Variable not defined: %s' % varName) notify.error('Variable not defined: %s' % varName)

78
toontown/quest/QuestPoster.py
View file

@ -70,7 +70,7 @@ class QuestPoster(DirectFrame):
self.questProgress.hide() self.questProgress.hide()
self.funQuest = DirectLabel(parent=self.questFrame, relief=None, text=TTLocalizer.QuestPosterFun, text_fg=(0.0, 0.439, 1.0, 1.0), text_shadow=(0, 0, 0, 1), pos=(0, 0, -0.125), scale=0.04) self.funQuest = DirectLabel(parent=self.questFrame, relief=None, text=TTLocalizer.QuestPosterFun, text_fg=(0.0, 0.439, 1.0, 1.0), text_shadow=(0, 0, 0, 1), pos=(0, 0, -0.125), scale=0.04)
self.funQuest.hide() self.funQuest.hide()
self.teleportButton = DirectButton(parent=self.questFrame, relief=None, image=circleModel, text="Teleport", text_scale=0.035, text_pos=(-0.0025, -0.015), pos=(0.175, 0, 0.125), scale=0.75) #, text_bg=(0, 0.75, 1, 1) self.teleportButton = DirectButton(parent=self.questFrame, relief=None, image=circleModel, text=TTLocalizer.TeleportButton, text_scale=0.035, text_pos=(-0.0025, -0.015), pos=(0.175, 0, 0.125), scale=0.75) #, text_bg=(0, 0.75, 1, 1)
self.teleportButton.hide() self.teleportButton.hide()
self.laffMeter = None self.laffMeter = None
return return
@ -172,31 +172,25 @@ class QuestPoster(DirectFrame):
suitDoorOrigin = building.find('**/*_door_origin') suitDoorOrigin = building.find('**/*_door_origin')
elevatorNodePath.reparentTo(suitDoorOrigin) elevatorNodePath.reparentTo(suitDoorOrigin)
elevatorNodePath.setPosHpr(0, 0, 0, 0, 0, 0) elevatorNodePath.setPosHpr(0, 0, 0, 0, 0, 0)
return
def teleportToShop(self, npcId): def teleportToShop(self, npcId):
npcZone = NPCToons.getNPCZone(npcId) npcZone = NPCToons.getNPCZone(npcId)
npcHood = ZoneUtil.getCanonicalHoodId(npcZone) npcHood = ZoneUtil.getCanonicalHoodId(npcZone)
avZone = base.localAvatar.getZoneId()
avHood = ZoneUtil.getCanonicalHoodId(avZone)
avShard = base.localAvatar.defaultShard
avPlace = base.cr.playGame.getPlace()
hqZone = {2000:2520, 1000:1507, 3000:3508, 4000:4504, 5000:5502, 7000:7503, 9000:9505} hqZone = {2000:2520, 1000:1507, 3000:3508, 4000:4504, 5000:5502, 7000:7503, 9000:9505}
def callback(flag):
if flag: if npcZone in (-1, 0, None):
npcZone = None npcHood = ZoneUtil.getCanonicalHoodId(base.localAvatar.getZoneId())
base.cr.buildingQueryMgr.d_isSuit(npcZone, callback) npcZone = hqZone.get(npcHood, 2520)
if avShard not in base.cr.activeDistrictMap:
base.cr.buildingQueryMgr.d_isSuit(npcZone, lambda isSuit: self.teleportToShopCallback(npcZone, npcHood, isSuit))
def teleportToShopCallback(self, npcZone, npcHood, flag):
if flag:
self.teleportButton.setColorScale(0.3, 0.3, 0.3, 1.0)
return return
if npcZone in [-1, 0, None]:
return self.teleportButton.setColorScale(1.0, 1.0, 1.0, 1.0)
if not ZoneUtil.isInterior(npcZone): base.cr.playGame.getPlace().requestTeleport(npcHood, npcZone, base.localAvatar.defaultShard, -1)
return
if ZoneUtil.isHQ(npcZone):
args = (avHood, hqZone[avHood], avShard, -1)
else:
args = (npcHood, npcZone, avShard, -1)
avPlace.requestTeleport(*args)
def fitGeometry(self, geom, fFlip = 0, dimension = 0.8): def fitGeometry(self, geom, fFlip = 0, dimension = 0.8):
p1 = Point3() p1 = Point3()
@ -230,8 +224,6 @@ class QuestPoster(DirectFrame):
self.lPictureFrame.hide() self.lPictureFrame.hide()
self.rPictureFrame.hide() self.rPictureFrame.hide()
self.questProgress.hide() self.questProgress.hide()
self.teleportButton.hide()
self.teleportButton.setPos(0.175, 0, -0.125)
if hasattr(self, 'chooseButton'): if hasattr(self, 'chooseButton'):
self.chooseButton.destroy() self.chooseButton.destroy()
del self.chooseButton del self.chooseButton
@ -305,30 +297,17 @@ class QuestPoster(DirectFrame):
fComplete = quest.getCompletionStatus(base.localAvatar, questDesc) == Quests.COMPLETE fComplete = quest.getCompletionStatus(base.localAvatar, questDesc) == Quests.COMPLETE
if Quests.isQuestJustForFun(questId, rewardId):
if fComplete:
self.funQuest.hide()
self.teleportButton.show()
else:
self.teleportButton.hide()
if toNpcId == Quests.ToonHQ: if toNpcId == Quests.ToonHQ:
self.teleportButton.show()
self.teleportButton.setPos(0.285, 0, -0.15)
toNpcName = TTLocalizer.QuestPosterHQOfficer toNpcName = TTLocalizer.QuestPosterHQOfficer
toNpcBuildingName = TTLocalizer.QuestPosterHQBuildingName toNpcBuildingName = TTLocalizer.QuestPosterHQBuildingName
toNpcStreetName = TTLocalizer.QuestPosterHQStreetName toNpcStreetName = TTLocalizer.QuestPosterHQStreetName
toNpcLocationName = TTLocalizer.QuestPosterHQLocationName toNpcLocationName = TTLocalizer.QuestPosterHQLocationName
elif toNpcId == Quests.ToonTailor: elif toNpcId == Quests.ToonTailor:
self.teleportButton.show()
self.teleportButton.setPos(0.285, 0, -0.15)
toNpcName = TTLocalizer.QuestPosterTailor toNpcName = TTLocalizer.QuestPosterTailor
toNpcBuildingName = TTLocalizer.QuestPosterTailorBuildingName toNpcBuildingName = TTLocalizer.QuestPosterTailorBuildingName
toNpcStreetName = TTLocalizer.QuestPosterTailorStreetName toNpcStreetName = TTLocalizer.QuestPosterTailorStreetName
toNpcLocationName = TTLocalizer.QuestPosterTailorLocationName toNpcLocationName = TTLocalizer.QuestPosterTailorLocationName
else: else:
self.teleportButton.show()
self.teleportButton.setPos(0.285, 0, -0.15)
toNpcName = NPCToons.getNPCName(toNpcId) toNpcName = NPCToons.getNPCName(toNpcId)
toNpcZone = NPCToons.getNPCZone(toNpcId) toNpcZone = NPCToons.getNPCZone(toNpcId)
toNpcHoodId = ZoneUtil.getCanonicalHoodId(toNpcZone) toNpcHoodId = ZoneUtil.getCanonicalHoodId(toNpcZone)
@ -349,8 +328,13 @@ class QuestPoster(DirectFrame):
objectiveStrings = quest.getObjectiveStrings() objectiveStrings = quest.getObjectiveStrings()
captions = map(string.capwords, quest.getObjectiveStrings()) captions = map(string.capwords, quest.getObjectiveStrings())
imageColor = Vec4(*self.colors['white']) imageColor = Vec4(*self.colors['white'])
self.teleportButton.hide()
if base.localAvatar.tutorialAck and (fComplete or quest.getType() in (Quests.DeliverGagQuest, Quests.DeliverItemQuest, Quests.VisitQuest, Quests.TrackChoiceQuest)):
self.teleportButton.show()
self.teleportButton.setPos(0.3, 0, -0.15)
if isinstance(quest, Quests.TexturedQuest) and quest.hasFrame(): if isinstance(quest, Quests.TexturedQuest) and quest.hasFrame():
self.teleportButton.hide()
frame = quest.getFrame() frame = quest.getFrame()
frameBgColor = frame[1] frameBgColor = frame[1]
lIconGeom = frame[0] lIconGeom = frame[0]
@ -361,9 +345,6 @@ class QuestPoster(DirectFrame):
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.DeliverGagQuest or quest.getType() == Quests.DeliverItemQuest: elif quest.getType() == Quests.DeliverGagQuest or quest.getType() == Quests.DeliverItemQuest:
frameBgColor = 'red' frameBgColor = 'red'
if fComplete:
self.teleportButton.show()
self.teleportButton.setPos(0.175, 0, -0.125)
if quest.getType() == Quests.DeliverGagQuest: if quest.getType() == Quests.DeliverGagQuest:
invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons') invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons')
track, item = quest.getGagType() track, item = quest.getGagType()
@ -382,7 +363,6 @@ class QuestPoster(DirectFrame):
infoText = TTLocalizer.QuestPageDestination % (toNpcBuildingName, toNpcStreetName, toNpcLocationName) infoText = TTLocalizer.QuestPageDestination % (toNpcBuildingName, toNpcStreetName, toNpcLocationName)
rIconGeom = self.createNpcToonHead(toNpcId) rIconGeom = self.createNpcToonHead(toNpcId)
rIconGeomScale = IMAGE_SCALE_SMALL rIconGeomScale = IMAGE_SCALE_SMALL
self.teleportButton.setPos(0.285, 0, -0.15)
elif quest.getType() == Quests.RecoverItemQuest: elif quest.getType() == Quests.RecoverItemQuest:
frameBgColor = 'green' frameBgColor = 'green'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
@ -425,10 +405,7 @@ class QuestPoster(DirectFrame):
infoText = quest.getLocationName() infoText = quest.getLocationName()
if infoText == '': if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
else:
self.teleportButton.show()
elif quest.getType() == Quests.VisitQuest: elif quest.getType() == Quests.VisitQuest:
self.teleportButton.show()
frameBgColor = 'brown' frameBgColor = 'brown'
captions[0] = '%s' % toNpcName captions[0] = '%s' % toNpcName
lIconGeom = self.createNpcToonHead(toNpcId) lIconGeom = self.createNpcToonHead(toNpcId)
@ -436,7 +413,6 @@ class QuestPoster(DirectFrame):
if not fComplete: if not fComplete:
infoText = TTLocalizer.QuestPageDestination % (toNpcBuildingName, toNpcStreetName, toNpcLocationName) infoText = TTLocalizer.QuestPageDestination % (toNpcBuildingName, toNpcStreetName, toNpcLocationName)
elif quest.getType() == Quests.TrackChoiceQuest: elif quest.getType() == Quests.TrackChoiceQuest:
self.teleportButton.hide()
frameBgColor = 'green' frameBgColor = 'green'
invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons') invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons')
track1, track2 = quest.getChoices(base.localAvatar) track1, track2 = quest.getChoices(base.localAvatar)
@ -455,7 +431,6 @@ class QuestPoster(DirectFrame):
infoZ = -0.02 infoZ = -0.02
invModel.removeNode() invModel.removeNode()
elif quest.getType() == Quests.BuildingQuest: elif quest.getType() == Quests.BuildingQuest:
self.teleportButton.hide()
frameBgColor = 'blue' frameBgColor = 'blue'
track = quest.getBuildingTrack() track = quest.getBuildingTrack()
numFloors = quest.getNumFloors() numFloors = quest.getNumFloors()
@ -483,7 +458,6 @@ class QuestPoster(DirectFrame):
if infoText == '': if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.FactoryQuest: elif quest.getType() == Quests.FactoryQuest:
self.teleportButton.hide()
frameBgColor = 'blue' frameBgColor = 'blue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = bookModel.find('**/factoryIcon2') lIconGeom = bookModel.find('**/factoryIcon2')
@ -494,7 +468,6 @@ class QuestPoster(DirectFrame):
if infoText == '': if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.MintQuest: elif quest.getType() == Quests.MintQuest:
self.teleportButton.hide()
frameBgColor = 'blue' frameBgColor = 'blue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = bookModel.find('**/CashBotMint') lIconGeom = bookModel.find('**/CashBotMint')
@ -505,7 +478,6 @@ class QuestPoster(DirectFrame):
if infoText == '': if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.CogPartQuest: elif quest.getType() == Quests.CogPartQuest:
self.teleportButton.hide()
frameBgColor = 'green' frameBgColor = 'green'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = bookModel.find('**/CogArmIcon2') lIconGeom = bookModel.find('**/CogArmIcon2')
@ -516,7 +488,6 @@ class QuestPoster(DirectFrame):
if infoText == '': if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.ForemanQuest or quest.getType() == Quests.SupervisorQuest: elif quest.getType() == Quests.ForemanQuest or quest.getType() == Quests.SupervisorQuest:
self.teleportButton.hide()
frameBgColor = 'blue' frameBgColor = 'blue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = bookModel.find('**/skelecog5') lIconGeom = bookModel.find('**/skelecog5')
@ -527,13 +498,11 @@ class QuestPoster(DirectFrame):
if infoText == '': if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.RescueQuest: elif quest.getType() == Quests.RescueQuest:
self.teleportButton.hide()
frameBgColor = 'blue' frameBgColor = 'blue'
lIconGeom = self.createNpcToonHead(random.choice(NPCToons.HQnpcFriends.keys())) lIconGeom = self.createNpcToonHead(random.choice(NPCToons.HQnpcFriends.keys()))
lIconGeomScale = 0.13 lIconGeomScale = 0.13
infoText = quest.getLocationName().strip() infoText = quest.getLocationName().strip()
elif quest.getType() == Quests.FriendQuest: elif quest.getType() == Quests.FriendQuest:
self.teleportButton.hide()
frameBgColor = 'brown' frameBgColor = 'brown'
gui = loader.loadModel('phase_3.5/models/gui/friendslist_gui') gui = loader.loadModel('phase_3.5/models/gui/friendslist_gui')
lIconGeom = gui.find('**/FriendsBox_Closed') lIconGeom = gui.find('**/FriendsBox_Closed')
@ -541,7 +510,6 @@ class QuestPoster(DirectFrame):
gui.removeNode() gui.removeNode()
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.TrolleyQuest: elif quest.getType() == Quests.TrolleyQuest:
self.teleportButton.hide()
frameBgColor = 'lightBlue' frameBgColor = 'lightBlue'
gui = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') gui = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = gui.find('**/trolley') lIconGeom = gui.find('**/trolley')
@ -549,7 +517,6 @@ class QuestPoster(DirectFrame):
gui.removeNode() gui.removeNode()
infoText = TTLocalizer.QuestPosterPlayground infoText = TTLocalizer.QuestPosterPlayground
elif quest.getType() == Quests.MailboxQuest: elif quest.getType() == Quests.MailboxQuest:
self.teleportButton.hide()
frameBgColor = 'lightBlue' frameBgColor = 'lightBlue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = bookModel.find('**/package') lIconGeom = bookModel.find('**/package')
@ -557,7 +524,6 @@ class QuestPoster(DirectFrame):
bookModel.removeNode() bookModel.removeNode()
infoText = TTLocalizer.QuestPosterAtHome infoText = TTLocalizer.QuestPosterAtHome
elif quest.getType() == Quests.PhoneQuest: elif quest.getType() == Quests.PhoneQuest:
self.teleportButton.hide()
frameBgColor = 'lightBlue' frameBgColor = 'lightBlue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = bookModel.find('**/clarabelleCow') lIconGeom = bookModel.find('**/clarabelleCow')
@ -565,7 +531,6 @@ class QuestPoster(DirectFrame):
bookModel.removeNode() bookModel.removeNode()
infoText = TTLocalizer.QuestPosterOnPhone infoText = TTLocalizer.QuestPosterOnPhone
else: else:
self.teleportButton.hide()
frameBgColor = 'blue' frameBgColor = 'blue'
if quest.getType() == Quests.CogTrackQuest: if quest.getType() == Quests.CogTrackQuest:
dept = quest.getCogTrack() dept = quest.getCogTrack()
@ -619,7 +584,6 @@ class QuestPoster(DirectFrame):
if infoText == '': if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere infoText = TTLocalizer.QuestPosterAnywhere
if fComplete: if fComplete:
self.teleportButton.show()
textColor = (0, 0.3, 0, 1) textColor = (0, 0.3, 0, 1)
imageColor = Vec4(*self.colors['lightGreen']) imageColor = Vec4(*self.colors['lightGreen'])
lPos.setX(-0.18) lPos.setX(-0.18)
@ -694,8 +658,6 @@ class QuestPoster(DirectFrame):
self.questInfo['text'] = infoText self.questInfo['text'] = infoText
self.questInfo.setZ(infoZ) self.questInfo.setZ(infoZ)
self.fitLabel(self.questInfo) self.fitLabel(self.questInfo)
if not Quests.QuestDict[questId][0] >= 11:
self.teleportButton.hide()
return return
def unbindMouseEnter(self): def unbindMouseEnter(self):

2
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -8729,6 +8729,8 @@ ShardPagePreferred = 'Preferred'
ShardPageShardTitle = '%s Population: %s' ShardPageShardTitle = '%s Population: %s'
ShardPageTeleport = 'Teleport to\n%s' ShardPageTeleport = 'Teleport to\n%s'
TeleportButton = 'Teleport'
Blacklist = [ Blacklist = [
"$1ut", "$1ut",
"$h1t", "$h1t",