diff --git a/toontown/battle/BattleCalculatorAI.py b/toontown/battle/BattleCalculatorAI.py index 55964e51..18d328e4 100755 --- a/toontown/battle/BattleCalculatorAI.py +++ b/toontown/battle/BattleCalculatorAI.py @@ -741,7 +741,7 @@ class BattleCalculatorAI: 0, 0] self.toonSkillPtsGained[id] = expList - expList[trk] = min(ExperienceCap, expList[trk] + (lvl + 1) * self.__skillCreditMultiplier) + expList[trk] = expList[trk] + (lvl + 1) * self.__skillCreditMultiplier return def __clearTgtDied(self, tgt, lastAtk, currAtk): diff --git a/toontown/toon/InventoryNew.py b/toontown/toon/InventoryNew.py index 79a013c7..60451260 100755 --- a/toontown/toon/InventoryNew.py +++ b/toontown/toon/InventoryNew.py @@ -312,9 +312,6 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame): def setDetailCredit(self, track, credit): if credit != None: - if self.toon.earnedExperience: - maxCredit = ExperienceCap - self.toon.earnedExperience[track] - credit = min(credit, maxCredit) credit = int(credit * 10 + 0.5) if credit % 10 == 0: credit /= 10 @@ -963,14 +960,7 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame): return 1 def itemIsCredit(self, track, level): - if self.toon.earnedExperience: - if self.toon.earnedExperience[track] >= ExperienceCap: - return 0 - if self.battleCreditLevel == None: - return 1 - else: - return level < self.battleCreditLevel - return + return self.battleCreditLevel == None or level < self.battleCreditLevel def getMax(self, track, level): if self.gagTutMode and (track not in (4, 5) or level > 0): diff --git a/toontown/toonbase/ToontownBattleGlobals.py b/toontown/toonbase/ToontownBattleGlobals.py index c70e3007..cb0e2aab 100755 --- a/toontown/toonbase/ToontownBattleGlobals.py +++ b/toontown/toonbase/ToontownBattleGlobals.py @@ -92,7 +92,6 @@ Levels = [[0, regMaxSkill = 10000 UberSkill = 500 MaxSkill = UberSkill + regMaxSkill -ExperienceCap = 300 MaxToonAcc = 95