From 13962b35d1a6bd51595f40b9b78e110095bd8723 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 27 Aug 2015 09:45:07 +0300 Subject: [PATCH] Fixed selling fish on Fish Bingo --- toontown/fishing/DistributedFishingPond.py | 2 +- toontown/safezone/DistributedFishingSpot.py | 7 +------ toontown/toon/DistributedToonAI.py | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/toontown/fishing/DistributedFishingPond.py b/toontown/fishing/DistributedFishingPond.py index dd2db7bf..5bb8bef4 100755 --- a/toontown/fishing/DistributedFishingPond.py +++ b/toontown/fishing/DistributedFishingPond.py @@ -90,7 +90,7 @@ class DistributedFishingPond(DistributedObject.DistributedObject): return self.pondBingoMgr def hasPondBingoManager(self): - return (self.pondBingoMgr and [1] or [0])[0] + return self.pondBingoMgr is not None def handleBingoCatch(self, catch): if self.pondBingoMgr: diff --git a/toontown/safezone/DistributedFishingSpot.py b/toontown/safezone/DistributedFishingSpot.py index 078f197f..58032a15 100755 --- a/toontown/safezone/DistributedFishingSpot.py +++ b/toontown/safezone/DistributedFishingSpot.py @@ -1050,9 +1050,4 @@ class DistributedFishingSpot(DistributedObject.DistributedObject): self.fsm.request('waiting', [False]) def __allowSellFish(self): - if base.wantBingo: - if self.pond.hasPondBingoManager(): - hoodId = base.cr.playGame.getPlaceId() - if hoodId == ToontownGlobals.MyEstate: - return True - return False + return base.wantBingo and self.pond.hasPondBingoManager() diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py index 2def54f5..2c3f9fef 100755 --- a/toontown/toon/DistributedToonAI.py +++ b/toontown/toon/DistributedToonAI.py @@ -5050,7 +5050,7 @@ def maxCogPage(): target.b_setCogStatus(cogStatus * deptCount) target.b_setCogRadar([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) def immortal():