Fix inventory

This commit is contained in:
Daniel 2015-03-16 17:29:29 +00:00
parent fd58fe5662
commit b373541292

View file

@ -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:
if self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or level > LAST_REGULAR_GAG_LEVEL:
self.makeUnpressable(button, track, level)
elif unpaid and gagIsVelvetRoped(track, level):
self.makeDisabledPressable(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:
if self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or level > LAST_REGULAR_GAG_LEVEL:
self.makeUnpressable(button, track, level)
elif unpaid and gagIsVelvetRoped(track, level):
self.makeDisabledPressable(button, track, level)
else:
self.makePressable(button, track, level)
else: