From c13922a2d8091d385086bebe607090def48f0073 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 29 Dec 2014 20:06:27 -0800 Subject: [PATCH] Transferring voice range from Hero Placeholder to heroes. --- app/models/Level.coffee | 3 +++ app/views/editor/campaign/CampaignEditorView.coffee | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/Level.coffee b/app/models/Level.coffee index 401fe2a65..6c2a71648 100644 --- a/app/models/Level.coffee +++ b/app/models/Level.coffee @@ -123,6 +123,9 @@ module.exports = class Level extends CocoModel else if placeholderConfig.extraHUDProperties levelThangComponent.config ?= {} levelThangComponent.config.extraHUDProperties = _.union(levelThangComponent.config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties) + else if placeholderConfig.voiceRange # Pull in voiceRange + levelThangComponent.config ?= {} + levelThangComponent.config.voiceRange = placeholderConfig.voiceRange if isHero if equips = _.find levelThang.components, {original: LevelComponent.EquipsID} diff --git a/app/views/editor/campaign/CampaignEditorView.coffee b/app/views/editor/campaign/CampaignEditorView.coffee index ead76c6e5..2253d0cb2 100644 --- a/app/views/editor/campaign/CampaignEditorView.coffee +++ b/app/views/editor/campaign/CampaignEditorView.coffee @@ -201,7 +201,7 @@ module.exports = class CampaignEditorView extends RootView onCampaignLevelClicked: (levelOriginal) -> return unless levelTreema = @treema.childrenTreemas?.levels?.childrenTreemas?[levelOriginal] - if key.ctrl + if key.ctrl or key.command url = "/editor/level/#{levelTreema.data.slug}" window.open url, '_blank' levelTreema.select()