From 3e9adf6b1aad4a2d600b227613dd25b10fd55881 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Tue, 26 Aug 2014 12:39:30 -0700
Subject: [PATCH] Fixed issue with IndieSprites no longer coloring properly.
---
app/lib/surface/IndieSprite.coffee | 2 ++
app/lib/surface/SpriteBoss.coffee | 2 +-
app/lib/world/thang.coffee | 2 +-
app/views/play/level/LevelHUDView.coffee | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/lib/surface/IndieSprite.coffee b/app/lib/surface/IndieSprite.coffee
index a297b7508..a914a96fb 100644
--- a/app/lib/surface/IndieSprite.coffee
+++ b/app/lib/surface/IndieSprite.coffee
@@ -26,6 +26,8 @@ module.exports = IndieSprite = class IndieSprite extends CocoSprite
thang.getActionName = -> thang.action
thang.acts = true
thang.isSelectable = true
+ thang.team = options.team
+ thang.teamColors = options.teamColors
thang
onNoteGroupStarted: => @scriptRunning = true
diff --git a/app/lib/surface/SpriteBoss.coffee b/app/lib/surface/SpriteBoss.coffee
index 319358d58..c7e22b56c 100644
--- a/app/lib/surface/SpriteBoss.coffee
+++ b/app/lib/surface/SpriteBoss.coffee
@@ -111,7 +111,7 @@ module.exports = class SpriteBoss extends CocoClass
unless thangType = @thangTypeFor indieSprite.thangType
console.warn "Need to convert #{indieSprite.id}'s ThangType #{indieSprite.thangType} to a ThangType reference. Until then, #{indieSprite.id} won't show up."
return
- sprite = new IndieSprite thangType, @createSpriteOptions {thangID: indieSprite.id, pos: indieSprite.pos, sprites: @sprites, colorConfig: indieSprite.colorConfig}
+ sprite = new IndieSprite thangType, @createSpriteOptions {thangID: indieSprite.id, pos: indieSprite.pos, sprites: @sprites, team: indieSprite.team, teamColors: @world.getTeamColors()}
@addSprite sprite, sprite.thang.id
createOpponentWizard: (opponent) ->
diff --git a/app/lib/world/thang.coffee b/app/lib/world/thang.coffee
index da69fdf0e..44900c417 100644
--- a/app/lib/world/thang.coffee
+++ b/app/lib/world/thang.coffee
@@ -167,7 +167,7 @@ module.exports = class Thang
{CN: @constructor.className, id: @id}
getSpriteOptions: ->
- colorConfigs = @world?.getTeamColors() or {}
+ colorConfigs = @teamColors or @world?.getTeamColors() or {}
options = {colorConfig: {}}
if @team and teamColor = colorConfigs[@team]
options.colorConfig.team = teamColor
diff --git a/app/views/play/level/LevelHUDView.coffee b/app/views/play/level/LevelHUDView.coffee
index c1314c823..0f10fa330 100644
--- a/app/views/play/level/LevelHUDView.coffee
+++ b/app/views/play/level/LevelHUDView.coffee
@@ -197,7 +197,7 @@ module.exports = class LevelHUDView extends CocoView
@lastResponses = null
@bubble.append($("<h3>#{@speaker ? 'Captain Anya'}</h3>"))
@animator = new DialogueAnimator(message, @bubble)
- @messageInterval = setInterval(@addMoreMessage, 1000 / 30)
+ @messageInterval = setInterval(@addMoreMessage, 1000 / 30) # 30 FPS
addMoreMessage: =>
if @animator.done()