Merge pull request #129 from EverestAPI/no_dash_refill_spring_sprite

Add a specific sprite for No Dash Refill Spring

Author: 0x0ade

Ahorn/entities/noDashRefillSpring.jl

@@ -36,10 +36,10 @@ function Ahorn.selection(entity::NoDashRefillSpringRight)
     return Ahorn.Rectangle(x - 4, y - 6, 5, 12)
 end
 
-sprite = "objects/spring/00.png"
+sprite = "objects/SpringCollab2020/noDashRefillSpring/00.png"
 
 Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::NoDashRefillSpring, room::Maple.Room) = Ahorn.drawSprite(ctx, sprite, 0, -8)
-Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::NoDashRefillSpringLeft, room::Maple.Room) = Ahorn.drawSprite(ctx, sprite, 9, -11, rot=pi / 2)
-Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::NoDashRefillSpringRight, room::Maple.Room) = Ahorn.drawSprite(ctx, sprite, 3, 1, rot=-pi / 2)
+Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::NoDashRefillSpringLeft, room::Maple.Room) = Ahorn.drawSprite(ctx, sprite, 24, 0, rot=pi / 2)
+Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::NoDashRefillSpringRight, room::Maple.Room) = Ahorn.drawSprite(ctx, sprite, -8, 16, rot=-pi / 2)
 
 end

Entities/NoDashRefillSpring.cs

@@ -1,6 +1,7 @@
 using Celeste.Mod.Entities;
 using Microsoft.Xna.Framework;
 using Monocle;
+using MonoMod.Utils;
 using System;
 using System.Reflection;
 
@@ -13,6 +14,8 @@ class NoDashRefillSpring : Spring {
         public NoDashRefillSpring(EntityData data, Vector2 offset)
             : base(data.Position + offset, GetOrientationFromName(data.Name), data.Bool("playerCanUse", true)) {
 
+            DynData<Spring> selfSpring = new DynData<Spring>(this);
+
             // remove the vanilla player collider. this is the one thing we want to mod here.
             foreach (Component component in this) {
                 if (component.GetType() == typeof(PlayerCollider)) {
@@ -25,6 +28,16 @@ public NoDashRefillSpring(EntityData data, Vector2 offset)
             if (data.Bool("playerCanUse", true)) {
                 Add(new PlayerCollider(OnCollide));
             }
+
+            // replace the vanilla sprite with our custom one.
+            Sprite sprite = selfSpring.Get<Sprite>("sprite");
+            sprite.Reset(GFX.Game, "objects/SpringCollab2020/noDashRefillSpring/");
+            sprite.Add("idle", "", 0f, default(int));
+            sprite.Add("bounce", "", 0.07f, "idle", 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 4, 5);
+            sprite.Add("disabled", "white", 0.07f);
+            sprite.Play("idle");
+            sprite.Origin.X = sprite.Width / 2f;
+            sprite.Origin.Y = sprite.Height;
         }
 
         private static Orientations GetOrientationFromName(string name) {