ye

bitDecayGames · Aug 19, 2024 · 1cb9146 · 1cb9146
1 parent 187469a
commit 1cb9146
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/assets/fmod/Desktop/Master.bank b/assets/fmod/Desktop/Master.bank
diff --git a/fmod/Metadata/Event/{f65f4a73-a9b0-47fa-8657-c3cee7d521be}.xml b/fmod/Metadata/Event/{f65f4a73-a9b0-47fa-8657-c3cee7d521be}.xml
@@ -97,6 +97,9 @@
 		</relationship>
 	</object>
 	<object class="EventMixerGroup" id="{e73ef743-e50e-450e-a0a4-72831a30e44f}">
+		<property name="volume">
+			<value>-12.5</value>
+		</property>
 		<property name="name">
 			<value>Audio 1</value>
 		</property>

diff --git a/source/entities/PracticeTarget.hx b/source/entities/PracticeTarget.hx
@@ -1,5 +1,7 @@
 package entities;
 
+import loaders.Aseprite;
+import loaders.AsepriteMacros;
 import echo.data.Data.CollisionData;
 import echo.Body;
 
@@ -9,10 +11,12 @@ class PracticeTarget extends Unibody {
 
     public var beenShot = false;
 
+    public static var anims = AsepriteMacros.tagNames("assets/aseprite/target.json");
+
     public function new(x:Float, y:Float) {
         super(x, y);
 
-		this.loadGraphic(AssetPaths.filler16__png, true, 16, 16);
+        Aseprite.loadAllAnimations(this, AssetPaths.target__json);
     }
 
     override function makeBody():Body {
@@ -23,9 +27,7 @@ class PracticeTarget extends Unibody {
 			shapes: [
 				{
 					type:CIRCLE,
-                    radius: 8,
-					offset_x: 8,
-					offset_y: 8,
+                    radius: 8
 				}
 			]
         });
@@ -40,9 +42,9 @@ class PracticeTarget extends Unibody {
 
         if (other.object is Bullet) {
             other.object.kill();
-            kill();
+            body.active = false;
             FmodManager.PlaySoundOneShot(FmodSFX.TargetHit2);
-            // TODO: Play some animation? Explode? Something
+            animation.play(anims.drop);
             beenShot = true;
         }
     }

diff --git a/source/entities/ScrapCollector.hx b/source/entities/ScrapCollector.hx
@@ -39,14 +39,14 @@ class ScrapCollector extends Unibody {
     public var isDepositable = true;
 
     public function new(x:Float, y:Float, scrapToActivate:Int, id:String) {
-        super(x, y);
+        super(x-10, y);
         Aseprite.loadAllAnimations(this, AssetPaths.recepticle__json);
         animation.frameIndex = 0;
         this.id = id;
 
         animation.finishCallback = handleAnimFinish;
 
-        displayText = FlxTextFactory.make('${scrapToActivate}', x-4, y-24, 20);
+        displayText = FlxTextFactory.make('${scrapToActivate}', x-10, y-28, 16);
         PlayState.me.add(displayText);
         this.scrapToActivate = scrapToActivate;
     }

diff --git a/source/ui/CharacterDialog.hx b/source/ui/CharacterDialog.hx
@@ -19,7 +19,7 @@ class CharacterDialog extends FlxGroup {
 
 	public var delayStarted = false;
 	public var timeSinceDelayStarted:Float = 0;
-	public var nextDialogDelay = 0.5;
+	public var nextDialogDelay = 0.25;
 	public var canProgressTextBox = false;
 
 	public var faster = false;