mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-10-31 08:47:54 +00:00
Fix inventory
This commit is contained in:
parent
fd58fe5662
commit
b373541292
1 changed files with 5 additions and 19 deletions
|
@ -719,15 +719,8 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame):
|
||||||
if self.itemIsUsable(track, level):
|
if self.itemIsUsable(track, level):
|
||||||
button.show()
|
button.show()
|
||||||
unpaid = not base.cr.isPaid()
|
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 self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or level > LAST_REGULAR_GAG_LEVEL:
|
||||||
if gagIsPaidOnly(track, level):
|
self.makeUnpressable(button, 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)
|
|
||||||
else:
|
else:
|
||||||
self.makePressable(button, track, level)
|
self.makePressable(button, track, level)
|
||||||
else:
|
else:
|
||||||
|
@ -772,15 +765,8 @@ class InventoryNew(InventoryBase.InventoryBase, DirectFrame):
|
||||||
if self.itemIsUsable(track, level):
|
if self.itemIsUsable(track, level):
|
||||||
button.show()
|
button.show()
|
||||||
unpaid = not base.cr.isPaid()
|
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 self.numItem(track, level) >= self.getMax(track, level) or totalProps == maxProps or level > LAST_REGULAR_GAG_LEVEL:
|
||||||
if gagIsPaidOnly(track, level):
|
self.makeUnpressable(button, 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)
|
|
||||||
else:
|
else:
|
||||||
self.makePressable(button, track, level)
|
self.makePressable(button, track, level)
|
||||||
else:
|
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')
|
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')
|
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))
|
newSeq = Sequence(goDark, goBright, Wait(0.2))
|
||||||
self.propBonusIval.append(newSeq)
|
self.propBonusIval.append(newSeq)
|
Loading…
Reference in a new issue