team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

fix it

Browse source
This commit is contained in:
Haze Weathers 2025-07-17 21:25:26 -06:00
parent 268b392a3b
commit 2d463c0243
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
maps/future/mountain_future.tscn
View file

@ -1,8 +1,4 @@
<<<<<<< HEAD [gd_scene load_steps=37 format=2]
[gd_scene load_steps=36 format=2]
=======
[gd_scene load_steps=28 format=2]
>>>>>>> 15d8307 (tghe end)
[ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1]
[ext_resource path="res://maps/future/mountain_future.gd" type="Script" id=2] [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/enemy/roboturret.tscn" type="PackedScene" id=16]
[ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=17] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=17]
[ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=18] [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://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://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_death.tres" type="TileSet" id=22]
[ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=23] [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://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://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] [sub_resource type="Curve2D" id=11]
_data = { _data = {
@ -598,7 +591,7 @@ anims/liftoff = SubResource( 10 )
[node name="EndingSound" type="AudioStreamPlayer" parent="."] [node name="EndingSound" type="AudioStreamPlayer" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
stream = ExtResource( 19 ) stream = ExtResource( 35 )
volume_db = -9.613 volume_db = -9.613
[connection signal="timeout" from="LightningTimer" to="." method="_spawn_lightning"] [connection signal="timeout" from="LightningTimer" to="." method="_spawn_lightning"]