diff --git a/Scenes/Levels/CustomLevelBase.tscn b/Scenes/Levels/CustomLevelBase.tscn index e3441a3..f41167f 100644 --- a/Scenes/Levels/CustomLevelBase.tscn +++ b/Scenes/Levels/CustomLevelBase.tscn @@ -1,9 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://bigssps82viks"] +[gd_scene load_steps=6 format=3 uid="uid://bigssps82viks"] [ext_resource type="Script" uid="uid://c0kflqgd1w6sg" path="res://Scripts/Classes/CustomLevel.gd" id="1_8pu80"] [ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="2_f32q3"] -[ext_resource type="Texture2D" uid="uid://cbha2l6hg1kfo" path="res://Assets/Sprites/UI/EditorGrid.png" id="3_e7vnc"] -[ext_resource type="Texture2D" uid="uid://bxciugu0dg7e8" path="res://Assets/Sprites/Editor/ChunkDisplay.png" id="4_rhepb"] [ext_resource type="PackedScene" uid="uid://ct5rrpa7uehkk" path="res://Scenes/Parts/Tiles.tscn" id="5_6gaxc"] [ext_resource type="PackedScene" uid="uid://cuh62hlq8errh" path="res://Scenes/Prefabs/Entities/Player.tscn" id="6_13qah"] [ext_resource type="PackedScene" uid="uid://cinr6kcbmo6gr" path="res://Scenes/Parts/DropShadowRenderer.tscn" id="7_rcw8p"] @@ -15,39 +13,6 @@ metadata/_custom_type_script = "uid://bcqr1v25ygedb" [node name="LevelBG" parent="." instance=ExtResource("2_f32q3")] z_index = -99 -[node name="Grid" type="Parallax2D" parent="."] -unique_name_in_owner = true -visible = false -visibility_layer = 2 -z_index = 4096 -z_as_relative = false -repeat_size = Vector2(512, 512) -repeat_times = 8 - -[node name="TextureRect" type="TextureRect" parent="Grid"] -modulate = Color(0.356863, 0.356863, 0.356863, 0.407843) -offset_right = 512.0 -offset_bottom = 512.0 -texture = ExtResource("3_e7vnc") -stretch_mode = 1 -metadata/_edit_use_anchors_ = true - -[node name="ChunkGrid" type="Parallax2D" parent="Grid"] -unique_name_in_owner = true -visible = false -visibility_layer = 2 -z_index = 4096 -z_as_relative = false -scroll_offset = Vector2(0, 32) -repeat_size = Vector2(512, 512) -repeat_times = 8 - -[node name="TextureRect" type="TextureRect" parent="Grid/ChunkGrid"] -offset_right = 512.0 -offset_bottom = 512.0 -texture = ExtResource("4_rhepb") -metadata/_edit_use_anchors_ = true - [node name="TileLayer5" parent="." instance=ExtResource("5_6gaxc")] unique_name_in_owner = true diff --git a/Scenes/Levels/EditorLevelBase.tscn b/Scenes/Levels/EditorLevelBase.tscn deleted file mode 100755 index d1ead16..0000000 --- a/Scenes/Levels/EditorLevelBase.tscn +++ /dev/null @@ -1,95 +0,0 @@ -[gd_scene load_steps=8 format=3 uid="uid://bow7jcfb6mf40"] - -[ext_resource type="Script" path="res://Scripts/Classes/EditorLevelBase.gd" id="1_nkx57"] -[ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="2_o5dwp"] -[ext_resource type="Texture2D" uid="uid://cbha2l6hg1kfo" path="res://Assets/Sprites/UI/EditorGrid.png" id="3_m2yqk"] -[ext_resource type="Texture2D" uid="uid://bxciugu0dg7e8" path="res://Assets/Sprites/Editor/ChunkDisplay.png" id="4_vqnjd"] -[ext_resource type="PackedScene" uid="uid://ct5rrpa7uehkk" path="res://Scenes/Parts/Tiles.tscn" id="5_7pgrs"] -[ext_resource type="PackedScene" uid="uid://cuh62hlq8errh" path="res://Scenes/Prefabs/Entities/Player.tscn" id="6_8b4x6"] -[ext_resource type="PackedScene" uid="uid://cinr6kcbmo6gr" path="res://Scenes/Parts/DropShadowRenderer.tscn" id="7_if7pi"] - -[node name="Level" type="Node"] -script = ExtResource("1_nkx57") -time_limit = 500 -vertical_height = -480 -metadata/_custom_type_script = "uid://bcqr1v25ygedb" - -[node name="LevelBG" parent="." instance=ExtResource("2_o5dwp")] - -[node name="Camera" type="Camera2D" parent="."] -unique_name_in_owner = true -position = Vector2(-232, 0) -process_callback = 0 -limit_enabled = false -limit_bottom = 32 - -[node name="Grid" type="Parallax2D" parent="."] -unique_name_in_owner = true -visibility_layer = 2 -z_index = -10 -z_as_relative = false -repeat_size = Vector2(512, 512) -repeat_times = 8 - -[node name="TextureRect" type="TextureRect" parent="Grid"] -modulate = Color(0.356863, 0.356863, 0.356863, 0.407843) -offset_right = 512.0 -offset_bottom = 512.0 -texture = ExtResource("3_m2yqk") -stretch_mode = 1 - -[node name="ChunkGrid" type="Parallax2D" parent="Grid"] -unique_name_in_owner = true -visibility_layer = 2 -z_index = -10 -z_as_relative = false -scroll_offset = Vector2(0, 32) -repeat_size = Vector2(512, 512) -repeat_times = 8 - -[node name="TextureRect" type="TextureRect" parent="Grid/ChunkGrid"] -offset_right = 512.0 -offset_bottom = 512.0 -texture = ExtResource("4_vqnjd") - -[node name="TileLayer5" parent="." instance=ExtResource("5_7pgrs")] -unique_name_in_owner = true - -[node name="TileLayer4" parent="." instance=ExtResource("5_7pgrs")] -unique_name_in_owner = true - -[node name="TileLayer3" parent="." instance=ExtResource("5_7pgrs")] -unique_name_in_owner = true - -[node name="TileLayer2" parent="." instance=ExtResource("5_7pgrs")] -unique_name_in_owner = true - -[node name="TileLayer1" parent="." instance=ExtResource("5_7pgrs")] -unique_name_in_owner = true - -[node name="EntityLayer5" type="Node2D" parent="."] -unique_name_in_owner = true -process_mode = 4 - -[node name="EntityLayer4" type="Node2D" parent="."] -unique_name_in_owner = true -process_mode = 4 - -[node name="EntityLayer3" type="Node2D" parent="."] -unique_name_in_owner = true -process_mode = 4 - -[node name="EntityLayer2" type="Node2D" parent="."] -unique_name_in_owner = true -process_mode = 4 - -[node name="EntityLayer1" type="Node2D" parent="."] -unique_name_in_owner = true -process_mode = 4 - -[node name="Player" parent="EntityLayer1" instance=ExtResource("6_8b4x6")] -position = Vector2(-232, 0) -metadata/tile_position = Vector2i(-15, -1) -metadata/no_save = false - -[node name="DropShadow" parent="." instance=ExtResource("7_if7pi")] diff --git a/Scenes/Levels/SMBLL/World2/2-2.tscn b/Scenes/Levels/SMBLL/World2/2-2.tscn index edaa61b..5f28d78 100644 --- a/Scenes/Levels/SMBLL/World2/2-2.tscn +++ b/Scenes/Levels/SMBLL/World2/2-2.tscn @@ -268,11 +268,11 @@ position = Vector2(2712, -120) position = Vector2(2728, -72) [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57358" to="Tiles/@Node2D@57358/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57359" to="Tiles/@Node2D@57359/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57360" to="Tiles/@Node2D@57360/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57361" to="Tiles/@Node2D@57361/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57362" to="Tiles/@Node2D@57362/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21378" to="Tiles/@Node2D@21378/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21379" to="Tiles/@Node2D@21379/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21380" to="Tiles/@Node2D@21380/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21381" to="Tiles/@Node2D@21381/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21382" to="Tiles/@Node2D@21382/LevelPersistance" method="set_as_active"] [connection signal="block_destroyed" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active_2"] [connection signal="block_emptied" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active"] [connection signal="item_changed" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="check_brick_empty"] @@ -280,75 +280,75 @@ position = Vector2(2728, -72) [connection signal="player_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1] [connection signal="shell_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="on_shell_block_hit"] [connection signal="shell_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="collected" from="Tiles/@Node2D@57363" to="Tiles/@Node2D@57363/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57364" to="Tiles/@Node2D@57364/LevelPersistance" method="set_as_active"] -[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@57365" to="Tiles/@AnimatableBody2D@57365/LevelPersistance" method="set_as_active_2"] -[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@57365" to="Tiles/@AnimatableBody2D@57365/LevelPersistance" method="set_as_active"] -[connection signal="item_changed" from="Tiles/@AnimatableBody2D@57365" to="Tiles/@AnimatableBody2D@57365" method="check_brick_empty"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@57365" to="Tiles/@AnimatableBody2D@57365" method="on_block_hit"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@57365" to="Tiles/@AnimatableBody2D@57365/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@57365" to="Tiles/@AnimatableBody2D@57365" method="on_shell_block_hit"] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@57365" to="Tiles/@AnimatableBody2D@57365/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="collected" from="Tiles/@Node2D@57366" to="Tiles/@Node2D@57366/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57367" to="Tiles/@Node2D@57367/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57368" to="Tiles/@Node2D@57368/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57369" to="Tiles/@Node2D@57369/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57370" to="Tiles/@Node2D@57370/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57371" to="Tiles/@Node2D@57371/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57372" to="Tiles/@Node2D@57372/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57373" to="Tiles/@Node2D@57373/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57374" to="Tiles/@Node2D@57374/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57375" to="Tiles/@Node2D@57375/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57376" to="Tiles/@Node2D@57376/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57377" to="Tiles/@Node2D@57377/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@57378" to="Tiles/@Node2D@57378/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21383" to="Tiles/@Node2D@21383/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21384" to="Tiles/@Node2D@21384/LevelPersistance" method="set_as_active"] +[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@21385" to="Tiles/@AnimatableBody2D@21385/LevelPersistance" method="set_as_active_2"] +[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@21385" to="Tiles/@AnimatableBody2D@21385/LevelPersistance" method="set_as_active"] +[connection signal="item_changed" from="Tiles/@AnimatableBody2D@21385" to="Tiles/@AnimatableBody2D@21385" method="check_brick_empty"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@21385" to="Tiles/@AnimatableBody2D@21385" method="on_block_hit"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@21385" to="Tiles/@AnimatableBody2D@21385/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@21385" to="Tiles/@AnimatableBody2D@21385" method="on_shell_block_hit"] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@21385" to="Tiles/@AnimatableBody2D@21385/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="collected" from="Tiles/@Node2D@21386" to="Tiles/@Node2D@21386/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21387" to="Tiles/@Node2D@21387/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21388" to="Tiles/@Node2D@21388/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21389" to="Tiles/@Node2D@21389/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21390" to="Tiles/@Node2D@21390/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21391" to="Tiles/@Node2D@21391/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21392" to="Tiles/@Node2D@21392/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21393" to="Tiles/@Node2D@21393/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21394" to="Tiles/@Node2D@21394/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21395" to="Tiles/@Node2D@21395/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21396" to="Tiles/@Node2D@21396/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21397" to="Tiles/@Node2D@21397/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@21398" to="Tiles/@Node2D@21398/LevelPersistance" method="set_as_active"] [connection signal="area_entered" from="Tiles/DeathPit" to="Tiles/DeathPit" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57379" to="Tiles/@Area2D@57379" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57380" to="Tiles/@Area2D@57380" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57381" to="Tiles/@Area2D@57381" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57382" to="Tiles/@Area2D@57382" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57383" to="Tiles/@Area2D@57383" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57384" to="Tiles/@Area2D@57384" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57385" to="Tiles/@Area2D@57385" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57386" to="Tiles/@Area2D@57386" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57387" to="Tiles/@Area2D@57387" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57388" to="Tiles/@Area2D@57388" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57389" to="Tiles/@Area2D@57389" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57390" to="Tiles/@Area2D@57390" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57391" to="Tiles/@Area2D@57391" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57392" to="Tiles/@Area2D@57392" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57393" to="Tiles/@Area2D@57393" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57394" to="Tiles/@Area2D@57394" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57395" to="Tiles/@Area2D@57395" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57396" to="Tiles/@Area2D@57396" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57397" to="Tiles/@Area2D@57397" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57398" to="Tiles/@Area2D@57398" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57399" to="Tiles/@Area2D@57399" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57400" to="Tiles/@Area2D@57400" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57401" to="Tiles/@Area2D@57401" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57402" to="Tiles/@Area2D@57402" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57403" to="Tiles/@Area2D@57403" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57404" to="Tiles/@Area2D@57404" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57405" to="Tiles/@Area2D@57405" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57406" to="Tiles/@Area2D@57406" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57407" to="Tiles/@Area2D@57407" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57408" to="Tiles/@Area2D@57408" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57409" to="Tiles/@Area2D@57409" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57410" to="Tiles/@Area2D@57410" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57411" to="Tiles/@Area2D@57411" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57412" to="Tiles/@Area2D@57412" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57413" to="Tiles/@Area2D@57413" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57414" to="Tiles/@Area2D@57414" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57415" to="Tiles/@Area2D@57415" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57416" to="Tiles/@Area2D@57416" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57417" to="Tiles/@Area2D@57417" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57418" to="Tiles/@Area2D@57418" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57419" to="Tiles/@Area2D@57419" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57420" to="Tiles/@Area2D@57420" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57421" to="Tiles/@Area2D@57421" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57422" to="Tiles/@Area2D@57422" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57423" to="Tiles/@Area2D@57423" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57424" to="Tiles/@Area2D@57424" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57425" to="Tiles/@Area2D@57425" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57426" to="Tiles/@Area2D@57426" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@57427" to="Tiles/@Area2D@57427" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21399" to="Tiles/@Area2D@21399" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21400" to="Tiles/@Area2D@21400" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21401" to="Tiles/@Area2D@21401" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21402" to="Tiles/@Area2D@21402" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21403" to="Tiles/@Area2D@21403" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21404" to="Tiles/@Area2D@21404" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21405" to="Tiles/@Area2D@21405" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21406" to="Tiles/@Area2D@21406" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21407" to="Tiles/@Area2D@21407" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21408" to="Tiles/@Area2D@21408" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21409" to="Tiles/@Area2D@21409" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21410" to="Tiles/@Area2D@21410" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21411" to="Tiles/@Area2D@21411" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21412" to="Tiles/@Area2D@21412" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21413" to="Tiles/@Area2D@21413" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21414" to="Tiles/@Area2D@21414" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21415" to="Tiles/@Area2D@21415" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21416" to="Tiles/@Area2D@21416" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21417" to="Tiles/@Area2D@21417" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21418" to="Tiles/@Area2D@21418" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21419" to="Tiles/@Area2D@21419" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21420" to="Tiles/@Area2D@21420" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21421" to="Tiles/@Area2D@21421" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21422" to="Tiles/@Area2D@21422" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21423" to="Tiles/@Area2D@21423" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21424" to="Tiles/@Area2D@21424" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21425" to="Tiles/@Area2D@21425" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21426" to="Tiles/@Area2D@21426" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21427" to="Tiles/@Area2D@21427" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21428" to="Tiles/@Area2D@21428" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21429" to="Tiles/@Area2D@21429" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21430" to="Tiles/@Area2D@21430" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21431" to="Tiles/@Area2D@21431" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21432" to="Tiles/@Area2D@21432" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21433" to="Tiles/@Area2D@21433" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21434" to="Tiles/@Area2D@21434" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21435" to="Tiles/@Area2D@21435" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21436" to="Tiles/@Area2D@21436" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21437" to="Tiles/@Area2D@21437" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21438" to="Tiles/@Area2D@21438" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21439" to="Tiles/@Area2D@21439" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21440" to="Tiles/@Area2D@21440" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21441" to="Tiles/@Area2D@21441" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21442" to="Tiles/@Area2D@21442" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21443" to="Tiles/@Area2D@21443" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21444" to="Tiles/@Area2D@21444" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21445" to="Tiles/@Area2D@21445" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21446" to="Tiles/@Area2D@21446" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@21447" to="Tiles/@Area2D@21447" method="area_entered"] diff --git a/Scenes/Prefabs/Autoload/NewLevelBuilder.gd b/Scenes/Prefabs/Autoload/NewLevelBuilder.gd index d88b7e5..cf95d8c 100644 --- a/Scenes/Prefabs/Autoload/NewLevelBuilder.gd +++ b/Scenes/Prefabs/Autoload/NewLevelBuilder.gd @@ -30,6 +30,7 @@ func load_level(level_file := {}) -> void: func build_sublevel(level_idx := 0, level_file := {}) -> PackedScene: var level = BASE_LEVEL_SCENE.instantiate() level.sublevel_id = level_idx + print(level_idx) sub_level_file = level_file["Levels"][level_idx] return pack_level_into_scene(build_level(level)) diff --git a/Scenes/Prefabs/LevelObjects/EditorLinkedElevator.tscn b/Scenes/Prefabs/LevelObjects/EditorLinkedElevator.tscn index 6b257eb..7a9ced5 100644 --- a/Scenes/Prefabs/LevelObjects/EditorLinkedElevator.tscn +++ b/Scenes/Prefabs/LevelObjects/EditorLinkedElevator.tscn @@ -10,6 +10,9 @@ [sub_resource type="GDScript" id="GDScript_0yjq3"] script/source = "extends Node +func _ready() -> void: + update() + func _process(_delta: float) -> void: if LevelEditor.playing_level == false: update() diff --git a/Scripts/Classes/Blocks/BrickBlock.gd b/Scripts/Classes/Blocks/BrickBlock.gd index 878e9f7..a1f6a1e 100644 --- a/Scripts/Classes/Blocks/BrickBlock.gd +++ b/Scripts/Classes/Blocks/BrickBlock.gd @@ -3,11 +3,6 @@ extends Block var ticking_down := false -func _ready() -> void: - if item == null: return - if item_amount == 10 and item.resource_path == "res://Scenes/Prefabs/Entities/Items/SpinningCoin.tscn" and is_instance_valid(Global.level_editor) == false: - Global.log_warning("Coin Brick Block is wrong! please report!: " + name) - func check_brick_empty() -> void: $PSwitcher.enabled = item == null diff --git a/Scripts/Classes/CustomLevel.gd b/Scripts/Classes/CustomLevel.gd index 48265ad..7dc97be 100644 --- a/Scripts/Classes/CustomLevel.gd +++ b/Scripts/Classes/CustomLevel.gd @@ -1,4 +1,4 @@ class_name CustomLevel extends Level -var sublevel_id := 0 +@export var sublevel_id := 0 diff --git a/Scripts/Classes/Entities/Objects/BobOmbHeld.gd b/Scripts/Classes/Entities/Objects/BobOmbHeld.gd index 4688c29..4749f3d 100644 --- a/Scripts/Classes/Entities/Objects/BobOmbHeld.gd +++ b/Scripts/Classes/Entities/Objects/BobOmbHeld.gd @@ -24,7 +24,8 @@ func explode() -> void: func kick(object: Node2D) -> void: AudioManager.play_sfx("kick", global_position) - object.kick_anim() + if object is Player: + object.kick_anim() var kick_dir = sign(global_position.x - object.global_position.x) velocity.x = 150 * kick_dir direction = kick_dir diff --git a/Scripts/Classes/Entities/Player.gd b/Scripts/Classes/Entities/Player.gd index c4259a7..7430b71 100644 --- a/Scripts/Classes/Entities/Player.gd +++ b/Scripts/Classes/Entities/Player.gd @@ -235,6 +235,8 @@ func _ready() -> void: handle_invincible_palette() if [Global.GameMode.LEVEL_EDITOR, Global.GameMode.CUSTOM_LEVEL].has(Global.current_game_mode): recenter_camera() + if Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL: + editor_level_start() func apply_character_physics(apply: bool) -> void: var path = "res://Assets/Sprites/Players/" + character + "/CharacterInfo.json" diff --git a/Scripts/Parts/Checkpoint.gd b/Scripts/Parts/Checkpoint.gd index 8b5c0b6..3b10a13 100644 --- a/Scripts/Parts/Checkpoint.gd +++ b/Scripts/Parts/Checkpoint.gd @@ -66,6 +66,7 @@ func on_area_entered(area: Area2D) -> void: sublevel_id = Global.level_editor.sub_level_id elif Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL: sublevel_id = Global.current_level.sublevel_id + print(sublevel_id) if Settings.file.difficulty.checkpoint_style == 2 and has_meta("is_flag"): if player.power_state.state_name == "Small": player.get_power_up("Big", false)