diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index 4b5931e9f..a932a87b6 100644 --- a/app/models/ThangType.coffee +++ b/app/models/ThangType.coffee @@ -24,7 +24,7 @@ module.exports = class ThangType extends CocoModel librarian: '52fbf74b7e01835453bd8d8e' 'potion-master': '52e9adf7427172ae56002172' sorcerer: '52fd1524c7e6cf99160e7bc9' - necromancer: '' + necromancer: '55652fb3b9effa46a1f775fd' 'dark-wizard': '' @heroClasses: Warrior: ['captain', 'knight', 'samurai', 'raider', 'goliath', 'guardian'] diff --git a/app/views/play/level/PlayLevelView.coffee b/app/views/play/level/PlayLevelView.coffee index ba588ef7b..da3aaa4c8 100644 --- a/app/views/play/level/PlayLevelView.coffee +++ b/app/views/play/level/PlayLevelView.coffee @@ -439,6 +439,7 @@ module.exports = class PlayLevelView extends RootView application.tracker?.trackTiming victoryTime, 'Level Victory Time', @levelID, @levelID showVictory: -> + return if @isEditorPreview and @level.hasLocalChanges() # Don't award achievements when beating level changed in level editor @endHighlight() options = {level: @level, supermodel: @supermodel, session: @session, hasReceivedMemoryWarning: @hasReceivedMemoryWarning} ModalClass = if @level.get('type', true) in ['hero', 'hero-ladder', 'hero-coop'] then HeroVictoryModal else VictoryModal @@ -537,6 +538,7 @@ module.exports = class PlayLevelView extends RootView onSubmissionComplete: => return if @destroyed + return if @isEditorPreview and @level.hasLocalChanges() # Don't award achievements when beating level changed in level editor # TODO: Show a victory dialog specific to hero-ladder level if @goalManager.checkOverallStatus() is 'success' and not @options.realTimeMultiplayerSessionID? showModalFn = -> Backbone.Mediator.publish 'level:show-victory', showModal: true diff --git a/app/views/play/level/tome/CastButtonView.coffee b/app/views/play/level/tome/CastButtonView.coffee index 6ad76861b..833c56b41 100644 --- a/app/views/play/level/tome/CastButtonView.coffee +++ b/app/views/play/level/tome/CastButtonView.coffee @@ -72,6 +72,7 @@ module.exports = class CastButtonView extends CocoView @updateReplayability() onDoneButtonClick: (e) -> + return if @getQueryVariable('dev') and @level.hasLocalChanges() # Don't award achievements when beating level changed in level editor @options.session.recordScores @world.scores, @options.level Backbone.Mediator.publish 'level:show-victory', showModal: true diff --git a/app/views/play/modal/PlayHeroesModal.coffee b/app/views/play/modal/PlayHeroesModal.coffee index 083decdb5..0e728ed12 100644 --- a/app/views/play/modal/PlayHeroesModal.coffee +++ b/app/views/play/modal/PlayHeroesModal.coffee @@ -178,7 +178,7 @@ module.exports = class PlayHeroesModal extends ModalView layer.container.children[0].y = 250/m if fullHero.get('slug') in ['forest-archer', 'librarian', 'sorcerer', 'potion-master', 'necromancer'] layer.container.children[0].y -= 3 - if fullHero.get('slug') in ['librarian', 'sorcerer', 'potion-master'] + if fullHero.get('slug') in ['librarian', 'sorcerer', 'potion-master', 'necromancer'] layer.container.children[0].x -= 3 stage = new createjs.SpriteStage(canvas[0])