codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-27 17:45:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

A few fixes for unequippable cross-class item state.

Browse source
This commit is contained in:
Nick Winter 2014-11-18 19:37:08 -08:00
parent 3ad67130c7
commit 96ff44017e
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/styles/game-menu/inventory-modal.sass
View file

@ -438,6 +438,9 @@ $itemSlotGridHeight: 70px
#selected-item-unlock-button #selected-item-unlock-button
left: 646px left: 646px
.unequippable
display: none
//- Equip/unequip/extra //- Equip/unequip/extra

18
app/templates/play/modal/item-details-view.jade
View file

@ -27,20 +27,18 @@
span.spr : span.spr :
span!= prop.description span!= prop.description
if item.comingSoon if item.comingSoon
.text-center .text-center
h3 This item has no stats. h3 This item has no stats.
p Only admins will see it for now. p Only admins will see it for now.
if item && !item.owned if item && !item.owned
if item.equippable if item.unequippable
// Temp, while we only have Warriors: prevent them from buying non-Warrior stuff
button.btn.big-font.disabled.unequippable #{item.get('heroClass')} Only
else
button#selected-item-unlock-button.btn.big-font.unlock-button(disabled=!item.affordable, data-item-id=item.id) button#selected-item-unlock-button.btn.big-font.unlock-button(disabled=!item.affordable, data-item-id=item.id)
span(data-i18n="play.unlock") Unlock span(data-i18n="play.unlock") Unlock
span.spl= '('+item.get('gems') span.spl= '('+item.get('gems')
img(src="/images/common/gem.png") img(src="/images/common/gem.png")
span ) span )
else
// Temp, while we only have Warriors: prevent them from buying non-Warrior stuff
button.btn.big-font.disabled.unequippable #{item.get('heroClass')} Only

4
app/views/game-menu/InventoryModal.coffee
View file

@ -86,7 +86,9 @@ module.exports = class InventoryModal extends ModalView
locked = not (item.get('original') in me.items()) locked = not (item.get('original') in me.items())
locked = false if me.get('slug') is 'nick' locked = false if me.get('slug') is 'nick'
if locked and item.get('slug') isnt 'simple-boots' if not item.getFrontFacingStats().props.length and not _.size item.getFrontFacingStats().stats # Temp: while there are placeholder items
null # Don't put into a collection
else if locked and item.get('slug') isnt 'simple-boots'
@itemGroups.lockedItems.add(item) @itemGroups.lockedItems.add(item)
item.classes.push 'locked' item.classes.push 'locked'
item.classes.push 'silhouette' if item.isSilhouettedItem() item.classes.push 'silhouette' if item.isSilhouettedItem()

2
app/views/play/modal/ItemDetailsView.coffee
View file

@ -53,7 +53,7 @@ module.exports = class ItemDetailsView extends CocoView
else else
@propDocs[propDoc.name] = propDoc @propDocs[propDoc.name] = propDoc
@render() @render()
afterRender: -> afterRender: ->
super() super()
@$el.find('.nano:visible').nanoScroller({alwaysVisible: true}) @$el.find('.nano:visible').nanoScroller({alwaysVisible: true})

2
app/views/play/modal/PlayItemsModal.coffee
View file

@ -89,7 +89,7 @@ module.exports = class PlayItemsModal extends ModalView
model.affordable = cost <= gemsOwned model.affordable = cost <= gemsOwned
model.silhouetted = not model.owned and model.isSilhouettedItem() model.silhouetted = not model.owned and model.isSilhouettedItem()
model.level = model.levelRequiredForItem() if model.get('tier')? model.level = model.levelRequiredForItem() if model.get('tier')?
model.equippable = 'Warrior' in model.getAllowedHeroClasses() # Temp: while there are no wizards/rangers model.unequippable = not ('Warrior' in model.getAllowedHeroClasses()) # Temp: while there are no wizards/rangers
model.comingSoon = not model.getFrontFacingStats().props.length and not _.size model.getFrontFacingStats().stats and not model.owned # Temp: while there are placeholder items model.comingSoon = not model.getFrontFacingStats().props.length and not _.size model.getFrontFacingStats().stats and not model.owned # Temp: while there are placeholder items
@idToItem[model.id] = model @idToItem[model.id] = model