From fa1c3d0c0b43389ccb14f3e05ae1a377a413e403 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 10 Mar 2015 00:14:20 +0200 Subject: [PATCH] Remove velvet rope --- otp/distributed/OTPClientRepository.py | 2 -- otp/otpbase/OTPGlobals.py | 1 - toontown/toon/DistributedNPCBankerAI.py | 1 - toontown/toon/DistributedNPCToonAI.py | 1 - toontown/toon/DistributedToonAI.py | 12 ++++-------- toontown/toon/InventoryBase.py | 11 ++++------- toontown/toonbase/ToontownBattleGlobals.py | 13 ------------- 7 files changed, 8 insertions(+), 33 deletions(-) diff --git a/otp/distributed/OTPClientRepository.py b/otp/distributed/OTPClientRepository.py index c960dc0e..9e9a17d8 100644 --- a/otp/distributed/OTPClientRepository.py +++ b/otp/distributed/OTPClientRepository.py @@ -1605,8 +1605,6 @@ class OTPClientRepository(ClientRepositoryBase): return 0 elif paidStatus == 'FULL': return OTPGlobals.AccessFull - elif paidStatus == 'VELVET': - return OTPGlobals.AccessVelvetRope else: return 0 diff --git a/otp/otpbase/OTPGlobals.py b/otp/otpbase/OTPGlobals.py index 723b818e..88becfe3 100644 --- a/otp/otpbase/OTPGlobals.py +++ b/otp/otpbase/OTPGlobals.py @@ -376,7 +376,6 @@ ChatFeedback_PassedBlacklist = 32 ChatFeedback_Whitelist = 64 ChatFeedback_OpenChat = 128 AccessUnknown = 0 -AccessVelvetRope = 1 AccessFull = 2 AccessInvalid = 3 AvatarPendingCreate = -1 diff --git a/toontown/toon/DistributedNPCBankerAI.py b/toontown/toon/DistributedNPCBankerAI.py index 87b8092c..59947f3b 100644 --- a/toontown/toon/DistributedNPCBankerAI.py +++ b/toontown/toon/DistributedNPCBankerAI.py @@ -5,7 +5,6 @@ from DistributedNPCToonBaseAI import * from toontown.estate import BankGlobals class DistributedNPCBankerAI(DistributedNPCToonBaseAI): - FourthGagVelvetRopeBan = config.GetBool('want-ban-fourth-gag-velvet-rope', 0) def __init__(self, air, npcId, questCallback = None, hq = 0): DistributedNPCToonBaseAI.__init__(self, air, npcId, questCallback) diff --git a/toontown/toon/DistributedNPCToonAI.py b/toontown/toon/DistributedNPCToonAI.py index a903eaa1..5e975fee 100644 --- a/toontown/toon/DistributedNPCToonAI.py +++ b/toontown/toon/DistributedNPCToonAI.py @@ -5,7 +5,6 @@ from DistributedNPCToonBaseAI import * from toontown.quest import Quests class DistributedNPCToonAI(DistributedNPCToonBaseAI): - FourthGagVelvetRopeBan = config.GetBool('want-ban-fourth-gag-velvet-rope', 0) def __init__(self, air, npcId, questCallback = None, hq = 0): DistributedNPCToonBaseAI.__init__(self, air, npcId, questCallback) diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py index 21f191ef..8919853d 100644 --- a/toontown/toon/DistributedToonAI.py +++ b/toontown/toon/DistributedToonAI.py @@ -474,7 +474,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo if oldTracks == 0 and oldLevels == 0: self.notify.warning('reseting invalid inventory to MAX on toon: %s' % self.doId) self.inventory.zeroInv() - self.inventory.maxOutInv(1, 1) + self.inventory.maxOutInv(1) else: newInventory = InventoryBase.InventoryBase(self) oldList = emptyInv.makeFromNetStringForceSize(inventoryNetString, oldTracks, oldLevels) @@ -488,9 +488,9 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo def getInventory(self): return self.inventory.makeNetString() - def doRestock(self, noUber = 1, noPaid = 1): + def doRestock(self, noUber = 1): self.inventory.zeroInv() - self.inventory.maxOutInv(noUber, noPaid) + self.inventory.maxOutInv(noUber) self.d_setInventory(self.inventory.makeNetString()) def setDefaultShard(self, shard): @@ -3703,11 +3703,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo if paidStatus == 'unpaid': access = 1 if access == OTPGlobals.AccessInvalid: - if not __dev__: - self.air.writeServerEvent('Setting Access', self.doId, 'setAccess not being sent by the OTP Server, changing access to unpaid') - access = OTPGlobals.AccessVelvetRope - elif __dev__: - access = OTPGlobals.AccessFull + access = OTPGlobals.AccessFull self.setGameAccess(access) def setGameAccess(self, access): diff --git a/toontown/toon/InventoryBase.py b/toontown/toon/InventoryBase.py index 0fb70f07..f076671e 100644 --- a/toontown/toon/InventoryBase.py +++ b/toontown/toon/InventoryBase.py @@ -241,14 +241,13 @@ class InventoryBase(DirectObject.DirectObject): self.updateInventory(newInventory) return 1 - def maxOutInv(self, filterUberGags = 0, filterPaidGags = 0): + def maxOutInv(self, filterUberGags = 0): unpaid = self.toon.getGameAccess() != ToontownGlobals.AccessFull for track in xrange(len(Tracks)): if self.toon.hasTrackAccess(track): for level in xrange(len(Levels[track])): if level <= LAST_REGULAR_GAG_LEVEL or not filterUberGags: - if not filterPaidGags or not (unpaid and gagIsPaidOnly(track, level)): - self.addItem(track, level) + self.addItem(track, level) addedAnything = 1 while addedAnything: @@ -259,12 +258,10 @@ class InventoryBase(DirectObject.DirectObject): level = len(Levels[track]) - 1 if level > LAST_REGULAR_GAG_LEVEL and filterUberGags: level = LAST_REGULAR_GAG_LEVEL - if not filterPaidGags or not (unpaid and gagIsPaidOnly(track, level)): - result = self.addItem(track, level) + result = self.addItem(track, level) level -= 1 while result <= 0 and level >= 0: - if not filterPaidGags or not (unpaid and gagIsPaidOnly(track, level)): - result = self.addItem(track, level) + result = self.addItem(track, level) level -= 1 if result > 0: diff --git a/toontown/toonbase/ToontownBattleGlobals.py b/toontown/toonbase/ToontownBattleGlobals.py index d1a79dcb..b5db2cf8 100644 --- a/toontown/toonbase/ToontownBattleGlobals.py +++ b/toontown/toonbase/ToontownBattleGlobals.py @@ -102,19 +102,6 @@ UnpaidMaxSkills = [Levels[0][1] - 1, Levels[6][1] - 1] ExperienceCap = 300 -def gagIsPaidOnly(track, level): - return Levels[track][level] > UnpaidMaxSkills[track] - - -def gagIsVelvetRoped(track, level): - if level > 0: - if track in [4, 5]: - if level > 3: - return True - else: - return True - return False - MaxToonAcc = 95 StartingLevel = 0