From def7ca4372a13c4c141f26fae5f3139e001af954 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 6 Jun 2015 22:45:27 +0300 Subject: [PATCH] Max true friends + cleanup --- toontown/shtiker/ShardPage.py | 2 +- toontown/toon/DistributedToonAI.py | 2 +- toontown/toonbase/ToontownGlobals.py | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/toontown/shtiker/ShardPage.py b/toontown/shtiker/ShardPage.py index 21bd59a8..5565c2f7 100755 --- a/toontown/shtiker/ShardPage.py +++ b/toontown/shtiker/ShardPage.py @@ -446,7 +446,7 @@ class ShardPage(ShtikerPage.ShtikerPage): elif self.showPop: handler = self.choseShard else: - if localAvatar.adminAccess >= 200: + if localAvatar.isAdmin(): handler = self.choseShard else: handler = self.shardChoiceReject diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py index ab60bcc0..2ba92d01 100755 --- a/toontown/toon/DistributedToonAI.py +++ b/toontown/toon/DistributedToonAI.py @@ -4047,7 +4047,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo self.b_setRedeemedCodes(self.redeemedCodes) def setTrueFriends(self, trueFriends): - self.trueFriends = trueFriends + self.trueFriends = trueFriends[:OTPGlobals.MaxFriends] def d_setTrueFriends(self, trueFriends): self.sendUpdate('setTrueFriends', [trueFriends]) diff --git a/toontown/toonbase/ToontownGlobals.py b/toontown/toonbase/ToontownGlobals.py index e2b77737..482630a2 100755 --- a/toontown/toonbase/ToontownGlobals.py +++ b/toontown/toonbase/ToontownGlobals.py @@ -1374,15 +1374,6 @@ LawbotBossBonusDuration = 20 LawbotBossBonusToonup = 10 LawbotBossBonusWeightMultiplier = 2 LawbotBossChanceToDoAreaAttack = 11 -LOW_POP_JP = 0 -MID_POP_JP = 100 -HIGH_POP_JP = 200 -LOW_POP_INTL = 399 -MID_POP_INTL = 499 -HIGH_POP_INTL = -1 -LOW_POP = 100 -MID_POP = 200 -HIGH_POP = -1 PinballCannonBumper = 0 PinballCloudBumperLow = 1 PinballCloudBumperMed = 2