diff --git a/Ahorn/entities/maxHelpingHandRespawningBounceJellyfish.jl b/Ahorn/entities/maxHelpingHandRespawningBounceJellyfish.jl index 5f72c2d3..8140379f 100644 --- a/Ahorn/entities/maxHelpingHandRespawningBounceJellyfish.jl +++ b/Ahorn/entities/maxHelpingHandRespawningBounceJellyfish.jl @@ -3,7 +3,7 @@ module MaxHelpingHandRespawningBounceJellyfish using ..Ahorn, Maple @mapdef Entity "MaxHelpingHand/RespawningBounceJellyfish" RespawningBounceJellyfish(x::Integer, y::Integer, platform::Bool=true, soulBound::Bool=true, baseDashCount::Integer=1, - respawnTime::Number=2.0, spriteDirectory::String="objects/MaxHelpingHand/glider") + respawnTime::Number=2.0, spriteDirectory::String="objects/MaxHelpingHand/bounceJellyfish") const placements = Ahorn.PlacementDict( "Respawning Bounce Jellyfish (Bounce Helper + Maddie's Helping Hand)" => Ahorn.EntityPlacement( @@ -13,13 +13,13 @@ const placements = Ahorn.PlacementDict( function Ahorn.selection(entity::RespawningBounceJellyfish) x, y = Ahorn.position(entity) - sprite = get(entity, "spriteDirectory", "objects/MaxHelpingHand/glider") * "/idle0" + sprite = get(entity, "spriteDirectory", "objects/MaxHelpingHand/glider") * "/blue/idle0" return Ahorn.getSpriteRectangle(sprite, x, y - 4) end function Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::RespawningBounceJellyfish, room::Maple.Room) - sprite = get(entity, "spriteDirectory", "objects/MaxHelpingHand/glider") * "/idle0" + sprite = get(entity, "spriteDirectory", "objects/MaxHelpingHand/glider") * "/blue/idle0" Ahorn.drawSprite(ctx, sprite, 0, -4) if get(entity, "platform", false) diff --git a/Ahorn/lang/en_gb.lang b/Ahorn/lang/en_gb.lang index d615e477..33c79378 100644 --- a/Ahorn/lang/en_gb.lang +++ b/Ahorn/lang/en_gb.lang @@ -157,7 +157,7 @@ placements.entities.MaxHelpingHand/RespawningBounceJellyfish.tooltips.platform=W placements.entities.MaxHelpingHand/RespawningBounceJellyfish.tooltips.soulBound=Whether the jelly kills the player on death and can't be left behind. placements.entities.MaxHelpingHand/RespawningBounceJellyfish.tooltips.baseDashCount=How many dashes the jelly will start with and refill to. placements.entities.MaxHelpingHand/RespawningBounceJellyfish.tooltips.respawnTime=The jellyfish will respawn at its starting location after this amount of time (in seconds) after being destroyed. -placements.entities.MaxHelpingHand/RespawningBounceJellyfish.tooltips.spriteDirectory=The directory containing all the sprites for the respawning jellyfish.\nTo make your own, copy Graphics/Atlases/Gameplay/objects/MaxHelpingHand/glider from the mod zip to Mods/yourmod/Graphics/Atlases/Gameplay/MyMap/myglider and type MyMap/myglider in this field. +placements.entities.MaxHelpingHand/RespawningBounceJellyfish.tooltips.spriteDirectory=The directory containing all the sprites for the respawning jellyfish.\nTo make your own, copy Graphics/Atlases/Gameplay/objects/MaxHelpingHand/respawningJellyfish from the mod zip to Mods/yourmod/Graphics/Atlases/Gameplay/MyMap/myglider and type MyMap/myglider in this field. # Grouped Trigger Spikes placements.entities.MaxHelpingHand/GroupedTriggerSpikesUp.tooltips.type=Changes the visual appearance of the spikes. diff --git a/Entities/RespawningBounceJellyfish.cs b/Entities/RespawningBounceJellyfish.cs index 191042ea..0c32eb3f 100644 --- a/Entities/RespawningBounceJellyfish.cs +++ b/Entities/RespawningBounceJellyfish.cs @@ -37,7 +37,20 @@ private static void onTrackerInitialize(On.Monocle.Tracker.orig_Initialize orig) private RespawningJellyfishGeneric manager; public RespawningBounceJellyfish(EntityData data, Vector2 offset) : base(data, offset) { - manager = new RespawningJellyfishGeneric(this, data, () => Speed, speed => Speed = speed); + manager = new RespawningJellyfishGeneric(this, data, sprite => { + foreach (string variant in new string[] { "blue", "red", "pink", "flash" }) { + string suffix = variant.Substring(0, 1).ToUpperInvariant(); + + sprite.AddLoop("idle" + suffix, variant + "/idle", 0.1f); + sprite.AddLoop("held" + suffix, variant + "/held", 0.1f); + sprite.Add("fall" + suffix, variant + "/fall", 0.06f, "fallLoop" + suffix); + sprite.AddLoop("fallLoop" + suffix, variant + "/fallLoop", 0.06f); + sprite.Add("death" + suffix, variant + "/death", 0.06f); + sprite.Add("respawn" + suffix, variant + "/respawn", 0.03f, "idle" + suffix); + } + + sprite.Play("idleB"); + }, () => Speed, speed => Speed = speed); } public override void Update() { diff --git a/Entities/RespawningJellyfish.cs b/Entities/RespawningJellyfish.cs index d7ee9d3a..94ca2320 100644 --- a/Entities/RespawningJellyfish.cs +++ b/Entities/RespawningJellyfish.cs @@ -8,7 +8,16 @@ public class RespawningJellyfish : Glider { private RespawningJellyfishGeneric manager; public RespawningJellyfish(EntityData data, Vector2 offset) : base(data, offset) { - manager = new RespawningJellyfishGeneric(this, data, () => Speed, speed => Speed = speed); + manager = new RespawningJellyfishGeneric(this, data, sprite => { + sprite.AddLoop("idle", "idle", 0.1f); + sprite.AddLoop("held", "held", 0.1f); + sprite.Add("fall", "fall", 0.06f, "fallLoop"); + sprite.AddLoop("fallLoop", "fallLoop", 0.06f); + sprite.Add("death", "death", 0.06f); + sprite.Add("respawn", "respawn", 0.03f, "idle"); + + sprite.Play("idle"); + }, () => Speed, speed => Speed = speed); } public override void Update() { @@ -22,5 +31,9 @@ protected override void OnSquish(CollisionData data) { private IEnumerator destroyThenRespawnRoutine() { return manager.destroyThenRespawnRoutine(); } + + private void spritePlay(string name) { + manager.sprite.Play(name); + } } } diff --git a/Entities/RespawningJellyfishGeneric.cs b/Entities/RespawningJellyfishGeneric.cs index 1ea37874..de5afdb1 100644 --- a/Entities/RespawningJellyfishGeneric.cs +++ b/Entities/RespawningJellyfishGeneric.cs @@ -12,11 +12,14 @@ namespace Celeste.Mod.MaxHelpingHand.Entities { internal static class RespawningJellyfishCache { internal static MethodInfo trySquishWiggle = typeof(Actor).GetMethod("TrySquishWiggle", BindingFlags.NonPublic | BindingFlags.Instance); } - public class RespawningJellyfishGeneric where T : Actor, U where U : Actor { + public class RespawningJellyfishGeneric where RespawningType : Actor, BaseType where BaseType : Actor { private static ILHook hookGliderUpdate = null; + private static MethodInfo jellyfishSpritePlay = typeof(BaseType).GetMethod("spritePlay", BindingFlags.NonPublic | BindingFlags.Instance) + ?? typeof(RespawningType).GetMethod("spritePlay", BindingFlags.NonPublic | BindingFlags.Instance); + private static MethodInfo jellyDashRefill = typeof(BaseType).GetMethod("refillDash", BindingFlags.Public | BindingFlags.Instance); public static void Load() { - hookGliderUpdate = new ILHook(typeof(U).GetMethod("Update"), modGliderUpdate); + hookGliderUpdate = new ILHook(typeof(BaseType).GetMethod("Update"), modGliderUpdate); } public static void Unload() { @@ -26,13 +29,13 @@ public static void Unload() { private static ParticleType P_NotGlow; - private T self; - private DynData selfData; + private RespawningType self; + private DynData selfData; private float respawnTime; private bool bubble; - private Sprite sprite; + internal Sprite sprite; private Vector2 initialPosition; private bool respawning; @@ -42,7 +45,7 @@ public static void Unload() { private Func getSpeed; private Action setSpeed; - public RespawningJellyfishGeneric(T self, EntityData data, Func getSpeed, Action setSpeed) { + public RespawningJellyfishGeneric(RespawningType self, EntityData data, Action setupSpriteCallback, Func getSpeed, Action setSpeed) { this.self = self; this.getSpeed = getSpeed; this.setSpeed = setSpeed; @@ -61,21 +64,13 @@ public RespawningJellyfishGeneric(T self, EntityData data, Func getSpee respawning = false; // get the sprite, and replace it depending on the path in entity properties. - selfData = new DynData(self); + selfData = new DynData(self); sprite = selfData.Get("sprite"); new DynData(sprite)["atlas"] = GFX.Game; sprite.Path = data.Attr("spriteDirectory", defaultValue: "objects/MaxHelpingHand/glider") + "/"; sprite.Stop(); sprite.ClearAnimations(); - foreach (string suffix in new string[] { "", "B", "R", "RH", "P", "PH", "F" }) { - sprite.AddLoop("idle" + suffix, "idle", 0.1f); - sprite.AddLoop("held" + suffix, "held", 0.1f); - sprite.Add("fall" + suffix, "fall", 0.06f, "fallLoop" + suffix); - sprite.AddLoop("fallLoop" + suffix, "fallLoop", 0.06f); - sprite.Add("death" + suffix, "death", 0.06f); - sprite.Add("respawn" + suffix, "respawn", 0.03f, "idle" + suffix); - } - sprite.Play("idle"); + setupSpriteCallback(sprite); // make the jelly go invisible when the death animation is done. sprite.OnFinish += anim => { @@ -109,12 +104,12 @@ private static void modGliderUpdate(ILContext il) { ILCursor cursor = new ILCursor(il); if (cursor.TryGotoNext(MoveType.After, instr => instr.MatchNewobj())) { - MethodInfo method = typeof(T).GetMethod("destroyThenRespawnRoutine", BindingFlags.NonPublic | BindingFlags.Instance); + MethodInfo method = typeof(RespawningType).GetMethod("destroyThenRespawnRoutine", BindingFlags.NonPublic | BindingFlags.Instance); Logger.Log("MaxHelpingHand/RespawningJellyfish", $"Replacing coroutine to make jellyfish respawn at {cursor.Index} in IL for {cursor.Method.FullName}, calling {method.DeclaringType.FullName}.{method.Name}"); cursor.Emit(OpCodes.Ldarg_0); cursor.EmitDelegate>((orig, self) => { - if (self is T) { + if (self is RespawningType) { return new Coroutine((IEnumerator) method.Invoke(self, new object[0])); } @@ -145,7 +140,7 @@ private void removeAndRespawn() { internal IEnumerator destroyThenRespawnRoutine() { // do like vanilla, but instead of removing the jelly, wait then have it respawn. Audio.Play("event:/new_content/game/10_farewell/glider_emancipate", self.Position); - sprite.Play("death"); + jellyfishSpritePlay.Invoke(self, new object[] { "death" }); return respawnRoutine(); } @@ -160,7 +155,11 @@ private IEnumerator respawnRoutine() { self.Visible = true; self.Position = initialPosition; setSpeed(Vector2.Zero); - sprite.Play("respawn"); + jellyfishSpritePlay.Invoke(self, new object[] { "respawn" }); + + // refill dashes and cancel ongoing dashes (bounce jellies only) + jellyDashRefill?.Invoke(self, new object[] { -1 }); + selfData["dashBufferTimer"] = 0f; yield return 0.24f; diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death00.png new file mode 100644 index 00000000..c5a957a3 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death01.png new file mode 100644 index 00000000..82a71885 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death02.png new file mode 100644 index 00000000..26e2710b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death03.png new file mode 100644 index 00000000..b841ccfe Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death04.png new file mode 100644 index 00000000..c80cb263 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death05.png new file mode 100644 index 00000000..05dba624 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death06.png new file mode 100644 index 00000000..f2ab154f Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death07.png new file mode 100644 index 00000000..8fec0d58 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/death07.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall0.png new file mode 100644 index 00000000..efef3be6 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall1.png new file mode 100644 index 00000000..f347a9f7 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall2.png new file mode 100644 index 00000000..257ad3f1 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fall2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fallLoop0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fallLoop0.png new file mode 100644 index 00000000..6b9b085c Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fallLoop0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fallLoop1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fallLoop1.png new file mode 100644 index 00000000..1c40342a Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/fallLoop1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/held0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/held0.png new file mode 100644 index 00000000..7cf4ede1 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/held0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle0.png new file mode 100644 index 00000000..6711786b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle1.png new file mode 100644 index 00000000..e4970366 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle2.png new file mode 100644 index 00000000..996f4491 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle3.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle3.png new file mode 100644 index 00000000..0355f945 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle3.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle4.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle4.png new file mode 100644 index 00000000..584866a3 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle4.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle5.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle5.png new file mode 100644 index 00000000..c1bda8fa Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle5.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle6.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle6.png new file mode 100644 index 00000000..55f9ae37 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle6.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle7.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle7.png new file mode 100644 index 00000000..2304d1b2 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle7.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle8.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle8.png new file mode 100644 index 00000000..4ebeff11 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle8.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle9.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle9.png new file mode 100644 index 00000000..59d50750 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/idle9.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn00.png new file mode 100644 index 00000000..8fec0d58 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn01.png new file mode 100644 index 00000000..f2ab154f Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn02.png new file mode 100644 index 00000000..05dba624 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn03.png new file mode 100644 index 00000000..c80cb263 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn04.png new file mode 100644 index 00000000..3713b745 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn05.png new file mode 100644 index 00000000..a123d2e2 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn06.png new file mode 100644 index 00000000..e8496f5b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn07.png new file mode 100644 index 00000000..83eeb7cc Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/blue/respawn07.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death00.png new file mode 100644 index 00000000..c5a957a3 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death01.png new file mode 100644 index 00000000..82a71885 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death02.png new file mode 100644 index 00000000..26e2710b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death03.png new file mode 100644 index 00000000..b841ccfe Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death04.png new file mode 100644 index 00000000..c80cb263 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death05.png new file mode 100644 index 00000000..05dba624 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death06.png new file mode 100644 index 00000000..f2ab154f Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death07.png new file mode 100644 index 00000000..8fec0d58 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/death07.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall0.png new file mode 100644 index 00000000..4693ec4a Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall1.png new file mode 100644 index 00000000..382235ff Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall2.png new file mode 100644 index 00000000..f44acb25 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fall2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fallLoop0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fallLoop0.png new file mode 100644 index 00000000..6269dc8b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fallLoop0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fallLoop1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fallLoop1.png new file mode 100644 index 00000000..6269dc8b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/fallLoop1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/held0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/held0.png new file mode 100644 index 00000000..50161489 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/held0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle0.png new file mode 100644 index 00000000..d213f02e Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle1.png new file mode 100644 index 00000000..c88229f8 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle2.png new file mode 100644 index 00000000..b0242c19 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle3.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle3.png new file mode 100644 index 00000000..152f7d97 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle3.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle4.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle4.png new file mode 100644 index 00000000..4a1ccc56 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle4.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle5.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle5.png new file mode 100644 index 00000000..d213f02e Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle5.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle6.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle6.png new file mode 100644 index 00000000..c88229f8 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle6.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle7.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle7.png new file mode 100644 index 00000000..b0242c19 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle7.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle8.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle8.png new file mode 100644 index 00000000..152f7d97 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle8.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle9.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle9.png new file mode 100644 index 00000000..4a1ccc56 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/idle9.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn00.png new file mode 100644 index 00000000..8fec0d58 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn01.png new file mode 100644 index 00000000..f2ab154f Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn02.png new file mode 100644 index 00000000..05dba624 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn03.png new file mode 100644 index 00000000..c80cb263 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn04.png new file mode 100644 index 00000000..3713b745 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn05.png new file mode 100644 index 00000000..a123d2e2 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn06.png new file mode 100644 index 00000000..e8496f5b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn07.png new file mode 100644 index 00000000..83eeb7cc Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/flash/respawn07.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death00.png new file mode 100644 index 00000000..8ed89db3 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death01.png new file mode 100644 index 00000000..14f2807d Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death02.png new file mode 100644 index 00000000..07b84efe Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death03.png new file mode 100644 index 00000000..16effca2 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death04.png new file mode 100644 index 00000000..4f0560dd Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death05.png new file mode 100644 index 00000000..26c39845 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death06.png new file mode 100644 index 00000000..c44d3d24 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death07.png new file mode 100644 index 00000000..c1d1a386 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/death07.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall0.png new file mode 100644 index 00000000..16b9a6a5 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall1.png new file mode 100644 index 00000000..1f5c7a92 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall2.png new file mode 100644 index 00000000..4510b169 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fall2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fallLoop0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fallLoop0.png new file mode 100644 index 00000000..5f0db2a1 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fallLoop0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fallLoop1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fallLoop1.png new file mode 100644 index 00000000..3380fa90 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/fallLoop1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/held0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/held0.png new file mode 100644 index 00000000..f1f6acf3 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/held0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle0.png new file mode 100644 index 00000000..ff48894b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle1.png new file mode 100644 index 00000000..aef5f23c Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle2.png new file mode 100644 index 00000000..06d1a51b Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle3.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle3.png new file mode 100644 index 00000000..8cc47861 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle3.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle4.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle4.png new file mode 100644 index 00000000..8a8f8549 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle4.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle5.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle5.png new file mode 100644 index 00000000..4ed7db9e Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle5.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle6.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle6.png new file mode 100644 index 00000000..bc26d79c Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle6.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle7.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle7.png new file mode 100644 index 00000000..4a18568a Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle7.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle8.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle8.png new file mode 100644 index 00000000..7c888945 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle8.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle9.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle9.png new file mode 100644 index 00000000..ba6c405d Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/idle9.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn00.png new file mode 100644 index 00000000..c1d1a386 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn01.png new file mode 100644 index 00000000..c44d3d24 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn02.png new file mode 100644 index 00000000..26c39845 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn03.png new file mode 100644 index 00000000..4f0560dd Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn04.png new file mode 100644 index 00000000..7dd93660 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn05.png new file mode 100644 index 00000000..8d029c2c Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn06.png new file mode 100644 index 00000000..9bda758d Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn07.png new file mode 100644 index 00000000..83eeb7cc Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/pink/respawn07.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death00.png new file mode 100644 index 00000000..8ed89db3 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death01.png new file mode 100644 index 00000000..10acad07 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death02.png new file mode 100644 index 00000000..0eb01157 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death03.png new file mode 100644 index 00000000..a9ff106a Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death04.png new file mode 100644 index 00000000..1b545e08 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death05.png new file mode 100644 index 00000000..c15d06b9 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death06.png new file mode 100644 index 00000000..07047be2 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death07.png new file mode 100644 index 00000000..c1d1a386 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/death07.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall0.png new file mode 100644 index 00000000..835f02e1 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall1.png new file mode 100644 index 00000000..6700722a Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall2.png new file mode 100644 index 00000000..5a7a59c5 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fall2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fallLoop0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fallLoop0.png new file mode 100644 index 00000000..7b0fb41c Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fallLoop0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fallLoop1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fallLoop1.png new file mode 100644 index 00000000..7172b25c Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/fallLoop1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/held0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/held0.png new file mode 100644 index 00000000..048e380a Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/held0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle0.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle0.png new file mode 100644 index 00000000..fa0d7693 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle0.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle1.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle1.png new file mode 100644 index 00000000..27fff7e4 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle1.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle2.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle2.png new file mode 100644 index 00000000..d30d5a91 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle2.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle3.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle3.png new file mode 100644 index 00000000..9d11a8de Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle3.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle4.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle4.png new file mode 100644 index 00000000..0ac6e111 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle4.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle5.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle5.png new file mode 100644 index 00000000..6bc71513 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle5.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle6.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle6.png new file mode 100644 index 00000000..00d52db0 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle6.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle7.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle7.png new file mode 100644 index 00000000..e9b428ec Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle7.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle8.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle8.png new file mode 100644 index 00000000..b7a0b8fb Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle8.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle9.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle9.png new file mode 100644 index 00000000..4b2ec115 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/idle9.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn00.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn00.png new file mode 100644 index 00000000..c1d1a386 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn00.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn01.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn01.png new file mode 100644 index 00000000..07047be2 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn01.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn02.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn02.png new file mode 100644 index 00000000..c15d06b9 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn02.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn03.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn03.png new file mode 100644 index 00000000..1b545e08 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn03.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn04.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn04.png new file mode 100644 index 00000000..edcfacbc Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn04.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn05.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn05.png new file mode 100644 index 00000000..0f2b2ca9 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn05.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn06.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn06.png new file mode 100644 index 00000000..239e7ee0 Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn06.png differ diff --git a/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn07.png b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn07.png new file mode 100644 index 00000000..83eeb7cc Binary files /dev/null and b/Graphics/Atlases/Gameplay/objects/MaxHelpingHand/bounceJellyfish/red/respawn07.png differ diff --git a/Loenn/entities/respawningBounceJellyfish.lua b/Loenn/entities/respawningBounceJellyfish.lua index f147073c..65fa0aaa 100644 --- a/Loenn/entities/respawningBounceJellyfish.lua +++ b/Loenn/entities/respawningBounceJellyfish.lua @@ -25,7 +25,7 @@ respawningBounceJellyfish.placements = { soulBound = false, baseDashCount = 0, respawnTime = 2.0, - spriteDirectory = "objects/MaxHelpingHand/glider" + spriteDirectory = "objects/MaxHelpingHand/bounceJellyfish" } }, { @@ -35,7 +35,7 @@ respawningBounceJellyfish.placements = { soulBound = false, baseDashCount = 1, respawnTime = 2.0, - spriteDirectory = "objects/MaxHelpingHand/glider" + spriteDirectory = "objects/MaxHelpingHand/bounceJellyfish" } }, { @@ -45,14 +45,14 @@ respawningBounceJellyfish.placements = { soulBound = false, baseDashCount = 2, respawnTime = 2.0, - spriteDirectory = "objects/MaxHelpingHand/glider" + spriteDirectory = "objects/MaxHelpingHand/bounceJellyfish" } } } function respawningBounceJellyfish.sprite(room, entity) local bubble = entity.platform - local texture = entity.spriteDirectory .. "/idle0" + local texture = entity.spriteDirectory .. "/blue/idle0" if entity.bubble then local x, y = entity.x or 0, entity.y or 0 @@ -71,7 +71,7 @@ function respawningBounceJellyfish.sprite(room, entity) end function respawningBounceJellyfish.rectangle(room, entity) - local texture = entity.spriteDirectory .. "/idle0" + local texture = entity.spriteDirectory .. "/blue/idle0" local sprite = drawableSprite.fromTexture(texture, entity) return sprite:getRectangle() diff --git a/Loenn/lang/en_gb.lang b/Loenn/lang/en_gb.lang index 8009d5d8..5336b37a 100644 --- a/Loenn/lang/en_gb.lang +++ b/Loenn/lang/en_gb.lang @@ -655,7 +655,7 @@ entities.MaxHelpingHand/RespawningBounceJellyfish.attributes.description.platfor entities.MaxHelpingHand/RespawningBounceJellyfish.attributes.description.soulBound=Whether the jelly kills the player on death and can't be left behind. entities.MaxHelpingHand/RespawningBounceJellyfish.attributes.description.baseDashCount=How many dashes the jelly will start with and refill to. entities.MaxHelpingHand/RespawningBounceJellyfish.attributes.description.respawnTime=The jellyfish will respawn at its starting location after this amount of time (in seconds) after being destroyed. -entities.MaxHelpingHand/RespawningBounceJellyfish.attributes.description.spriteDirectory=The directory containing all the sprites for the respawning jellyfish.\nTo make your own, copy Graphics/Atlases/Gameplay/objects/MaxHelpingHand/glider from the mod zip to Mods/yourmod/Graphics/Atlases/Gameplay/MyMap/myglider and type MyMap/myglider in this field. +entities.MaxHelpingHand/RespawningBounceJellyfish.attributes.description.spriteDirectory=The directory containing all the sprites for the respawning jellyfish.\nTo make your own, copy Graphics/Atlases/Gameplay/objects/MaxHelpingHand/respawningJellyfish from the mod zip to Mods/yourmod/Graphics/Atlases/Gameplay/MyMap/myglider and type MyMap/myglider in this field. # Rotating Bumper entities.MaxHelpingHand/RotatingBumper.placements.name.bumper=Bumper (Rotating) diff --git a/everest.yaml b/everest.yaml index 015c5c23..140b91e8 100644 --- a/everest.yaml +++ b/everest.yaml @@ -1,6 +1,6 @@ # The mod used to be known as "max480's Helping Hand", and wasn't renamed for compatibility reasons - Name: MaxHelpingHand - Version: 1.28.8 + Version: 1.28.9 DLL: bin/Release/net452/MaxHelpingHand.dll Dependencies: - Name: Everest