From 2d463c02431b87b0691d08ecf0fd9fcca2f5fac4 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Thu, 17 Jul 2025 21:25:26 -0600 Subject: [PATCH] fix it --- maps/future/mountain_future.tscn | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/maps/future/mountain_future.tscn b/maps/future/mountain_future.tscn index 10e3106..33e6c6f 100644 --- a/maps/future/mountain_future.tscn +++ b/maps/future/mountain_future.tscn @@ -1,8 +1,4 @@ -<<<<<<< HEAD -[gd_scene load_steps=36 format=2] -======= -[gd_scene load_steps=28 format=2] ->>>>>>> 15d8307 (tghe end) +[gd_scene load_steps=37 format=2] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1] [ext_resource path="res://maps/future/mountain_future.gd" type="Script" id=2] @@ -22,16 +18,13 @@ [ext_resource path="res://objects/enemy/roboturret.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=17] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=18] -<<<<<<< HEAD [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=19] -======= -[ext_resource path="res://audio/sounds/msx_ending.ogg" type="AudioStream" id=19] ->>>>>>> 15d8307 (tghe end) [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=21] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=22] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=23] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=26] [ext_resource path="res://graphics/particles/raindrop.png" type="Texture" id=33] +[ext_resource path="res://audio/sounds/msx_ending.ogg" type="AudioStream" id=35] [sub_resource type="Curve2D" id=11] _data = { @@ -598,7 +591,7 @@ anims/liftoff = SubResource( 10 ) [node name="EndingSound" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -stream = ExtResource( 19 ) +stream = ExtResource( 35 ) volume_db = -9.613 [connection signal="timeout" from="LightningTimer" to="." method="_spawn_lightning"]