It is always available.

This commit is contained in:
John 2015-07-09 17:43:52 +03:00
parent de7a36b95e
commit 071ee08176
7 changed files with 5 additions and 21 deletions

View file

@ -29360,6 +29360,7 @@ WHITELIST = [
"schedule's", "schedule's",
'schedules', 'schedules',
'schell', 'schell',
'schellgames',
'scheme', 'scheme',
'schemer', 'schemer',
'schemes', 'schemes',

View file

@ -6,12 +6,4 @@ class DistributedBBElevatorAI(DistributedBossElevatorAI.DistributedBossElevatorA
def __init__(self, air, bldg, zone, antiShuffle = 0, minLaff = 0): def __init__(self, air, bldg, zone, antiShuffle = 0, minLaff = 0):
DistributedBossElevatorAI.DistributedBossElevatorAI.__init__(self, air, bldg, zone, antiShuffle=antiShuffle, minLaff=0) DistributedBossElevatorAI.DistributedBossElevatorAI.__init__(self, air, bldg, zone, antiShuffle=antiShuffle, minLaff=0)
self.type = ELEVATOR_BB self.type = ELEVATOR_BB
self.countdownTime = ElevatorData[self.type]['countdown'] self.countdownTime = ElevatorData[self.type]['countdown']
def checkBoard(self, av):
result = 0
if simbase.config.GetBool('allow-ceo-elevator', 1):
result = DistributedBossElevatorAI.DistributedBossElevatorAI.checkBoard(self, av)
else:
result = REJECT_NOT_YET_AVAILABLE
return result

View file

@ -348,8 +348,6 @@ class DistributedElevator(DistributedObject.DistributedObject):
base.localAvatar.elevatorNotifier.showMe(TTLocalizer.ElevatorMinLaff % self.minLaff) base.localAvatar.elevatorNotifier.showMe(TTLocalizer.ElevatorMinLaff % self.minLaff)
elif reason == REJECT_PROMOTION: elif reason == REJECT_PROMOTION:
base.localAvatar.elevatorNotifier.showMe(TTLocalizer.BossElevatorRejectMessage) base.localAvatar.elevatorNotifier.showMe(TTLocalizer.BossElevatorRejectMessage)
elif reason == REJECT_NOT_YET_AVAILABLE:
base.localAvatar.elevatorNotifier.showMe(TTLocalizer.NotYetAvailable)
doneStatus = {'where': 'reject'} doneStatus = {'where': 'reject'}
elevator = self.getPlaceElevator() elevator = self.getPlaceElevator()
if elevator: if elevator:

View file

@ -15,8 +15,7 @@ REJECT_MINLAFF = 2
REJECT_NOSEAT = 3 REJECT_NOSEAT = 3
REJECT_PROMOTION = 4 REJECT_PROMOTION = 4
REJECT_BLOCKED_ROOM = 5 REJECT_BLOCKED_ROOM = 5
REJECT_NOT_YET_AVAILABLE = 6 REJECT_BOARDINGPARTY = 6
REJECT_BOARDINGPARTY = 7
MAX_GROUP_BOARDING_TIME = 6.0 MAX_GROUP_BOARDING_TIME = 6.0
ElevatorData = {ELEVATOR_NORMAL: {'openTime': 2.0, ElevatorData = {ELEVATOR_NORMAL: {'openTime': 2.0,
'closeTime': 2.0, 'closeTime': 2.0,

View file

@ -11,7 +11,6 @@ from toontown.minigame.MinigameRulesPanel import MinigameRulesPanel
from toontown.cogdominium.CogdoGameRulesPanel import CogdoGameRulesPanel from toontown.cogdominium.CogdoGameRulesPanel import CogdoGameRulesPanel
from toontown.minigame import MinigameGlobals from toontown.minigame import MinigameGlobals
from toontown.toonbase import TTLocalizer as TTL from toontown.toonbase import TTLocalizer as TTL
SCHELLGAMES_DEV = __debug__ and base.config.GetBool('cogdo-enable-cheat', True)
class DistCogdoGame(DistCogdoGameBase, DistributedObject): class DistCogdoGame(DistCogdoGameBase, DistributedObject):
notify = directNotify.newCategory('DistCogdoGame') notify = directNotify.newCategory('DistCogdoGame')
@ -231,12 +230,10 @@ class DistCogdoGame(DistCogdoGameBase, DistributedObject):
return self._startTime return self._startTime
def enterGame(self): def enterGame(self):
if SCHELLGAMES_DEV: pass
self.acceptOnce('escape', messenger.send, ['magicWord', ['~endMaze']])
def exitGame(self): def exitGame(self):
if SCHELLGAMES_DEV: pass
self.ignore('escape')
def setGameFinish(self, timestamp): def setGameFinish(self, timestamp):
self._finishTime = globalClockDelta.networkToLocalTime(timestamp) self._finishTime = globalClockDelta.networkToLocalTime(timestamp)

View file

@ -359,8 +359,6 @@ class DistributedCogKart(DistributedElevatorExt.DistributedElevatorExt):
base.localAvatar.elevatorNotifier.showMe(TTLocalizer.KartMinLaff % self.minLaff) base.localAvatar.elevatorNotifier.showMe(TTLocalizer.KartMinLaff % self.minLaff)
elif reason == ElevatorConstants.REJECT_PROMOTION: elif reason == ElevatorConstants.REJECT_PROMOTION:
base.localAvatar.elevatorNotifier.showMe(TTLocalizer.BossElevatorRejectMessage) base.localAvatar.elevatorNotifier.showMe(TTLocalizer.BossElevatorRejectMessage)
elif reason == ElevatorConstants.REJECT_NOT_YET_AVAILABLE:
base.localAvatar.elevatorNotifier.showMe(TTLocalizer.NotYetAvailable)
doneStatus = {'where': 'reject'} doneStatus = {'where': 'reject'}
elevator = self.getPlaceElevator() elevator = self.getPlaceElevator()
if elevator: if elevator:

View file

@ -4770,7 +4770,6 @@ CashbotMagnetAdvice = 'Hold down the control key to pick things up.'
CashbotCraneLeaving = 'Leaving crane' CashbotCraneLeaving = 'Leaving crane'
MintElevatorRejectMessage = 'You cannot enter the Mints until you have completed your %s Cog Suit.' MintElevatorRejectMessage = 'You cannot enter the Mints until you have completed your %s Cog Suit.'
BossElevatorRejectMessage = 'You cannot board this elevator until you have earned a promotion.' BossElevatorRejectMessage = 'You cannot board this elevator until you have earned a promotion.'
NotYetAvailable = 'This elevator is not yet available.'
SellbotRentalSuitMessage = "Wear this Rental Suit so you can get close enough to the VP to attack.\n\nYou won't earn Merits or promotions, but you can rescue a Toon for an SOS reward!" SellbotRentalSuitMessage = "Wear this Rental Suit so you can get close enough to the VP to attack.\n\nYou won't earn Merits or promotions, but you can rescue a Toon for an SOS reward!"
SellbotCogSuitNoMeritsMessage = "Your Sellbot Disguise will get you in, but since you don't have enough Merits, you won't earn a promotion.\n\nIf you rescue the trapped Toon, you will earn an SOS Toon reward!" SellbotCogSuitNoMeritsMessage = "Your Sellbot Disguise will get you in, but since you don't have enough Merits, you won't earn a promotion.\n\nIf you rescue the trapped Toon, you will earn an SOS Toon reward!"
SellbotCogSuitHasMeritsMessage = "It's Operation: Storm Sellbot!\n\nBring 5 or more Rental Suit Toons with you to defeat the VP and earn credit towards a reward!" SellbotCogSuitHasMeritsMessage = "It's Operation: Storm Sellbot!\n\nBring 5 or more Rental Suit Toons with you to defeat the VP and earn credit towards a reward!"