From b373541292e926c9f52262eee7a05a93323c94fe Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 16 Mar 2015 17:29:29 +0000 Subject: [PATCH] Fix inventory --- toontown/toon/InventoryNew.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/toontown/toon/InventoryNew.py b/toontown/toon/InventoryNew.py index 1ba08080..85304c31 100644 --- a/toontown/toon/InventoryNew.py +++ b/toontown/toon/InventoryNew.py @@ -719,15 +719,8 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame): if self.itemIsUsable(track, level): button.show() unpaid = not base.cr.isPaid() - if self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or unpaid and gagIsPaidOnly(track, level) or level > LAST_REGULAR_GAG_LEVEL: - if gagIsPaidOnly(track, level): - self.makeDisabledPressable(button, track, level) - elif unpaid and gagIsVelvetRoped(track, level): - self.makeDisabledPressable(button, track, level) - else: - self.makeUnpressable(button, track, level) - elif unpaid and gagIsVelvetRoped(track, level): - self.makeDisabledPressable(button, track, level) + if self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or level > LAST_REGULAR_GAG_LEVEL: + self.makeUnpressable(button, track, level) else: self.makePressable(button, track, level) else: @@ -772,15 +765,8 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame): if self.itemIsUsable(track, level): button.show() unpaid = not base.cr.isPaid() - if self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or unpaid and gagIsPaidOnly(track, level) or level > LAST_REGULAR_GAG_LEVEL: - if gagIsPaidOnly(track, level): - self.makeDisabledPressable(button, track, level) - elif unpaid and gagIsVelvetRoped(track, level): - self.makeDisabledPressable(button, track, level) - else: - self.makeUnpressable(button, track, level) - elif unpaid and gagIsVelvetRoped(track, level): - self.makeDisabledPressable(button, track, level) + if self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or level > LAST_REGULAR_GAG_LEVEL: + self.makeUnpressable(button, track, level) else: self.makePressable(button, track, level) else: @@ -1246,4 +1232,4 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame): goDark = LerpColorScaleInterval(flashObject, 0.5, Point4(0.1, 0.1, 0.1, 1.0), Point4(1, 1, 1, 1), blendType='easeIn') goBright = LerpColorScaleInterval(flashObject, 0.5, Point4(1, 1, 1, 1), Point4(0.1, 0.1, 0.1, 1.0), blendType='easeOut') newSeq = Sequence(goDark, goBright, Wait(0.2)) - self.propBonusIval.append(newSeq) + self.propBonusIval.append(newSeq) \ No newline at end of file