diff --git a/Scenes/Levels/Credits.tscn b/Scenes/Levels/Credits.tscn index dbffe81..0311266 100644 --- a/Scenes/Levels/Credits.tscn +++ b/Scenes/Levels/Credits.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=81 format=3 uid="uid://bgeh6ex0lbqfq"] +[gd_scene load_steps=82 format=3 uid="uid://bgeh6ex0lbqfq"] [ext_resource type="Script" uid="uid://b3stoe2kp1nv1" path="res://Scripts/UI/Credits.gd" id="1_db8c5"] [ext_resource type="AudioStream" uid="uid://cdhsj02wqdt7y" path="res://Assets/Audio/BGM/Credits.mp3" id="1_k57dj"] +[ext_resource type="Script" uid="uid://dmtw1jesw1vl7" path="res://Scripts/Classes/Components/PackStreamPlayer.gd" id="3_suvme"] [ext_resource type="Texture2D" uid="uid://bmvf1l15447r" path="res://Assets/Sprites/UI/Staff.png" id="4_g2gtw"] [ext_resource type="Texture2D" uid="uid://vqtqnrt5rco1" path="res://Assets/Sprites/UI/CreditsDioramas/1.png" id="4_j3afk"] [ext_resource type="Texture2D" uid="uid://dvo3gs4wg68hl" path="res://Assets/Sprites/UI/CreditsDioramas/2.png" id="6_s34bh"] @@ -292,6 +293,8 @@ color = Color(0, 0, 0, 1) [node name="Music" type="AudioStreamPlayer" parent="."] stream = ExtResource("1_k57dj") bus = &"Music" +script = ExtResource("3_suvme") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="Labels" type="Node" parent="."] diff --git a/Scenes/Prefabs/UI/AchievementContainer.tscn b/Scenes/Prefabs/UI/AchievementContainer.tscn index 58b64be..e330fa0 100644 --- a/Scenes/Prefabs/UI/AchievementContainer.tscn +++ b/Scenes/Prefabs/UI/AchievementContainer.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://8wnmuhtwu8ib"] +[gd_scene load_steps=11 format=3 uid="uid://8wnmuhtwu8ib"] [ext_resource type="Script" uid="uid://cfoivmjplms0g" path="res://Scripts/UI/AchievementContainer.gd" id="1_mcb14"] [ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="3_d3cm7"] @@ -7,6 +7,7 @@ [ext_resource type="JSON" path="res://Assets/Sprites/UI/Cursor.json" id="5_0kyuu"] [ext_resource type="Script" uid="uid://d63p6qr5a748" path="res://Scripts/UI/AutoScrollContainer.gd" id="5_pjc6k"] [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="6_d3cm7"] +[ext_resource type="Script" uid="uid://xem6lai3ufyj" path="res://Scripts/Classes/UI/PackNinePatch.gd" id="6_ptsd0"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_mcb14"] bg_color = Color(0.27387273, 0.27387276, 0.27387264, 1) @@ -64,6 +65,8 @@ custom_minimum_size = Vector2(32, 32) layout_mode = 2 texture = ExtResource("4_ptsd0") region_rect = Rect2(0, 0, 32, 32) +script = ExtResource("6_ptsd0") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 diff --git a/Scenes/Prefabs/UI/AchievementUnlockPopup.tscn b/Scenes/Prefabs/UI/AchievementUnlockPopup.tscn index 539c2f9..6c49811 100644 --- a/Scenes/Prefabs/UI/AchievementUnlockPopup.tscn +++ b/Scenes/Prefabs/UI/AchievementUnlockPopup.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=12 format=3 uid="uid://ud3ktt2adw8l"] +[gd_scene load_steps=13 format=3 uid="uid://ud3ktt2adw8l"] [ext_resource type="Script" uid="uid://dmp6qqm3q16pc" path="res://Scripts/UI/AchievementUnlockPopup.gd" id="1_uc4d1"] [ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="1_x3tc0"] [ext_resource type="Texture2D" uid="uid://bul3c11keqjfi" path="res://Assets/Sprites/UI/AchievementIcons.png" id="2_uc4d1"] [ext_resource type="AudioStream" uid="uid://yxb07387lw0o" path="res://Assets/Audio/SFX/AchievementUnlock.wav" id="3_r2311"] +[ext_resource type="Script" uid="uid://xem6lai3ufyj" path="res://Scripts/Classes/UI/PackNinePatch.gd" id="4_ok8j7"] [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="5_01gcg"] [ext_resource type="Script" uid="uid://dmtw1jesw1vl7" path="res://Scripts/Classes/Components/PackStreamPlayer.gd" id="5_ok8j7"] @@ -172,6 +173,8 @@ layout_mode = 2 size_flags_horizontal = 0 texture = ExtResource("2_uc4d1") region_rect = Rect2(0, 0, 32, 32) +script = ExtResource("4_ok8j7") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Icon2" type="NinePatchRect" parent="Control/Panel/MarginContainer/VBoxContainer/HBoxContainer"] unique_name_in_owner = true @@ -181,6 +184,8 @@ layout_mode = 2 size_flags_horizontal = 0 texture = ExtResource("2_uc4d1") region_rect = Rect2(0, 0, 32, 32) +script = ExtResource("4_ok8j7") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Icon3" type="NinePatchRect" parent="Control/Panel/MarginContainer/VBoxContainer/HBoxContainer"] unique_name_in_owner = true @@ -190,6 +195,8 @@ layout_mode = 2 size_flags_horizontal = 0 texture = ExtResource("2_uc4d1") region_rect = Rect2(0, 0, 32, 32) +script = ExtResource("4_ok8j7") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Icon4" type="NinePatchRect" parent="Control/Panel/MarginContainer/VBoxContainer/HBoxContainer"] unique_name_in_owner = true @@ -199,6 +206,8 @@ layout_mode = 2 size_flags_horizontal = 0 texture = ExtResource("2_uc4d1") region_rect = Rect2(0, 0, 32, 32) +script = ExtResource("4_ok8j7") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Extra" type="Label" parent="Control/Panel/MarginContainer/VBoxContainer/HBoxContainer"] unique_name_in_owner = true @@ -224,6 +233,7 @@ libraries = { stream = ExtResource("3_r2311") bus = &"SFX" script = ExtResource("5_ok8j7") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")] script = ExtResource("5_01gcg") diff --git a/Scenes/Prefabs/UI/CampaignSelect.tscn b/Scenes/Prefabs/UI/CampaignSelect.tscn index 68862fb..c9206e2 100644 --- a/Scenes/Prefabs/UI/CampaignSelect.tscn +++ b/Scenes/Prefabs/UI/CampaignSelect.tscn @@ -5,7 +5,7 @@ [ext_resource type="Texture2D" uid="uid://v2lub78wus46" path="res://Assets/Sprites/UI/CampaignIcons.png" id="3_6ft85"] [ext_resource type="Script" uid="uid://ca3bew33g45eq" path="res://Scripts/Classes/UI/PackTextureRect.gd" id="4_uaivh"] [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="6_1wxv0"] -[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="7_l766q"] +[ext_resource type="Script" uid="uid://bsp584niccobr" path="res://Scripts/Classes/Components/ResourceGetter.gd" id="6_6ft85"] [sub_resource type="AtlasTexture" id="AtlasTexture_6ft85"] atlas = ExtResource("3_6ft85") @@ -215,5 +215,8 @@ vertical_alignment = 2 [node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")] script = ExtResource("6_1wxv0") labels = [NodePath("../PanelContainer/MarginContainer/VBoxContainer/CampaignNames/SMB1"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/SelectWorld"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/CampaignNames/SMBLL"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/CampaignNames/SMBS"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/CampaignNames/SMBANN"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/CampaignNames/Custom"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/BarLabel")] -resource = ExtResource("7_l766q") metadata/_custom_type_script = "uid://co6tjg3w6qpd8" + +[node name="ResourceGetter" type="Node" parent="."] +script = ExtResource("6_6ft85") +metadata/_custom_type_script = "uid://bsp584niccobr" diff --git a/Scenes/Prefabs/UI/CharacterSelect.tscn b/Scenes/Prefabs/UI/CharacterSelect.tscn index ce1ed42..6871c17 100644 --- a/Scenes/Prefabs/UI/CharacterSelect.tscn +++ b/Scenes/Prefabs/UI/CharacterSelect.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=14 format=3 uid="uid://ci678koo0peoa"] +[gd_scene load_steps=15 format=3 uid="uid://ci678koo0peoa"] [ext_resource type="Theme" uid="uid://dtn507x2b5de7" path="res://Resources/Theme.tres" id="1_b1bds"] [ext_resource type="Script" uid="uid://d0f4edmfxs2pu" path="res://Scripts/UI/CharacterSelect.gd" id="1_en0c6"] [ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="3_8l01y"] [ext_resource type="Texture2D" uid="uid://hu770pufown3" path="res://Assets/Sprites/UI/CharacterSelectSpotlight.png" id="4_mgr7r"] +[ext_resource type="Script" uid="uid://ca3bew33g45eq" path="res://Scripts/Classes/UI/PackTextureRect.gd" id="5_b1bds"] [ext_resource type="SpriteFrames" uid="uid://df4enjjl84mji" path="res://Resources/SpriteFrames/Player/Mario/Small.tres" id="5_l7t2o"] [ext_resource type="Script" uid="uid://dt2p68xl462v2" path="res://Scripts/Parts/TextShadowColourChanger.gd" id="6_0j631"] [ext_resource type="Script" uid="uid://b08qfwj5jk6g1" path="res://Scripts/Parts/PlayerSprite.gd" id="6_0oqrn"] @@ -77,6 +78,8 @@ size_flags_horizontal = 4 size_flags_vertical = 0 texture = ExtResource("4_mgr7r") stretch_mode = 2 +script = ExtResource("5_b1bds") +metadata/_custom_type_script = "uid://ca3bew33g45eq" [node name="ColourPaletteSampler" type="Node" parent="Panel/MarginContainer/VBoxContainer/Spotlight" node_paths=PackedStringArray("node_to_affect")] unique_name_in_owner = true diff --git a/Scenes/Prefabs/UI/CustomLevelContainer.tscn b/Scenes/Prefabs/UI/CustomLevelContainer.tscn index 24d1db2..d9b0f01 100644 --- a/Scenes/Prefabs/UI/CustomLevelContainer.tscn +++ b/Scenes/Prefabs/UI/CustomLevelContainer.tscn @@ -7,10 +7,10 @@ [ext_resource type="Texture2D" uid="uid://dmggnqp6esawy" path="res://Assets/Sprites/UI/DifficultyStars.png" id="5_6ktlh"] [ext_resource type="Texture2D" uid="uid://dfeu75lbxfkim" path="res://Assets/Sprites/UI/GameStyles.png" id="5_l0vwk"] [ext_resource type="Script" uid="uid://d63p6qr5a748" path="res://Scripts/UI/AutoScrollContainer.gd" id="5_psjdr"] +[ext_resource type="Script" uid="uid://xem6lai3ufyj" path="res://Scripts/Classes/UI/PackNinePatch.gd" id="7_psjdr"] [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="7_t47t0"] [ext_resource type="JSON" path="res://Assets/Sprites/UI/Cursor.json" id="8_l0vwk"] [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="10_psjdr"] -[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="11_jiigy"] [node name="CustomLevelContainer" type="Button"] custom_minimum_size = Vector2(0, 40) @@ -57,6 +57,7 @@ size_flags_horizontal = 0 size_flags_vertical = 4 texture = ExtResource("4_jiwhq") region_rect = Rect2(64, 64, 32, 32) +script = ExtResource("7_psjdr") [node name="LevelInfo" type="VBoxContainer" parent="MarginContainer/HBoxContainer/HSplitContainer/LeftHalf"] layout_mode = 2 @@ -104,6 +105,7 @@ layout_mode = 2 texture = ExtResource("5_6ktlh") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("7_psjdr") [node name="Star2" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -111,6 +113,7 @@ layout_mode = 2 texture = ExtResource("5_6ktlh") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("7_psjdr") [node name="Star3" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -118,6 +121,7 @@ layout_mode = 2 texture = ExtResource("5_6ktlh") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("7_psjdr") [node name="Star4" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -125,6 +129,7 @@ layout_mode = 2 texture = ExtResource("5_6ktlh") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("7_psjdr") [node name="Star5" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -132,6 +137,7 @@ layout_mode = 2 texture = ExtResource("5_6ktlh") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("7_psjdr") [node name="CampaignIcon" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer"] unique_name_in_owner = true @@ -140,6 +146,7 @@ layout_mode = 2 size_flags_vertical = 10 texture = ExtResource("5_l0vwk") region_rect = Rect2(0, 0, 42, 16) +script = ExtResource("7_psjdr") [node name="TextureRect" type="TextureRect" parent="."] visible = false @@ -163,7 +170,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik" [node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")] script = ExtResource("10_psjdr") labels = [NodePath("../MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo/ScrollContainer/LevelName"), NodePath("../MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo/ScrollContainer2/LevelAuthor")] -resource = ExtResource("11_jiigy") metadata/_custom_type_script = "uid://co6tjg3w6qpd8" [connection signal="focus_entered" from="." to="TextureRect" method="show"] diff --git a/Scenes/Prefabs/UI/OnlineLevelContainer.tscn b/Scenes/Prefabs/UI/OnlineLevelContainer.tscn index 315ff6a..cfed6d3 100644 --- a/Scenes/Prefabs/UI/OnlineLevelContainer.tscn +++ b/Scenes/Prefabs/UI/OnlineLevelContainer.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=13 format=3 uid="uid://cr2pku7fjkgpo"] +[gd_scene load_steps=14 format=3 uid="uid://cr2pku7fjkgpo"] [ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="1_1k7iw"] [ext_resource type="StyleBox" uid="uid://dlbdmqmnl30sq" path="res://Resources/UI/PanelSelected.tres" id="2_h6n8u"] [ext_resource type="Script" uid="uid://d486p6delid2" path="res://Scripts/UI/OnlineLevelContainer.gd" id="3_1k7iw"] [ext_resource type="Script" uid="uid://d63p6qr5a748" path="res://Scripts/UI/AutoScrollContainer.gd" id="5_ajmg3"] [ext_resource type="Texture2D" uid="uid://dmggnqp6esawy" path="res://Assets/Sprites/UI/DifficultyStars.png" id="6_m23pw"] +[ext_resource type="Script" uid="uid://xem6lai3ufyj" path="res://Scripts/Classes/UI/PackNinePatch.gd" id="6_w0xci"] [ext_resource type="Texture2D" uid="uid://dfeu75lbxfkim" path="res://Assets/Sprites/UI/GameStyles.png" id="7_scevv"] [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="8_vfnya"] [ext_resource type="JSON" path="res://Assets/Sprites/UI/Cursor.json" id="9_d0564"] @@ -175,6 +176,8 @@ layout_mode = 2 texture = ExtResource("6_m23pw") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("6_w0xci") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Star2" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -182,6 +185,8 @@ layout_mode = 2 texture = ExtResource("6_m23pw") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("6_w0xci") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Star3" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -189,6 +194,8 @@ layout_mode = 2 texture = ExtResource("6_m23pw") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("6_w0xci") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Star4" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -196,6 +203,8 @@ layout_mode = 2 texture = ExtResource("6_m23pw") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("6_w0xci") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="Star5" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer/DifficultyStars"] custom_minimum_size = Vector2(8, 0) @@ -203,6 +212,8 @@ layout_mode = 2 texture = ExtResource("6_m23pw") region_rect = Rect2(0, 0, 8, 8) patch_margin_bottom = 8 +script = ExtResource("6_w0xci") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="CampaignIcon" type="NinePatchRect" parent="MarginContainer/HBoxContainer/HSplitContainer/VBoxContainer"] unique_name_in_owner = true @@ -211,6 +222,8 @@ layout_mode = 2 size_flags_vertical = 10 texture = ExtResource("7_scevv") region_rect = Rect2(0, 0, 42, 16) +script = ExtResource("6_w0xci") +metadata/_custom_type_script = "uid://xem6lai3ufyj" [node name="TextureRect" type="TextureRect" parent="."] visible = false diff --git a/Scenes/Prefabs/UI/QuitDialog.tscn b/Scenes/Prefabs/UI/QuitDialog.tscn index e2a48db..03d6a9f 100644 --- a/Scenes/Prefabs/UI/QuitDialog.tscn +++ b/Scenes/Prefabs/UI/QuitDialog.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=6 format=3 uid="uid://b75f3fd7xjeya"] +[gd_scene load_steps=8 format=3 uid="uid://b75f3fd7xjeya"] [ext_resource type="Script" uid="uid://fwgm5xy4jvwf" path="res://Scripts/UI/QuitDialog.gd" id="1_w3irg"] [ext_resource type="AudioStream" uid="uid://drs3md0tuek2w" path="res://Assets/Audio/SFX/Beep.wav" id="2_yapnp"] +[ext_resource type="Script" uid="uid://dmtw1jesw1vl7" path="res://Scripts/Classes/Components/PackStreamPlayer.gd" id="3_fbj8r"] +[ext_resource type="Script" uid="uid://bsp584niccobr" path="res://Scripts/Classes/Components/ResourceGetter.gd" id="3_kfsue"] [sub_resource type="Animation" id="Animation_yapnp"] resource_name = "Animation" @@ -105,3 +107,9 @@ libraries = { [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource("2_yapnp") +script = ExtResource("3_fbj8r") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" + +[node name="ResourceGetter" type="Node" parent="."] +script = ExtResource("3_kfsue") +metadata/_custom_type_script = "uid://bsp584niccobr" diff --git a/Scripts/Parts/Disclaimer.gd b/Scripts/Parts/Disclaimer.gd index f468eb5..a20110a 100644 --- a/Scripts/Parts/Disclaimer.gd +++ b/Scripts/Parts/Disclaimer.gd @@ -11,6 +11,11 @@ func _enter_tree() -> void: i.uppercase = true func _ready() -> void: + var animation: Animation = $AnimationPlayer.get_animation_library("").get_animation(&"Go") + var track: int = animation.find_track("AudioStreamPlayer", Animation.TYPE_AUDIO) + for key in animation.track_get_key_count(track): + var resource_getter = ResourceGetter.new() #Why do I have to make a new one each time? + animation.audio_track_set_key_stream(track, key, resource_getter.get_resource(animation.audio_track_get_key_stream(track, key))) Global.debugged_in = false Global.get_node("GameHUD").hide() await get_tree().create_timer(1, false).timeout diff --git a/Scripts/UI/CampaignSelect.gd b/Scripts/UI/CampaignSelect.gd index f8665bd..ab76373 100644 --- a/Scripts/UI/CampaignSelect.gd +++ b/Scripts/UI/CampaignSelect.gd @@ -13,9 +13,15 @@ var old_campaign := "" @export var campaign := ["SMB1", "SMBLL", "SMBS", "SMBANN", "Custom"] func _ready() -> void: + update() + Global.level_theme_changed.connect(update) get_starting_position() handle_visuals() +func update() -> void: + for icon in campaign_icons: + icon.atlas = $ResourceGetter.get_resource(icon.atlas) + func _process(_delta: float) -> void: if active: handle_input() diff --git a/Scripts/UI/WorldSelect.gd b/Scripts/UI/WorldSelect.gd index 1d83ccf..884697a 100644 --- a/Scripts/UI/WorldSelect.gd +++ b/Scripts/UI/WorldSelect.gd @@ -59,8 +59,9 @@ func setup_visuals() -> void: var world_visited = (SaveManager.visited_levels.substr((idx + world_offset) * 4, 4) != "0000" or Global.debug_mode or idx == 0) if world_visited == false: level_theme = "Mystery" + var resource_getter = ResourceGetter.new() #Is it safe to be making a new one of these per icon? i.get_node("Icon").region_rect = CustomLevelContainer.THEME_RECTS[level_theme] - i.get_node("Icon").texture = CustomLevelContainer.ICON_TEXTURES[0 if (idx <= 3 or idx >= 8) and Global.current_campaign != "SMBANN" else 1] + i.get_node("Icon").texture = resource_getter.get_resource(CustomLevelContainer.ICON_TEXTURES[0 if (idx <= 3 or idx >= 8) and Global.current_campaign != "SMBANN" else 1]) i.get_node("Icon/Number").region_rect.position.y = clamp(NUMBER_Y.find(level_theme) * 12, 0, 9999) i.get_node("Icon/Number").region_rect.position.x = (idx + world_offset) * 12 idx += 1