diff --git a/app/lib/world/thang.coffee b/app/lib/world/thang.coffee index 05d21249a..6797720d6 100644 --- a/app/lib/world/thang.coffee +++ b/app/lib/world/thang.coffee @@ -73,7 +73,7 @@ module.exports = class Thang for [prop, type] in props unless type in ThangState.trackedPropertyTypes # How should errors for busted Components work? We can't recover from this and run the world. - throw new Error "Type #{type} for property #{prop} is not a trackable property type: #{trackedPropertyTypes}" + throw new Error "Type #{type} for property #{prop} is not a trackable property type: #{ThangState.trackedPropertyTypes}" oldPropIndex = @trackedPropertiesKeys.indexOf prop if oldPropIndex is -1 @trackedPropertiesKeys.push prop diff --git a/app/models/Level.coffee b/app/models/Level.coffee index bf5178e9d..6fa720673 100644 --- a/app/models/Level.coffee +++ b/app/models/Level.coffee @@ -9,7 +9,6 @@ module.exports = class Level extends CocoModel @levels: 'dungeons-of-kithgard': '5411cb3769152f1707be029c' 'defense-of-plainswood': '541b67f71ccc8eaae19f3c62' - 'the-mighty-sand-yak': '5480b9d01bf0b10000711c5f' urlRoot: '/db/level' serialize: (supermodel, session, otherSession, cached=false) -> diff --git a/app/views/editor/level/LevelEditView.coffee b/app/views/editor/level/LevelEditView.coffee index 2ed868b2d..da6e1fe36 100644 --- a/app/views/editor/level/LevelEditView.coffee +++ b/app/views/editor/level/LevelEditView.coffee @@ -200,5 +200,5 @@ module.exports = class LevelEditView extends RootView incrementBuildTime: => return if application.userIsIdle - @levelBuildTime ?= @level.get('buildTime') + @levelBuildTime ?= @level.get('buildTime') ? 0 ++@levelBuildTime diff --git a/app/views/play/CampaignView.coffee b/app/views/play/CampaignView.coffee index 07fff7412..add5f3ff1 100644 --- a/app/views/play/CampaignView.coffee +++ b/app/views/play/CampaignView.coffee @@ -138,6 +138,7 @@ module.exports = class CampaignView extends RootView level.locked = not me.ownsLevel level.original level.locked = false if @levelStatusMap[level.slug] in ['started', 'complete'] level.locked = false if @editorMode + level.locked = false if @campaign.get('name') is 'Auditions' level.disabled = true if level.adminOnly and @levelStatusMap[level.slug] not in ['started', 'complete'] level.color = 'rgb(255, 80, 60)' if level.requiresSubscription diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee index b2313eb04..d88760dae 100644 --- a/app/views/play/level/modal/HeroVictoryModal.coffee +++ b/app/views/play/level/modal/HeroVictoryModal.coffee @@ -88,7 +88,7 @@ module.exports = class HeroVictoryModal extends ModalView me.fetch cache: false unless me.loading @readyToContinue = true if not @achievements.models.length - + # have to use a something resource because addModelResource doesn't handle models being upserted/fetched via POST like we're doing here @newEarnedAchievementsResource = @supermodel.addSomethingResource('earned achievements') if @newEarnedAchievements.length @@ -314,7 +314,7 @@ module.exports = class HeroVictoryModal extends ModalView AudioPlayer.playSound name, 1 getNextLevelCampaign: -> - {'kithgard-gates': 'forest', 'siege-of-stonehold': 'desert'}[@level.get('slug')] or @level.get 'campaign' # Much easier to just keep this updated than to dynamically figure it out. + {'kithgard-gates': 'forest', 'siege-of-stonehold': 'desert', 'clash-of-clones': 'mountain'}[@level.get('slug')] or @level.get 'campaign' # Much easier to just keep this updated than to dynamically figure it out. getNextLevelLink: -> link = '/play' diff --git a/config.coffee b/config.coffee index bfe7fd781..7b9945fd8 100644 --- a/config.coffee +++ b/config.coffee @@ -126,7 +126,7 @@ exports.config = 'vendor/scripts/jasmine-html.js' 'vendor/scripts/jasmine-boot.js' 'vendor/scripts/jasmine-mock-ajax.js' - + # vendor.js ordering 'bower_components/jquery/dist/jquery.js' 'bower_components/lodash/dist/lodash.js'