chore: bunch of scene id churn

russmatney · Feb 12, 2024 · 31768d1 · 31768d1
1 parent 07e92af
commit 31768d1
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 38 deletions.
diff --git a/src/menus/worldmap/PuzzleMap.tscn b/src/menus/worldmap/PuzzleMap.tscn
@@ -10,27 +10,27 @@
 [ext_resource type="Texture2D" uid="uid://wgm34cmhyqk" path="res://assets/worldmap/world_map_island5_sheet.png" id="6_h34ua"]
 [ext_resource type="Texture2D" uid="uid://cj834sx06wvo0" path="res://assets/worldmap/world_map_island6_sheet.png" id="7_4l06y"]
 
-[sub_resource type="Resource" id="Resource_riocb"]
+[sub_resource type="Resource" id="Resource_5eqed"]
 script = ExtResource("3_386ps")
 _id = "16"
 
-[sub_resource type="Resource" id="Resource_f2l02"]
+[sub_resource type="Resource" id="Resource_ijmlu"]
 script = ExtResource("3_386ps")
 _id = "17"
 
-[sub_resource type="Resource" id="Resource_8qvaa"]
+[sub_resource type="Resource" id="Resource_rv8oq"]
 script = ExtResource("3_386ps")
 _id = "18"
 
-[sub_resource type="Resource" id="Resource_1y2su"]
+[sub_resource type="Resource" id="Resource_yn1i4"]
 script = ExtResource("3_386ps")
 _id = "25"
 
-[sub_resource type="Resource" id="Resource_7le7n"]
+[sub_resource type="Resource" id="Resource_pq2ra"]
 script = ExtResource("3_386ps")
 _id = "26"
 
-[sub_resource type="Resource" id="Resource_kjmlm"]
+[sub_resource type="Resource" id="Resource_yxh88"]
 script = ExtResource("3_386ps")
 _id = "27"
 
@@ -40,87 +40,87 @@ script = ExtResource("1_4t3eb")
 [node name="MapSprite" type="Node2D" parent="."]
 unique_name_in_owner = true
 
-[node name="@Node2D@18175" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@Node2D@18169" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
 
-[node name="@TextureRect@18176" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@TextureRect@18170" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
 texture = ExtResource("2_uod71")
 
-[node name="@Node2D@18178" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@Node2D@18172" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
 position = Vector2(96, 72)
 
-[node name="@TextureRect@18179" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@TextureRect@18173" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
 offset_left = 96.0
 offset_top = 72.0
 offset_right = 96.0
 offset_bottom = 72.0
 texture = ExtResource("3_vh7x8")
 
-[node name="@Node2D@18181" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@Node2D@18175" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
 position = Vector2(192, 144)
 
-[node name="@TextureRect@18182" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@TextureRect@18176" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
 offset_left = 192.0
 offset_top = 144.0
 offset_right = 192.0
 offset_bottom = 144.0
 texture = ExtResource("4_sxfhr")
 
-[node name="@Node2D@18184" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@Node2D@18178" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
 position = Vector2(288, 216)
 
-[node name="@TextureRect@18185" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@TextureRect@18179" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
 offset_left = 288.0
 offset_top = 216.0
 offset_right = 288.0
 offset_bottom = 216.0
 texture = ExtResource("5_n2dda")
 
-[node name="@Node2D@18187" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@Node2D@18181" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
 position = Vector2(384, 288)
 
-[node name="@TextureRect@18188" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@TextureRect@18182" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
 offset_left = 384.0
 offset_top = 288.0
 offset_right = 384.0
 offset_bottom = 288.0
 texture = ExtResource("6_h34ua")
 
-[node name="@Node2D@18190" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@Node2D@18184" type="Node2D" parent="MapSprite" groups=["puzzlemap_generated"]]
 position = Vector2(480, 360)
 
-[node name="@TextureRect@18191" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
+[node name="@TextureRect@18185" type="TextureRect" parent="MapSprite" groups=["puzzlemap_generated"]]
 offset_left = 480.0
 offset_top = 360.0
 offset_right = 480.0
 offset_bottom = 360.0
 texture = ExtResource("7_4l06y")
 
-[node name="@Marker2D@18177" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
+[node name="@Marker2D@18171" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
 position = Vector2(24, 24)
 script = ExtResource("2_jhjra")
-puzzle_set = SubResource("Resource_riocb")
+puzzle_set = SubResource("Resource_5eqed")
 
-[node name="@Marker2D@18180" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
+[node name="@Marker2D@18174" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
 position = Vector2(120, 96)
 script = ExtResource("2_jhjra")
-puzzle_set = SubResource("Resource_f2l02")
+puzzle_set = SubResource("Resource_ijmlu")
 
-[node name="@Marker2D@18183" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
+[node name="@Marker2D@18177" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
 position = Vector2(216, 168)
 script = ExtResource("2_jhjra")
-puzzle_set = SubResource("Resource_8qvaa")
+puzzle_set = SubResource("Resource_rv8oq")
 
-[node name="@Marker2D@18186" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
+[node name="@Marker2D@18180" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
 position = Vector2(312, 240)
 script = ExtResource("2_jhjra")
-puzzle_set = SubResource("Resource_1y2su")
+puzzle_set = SubResource("Resource_yn1i4")
 
-[node name="@Marker2D@18189" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
+[node name="@Marker2D@18183" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
 position = Vector2(408, 312)
 script = ExtResource("2_jhjra")
-puzzle_set = SubResource("Resource_7le7n")
+puzzle_set = SubResource("Resource_pq2ra")
 
-[node name="@Marker2D@18192" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
+[node name="@Marker2D@18186" type="Marker2D" parent="." groups=["puzzlemap_generated"]]
 position = Vector2(512, 384)
 script = ExtResource("2_jhjra")
-puzzle_set = SubResource("Resource_kjmlm")
+puzzle_set = SubResource("Resource_yxh88")
diff --git a/src/menus/worldmap/WorldMapMenu.gd b/src/menus/worldmap/WorldMapMenu.gd
@@ -52,6 +52,9 @@ func _unhandled_input(event):
 			if not get_tree().paused:
 				Navi.pause()
 				get_viewport().set_input_as_handled()
+
+		# handle moving around the UI
+
 		if Trolls.is_move_right(event):
 			current_puzzle_set_idx += 1
 			set_puzzle_set()

diff --git a/src/menus/worldmap/WorldMapMenu.tscn b/src/menus/worldmap/WorldMapMenu.tscn
@@ -28,7 +28,7 @@ color = Color(0.101961, 0.109804, 0.188235, 1)
 unique_name_in_owner = true
 position = Vector2(832, 418)
 scale = Vector2(5, 5)
-current_marker = NodePath("@Marker2D@18152")
+current_marker = NodePath("@Marker2D@18146")
 zoom_scale_min = 5.0
 zoom_scale_max = 10.0
 

diff --git a/src/ui/BlueButtonTheme.tres b/src/ui/BlueButtonTheme.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=5 format=3 uid="uid://201uqddgbb42"]
+[gd_resource type="Theme" load_steps=5 format=3 uid="uid://cul4fuxbykddp"]
 
 [ext_resource type="FontFile" uid="uid://b0w8s6hidvrrr" path="res://addons/core/assets/fonts/Born2bSportyV2.ttf" id="1_snhp5"]
 [ext_resource type="Texture2D" uid="uid://dp0f63m68p5tx" path="res://assets/ui/green_button_full_4x.png" id="2_yacb7"]

diff --git a/src/ui/BlueWoodPanelTheme.tres b/src/ui/BlueWoodPanelTheme.tres
@@ -1,6 +1,6 @@
-[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dp8badsrf50pe"]
+[gd_resource type="Theme" load_steps=3 format=3 uid="uid://rv7rm10d10gc"]
 
-[ext_resource type="StyleBox" path="res://src/ui/BlueWoodPanelTexture.tres" id="1_1ocxo"]
+[ext_resource type="StyleBox" uid="uid://i5t8fygrktcp" path="res://src/ui/BlueWoodPanelTexture.tres" id="1_1ocxo"]
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_7yow8"]
 region_rect = Rect2(0, 0, 94, 90)

diff --git a/src/ui/GreenButtonTheme.tres b/src/ui/GreenButtonTheme.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=5 format=3 uid="uid://fqqdh3sjsin5"]
+[gd_resource type="Theme" load_steps=5 format=3 uid="uid://beg0yvicrirg0"]
 
 [ext_resource type="FontFile" uid="uid://b0w8s6hidvrrr" path="res://addons/core/assets/fonts/Born2bSportyV2.ttf" id="1_2jo36"]
 [ext_resource type="Texture2D" uid="uid://dp0f63m68p5tx" path="res://assets/ui/green_button_full_4x.png" id="2_w374q"]

diff --git a/src/ui/GreenWoodPanelTheme.tres b/src/ui/GreenWoodPanelTheme.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=4 format=3 uid="uid://djaqw7ymmb124"]
+[gd_resource type="Theme" load_steps=4 format=3 uid="uid://tmcplph82m7i"]
 
 [ext_resource type="Texture2D" uid="uid://cgfai6wbpclg5" path="res://assets/ui/greenboard_full_4x.png" id="1_88kbo"]
 

diff --git a/src/ui/RedButtonTheme.tres b/src/ui/RedButtonTheme.tres
@@ -1,6 +1,6 @@
-[gd_resource type="Theme" load_steps=9 format=3 uid="uid://c1kf36yi7cjv7"]
+[gd_resource type="Theme" load_steps=9 format=3 uid="uid://d36tu8qosbiom"]
 
-[ext_resource type="StyleBox" path="res://src/ui/BlueWoodPanelTexture.tres" id="1_hftyr"]
+[ext_resource type="StyleBox" uid="uid://i5t8fygrktcp" path="res://src/ui/BlueWoodPanelTexture.tres" id="1_hftyr"]
 [ext_resource type="FontFile" uid="uid://b0w8s6hidvrrr" path="res://addons/core/assets/fonts/Born2bSportyV2.ttf" id="2_vaig3"]
 [ext_resource type="Texture2D" uid="uid://dp0f63m68p5tx" path="res://assets/ui/green_button_full_4x.png" id="3_fiil7"]
 [ext_resource type="FontFile" uid="uid://b1c3fty8httvk" path="res://addons/core/assets/fonts/at01.ttf" id="4_6x40x"]