mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-03-22 10:55:19 -04:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
dd8ea18186
3 changed files with 10 additions and 3 deletions
app
|
@ -10,4 +10,4 @@
|
|||
.progress.progress-striped.active
|
||||
.progress-bar.progress-bar-success
|
||||
|
||||
h4 Tip: you can shift+click a position on the map to insert it into the spell editor.
|
||||
h4= tip
|
|
@ -1,6 +1,13 @@
|
|||
View = require 'views/kinds/CocoView'
|
||||
template = require 'templates/play/level/level_loading'
|
||||
|
||||
|
||||
tips = [
|
||||
"Tip: you can shift+click a position on the map to insert it into the spell editor."
|
||||
"You can toggle play/paused with ctrl+p."
|
||||
"Pressing ctrl+[ and ctrl+] rewinds and fast-forwards."
|
||||
]
|
||||
|
||||
module.exports = class LevelLoadingView extends View
|
||||
id: "level-loading-view"
|
||||
template: template
|
||||
|
@ -17,7 +24,7 @@ module.exports = class LevelLoadingView extends View
|
|||
@$el.find('.progress-bar').css('width', (100 * @progress) + '%')
|
||||
|
||||
showReady: ->
|
||||
return
|
||||
@$el.find('h2').addClass('ready').text 'Ready!'
|
||||
|
||||
unveil: ->
|
||||
_.delay @reallyUnveil, 1000
|
||||
|
@ -37,4 +44,5 @@ module.exports = class LevelLoadingView extends View
|
|||
|
||||
getRenderData: (c={}) ->
|
||||
super c
|
||||
c.tip = _.sample tips
|
||||
c
|
||||
|
|
|
@ -129,7 +129,6 @@ module.exports = class TomeView extends View
|
|||
@thangSpells[thang.id].push spellKey
|
||||
unless method.cloneOf
|
||||
skipProtectAPI = @getQueryVariable("skip_protect_api") is "true" or @options.levelID isnt 'brawlwood'
|
||||
skipProtectAPI = true # gah, it's so slow :( and somehow still affects simulation
|
||||
skipProtectAPI = false if @options.levelID is 'dungeon-arena'
|
||||
skipFlow = @getQueryVariable("skip_flow") is "true" or @options.levelID is 'brawlwood'
|
||||
spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: skipFlow, skipProtectAPI: skipProtectAPI, worker: @worker
|
||||
|
|
Loading…
Reference in a new issue