diff --git a/app/lib/surface/Label.coffee b/app/lib/surface/Label.coffee index 1f134ef2b..e4b6f1f2d 100644 --- a/app/lib/surface/Label.coffee +++ b/app/lib/surface/Label.coffee @@ -15,7 +15,7 @@ module.exports = class Label extends CocoClass @sprite = options.sprite @camera = options.camera @layer = options.layer - @style = options.style ? Label.STYLE_SAY + @style = options.style ? (@sprite?.thang?.labelStyle || Label.STYLE_SAY) console.error @toString(), 'needs a sprite.' unless @sprite console.error @toString(), 'needs a camera.' unless @camera console.error @toString(), 'needs a layer.' unless @layer diff --git a/app/lib/surface/Lank.coffee b/app/lib/surface/Lank.coffee index a606054e1..a116f3fa2 100644 --- a/app/lib/surface/Lank.coffee +++ b/app/lib/surface/Lank.coffee @@ -684,7 +684,10 @@ module.exports = Lank = class Lank extends CocoClass return unless @thang blurb = if @thang.health <= 0 then null else @thang.sayMessage # Dead men tell no tales blurb = null if blurb in ['For Thoktar!', 'Bones!', 'Behead!', 'Destroy!', 'Die, humans!'] # Let's just hear, not see, these ones. - labelStyle = if /Hero Placeholder/.test(@thang.id) then Label.STYLE_DIALOGUE else Label.STYLE_SAY + if /Hero Placeholder/.test(@thang.id) + labelStyle = Label.STYLE_DIALOGUE + else + labelStyle = @thang.labelStyle ? Label.STYLE_SAY @addLabel 'say', labelStyle if blurb if @labels.say?.setText blurb @notifySpeechUpdated blurb: blurb