Added 'no ghost sprite' option to Mini Hearts

Author: maddie480

Ahorn/entities/miniHeart.jl

@@ -2,8 +2,8 @@
 
 using ..Ahorn, Maple
 
-@mapdef Entity "CollabUtils2/MiniHeart" MiniHeart(x::Integer, y::Integer, sprite::String="beginner", refillDash::Bool=true, requireDashToBreak::Bool=true)
-@mapdef Entity "CollabUtils2/FakeMiniHeart" FakeMiniHeart(x::Integer, y::Integer, sprite::String="beginner", refillDash::Bool=true, requireDashToBreak::Bool=true)
+@mapdef Entity "CollabUtils2/MiniHeart" MiniHeart(x::Integer, y::Integer, sprite::String="beginner", refillDash::Bool=true, requireDashToBreak::Bool=true, noGhostSprite::Bool=false)
+@mapdef Entity "CollabUtils2/FakeMiniHeart" FakeMiniHeart(x::Integer, y::Integer, sprite::String="beginner", refillDash::Bool=true, requireDashToBreak::Bool=true, noGhostSprite::Bool=false)
 
 heartUnion = Union{MiniHeart, FakeMiniHeart}
 

Ahorn/lang/en_gb.lang

@@ -11,11 +11,13 @@ placements.triggers.CollabUtils2/JournalTrigger.tooltips.showOnlyDiscovered=If c
 placements.entities.CollabUtils2/MiniHeart.tooltips.sprite=The sprite the mini heart should use.
 placements.entities.CollabUtils2/MiniHeart.tooltips.refillDash=Whether bouncing on the heart should refill dashes.
 placements.entities.CollabUtils2/MiniHeart.tooltips.requireDashToBreak=Whether the player needs to dash on the heart to collect it.\nIf this is unchecked, the player will be able to collect the heart by just touching it.
+placements.entities.CollabUtils2/MiniHeart.tooltips.noGhostSprite=If checked, the heart will never use the "ghost" sprite even when already collected.
 
 # Fake Mini Heart
 placements.entities.CollabUtils2/FakeMiniHeart.tooltips.sprite=The sprite the fake mini heart should use.
 placements.entities.CollabUtils2/FakeMiniHeart.tooltips.refillDash=Whether bouncing on the heart should refill dashes.
 placements.entities.CollabUtils2/FakeMiniHeart.tooltips.requireDashToBreak=Whether the player needs to dash on the heart to make it disappear.\nIf this is unchecked, the heart will disappear when the player touches it.
+placements.entities.CollabUtils2/FakeMiniHeart.tooltips.noGhostSprite=If checked, the heart will never use the "ghost" sprite even when already collected.
 
 # Rainbow Berry
 placements.entities.CollabUtils2/RainbowBerry.tooltips.levelSet=The rainbow berry will only spawn if all silver berries in this level set have been collected.

Entities/AbstractMiniHeart.cs

@@ -10,6 +10,7 @@ public abstract class AbstractMiniHeart : Entity {
         private string spriteName;
         private bool refillDash;
         private bool requireDashToBreak;
+        private bool noGhostSprite;
 
         protected Wiggler scaleWiggler;
 
@@ -30,6 +31,7 @@ public AbstractMiniHeart(EntityData data, Vector2 position, EntityID gid)
             spriteName = data.Attr("sprite");
             refillDash = data.Bool("refillDash", defaultValue: true);
             requireDashToBreak = data.Bool("requireDashToBreak", defaultValue: true);
+            noGhostSprite = data.Bool("noGhostSprite", defaultValue: false);
 
             Collider = new Hitbox(12f, 12f, -6f, -6f);
 
@@ -51,7 +53,7 @@ public override void Awake(Scene scene) {
 
             string spritePath = "CollabUtils2/miniheart/" + spriteName + "/";
             bool alreadyCollectedInSave = SaveData.Instance.Areas_Safe[area.ID].Modes[(int) area.Mode].HeartGem;
-            if (alreadyCollectedInSave) {
+            if (alreadyCollectedInSave && !noGhostSprite) {
                 // use the ghost sprite specific to the heart: instead of reading 00.png, read ghost00.png
                 spritePath += "ghost";
                 if (!GFX.Game.Has(spritePath + "00")) {
@@ -101,7 +103,7 @@ public override void Awake(Scene scene) {
                     };
                     break;
             }
-            if (alreadyCollectedInSave) {
+            if (alreadyCollectedInSave && !noGhostSprite) {
                 heartColor = Color.White * 0.8f;
                 shineParticle = new ParticleType(HeartGem.P_BlueShine) {
                     Color = Calc.HexToColor("7589FF")