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

Revert "No XP cap"

Browse source 
This reverts commit f42631b401.
This commit is contained in:
Loudrob 2015-07-29 16:02:57 -04:00
parent a9d6a70ef7
commit 369f038b63
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/battle/BattleCalculatorAI.py
View file

@ -721,7 +721,7 @@ class BattleCalculatorAI:
0, 0,
0] 0]
self.toonSkillPtsGained[id] = expList self.toonSkillPtsGained[id] = expList
expList[trk] = expList[trk] + (lvl + 1) * self.__skillCreditMultiplier expList[trk] = min(ExperienceCap, expList[trk] + (lvl + 1) * self.__skillCreditMultiplier)
return return
def __clearTgtDied(self, tgt, lastAtk, currAtk): def __clearTgtDied(self, tgt, lastAtk, currAtk):

12
toontown/toon/InventoryNew.py
View file

@ -327,6 +327,9 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame):
def setDetailCredit(self, track, credit): def setDetailCredit(self, track, credit):
if credit != None: if credit != None:
if self.toon.earnedExperience:
maxCredit = ExperienceCap - self.toon.earnedExperience[track]
credit = min(credit, maxCredit)
credit = int(credit * 10 + 0.5) credit = int(credit * 10 + 0.5)
if credit % 10 == 0: if credit % 10 == 0:
credit /= 10 credit /= 10
@ -859,7 +862,14 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame):
return 1 return 1
def itemIsCredit(self, track, level): def itemIsCredit(self, track, level):
return self.battleCreditLevel == None or level < self.battleCreditLevel if self.toon.earnedExperience:
if self.toon.earnedExperience[track] >= ExperienceCap:
return 0
if self.battleCreditLevel == None:
return 1
else:
return level < self.battleCreditLevel
return
def getMax(self, track, level): def getMax(self, track, level):
if self.gagTutMode and (track not in (4, 5) or level > 0): if self.gagTutMode and (track not in (4, 5) or level > 0):

3
toontown/toonbase/ToontownBattleGlobals.py
View file

@ -92,6 +92,7 @@ Levels = [[0,
regMaxSkill = 10000 regMaxSkill = 10000
UberSkill = 500 UberSkill = 500
MaxSkill = UberSkill + regMaxSkill MaxSkill = UberSkill + regMaxSkill
ExperienceCap = 300
MaxToonAcc = 95 MaxToonAcc = 95
@ -830,4 +831,4 @@ def getUberFlagSafe(flagMask, index):
if flagMask == 'unknown' or flagMask < 0: if flagMask == 'unknown' or flagMask < 0:
return -1 return -1
else: else:
return getUberFlag(flagMask, index) return getUberFlag(flagMask, index)