Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload.

This commit is contained in:
Nick Winter 2014-11-13 10:49:37 -08:00
parent 29860caeea
commit 05a3577de9
6 changed files with 20 additions and 10 deletions

View file

@ -313,7 +313,7 @@ $itemSlotGridHeight: 70px
padding: 9px 0 9px 9px
#double-click-hint
margin: 20px 0 70px
margin: 20px 50px 70px 0
h4
clear: both

View file

@ -71,7 +71,7 @@
strong
color: rgb(50,50,30)
#selected-item-unlock-button
#selected-item-unlock-button, .unequippable
left: 856px
top: 594px
width: 337px
@ -80,3 +80,7 @@
img
height: 16px
.unequippable
position: absolute

View file

@ -33,9 +33,14 @@
p Only admins will see it for now.
if item && !item.owned
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.spl= '('+item.get('gems')
img(src="/images/common/gem.png")
span )
if item.equippable
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.spl= '('+item.get('gems')
img(src="/images/common/gem.png")
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

View file

@ -422,7 +422,7 @@ module.exports = class InventoryModal extends ModalView
@toggleFullscreen()
hasGoneFullScreenOnce = true
@updateConfig =>
@trigger 'play-click'
@trigger? 'play-click'
window.tracker?.trackEvent 'Play Level Modal', Action: 'Play'
updateConfig: (callback, skipSessionSave) ->

View file

@ -361,7 +361,7 @@ dungeon = [
y: 14
nextLevels:
#more_practice: 'crawlways-of-kithgard'
continue: 'true-names'
continue: 'forgetful-gemsmith'
practice: true
}
#{
@ -385,7 +385,7 @@ dungeon = [
x: 63
y: 13
nextLevels:
continue: 'shadow-guard'
continue: 'true-names'
}
{
name: 'True Names'

View file

@ -392,6 +392,7 @@ module.exports = class SpellView extends CocoView
return unless e.spell is @spell
@reloadCode true
@ace.clearSelection()
_.delay (=> @ace?.clearSelection()), 500 # Make double sure this gets done (saw some timing issues?)
reloadCode: (cast=true) ->
@updateACEText @spell.originalSource