Fixed selling fish on Fish Bingo

This commit is contained in:
John 2015-08-27 09:45:07 +03:00
parent b16654e456
commit 13962b35d1
3 changed files with 3 additions and 8 deletions

View file

@ -90,7 +90,7 @@ class DistributedFishingPond(DistributedObject.DistributedObject):
return self.pondBingoMgr return self.pondBingoMgr
def hasPondBingoManager(self): def hasPondBingoManager(self):
return (self.pondBingoMgr and [1] or [0])[0] return self.pondBingoMgr is not None
def handleBingoCatch(self, catch): def handleBingoCatch(self, catch):
if self.pondBingoMgr: if self.pondBingoMgr:

View file

@ -1050,9 +1050,4 @@ class DistributedFishingSpot(DistributedObject.DistributedObject):
self.fsm.request('waiting', [False]) self.fsm.request('waiting', [False])
def __allowSellFish(self): def __allowSellFish(self):
if base.wantBingo: return base.wantBingo and self.pond.hasPondBingoManager()
if self.pond.hasPondBingoManager():
hoodId = base.cr.playGame.getPlaceId()
if hoodId == ToontownGlobals.MyEstate:
return True
return False

View file

@ -5050,7 +5050,7 @@ def maxCogPage():
target.b_setCogStatus(cogStatus * deptCount) target.b_setCogStatus(cogStatus * deptCount)
target.b_setCogRadar([1, 1, 1, 1]) target.b_setCogRadar([1, 1, 1, 1])
target.b_setBuildingRadar([1, 1, 1, 1]) target.b_setBuildingRadar([1, 1, 1, 1])
return 'Maxed %s\'s discovered cogs -- Jumble' % (target.getName()) return 'Maxed %s\'s discovered cogs!' % (target.getName())
@magicWord(category=CATEGORY_PROGRAMMER) @magicWord(category=CATEGORY_PROGRAMMER)
def immortal(): def immortal():