tink cleanup

bitDecayGames · Aug 20, 2024 · 0f0cba4 · 0f0cba4
1 parent 7aeeb07
commit 0f0cba4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/source/entities/PracticeTarget.hx b/source/entities/PracticeTarget.hx
@@ -1,5 +1,6 @@
 package entities;
 
+import flixel.util.FlxTimer;
 import loaders.Aseprite;
 import loaders.AsepriteMacros;
 import echo.data.Data.CollisionData;
@@ -31,10 +32,17 @@ class PracticeTarget extends Unibody {
 				}
 			]
         });
+
+        animation.finishCallback = (name) -> {
+            if (name == anims.drop) {
+                beenShot = true;
+            }
+        }
     }
 
     override function update(elapsed:Float) {
         super.update(elapsed);
+
     }
 
     override function handleEnter(other:Body, data:Array<CollisionData>) {
@@ -45,7 +53,9 @@ class PracticeTarget extends Unibody {
             body.active = false;
             FmodManager.PlaySoundOneShot(FmodSFX.TargetHit2);
             animation.play(anims.drop);
-            beenShot = true;
+            new FlxTimer().start(0.2, (t) -> {
+                beenShot = true;
+            });
         }
     }
 }
diff --git a/source/entities/Tink.hx b/source/entities/Tink.hx
@@ -124,7 +124,12 @@ class Tink extends Unibody {
 		}
 
 		distanceToPlayer = PlayState.me.player.getMidpoint().distanceTo(getMidpoint());
-		if (distanceToPlayer < activationRadius) {
+		var checkDistance = activationRadius;
+		if (spawnPoint == TINK_TARGETS && dialogIndex == 1) {
+			// we want him to trigger as soon as you break the last target
+			checkDistance = 1000;
+		}
+		if (distanceToPlayer < checkDistance) {
 
 			switch (spawnPoint) {
 				case TINK_INTRO: