diff --git a/_game/GameMain.tscn b/_game/GameMain.tscn index 8745059..928e1fa 100644 --- a/_game/GameMain.tscn +++ b/_game/GameMain.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://3vc8ojbiyy5w"] +[gd_scene load_steps=8 format=3 uid="uid://3vc8ojbiyy5w"] [ext_resource type="Script" uid="uid://crgac4manhoud" path="res://_game/game.gd" id="1_yksyv"] [ext_resource type="PackedScene" uid="uid://cvqehvdjpoar4" path="res://_player/player_controller.tscn" id="2_x2i0j"] @@ -6,6 +6,7 @@ [ext_resource type="PackedScene" uid="uid://cd88ydqhdo28" path="res://_scene/level1/l1_s1.tscn" id="4_m1t3p"] [ext_resource type="PackedScene" uid="uid://djs1eg5y008cs" path="res://_scene/level1/l1_s2.tscn" id="5_5s0xe"] [ext_resource type="PackedScene" uid="uid://dh43kt0l28qd5" path="res://_scene/level1/l1_s3.tscn" id="6_ktxjv"] +[ext_resource type="PackedScene" uid="uid://br46ftt4v3bwm" path="res://_scene/level1/l1_s4_Es.tscn" id="7_x2i0j"] [node name="Game" type="Node2D"] script = ExtResource("1_yksyv") @@ -14,7 +15,7 @@ script = ExtResource("1_yksyv") auto_controlled_avatar = NodePath("../Avatar") [node name="Avatar" parent="." instance=ExtResource("3_4ifj7")] -position = Vector2(-330, 0) +position = Vector2(1000, -450) collision_mask = 4 [node name="L1_S1" parent="." instance=ExtResource("4_m1t3p")] @@ -22,3 +23,7 @@ collision_mask = 4 [node name="L1_S2" parent="." instance=ExtResource("5_5s0xe")] [node name="L1_S3" parent="." instance=ExtResource("6_ktxjv")] + +[node name="L1_S4_Es" parent="." instance=ExtResource("7_x2i0j")] +position = Vector2(0, -15) +metadata/_edit_group_ = true diff --git a/_scene/level1/l1_s4_Es.tscn b/_scene/level1/l1_s4_Es.tscn index dddce28..4ba90fc 100644 --- a/_scene/level1/l1_s4_Es.tscn +++ b/_scene/level1/l1_s4_Es.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=26 format=4 uid="uid://br46ftt4v3bwm"] +[gd_scene load_steps=28 format=4 uid="uid://br46ftt4v3bwm"] [ext_resource type="Script" uid="uid://5e157vdk6175" path="res://addons/reedscene/scene/ReedScene.gd" id="1_b3tf0"] [ext_resource type="Script" uid="uid://bh066o84byplh" path="res://addons/reedscene/scene/ReedSceneID.gd" id="2_huisa"] -[ext_resource type="Script" uid="uid://d3600a4hjp6y6" path="res://_game/example/example.gd" id="3_6bhoi"] +[ext_resource type="Script" uid="uid://dn0ksjoswquf5" path="res://addons/reedscene/scene/SceneManager.gd" id="3_6bhoi"] [ext_resource type="Script" uid="uid://dsgl7lbyjsiif" path="res://addons/reedscene/act/ActManager.gd" id="4_dnt6f"] +[ext_resource type="Script" uid="uid://ons77en82uls" path="res://addons/reedscene/scene/SceneTrigger.gd" id="4_sv1n5"] [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="5_dnt6f"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="5_qtvqv"] +[ext_resource type="Resource" uid="uid://gmaitie4ys4h" path="res://_shared/QuickTriggerConfig/player_entered_act_1.tres" id="5_sv1n5"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="6_qtvqv"] [ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="8_6bhoi"] [ext_resource type="TileSet" uid="uid://doepkfp83k0lb" path="res://_tileset/test.tres" id="8_wofhb"] @@ -52,7 +54,7 @@ prop_state_map = Dictionary[int, ExtResource("6_qtvqv")]({ metadata/_custom_type_script = "uid://fxpk2ot6otfh" [sub_resource type="RectangleShape2D" id="RectangleShape2D_nvw5u"] -size = Vector2(647, 446) +size = Vector2(641.5, 432) [node name="L1_S4_Es" type="Node2D"] script = ExtResource("1_b3tf0") @@ -63,6 +65,7 @@ script = ExtResource("2_huisa") [node name="SceneManager" type="Node" parent="."] script = ExtResource("3_6bhoi") +quick_trigger = Array[ExtResource("4_sv1n5")]([ExtResource("5_sv1n5")]) [node name="ActManager" type="Node" parent="."] script = ExtResource("4_dnt6f") @@ -99,7 +102,7 @@ effects = Array[ExtResource("12_3jyxx")]([ExtResource("14_chfvl")]) position = Vector2(1389, -480) [node name="CollisionShape2D" type="CollisionShape2D" parent="Props/PlayerTriggerVolumn"] -position = Vector2(-90, -413) +position = Vector2(-92.75, -393) shape = SubResource("RectangleShape2D_nvw5u") debug_color = Color(0.8478524, 0.3433138, 0.36450645, 0.41960785) @@ -121,7 +124,7 @@ state_id = 1 effects = Array[ExtResource("12_3jyxx")]([ExtResource("17_xflbg")]) [node name="TileMapLayer" type="TileMapLayer" parent="."] -tile_map_data = PackedByteArray("AAA9ALv/AAAAAAAAAAA9ALz/AAAAAAAAAAA9AL3/AAAAAAAAAAA9AL7/AAAAAAAAAAA9AL//AAAAAAAAAAA9AMD/AAAAAAAAAAA9AMH/AAAAAAAAAAA9AML/AAAAAAAAAAA9AMP/AAAAAAAAAAA9AMT/AAAAAAAAAAA9AMX/AAAAAAAAAAA9AMb/AAAAAAAAAAA9AMf/AAAAAAAAAAA9AMj/AAAAAAAAAAA9AMn/AAAAAAAAAAA9AMr/AAAAAAAAAAA9AMv/AAAAAAAAAAA9AMz/AAAAAAAAAAA9AM3/AAAAAAAAAAA9AM7/AAAAAAAAAAA9AM//AAAAAAAAAAA9AND/AAAAAAAAAAA+ALv/AAAAAAAAAAA+AM//AAAAAAAAAAA+AND/AAAAAAAAAAA+ANH/AAAAAAAAAAA/ALv/AAAAAAAAAAA/AM//AAAAAAAAAAA/AND/AAAAAAAAAAA/ANH/AAAAAAAAAABAALv/AAAAAAAAAABAAM//AAAAAAAAAABAAND/AAAAAAAAAABAANH/AAAAAAAAAABBALv/AAAAAAAAAABBAM//AAAAAAAAAABBAND/AAAAAAAAAABBANH/AAAAAAAAAABCALv/AAAAAAAAAABCAM//AAAAAAAAAABCAND/AAAAAAAAAABCANH/AAAAAAAAAABDALv/AAAAAAAAAABDAM//AAAAAAAAAABDAND/AAAAAAAAAABDANH/AAAAAAAAAABEALv/AAAAAAAAAABEAM//AAAAAAAAAABEAND/AAAAAAAAAABEANH/AAAAAAAAAABFALv/AAAAAAAAAABFAM//AAAAAAAAAABFAND/AAAAAAAAAABFANH/AAAAAAAAAABGALv/AAAAAAAAAABGAM//AAAAAAAAAABGAND/AAAAAAAAAABGANH/AAAAAAAAAABHALv/AAAAAAAAAABHAM//AAAAAAAAAABHAND/AAAAAAAAAABHANH/AAAAAAAAAABIALv/AAAAAAAAAABIAM//AAAAAAAAAABIAND/AAAAAAAAAABIANH/AAAAAAAAAABJALv/AAAAAAAAAABJAM//AAAAAAAAAABJAND/AAAAAAAAAABJANH/AAAAAAAAAABKALv/AAAAAAAAAABKAM//AAAAAAAAAABKAND/AAAAAAAAAABKANH/AAAAAAAAAABLALv/AAAAAAAAAABLAM//AAAAAAAAAABLAND/AAAAAAAAAABLANH/AAAAAAAAAABMALv/AAAAAAAAAABMAM//AAAAAAAAAABMAND/AAAAAAAAAABMANH/AAAAAAAAAABNALv/AAAAAAAAAABNAM//AAAAAAAAAABNAND/AAAAAAAAAABNANH/AAAAAAAAAABOALv/AAAAAAAAAABOAM//AAAAAAAAAABOAND/AAAAAAAAAABOANH/AAAAAAAAAABPALv/AAAAAAAAAABPAM//AAAAAAAAAABPAND/AAAAAAAAAABPANH/AAAAAAAAAABQALv/AAAAAAAAAABQAM//AAAAAAAAAABQAND/AAAAAAAAAABQANH/AAAAAAAAAABRALv/AAAAAAAAAABRAM//AAAAAAAAAABRAND/AAAAAAAAAABRANH/AAAAAAAAAABSALv/AAAAAAAAAABSAM//AAAAAAAAAABSAND/AAAAAAAAAABSANH/AAAAAAAAAABTALv/AAAAAAAAAABTAND/AAAAAAAAAABTANH/AAAAAAAAAABUALv/AAAAAAAAAABUANH/AAAAAAAAAABVALv/AAAAAAAAAABWALv/AAAAAAAAAABXALv/AAAAAAAAAABYALv/AAAAAAAAAABZALv/AAAAAAAAAABaALv/AAAAAAAAAABbALv/AAAAAAAAAABcALv/AAAAAAAAAABdALv/AAAAAAAAAABeALv/AAAAAAAAAABfALv/AAAAAAAAAABgALv/AAAAAAAAAABgAM//AAAAAAAAAABgAND/AAAAAAAAAABgANH/AAAAAAAAAABhALv/AAAAAAAAAABhAM//AAAAAAAAAABhAND/AAAAAAAAAABhANH/AAAAAAAAAABiALv/AAAAAAAAAABiAM//AAAAAAAAAABiAND/AAAAAAAAAABiANH/AAAAAAAAAABjALv/AAAAAAAAAABjAM//AAAAAAAAAABjAND/AAAAAAAAAABjANH/AAAAAAAAAABkALv/AAAAAAAAAABkALz/AAAAAAAAAABkAL3/AAAAAAAAAABkAL7/AAAAAAAAAABkAL//AAAAAAAAAABkAMD/AAAAAAAAAABkAMH/AAAAAAAAAABkAML/AAAAAAAAAABkAMP/AAAAAAAAAABkAMT/AAAAAAAAAABkAMX/AAAAAAAAAABkAMb/AAAAAAAAAABkAMf/AAAAAAAAAABkAMj/AAAAAAAAAABkAMn/AAAAAAAAAABkAMr/AAAAAAAAAABkAMv/AAAAAAAAAABkAMz/AAAAAAAAAABkAM3/AAAAAAAAAABkAM7/AAAAAAAAAABkAM//AAAAAAAAAABkAND/AAAAAAAAAABkANH/AAAAAAAAAAA9ANH/AAAAAAAAAABUAND/AAAAAAAAAABVANH/AAAAAAAAAABWANH/AAAAAAAAAABXANH/AAAAAAAAAABYANH/AAAAAAAAAABZANH/AAAAAAAAAABZAND/AAAAAAAAAABYAND/AAAAAAAAAABXAND/AAAAAAAAAABWAND/AAAAAAAAAABVAND/AAAAAAAAAABTAM//AAAAAAAAAABUAM//AAAAAAAAAABVAM//AAAAAAAAAABWAM//AAAAAAAAAABXAM//AAAAAAAAAABgAM7/AAAAAAAAAAA=") +tile_map_data = PackedByteArray("AAA9AND/AAAAAAAAAAA9ANH/AAAAAAAAAAA9ANL/AAAAAAAAAAA+AND/AAAAAAAAAAA+ANH/AAAAAAAAAAA+ANL/AAAAAAAAAAA/AND/AAAAAAAAAAA/ANH/AAAAAAAAAAA/ANL/AAAAAAAAAABAAND/AAAAAAAAAABAANH/AAAAAAAAAABAANL/AAAAAAAAAABBAND/AAAAAAAAAABBANH/AAAAAAAAAABBANL/AAAAAAAAAABCAND/AAAAAAAAAABCANH/AAAAAAAAAABCANL/AAAAAAAAAABDAND/AAAAAAAAAABDANH/AAAAAAAAAABDANL/AAAAAAAAAABEAND/AAAAAAAAAABEANH/AAAAAAAAAABEANL/AAAAAAAAAABFAND/AAAAAAAAAABFANH/AAAAAAAAAABFANL/AAAAAAAAAABGAND/AAAAAAAAAABGANH/AAAAAAAAAABGANL/AAAAAAAAAABHAND/AAAAAAAAAABHANH/AAAAAAAAAABHANL/AAAAAAAAAABIAND/AAAAAAAAAABIANH/AAAAAAAAAABIANL/AAAAAAAAAABJAND/AAAAAAAAAABJANH/AAAAAAAAAABJANL/AAAAAAAAAABKAND/AAAAAAAAAABKANH/AAAAAAAAAABKANL/AAAAAAAAAABLAND/AAAAAAAAAABLANH/AAAAAAAAAABLANL/AAAAAAAAAABMAND/AAAAAAAAAABMANH/AAAAAAAAAABMANL/AAAAAAAAAABNAND/AAAAAAAAAABNANH/AAAAAAAAAABNANL/AAAAAAAAAABOAND/AAAAAAAAAABOANH/AAAAAAAAAABOANL/AAAAAAAAAABPAND/AAAAAAAAAABPANH/AAAAAAAAAABPANL/AAAAAAAAAABQAND/AAAAAAAAAABQANH/AAAAAAAAAABQANL/AAAAAAAAAABRAND/AAAAAAAAAABRANH/AAAAAAAAAABRANL/AAAAAAAAAABSAND/AAAAAAAAAABSANH/AAAAAAAAAABSANL/AAAAAAAAAABTAND/AAAAAAAAAABTANH/AAAAAAAAAABTANL/AAAAAAAAAABUAND/AAAAAAAAAABUANH/AAAAAAAAAABUANL/AAAAAAAAAABVAND/AAAAAAAAAABVANH/AAAAAAAAAABVANL/AAAAAAAAAABWAND/AAAAAAAAAABWANH/AAAAAAAAAABWANL/AAAAAAAAAABXAND/AAAAAAAAAABXANH/AAAAAAAAAABXANL/AAAAAAAAAABYANH/AAAAAAAAAABYANL/AAAAAAAAAABZANH/AAAAAAAAAABZANL/AAAAAAAAAABgAND/AAAAAAAAAABgANH/AAAAAAAAAABhAND/AAAAAAAAAABhANH/AAAAAAAAAABhANL/AAAAAAAAAABiAND/AAAAAAAAAABiANH/AAAAAAAAAABiANL/AAAAAAAAAABjAND/AAAAAAAAAABjANH/AAAAAAAAAABjANL/AAAAAAAAAABkALz/AAAAAAAAAABkAL3/AAAAAAAAAABkAL7/AAAAAAAAAABkAL//AAAAAAAAAABkAMD/AAAAAAAAAABkAMH/AAAAAAAAAABkAML/AAAAAAAAAABkAMP/AAAAAAAAAABkAMT/AAAAAAAAAABkAMX/AAAAAAAAAABkAMb/AAAAAAAAAABkAMf/AAAAAAAAAABkAMj/AAAAAAAAAABkAMn/AAAAAAAAAABkAMr/AAAAAAAAAABkAMv/AAAAAAAAAABkAMz/AAAAAAAAAABkAM3/AAAAAAAAAABkAM7/AAAAAAAAAABkAM//AAAAAAAAAABkAND/AAAAAAAAAABkANH/AAAAAAAAAABkANL/AAAAAAAAAABgANL/AAAAAAAAAAA7ALz/AAAAAAAAAAA7AL3/AAAAAAAAAAA7AL7/AAAAAAAAAAA7AL//AAAAAAAAAAA7AMb/AAAAAAAAAAA7AMf/AAAAAAAAAAA7AMj/AAAAAAAAAAA7AMn/AAAAAAAAAAA7AM7/AAAAAAAAAAA7AM//AAAAAAAAAAA7AND/AAAAAAAAAAA7ANH/AAAAAAAAAAA7ANL/AAAAAAAAAAA8ANL/AAAAAAAAAAA7ALv/AAAAAAAAAAA7ALr/AAAAAAAAAAA7ALn/AAAAAAAAAAA7ALj/AAAAAAAAAAA8ALj/AAAAAAAAAAA9ALj/AAAAAAAAAAA+ALj/AAAAAAAAAAA/ALj/AAAAAAAAAABAALj/AAAAAAAAAABBALj/AAAAAAAAAABCALj/AAAAAAAAAABDALj/AAAAAAAAAABEALj/AAAAAAAAAABFALj/AAAAAAAAAABGALj/AAAAAAAAAABHALj/AAAAAAAAAABIALj/AAAAAAAAAABJALj/AAAAAAAAAABKALj/AAAAAAAAAABLALj/AAAAAAAAAABMALj/AAAAAAAAAABNALj/AAAAAAAAAABOALj/AAAAAAAAAABPALj/AAAAAAAAAABQALj/AAAAAAAAAABRALj/AAAAAAAAAABSALj/AAAAAAAAAABTALj/AAAAAAAAAABUALj/AAAAAAAAAABVALj/AAAAAAAAAABWALj/AAAAAAAAAABXALj/AAAAAAAAAABYALj/AAAAAAAAAABZALj/AAAAAAAAAABaALj/AAAAAAAAAABbALj/AAAAAAAAAABcALj/AAAAAAAAAABdALj/AAAAAAAAAABeALj/AAAAAAAAAABfALj/AAAAAAAAAABgALj/AAAAAAAAAABkALj/AAAAAAAAAABkALn/AAAAAAAAAABkALr/AAAAAAAAAABkALv/AAAAAAAAAABhALj/AAAAAAAAAABiALj/AAAAAAAAAABjALj/AAAAAAAAAAA8ANH/AAAAAAAAAAA8AND/AAAAAAAAAABjALn/AAAAAAAAAABiALn/AAAAAAAAAABhALn/AAAAAAAAAABgALn/AAAAAAAAAABfALn/AAAAAAAAAABeALn/AAAAAAAAAABUALn/AAAAAAAAAABVALn/AAAAAAAAAABWALn/AAAAAAAAAABXALn/AAAAAAAAAABYALn/AAAAAAAAAABZALn/AAAAAAAAAABaALn/AAAAAAAAAABbALn/AAAAAAAAAABcALn/AAAAAAAAAABdALn/AAAAAAAAAABQALn/AAAAAAAAAABRALn/AAAAAAAAAABSALn/AAAAAAAAAABTALn/AAAAAAAAAABPALn/AAAAAAAAAABOALn/AAAAAAAAAABNALn/AAAAAAAAAABMALn/AAAAAAAAAABLALn/AAAAAAAAAABKALn/AAAAAAAAAABJALn/AAAAAAAAAABIALn/AAAAAAAAAABHALn/AAAAAAAAAABGALn/AAAAAAAAAABFALn/AAAAAAAAAABEALn/AAAAAAAAAABDALn/AAAAAAAAAABCALn/AAAAAAAAAABBALn/AAAAAAAAAABAALn/AAAAAAAAAAA/ALn/AAAAAAAAAAA+ALn/AAAAAAAAAAA9ALn/AAAAAAAAAAA7AM3/AAAAAAAAAAA7AMz/AAAAAAAAAAA7AMv/AAAAAAAAAAA7AMr/AAAAAAAAAAA/ALv/AAAAAAAAAABAALv/AAAAAAAAAABAALz/AAAAAAAAAABBALz/AAAAAAAAAAA/AL3/AAAAAAAAAABFALv/AAAAAAAAAABHALv/AAAAAAAAAABMALv/AAAAAAAAAABNALv/AAAAAAAAAABPALv/AAAAAAAAAABQALv/AAAAAAAAAABZALv/AAAAAAAAAABaALr/AAAAAAAAAABWALv/AAAAAAAAAABUALr/AAAAAAAAAABXALr/AAAAAAAAAABYALr/AAAAAAAAAABbALr/AAAAAAAAAABcALr/AAAAAAAAAABdALr/AAAAAAAAAABeALr/AAAAAAAAAABgALv/AAAAAAAAAABEALv/AAAAAAAAAABDALr/AAAAAAAAAABBALr/AAAAAAAAAABKALr/AAAAAAAAAABLALr/AAAAAAAAAABMALr/AAAAAAAAAABNALr/AAAAAAAAAABbALv/AAAAAAAAAABeALv/AAAAAAAAAABhALv/AAAAAAAAAABjAL3/AAAAAAAAAABjAL7/AAAAAAAAAAA6ALj/AAAAAAAAAAA6ALr/AAAAAAAAAAA6ALn/AAAAAAAAAAA6ALv/AAAAAAAAAAA6AL7/AAAAAAAAAAA6ALz/AAAAAAAAAAA6AL//AAAAAAAAAAA6AL3/AAAAAAAAAAA6AMn/AAAAAAAAAAA6AMz/AAAAAAAAAAA6ANH/AAAAAAAAAAA6ANL/AAAAAAAAAAA6AND/AAAAAAAAAAA6AM//AAAAAAAAAAA6AM7/AAAAAAAAAAA6AM3/AAAAAAAAAAA6AMv/AAAAAAAAAAA6AMr/AAAAAAAAAAA6AMj/AAAAAAAAAAA6AMf/AAAAAAAAAAA6AMb/AAAAAAAAAAA6AMX/AAAAAAAAAAA7AMX/AAAAAAAAAAA8AMX/AAAAAAAAAAA9AMX/AAAAAAAAAAA+AMX/AAAAAAAAAAA/AMX/AAAAAAAAAAA+AMb/AAAAAAAAAAA9AMb/AAAAAAAAAAA8AMb/AAAAAAAAAABLAMn/AAAAAAAAAABLAMj/AAAAAAAAAABLAMf/AAAAAAAAAABKAMf/AAAAAAAAAABKAMb/AAAAAAAAAABKAMX/AAAAAAAAAABKAMT/AAAAAAAAAABKAMP/AAAAAAAAAABLAMP/AAAAAAAAAABLAMT/AAAAAAAAAABLAMX/AAAAAAAAAABLAMb/AAAAAAAAAABMAMb/AAAAAAAAAABMAMf/AAAAAAAAAABMAMj/AAAAAAAAAABMAMn/AAAAAAAAAABUALv/AAAAAAAAAABUALz/AAAAAAAAAABUAL3/AAAAAAAAAABUAL7/AAAAAAAAAABUAL//AAAAAAAAAABVAL//AAAAAAAAAABWAL//AAAAAAAAAABWAL7/AAAAAAAAAABWAL3/AAAAAAAAAABWALz/AAAAAAAAAABVALz/AAAAAAAAAABVAL3/AAAAAAAAAABVAL7/AAAAAAAAAABVALv/AAAAAAAAAABVALr/AAAAAAAAAABWALr/AAAAAAAAAABXALz/AAABAAAAAABXAL3/AAABAAAAAABXAL7/AAABAAAAAABXAL//AAABAAAAAABXALv/AAABAAAAAABSAM//AAABAAAAAABTAM//AAABAAAAAABUAM//AAABAAAAAABVAM//AAABAAAAAABWAM//AAABAAAAAABXAM//AAABAAAAAAA=") tile_set = ExtResource("8_wofhb") [connection signal="player_entered" from="Props/PlayerTriggerVolumn" to="SceneManager" method="_on_player_trigger_volumn_player_entered"]