finish animation on editor

Author: WeylonSantana

Intersect.Editor/Core/Graphics.cs

@@ -1469,7 +1469,33 @@ bool alternate
                             break;
 
                         case ResourceGraphicType.Animation:
-                            //TODO: FIX THIS
+                            {
+                                if (!AnimationDescriptor.TryGet(resourceGraphic.AnimationId, out var animation))
+                                {
+                                    continue;
+                                }
+
+                                float xpos = x * Options.Instance.Map.TileWidth + xoffset + Options.Instance.Map.TileWidth / 2;
+                                float ypos = y * Options.Instance.Map.TileHeight + yoffset + Options.Instance.Map.TileHeight / 2;
+
+                                var animationInstance = tmpMap.GetAttributeAnimation(tmpMap.Attributes[x, y], animation.Id);
+
+                                //Update if the animation isn't right!
+                                if (animationInstance == null || animationInstance.Descriptor != animation)
+                                {
+                                    tmpMap.SetAttributeAnimation(
+                                        tmpMap.Attributes[x, y], new Animation(animation, true)
+                                    );
+                                }
+
+                                if (animationInstance != null)
+                                {
+                                    animationInstance.Update();
+                                    animationInstance.SetPosition((int)xpos, (int)ypos, 0);
+                                    animationInstance.Draw(renderTarget, false, alternate);
+                                    animationInstance.Draw(renderTarget, true, alternate);
+                                }
+                            }
                             break;
 
                         default:

Intersect.Editor/Forms/Editors/frmResource.Designer.cs

@@ -387,32 +387,20 @@ private void UpdateHealthStateControls()
         UpdateGraphicFileControl(currentState);
     }
 
-    private void UpdateCurrentState(object sender, EventArgs e)
-    {
-        if (_editorItem is null)
-        {
-            return;
-        }
-
-        if (!TryGetCurrentHealthState(out var currentState))
-        {
-            return;
-        }
-
-        currentState.GraphicType = (ResourceGraphicType)cmbGraphicType.SelectedIndex;
-        currentState.AnimationId = AnimationDescriptor.IdFromList(cmbAnimation.SelectedIndex - 1);
-    }
-
     private void UpdateGraphicFileControl(ResourceStateDescriptor currentState)
     {
         cmbGraphicFile.Items.Clear();
         cmbGraphicFile.Items.Add(Strings.General.None);
+        cmbAnimation.Items.Clear();
+        cmbAnimation.Items.Add(Strings.General.None);
 
         if (currentState.GraphicType == ResourceGraphicType.Animation)
         {
             cmbGraphicFile.Enabled = false;
             picResource.Visible = false;
             cmbAnimation.Enabled = true;
+            cmbAnimation.Items.AddRange(AnimationDescriptor.Names);
+            cmbAnimation.SelectedIndex = AnimationDescriptor.ListIndex(currentState.AnimationId) + 1;
             return;
         }
 
@@ -868,7 +856,7 @@ private void cmbGraphicType_SelectedIndexChanged(object sender, EventArgs e)
             return;
         }
 
-        UpdateCurrentState(sender, e);
+        currentState.GraphicType = (ResourceGraphicType)cmbGraphicType.SelectedIndex;
         UpdateGraphicFileControl(currentState);
     }
 
@@ -915,6 +903,16 @@ private void cmbGraphicFile_SelectedIndexChanged(object sender, EventArgs e)
         picResource.Visible = _resourceGraphic != null;
     }
 
+    private void cmbAnimation_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        if (!TryGetCurrentHealthState(out var currentState))
+        {
+            return;
+        }
+
+        currentState.AnimationId = AnimationDescriptor.IdFromList(cmbAnimation.SelectedIndex - 1);
+    }
+
     private void nudHealthRangeMin_ValueChanged(object sender, EventArgs e)
     {
         if (!TryGetCurrentHealthState(out var currentState))