From 1f9dddf534b9c5d279ad3b16fe5e4c3ad098aff6 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 27 Aug 2015 19:37:18 +0300 Subject: [PATCH] Quest map fixes in suit interiors --- toontown/building/DistributedElevator.py | 6 +---- toontown/building/DistributedSuitInterior.py | 1 + toontown/cogdominium/CogdoBarrelRoom.py | 2 -- .../cogdominium/DistributedCogdoInterior.py | 26 +++---------------- toontown/hood/Place.py | 2 -- toontown/quest/QuestMap.py | 14 +--------- toontown/toonbase/ToontownGlobals.py | 2 -- 7 files changed, 6 insertions(+), 47 deletions(-) diff --git a/toontown/building/DistributedElevator.py b/toontown/building/DistributedElevator.py index 83b244fc..8f0ad08a 100755 --- a/toontown/building/DistributedElevator.py +++ b/toontown/building/DistributedElevator.py @@ -465,7 +465,6 @@ class DistributedElevator(DistributedObject.DistributedObject): del self.elevatorFSM elevator.signalDone(doneStatus) base.camLens.setMinFov(ToontownGlobals.CBElevatorFov/(4./3.)) - return def getElevatorModel(self): self.notify.error('getElevatorModel: pure virtual -- inheritors must override') @@ -530,10 +529,7 @@ class DistributedElevator(DistributedObject.DistributedObject): return self.offsetNP.getPos(render) def canHideBoardingQuitBtn(self, avId): - if avId == localAvatar.doId and hasattr(localAvatar, 'boardingParty') and localAvatar.boardingParty and localAvatar.boardingParty.groupPanel: - return True - else: - return False + return avId == localAvatar.doId and hasattr(localAvatar, 'boardingParty') and localAvatar.boardingParty and localAvatar.boardingParty.groupPanel def getBoardingTrack(self, toon, seatIndex, wantToonRotation): self.boardingGroupShow = BoardingGroupShow.BoardingGroupShow(toon) diff --git a/toontown/building/DistributedSuitInterior.py b/toontown/building/DistributedSuitInterior.py index 8d7688dd..78386e6b 100755 --- a/toontown/building/DistributedSuitInterior.py +++ b/toontown/building/DistributedSuitInterior.py @@ -365,6 +365,7 @@ class DistributedSuitInterior(DistributedObject.DistributedObject): def enterResting(self, ts = 0): base.playMusic(self.waitMusic, looping=1, volume=0.7) + base.localAvatar.questMap.stop() self.__closeInElevator() def exitResting(self): diff --git a/toontown/cogdominium/CogdoBarrelRoom.py b/toontown/cogdominium/CogdoBarrelRoom.py index 04a2147e..2d1ab2d1 100755 --- a/toontown/cogdominium/CogdoBarrelRoom.py +++ b/toontown/cogdominium/CogdoBarrelRoom.py @@ -23,7 +23,6 @@ class CogdoBarrelRoom: self.fog = None self.defaultFar = None self.stomperSfx = None - return def destroy(self): self.unload() @@ -71,7 +70,6 @@ class CogdoBarrelRoom: taskMgr.remove(self.rewardUiTaskName) taskMgr.remove(self.rewardCameraTaskName) self._isLoaded = False - return def isLoaded(self): return self._isLoaded diff --git a/toontown/cogdominium/DistributedCogdoInterior.py b/toontown/cogdominium/DistributedCogdoInterior.py index 837c3e3e..c599e426 100755 --- a/toontown/cogdominium/DistributedCogdoInterior.py +++ b/toontown/cogdominium/DistributedCogdoInterior.py @@ -113,7 +113,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self._movie = None self.SOSToonName = None self.FOType = None - return def setShopOwnerNpcId(self, npcId): self.shopOwnerNpcId = npcId @@ -202,13 +201,11 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.shopOwnerNpc.removeActive() self.shopOwnerNpc.delete() self.shopOwnerNpc = None - return def __cleanupPenthouseIntro(self): if hasattr(self, '_movie') and self._movie: self._movie.unload() self._movie = None - return def delete(self): self._stashEntranceElevatorFC.destroy() @@ -223,13 +220,9 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): del self.fsm base.localAvatar.inventory.setBattleCreditMultiplier(1) DistributedObject.DistributedObject.delete(self) - return def isBossFloor(self, floorNum): - if not self.layout.hasBossBattle(): - return False - - return (self.layout.getBossBattleFloor() + 0) == floorNum + return self.layout.hasBossBattle() and (self.layout.getBossBattleFloor() + 0) == floorNum def __cleanup(self): self.toons = [] @@ -251,7 +244,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.rightDoorIn = None self.leftDoorOut = None self.rightDoorOut = None - return def __addToon(self, toon): self.accept(toon.uniqueName('disable'), self.__handleUnexpectedExit, extraArgs=[toon]) @@ -404,7 +396,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): def enterWaitForAllToonsInside(self, ts = 0): base.transitions.fadeOut(0) - return None def exitWaitForAllToonsInside(self): return None @@ -568,7 +559,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self._movie.end() self.__cleanupPenthouseIntro() self.__finishInterval(self.elevatorName) - return None def __setupBarrelRoom(self): self.currentFloor += 1 @@ -607,7 +597,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.barrelRoomIntroTrack.finish() DelayDelete.cleanupDelayDeletes(self.barrelRoomIntroTrack) self.barrelRoomIntroTrack = None - return def __handleLocalToonLeftBarrelRoom(self): self.notify.info('Local toon teleported out of barrel room.') @@ -620,6 +609,7 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.acceptOnce('localToonLeft', self.__handleLocalToonLeftBarrelRoom) self.barrelRoom.activate() base.playMusic(self.waitMusic, looping=1, volume=0.7) + base.localAvatar.questMap.stop() def exitCollectBarrels(self): if self._wantBarrelRoom and not self.isBossFloor(self.currentFloor): @@ -675,13 +665,11 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.__playCloseElevatorOut(self.uniqueName('close-out-elevator')) camera.setPos(0, -15, 6) camera.headsUp(self.elevatorModelOut) - return None def exitBattle(self): if self.elevatorOutOpen == 1: self.__finishInterval(self.uniqueName('close-out-elevator')) self.elevatorOutOpen = 0 - return None def __playReservesJoining(self, ts, name, callback): index = 0 @@ -698,7 +686,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): def enterReservesJoining(self, ts = 0): self.__playReservesJoining(ts, self.uniqueName('reserves-joining'), self.__handleReserveJoinDone) - return None def __handleReserveJoinDone(self): self.joiningReserves = [] @@ -707,7 +694,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): def exitReservesJoining(self): self.__finishInterval(self.uniqueName('reserves-joining')) - return None def enterResting(self, ts = 0): self._showExitElevator() @@ -734,7 +720,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.penthouseOutroTrack.start(ts) else: self.exitCogdoBuilding() - return None def exitReward(self): self.notify.debug('exitReward') @@ -747,16 +732,13 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.__outroPenthouseChatDone() self.penthouseOutroChatDoneTrack.finish() self.penthouseOutroChatDoneTrack = None - return def enterFailed(self, ts = 0): self.exitCogdoBuilding() - return None def exitFailed(self): self.notify.debug('exitFailed()') self.exitCogdoBuilding() - return None def exitCogdoBuilding(self): if base.localAvatar.hp < 0: @@ -771,7 +753,6 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): 'avId': -1, 'bldgDoId': self.distBldgDoId} messenger.send('DSIDoneEvent', [request]) - return def displayBadges(self): numFloors = self.layout.getNumGameFloors() @@ -796,9 +777,8 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): track = Parallel(name=trackName) base.cr.playGame.getPlace().fsm.request('stopped') - if self.FOType == "l": + if self.FOType == 'l': speech = TTLocalizer.CogdoExecutiveSuiteToonThankYouLawbot - else: speech = TTLocalizer.CogdoExecutiveSuiteToonThankYou % self.SOSToonName diff --git a/toontown/hood/Place.py b/toontown/hood/Place.py index 21aca716..65da8cab 100755 --- a/toontown/hood/Place.py +++ b/toontown/hood/Place.py @@ -187,7 +187,6 @@ class Place(StateData.StateData, FriendsListManager.FriendsListManager): base.localAvatar.invPage.hideInventoryOnscreen() base.localAvatar.questMap.hide() base.localAvatar.questMap.ignoreOnscreenHooks() - return def handleWalkDone(self, doneStatus): mode = doneStatus['mode'] @@ -495,7 +494,6 @@ class Place(StateData.StateData, FriendsListManager.FriendsListManager): self.accept('tunnelOutMovieDone', self.__tunnelOutMovieDone) base.localAvatar.tunnelOut(tunnelOrigin) base.localAvatar.stopQuestMap() - return def __tunnelOutMovieDone(self): self.ignore('tunnelOutMovieDone') diff --git a/toontown/quest/QuestMap.py b/toontown/quest/QuestMap.py index 038601c7..1cb2dbab 100755 --- a/toontown/quest/QuestMap.py +++ b/toontown/quest/QuestMap.py @@ -30,9 +30,6 @@ class QuestMap(DirectFrame): self.cogInfoFrame.setPos(0, 0, 0.6) self.buildingMarkers = [] self.av = av - self.wantToggle = False - if base.config.GetBool('want-toggle-quest-map', True): - self.wantToggle = True self.updateMarker = True self.cornerPosInfo = None self.hqPosInfo = None @@ -47,8 +44,6 @@ class QuestMap(DirectFrame): tracks = currHoodInfo[SuitPlannerBase.SuitPlannerBase.SUIT_HOOD_INFO_TRACK] self.suitPercentage[currHoodInfo[SuitPlannerBase.SuitPlannerBase.SUIT_HOOD_INFO_ZONE]] = tracks - return - def load(self): gui = loader.loadModel('phase_4/models/questmap/questmap_gui') icon = gui.find('**/tt_t_gui_qst_arrow') @@ -279,7 +274,6 @@ class QuestMap(DirectFrame): self.obscureButton() self.ignore('questPageUpdated') taskMgr.remove('questMapUpdate') - return def handleMarker(self): if hasattr(base.cr.playGame.getPlace(), 'isInterior') and base.cr.playGame.getPlace().isInterior: @@ -288,15 +282,9 @@ class QuestMap(DirectFrame): self.updateMarker = True def acceptOnscreenHooks(self): - if self.wantToggle: - self.accept(ToontownGlobals.MapHotkey, self.toggle) - else: - self.accept(ToontownGlobals.MapHotkeyOn, self.show) - self.accept(ToontownGlobals.MapHotkeyOff, self.hide) + self.accept(ToontownGlobals.MapHotkey, self.toggle) self.updateMap() def ignoreOnscreenHooks(self): self.ignore(ToontownGlobals.MapHotkey) - self.ignore(ToontownGlobals.MapHotkeyOn) - self.ignore(ToontownGlobals.MapHotkeyOff) self.obscureButton() diff --git a/toontown/toonbase/ToontownGlobals.py b/toontown/toonbase/ToontownGlobals.py index 5250a993..6e4ede84 100755 --- a/toontown/toonbase/ToontownGlobals.py +++ b/toontown/toonbase/ToontownGlobals.py @@ -2,8 +2,6 @@ import TTLocalizer from otp.otpbase.OTPGlobals import * from direct.showbase.PythonUtil import Enum, invertDict from pandac.PandaModules import BitMask32, Vec4 -MapHotkeyOn = 'alt' -MapHotkeyOff = 'alt-up' MapHotkey = 'alt' CogHQCameraFov = 60.0 BossBattleCameraFov = 72.0