Fixed a handful of bugs with the thang editor and sprite animation.

app/lib/surface/Lank.coffee

@@ -141,9 +141,9 @@ module.exports = Lank = class Lank extends CocoClass
   playAction: (action) ->
     return if @isRaster
     @currentAction = action
-    return @hide() unless action.animation or action.container or action.relatedActions
+    return @hide() unless action.animation or action.container or action.relatedActions or action.goesTo
     @show()
-    return @updateActionDirection() unless action.animation or action.container
+    return @updateActionDirection() unless action.animation or action.container or action.goesTo
     return if @sprite.placeholder
     m = if action.container then 'gotoAndStop' else 'gotoAndPlay'
     @sprite[m]?(action.name)

app/lib/surface/SegmentedSprite.coffee

@@ -93,7 +93,11 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
         sprite.scaleX = sprite.scaleY = 1 / @resolutionFactor
       @children = []
       @addChild(sprite)
-
+      
+    else if action.goesTo
+      @goto(action.goesTo, @paused)
+      return
+      
     @scaleX *= -1 if action.flipX
     @scaleY *= -1 if action.flipY
     @baseScaleX = @scaleX
@@ -101,7 +105,7 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
     return
     
   notifyActionNeedsRender: (action) ->
-    @sprite?.trigger('action-needs-render', @sprite, action)
+    @lank?.trigger('action-needs-render', @lank, action)
 
   buildMovieClip: (animationName, mode, startPosition, loops) ->
     key = JSON.stringify([@spriteSheetPrefix].concat(arguments))
@@ -221,7 +225,7 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
       else if not @loop
         @paused = true
         newFrame = @animLength - 1
-        @dispatchEvent('animationend')
+        _.defer => @dispatchEvent('animationend')
       else
         newFrame = newFrame % @animLength
 

app/lib/surface/SingularSprite.coffee

@@ -75,4 +75,4 @@ module.exports = class SingularSprite extends createjs.Sprite
     return
     
   notifyActionNeedsRender: (action) ->
-    @sprite?.trigger('action-needs-render', @sprite, action) 
+    @lank?.trigger('action-needs-render', @lank, action) 

app/views/editor/thang/ThangTypeEditView.coffee

@@ -28,6 +28,7 @@ module.exports = class ThangTypeEditView extends RootView
     health: 10.0
     maxHealth: 10.0
     hudProperties: ['health']
+    acts: true
 
   events:
     'click #clear-button': 'clearRawData'
@@ -74,13 +75,8 @@ module.exports = class ThangTypeEditView extends RootView
     context.fileSizeString = @fileSizeString
     context
 
-  getAnimationNames: ->
-    raw = _.keys((@thangType.get('raw') or {}).animations)
-    return [] unless raw
-    raw = ("raw:#{name}" for name in raw)
-    main = _.keys(@thangType.get('actions') or {})
-    main.concat(raw)
-
+  getAnimationNames: -> _.keys(@thangType.get('actions') or {})
+  
   afterRender: ->
     super()
     return unless @supermodel.finished()
@@ -113,17 +109,20 @@ module.exports = class ThangTypeEditView extends RootView
   makeDot: (color) ->
     circle = new createjs.Shape()
     circle.graphics.beginFill(color).beginStroke('black').drawCircle(0, 0, 5)
-    circle.x = CENTER.x
-    circle.y = CENTER.y
-    circle.scaleY = 0.5
+    circle.scaleY = 0.2
+    circle.scaleX = 0.5
     circle
 
   initStage: ->
     canvas = @$el.find('#canvas')
     @stage = new createjs.Stage(canvas[0])
     @layerAdapter = new LayerAdapter({name:'Default', webGL: true})
+    @topLayer = new createjs.Container()
+    
+    @layerAdapter.container.x = @topLayer.x = CENTER.x
+    @layerAdapter.container.y = @topLayer.y = CENTER.y
+    @stage.addChild(@layerAdapter.container, @topLayer)
     @listenTo @layerAdapter, 'new-spritesheet', @onNewSpriteSheet
-    @stage.addChild(@layerAdapter.container)
     @camera?.destroy()
     @camera = new Camera canvas
 
@@ -131,7 +130,7 @@ module.exports = class ThangTypeEditView extends RootView
     @mouthDot = @makeDot('yellow')
     @aboveHeadDot = @makeDot('green')
     @groundDot = @makeDot('red')
-    @stage.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
+    @topLayer.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
     @updateGrid()
     _.defer @refreshAnimation
 
@@ -143,19 +142,19 @@ module.exports = class ThangTypeEditView extends RootView
     @updateDots()
 
   updateDots: ->
-    @stage.removeChild(@torsoDot, @mouthDot, @aboveHeadDot, @groundDot)
+    @topLayer.removeChild(@torsoDot, @mouthDot, @aboveHeadDot, @groundDot)
     return unless @currentLank
     return unless @showDots
     torso = @currentLank.getOffset 'torso'
     mouth = @currentLank.getOffset 'mouth'
     aboveHead = @currentLank.getOffset 'aboveHead'
-    @torsoDot.x = CENTER.x + torso.x * @scale
-    @torsoDot.y = CENTER.y + torso.y * @scale
-    @mouthDot.x = CENTER.x + mouth.x * @scale
-    @mouthDot.y = CENTER.y + mouth.y * @scale
-    @aboveHeadDot.x = CENTER.x + aboveHead.x * @scale
-    @aboveHeadDot.y = CENTER.y + aboveHead.y * @scale
-    @stage.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
+    @torsoDot.x = torso.x
+    @torsoDot.y = torso.y
+    @mouthDot.x = mouth.x
+    @mouthDot.y = mouth.y
+    @aboveHeadDot.x = aboveHead.x
+    @aboveHeadDot.y = aboveHead.y
+    @topLayer.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
 
   endAnimation: ->
     @currentLank?.queueAction('idle')
@@ -247,16 +246,15 @@ module.exports = class ThangTypeEditView extends RootView
     $('#spritesheets').empty()
     for image in @layerAdapter.spriteSheet._images
       $('#spritesheets').append(image)
+    @layerAdapter.container.x = CENTER.x
+    @layerAdapter.container.y = CENTER.y
     @updateScale()
 
   showAnimation: (animationName) ->
     animationName = @$el.find('#animations-select').val() unless _.isString animationName
     return unless animationName
-    if animationName.startsWith('raw:')
-      animationName = animationName[4...]
-      @showMovieClip(animationName)
-    else
-      @showAction(animationName)
+    @mockThang.action = animationName
+    @showAction(animationName)
     @updateRotation()
     @updateScale() # must happen after update rotation, because updateRotation calls the sprite update() method.
 
@@ -268,6 +266,9 @@ module.exports = class ThangTypeEditView extends RootView
     if reg
       movieClip.regX = -reg.x
       movieClip.regY = -reg.y
+    scale = @thangType.get('scale')
+    if scale
+      movieClip.scaleX = movieClip.scaleY = scale
     @showSprite(movieClip)
 
   getLankOptions: -> {resolutionFactor: @resolution, thang: @mockThang}
@@ -292,23 +293,16 @@ module.exports = class ThangTypeEditView extends RootView
     @layerAdapter.resetSpriteSheet()
     @layerAdapter.addLank(lank)
     @currentLank = lank
-    lank.sprite.x = CENTER.x
-    lank.sprite.y = CENTER.y
-    lank.on 'new-sprite', ->
-      lank.sprite.x = CENTER.x
-      lank.sprite.y = CENTER.y
 
   showSprite: (sprite) ->
     @clearDisplayObject()
     @clearLank()
-    sprite.x = CENTER.x
-    sprite.y = CENTER.y
-    @stage.addChildAt(sprite, 1)
+    @topLayer.addChild(sprite)
     @currentObject = sprite
     @updateDots()
 
   clearDisplayObject: ->
-    @stage.removeChild(@currentObject) if @currentObject?
+    @topLayer.removeChild(@currentObject) if @currentObject?
     
   clearLank: ->
     @layerAdapter.removeLank(@currentLank) if @currentLank
@@ -330,18 +324,12 @@ module.exports = class ThangTypeEditView extends RootView
       @currentLank.update(true)
 
   updateScale: =>
-    resValue = (@resolutionSlider.slider('value') + 1) / 10
     scaleValue = (@scaleSlider.slider('value') + 1) / 10
+    @layerAdapter.container.scaleX = @layerAdapter.container.scaleY = @topLayer.scaleX = @topLayer.scaleY = scaleValue
     fixed = scaleValue.toFixed(1)
     @scale = scaleValue
     @$el.find('.scale-label').text " #{fixed}x "
-    if @currentLank
-      @currentLank.sprite.scaleX = @currentLank.sprite.baseScaleX * scaleValue
-      @currentLank.sprite.scaleY = @currentLank.sprite.baseScaleY * scaleValue
-    else if @currentObject?
-      @currentObject.scaleX = @currentObject.scaleY = scaleValue / resValue
     @updateGrid()
-    @updateDots()
 
   updateResolution: =>
     value = (@resolutionSlider.slider('value') + 1) / 10
@@ -445,7 +433,6 @@ module.exports = class ThangTypeEditView extends RootView
       obj.regX = bounds.x + bounds.width / 2
       obj.regY = bounds.y + bounds.height / 2
     @showSprite(obj) if obj
-    obj.y = 200 if obj # truly center the container
     @showingSelectedNode = true
     @currentLank?.destroy()
     @currentLank = null