mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-04-26 14:03:28 -04:00
Fixed #1152.
This commit is contained in:
parent
1b0346a1b7
commit
051f1a77ae
2 changed files with 14 additions and 1 deletions
app
|
@ -83,7 +83,7 @@ module.exports = class SuperModel extends Backbone.Model
|
|||
getModelByURL: (modelURL) ->
|
||||
modelURL = modelURL() if _.isFunction(modelURL)
|
||||
return @models[modelURL] or null
|
||||
|
||||
|
||||
getModelByOriginal: (ModelClass, original) ->
|
||||
_.find @models, (m) ->
|
||||
m.get('original') is original and m.constructor.className is ModelClass.className
|
||||
|
|
|
@ -52,6 +52,7 @@ module.exports = class PlayLevelView extends RootView
|
|||
'level:focus-dom': 'onFocusDom'
|
||||
'level:disable-controls': 'onDisableControls'
|
||||
'level:enable-controls': 'onEnableControls'
|
||||
'god:world-load-progress-changed': 'onWorldLoadProgressChanged'
|
||||
'god:new-world-created': 'onNewWorld'
|
||||
'god:streaming-world-updated': 'onNewWorld'
|
||||
'god:infinite-loop': 'onInfiniteLoop'
|
||||
|
@ -195,6 +196,18 @@ module.exports = class PlayLevelView extends RootView
|
|||
@world = @levelLoader.world
|
||||
@level = @levelLoader.level
|
||||
@otherSession = @levelLoader.opponentSession
|
||||
@worldLoadFakeResources = [] # first element (0) is 1%, last (100) is 100%
|
||||
for percent in [1 .. 100]
|
||||
@worldLoadFakeResources.push @supermodel.addSomethingResource "world_simulation_#{percent}%", 1
|
||||
|
||||
onWorldLoadProgressChanged: (e) ->
|
||||
return unless @worldLoadFakeResources
|
||||
@lastWorldLoadPercent ?= 0
|
||||
worldLoadPercent = Math.floor 100 * e.progress
|
||||
for percent in [@lastWorldLoadPercent + 1 .. worldLoadPercent] by 1
|
||||
@worldLoadFakeResources[percent - 1].markLoaded()
|
||||
@lastWorldLoadPercent = worldLoadPercent
|
||||
@worldFakeLoadResources = null if worldLoadPercent is 100 # Done, don't need to watch progress any more.
|
||||
|
||||
loadOpponentTeam: (myTeam) ->
|
||||
opponentSpells = []
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue