Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove velvet rope

Browse source
This commit is contained in:
Daniel 2015-03-10 00:14:20 +02:00
parent d7279b7778
commit fa1c3d0c0b
7 changed files with 8 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otp/distributed/OTPClientRepository.py
View file

@ -1605,8 +1605,6 @@ class OTPClientRepository(ClientRepositoryBase):
return 0
elif paidStatus == 'FULL':
return OTPGlobals.AccessFull
elif paidStatus == 'VELVET':
return OTPGlobals.AccessVelvetRope
else:
return 0

1
otp/otpbase/OTPGlobals.py
View file

@ -376,7 +376,6 @@ ChatFeedback_PassedBlacklist = 32
ChatFeedback_Whitelist = 64
ChatFeedback_OpenChat = 128
AccessUnknown = 0
AccessVelvetRope = 1
AccessFull = 2
AccessInvalid = 3
AvatarPendingCreate = -1

1
toontown/toon/DistributedNPCBankerAI.py
View file

@ -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)

1
toontown/toon/DistributedNPCToonAI.py
View file

@ -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)

12
toontown/toon/DistributedToonAI.py
View file

@ -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):

11
toontown/toon/InventoryBase.py
View file

@ -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:

13
toontown/toonbase/ToontownBattleGlobals.py
View file

@ -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