Fix merge issues more

This commit is contained in:
jdaster64
2025-10-07 00:02:33 -04:00
parent 6bfff3f87f
commit 50a01a1a92
8 changed files with 1074 additions and 809 deletions

View File

@@ -16,7 +16,7 @@
[ext_resource type="PackedScene" uid="uid://iq86u4w60yee" path="res://Scenes/Prefabs/Entities/Objects/Firebar.tscn" id="16_6tii1"]
[ext_resource type="Script" uid="uid://cybpwmw4ywoow" path="res://Scripts/Parts/TileMapConverter.gd" id="16_g83sl"]
[node name="11-2" type="Node"]
[node name="B-2" type="Node"]
script = ExtResource("1_lqo4n")
music = ExtResource("2_5ws2p")
theme = "Underwater"
@@ -126,65 +126,66 @@ metadata/_custom_type_script = "uid://cybpwmw4ywoow"
[node name="Firebar" parent="." instance=ExtResource("16_6tii1")]
position = Vector2(2168.89, -88.0218)
length = 16
direction = 1
[connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79039" to="Tiles/@Node2D@79039/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79040" to="Tiles/@Node2D@79040/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79041" to="Tiles/@Node2D@79041/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79042" to="Tiles/@Node2D@79042/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79043" to="Tiles/@Node2D@79043/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79044" to="Tiles/@Node2D@79044/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79045" to="Tiles/@Node2D@79045/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79046" to="Tiles/@Node2D@79046/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79047" to="Tiles/@Node2D@79047/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79048" to="Tiles/@Node2D@79048/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79049" to="Tiles/@Node2D@79049/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79050" to="Tiles/@Node2D@79050/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79051" to="Tiles/@Node2D@79051/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79052" to="Tiles/@Node2D@79052/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79053" to="Tiles/@Node2D@79053/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79054" to="Tiles/@Node2D@79054/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79055" to="Tiles/@Node2D@79055/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79056" to="Tiles/@Node2D@79056/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79057" to="Tiles/@Node2D@79057/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79058" to="Tiles/@Node2D@79058/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79059" to="Tiles/@Node2D@79059/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79060" to="Tiles/@Node2D@79060/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79061" to="Tiles/@Node2D@79061/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79062" to="Tiles/@Node2D@79062/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79063" to="Tiles/@Node2D@79063/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79064" to="Tiles/@Node2D@79064/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79065" to="Tiles/@Node2D@79065/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79066" to="Tiles/@Node2D@79066/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79067" to="Tiles/@Node2D@79067/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79068" to="Tiles/@Node2D@79068/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79069" to="Tiles/@Node2D@79069/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79070" to="Tiles/@Node2D@79070/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79071" to="Tiles/@Node2D@79071/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79072" to="Tiles/@Node2D@79072/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79073" to="Tiles/@Node2D@79073/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79074" to="Tiles/@Node2D@79074/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79075" to="Tiles/@Node2D@79075/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79076" to="Tiles/@Node2D@79076/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79077" to="Tiles/@Node2D@79077/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79078" to="Tiles/@Node2D@79078/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79079" to="Tiles/@Node2D@79079/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79080" to="Tiles/@Node2D@79080/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79081" to="Tiles/@Node2D@79081/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79082" to="Tiles/@Node2D@79082/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79083" to="Tiles/@Node2D@79083/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79084" to="Tiles/@Node2D@79084/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79085" to="Tiles/@Node2D@79085/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79086" to="Tiles/@Node2D@79086/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79087" to="Tiles/@Node2D@79087/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79088" to="Tiles/@Node2D@79088/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79089" to="Tiles/@Node2D@79089/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79090" to="Tiles/@Node2D@79090/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79091" to="Tiles/@Node2D@79091/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79092" to="Tiles/@Node2D@79092/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79093" to="Tiles/@Node2D@79093/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79094" to="Tiles/@Node2D@79094/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79095" to="Tiles/@Node2D@79095/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79096" to="Tiles/@Node2D@79096/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79097" to="Tiles/@Node2D@79097/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@79098" to="Tiles/@Node2D@79098/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24099" to="Tiles/@Node2D@24099/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24100" to="Tiles/@Node2D@24100/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24101" to="Tiles/@Node2D@24101/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24102" to="Tiles/@Node2D@24102/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24103" to="Tiles/@Node2D@24103/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24104" to="Tiles/@Node2D@24104/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24105" to="Tiles/@Node2D@24105/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24106" to="Tiles/@Node2D@24106/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24107" to="Tiles/@Node2D@24107/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24108" to="Tiles/@Node2D@24108/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24109" to="Tiles/@Node2D@24109/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24110" to="Tiles/@Node2D@24110/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24111" to="Tiles/@Node2D@24111/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24112" to="Tiles/@Node2D@24112/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24113" to="Tiles/@Node2D@24113/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24114" to="Tiles/@Node2D@24114/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24115" to="Tiles/@Node2D@24115/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24116" to="Tiles/@Node2D@24116/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24117" to="Tiles/@Node2D@24117/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24118" to="Tiles/@Node2D@24118/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24119" to="Tiles/@Node2D@24119/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24120" to="Tiles/@Node2D@24120/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24121" to="Tiles/@Node2D@24121/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24122" to="Tiles/@Node2D@24122/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24123" to="Tiles/@Node2D@24123/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24124" to="Tiles/@Node2D@24124/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24125" to="Tiles/@Node2D@24125/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24126" to="Tiles/@Node2D@24126/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24127" to="Tiles/@Node2D@24127/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24128" to="Tiles/@Node2D@24128/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24129" to="Tiles/@Node2D@24129/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24130" to="Tiles/@Node2D@24130/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24131" to="Tiles/@Node2D@24131/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24132" to="Tiles/@Node2D@24132/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24133" to="Tiles/@Node2D@24133/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24134" to="Tiles/@Node2D@24134/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24135" to="Tiles/@Node2D@24135/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24136" to="Tiles/@Node2D@24136/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24137" to="Tiles/@Node2D@24137/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24138" to="Tiles/@Node2D@24138/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24139" to="Tiles/@Node2D@24139/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24140" to="Tiles/@Node2D@24140/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24141" to="Tiles/@Node2D@24141/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24142" to="Tiles/@Node2D@24142/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24143" to="Tiles/@Node2D@24143/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24144" to="Tiles/@Node2D@24144/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24145" to="Tiles/@Node2D@24145/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24146" to="Tiles/@Node2D@24146/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24147" to="Tiles/@Node2D@24147/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24148" to="Tiles/@Node2D@24148/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24149" to="Tiles/@Node2D@24149/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24150" to="Tiles/@Node2D@24150/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24151" to="Tiles/@Node2D@24151/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24152" to="Tiles/@Node2D@24152/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24153" to="Tiles/@Node2D@24153/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24154" to="Tiles/@Node2D@24154/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24155" to="Tiles/@Node2D@24155/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24156" to="Tiles/@Node2D@24156/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24157" to="Tiles/@Node2D@24157/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@24158" to="Tiles/@Node2D@24158/LevelPersistance" method="set_as_active"]