Added option to be able to collect mini hearts without dashing

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)
-@mapdef Entity "CollabUtils2/FakeMiniHeart" FakeMiniHeart(x::Integer, y::Integer, sprite::String="beginner", refillDash::Bool=true)
+@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)
 
 heartUnion = Union{MiniHeart, FakeMiniHeart}
 

Ahorn/lang/en_gb.lang

@@ -10,10 +10,12 @@ placements.triggers.CollabUtils2/JournalTrigger.tooltips.showOnlyDiscovered=If c
 # Mini Heart
 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.
 
 # 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.
 
 # 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

@@ -9,6 +9,7 @@ public abstract class AbstractMiniHeart : Entity {
         protected Sprite sprite;
         private string spriteName;
         private bool refillDash;
+        private bool requireDashToBreak;
 
         protected Wiggler scaleWiggler;
 
@@ -28,6 +29,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);
 
             Collider = new Hitbox(12f, 12f, -6f, -6f);
 
@@ -122,7 +124,7 @@ public override void Update() {
 
         private void onPlayer(Player player) {
             Level level = Scene as Level;
-            if (player.DashAttacking) {
+            if (player.DashAttacking || !requireDashToBreak) {
                 // player broke the heart
                 heartBroken(player, null, level);
             } else {