Set up the HeroVictoryModal to block until achievements data has loaded. Enabled the HeroVictoryModal for hero levels.

app/locale/en.coffee

@@ -205,6 +205,7 @@
     victory_return_to_ladder: "Return to Ladder"
     victory_play_next_level: "Play Next Level"  # Only in old-style levels.
     victory_play_continue: "Continue"
+    victory_saving_progress: "Saving Progress"
     victory_go_home: "Go Home"  # Only in old-style levels.
     victory_review: "Tell us more!"  # Only in old-style levels.
     victory_hour_of_code_done: "Are You Done?"

app/templates/play/level/modal/hero-victory-modal.jade

@@ -49,5 +49,6 @@ block modal-footer-content
     br
     span.spr Gems Gained:
     span#gem-total +0
-  
-  button.btn.btn-primary.pull-right#continue-button Continue
+
+  button.btn.btn-warning.hide#saving-progress-label(disabled, data-i18n="play_level.victory_saving_progress") Saving Progress
+  a.btn.btn-success.world-map-button.hide#continue-button(href="/play-hero", data-dismiss="modal", data-i18n="play_level.victory_play_continue") Continue

app/views/play/level/PlayLevelView.coffee

@@ -455,9 +455,8 @@ module.exports = class PlayLevelView extends RootView
 
   showVictory: ->
     options = {level: @level, supermodel: @supermodel, session: @session}
-#    ModalClass = if @level.get('type', true) is 'hero' then HeroVictoryModal else VictoryModal
-#    victoryModal = new ModalClass(options)
-    victoryModal = new VictoryModal(options)
+    ModalClass = if @level.get('type', true) is 'hero' then HeroVictoryModal else VictoryModal
+    victoryModal = new ModalClass(options)
     @openModalView(victoryModal)
     if me.get('anonymous')
       window.nextLevelURL = @getNextLevelURL()  # Signup will go here on completion instead of reloading.

app/views/play/level/modal/HeroVictoryModal.coffee

@@ -23,6 +23,7 @@ module.exports = class HeroVictoryModal extends ModalView
     @thangTypes = {}
     @achievements = @supermodel.loadCollection(achievements, 'achievements').model
     @listenToOnce @achievements, 'sync', @onAchievementsLoaded
+    @readyToContinue = false
   
   onAchievementsLoaded: ->
     thangTypeOriginals = []
@@ -31,27 +32,41 @@ module.exports = class HeroVictoryModal extends ModalView
       rewards = achievement.get('rewards')
       thangTypeOriginals.push rewards.heroes or []
       thangTypeOriginals.push rewards.items or []
-      achievementIDs.push(achievement.id)
+      achievement.completed = LocalMongo.matchesQuery(@session.attributes, achievement.get('query'))
+      achievementIDs.push(achievement.id) if achievement.completed
+        
     thangTypeOriginals = _.uniq _.flatten thangTypeOriginals
     for thangTypeOriginal in thangTypeOriginals
       thangType = new ThangType()
       thangType.url = "/db/thang.type/#{thangTypeOriginal}/version"
       thangType.project = ['original', 'rasterIcon', 'name']
       @thangTypes[thangTypeOriginal] = @supermodel.loadModel(thangType, 'thang').model
-    url = "/db/earned_achievement?view=get-by-achievement-ids&achievementIDs=#{achievementIDs.join(',')}"
-    earnedAchievements = new CocoCollection([], {
-      url: url
-      model: EarnedAchievement
-    })
-    res = @supermodel.loadCollection(earnedAchievements, 'earned_achievements')
-    @earnedAchievements = res.model
-      
+
+    if achievementIDs.length
+      url = "/db/earned_achievement?view=get-by-achievement-ids&achievementIDs=#{achievementIDs.join(',')}"
+      earnedAchievements = new CocoCollection([], {
+        url: url
+        model: EarnedAchievement
+      })
+      earnedAchievements.sizeShouldBe = achievementIDs.length
+      res = @supermodel.loadCollection(earnedAchievements, 'earned_achievements')
+      @earnedAchievements = res.model
+      @listenTo @earnedAchievements, 'sync', ->
+        if @earnedAchievements.models.length < @earnedAchievements.sizeShouldBe
+          @earnedAchievements.fetch()
+        else
+          @listenToOnce me, 'sync', ->
+            @readyToContinue = true
+            @updateSavingProgressStatus()
+          me.fetch() unless me.loading
+    else
+      @readyToContinue = true
+    
   getRenderData: ->
     c = super()
     c.levelName = utils.i18n @level.attributes, 'name'
     earnedAchievementMap = _.indexBy(@earnedAchievements?.models or [], (ea) -> ea.get('achievement'))
-    for achievement, index in @achievements.models
-      achievement.completed = LocalMongo.matchesQuery(@session.attributes, achievement.get('query'))
+    for achievement in @achievements.models
       earnedAchievement = earnedAchievementMap[achievement.id]
       if earnedAchievement
         achievement.completedAWhileAgo = new Date() - Date.parse(earnedAchievement.get('created')) > 30 * 1000
@@ -70,6 +85,7 @@ module.exports = class HeroVictoryModal extends ModalView
   afterRender: ->
     super()
     return unless @supermodel.finished()
+    @updateSavingProgressStatus()
     complete = _.once(_.bind(@beginAnimateNumbers, @))
     @animatedPanels = $()
     panels = @$el.find('.achievement-panel')
@@ -89,6 +105,7 @@ module.exports = class HeroVictoryModal extends ModalView
       )
       panel.delay(500)
       panel.queue(-> complete())
+    @animationComplete = !@animatedPanels.length
       
   beginAnimateNumbers: ->
     @numericalItemPanels = _.map(@animatedPanels.find('.numerical'), (panel) -> {
@@ -119,3 +136,10 @@ module.exports = class HeroVictoryModal extends ModalView
   endAnimateNumbers: ->
     @$el.find('.pulse').removeClass('pulse')
     clearInterval(@numberAnimationInterval)
+    @animationComplete = true
+    @updateSavingProgressStatus()
+
+  updateSavingProgressStatus: ->
+    return unless @animationComplete
+    @$el.find('#saving-progress-label').toggleClass('hide', @readyToContinue)
+    @$el.find('#continue-button').toggleClass('hide', !@readyToContinue)