From 76953f8e40b9adf059ebaa9923ab2311b71d09f3 Mon Sep 17 00:00:00 2001 From: JHDev2006 Date: Wed, 1 Oct 2025 14:24:26 +0100 Subject: [PATCH] ANN + LL ending npc's are no longer hard coded --- Scenes/Levels/SMBANN/DiscoEnding.tscn | 55 ++++------------------- Scenes/Levels/SMBLL/LostLevelsEnding.tscn | 12 ++--- 2 files changed, 13 insertions(+), 54 deletions(-) diff --git a/Scenes/Levels/SMBANN/DiscoEnding.tscn b/Scenes/Levels/SMBANN/DiscoEnding.tscn index 1928dcf..2f85f17 100644 --- a/Scenes/Levels/SMBANN/DiscoEnding.tscn +++ b/Scenes/Levels/SMBANN/DiscoEnding.tscn @@ -112,12 +112,16 @@ animations = [{ [node name="LostLevelsEnding" instance=ExtResource("1_3ouhg")] campaign = "SMBANN" -[node name="Sprite2D2" parent="." index="8"] -texture = ExtResource("2_xj4cw") -region_rect = Rect2(128, 0, 16, 32) +[node name="Cheer1" parent="LevelBG/DiscoBits" index="3"] +volume_db = -80.0 + +[node name="Cheer2" parent="LevelBG/DiscoBits" index="4"] +volume_db = -80.0 + +[node name="Cheer3" parent="LevelBG/DiscoBits" index="5"] +volume_db = -80.0 [node name="1" parent="Toads" index="0"] -self_modulate = Color(1, 1, 1, 0) sprite_frames = SubResource("SpriteFrames_twn8w") animation = &"default" autoplay = "" @@ -125,16 +129,10 @@ autoplay = "" [node name="ResourceSetterNew" parent="Toads/1" index="0"] use_cache = false force_properties = { -"World": 2 +"World": 1 } -[node name="Sprite2D" type="Sprite2D" parent="Toads/1" index="1"] -texture = ExtResource("2_xj4cw") -region_enabled = true -region_rect = Rect2(0, 0, 16, 32) - [node name="2" parent="Toads" index="1"] -self_modulate = Color(1, 1, 1, 0) sprite_frames = SubResource("SpriteFrames_u2ma4") animation = &"default" autoplay = "" @@ -145,13 +143,7 @@ force_properties = { "World": 2 } -[node name="Sprite2D" type="Sprite2D" parent="Toads/2" index="1"] -texture = ExtResource("2_xj4cw") -region_enabled = true -region_rect = Rect2(16, 0, 16, 32) - [node name="3" parent="Toads" index="2"] -self_modulate = Color(1, 1, 1, 0) sprite_frames = SubResource("SpriteFrames_op12h") animation = &"default" autoplay = "" @@ -162,13 +154,7 @@ force_properties = { "World": 3 } -[node name="Sprite2D" type="Sprite2D" parent="Toads/3" index="1"] -texture = ExtResource("2_xj4cw") -region_enabled = true -region_rect = Rect2(32, 0, 16, 32) - [node name="4" parent="Toads" index="3"] -self_modulate = Color(1, 1, 1, 0) sprite_frames = SubResource("SpriteFrames_uuw0f") animation = &"default" autoplay = "" @@ -179,13 +165,7 @@ force_properties = { "World": 4 } -[node name="Sprite2D" type="Sprite2D" parent="Toads/4" index="1"] -texture = ExtResource("2_xj4cw") -region_enabled = true -region_rect = Rect2(48, 0, 16, 32) - [node name="5" parent="Toads" index="4"] -self_modulate = Color(1, 1, 1, 0) sprite_frames = SubResource("SpriteFrames_tsyh5") animation = &"default" autoplay = "" @@ -196,13 +176,7 @@ force_properties = { "World": 5 } -[node name="Sprite2D" type="Sprite2D" parent="Toads/5" index="1"] -texture = ExtResource("2_xj4cw") -region_enabled = true -region_rect = Rect2(64, 0, 16, 32) - [node name="6" parent="Toads" index="5"] -self_modulate = Color(1, 1, 1, 0) sprite_frames = SubResource("SpriteFrames_pijpk") animation = &"default" autoplay = "" @@ -213,13 +187,7 @@ force_properties = { "World": 6 } -[node name="Sprite2D" type="Sprite2D" parent="Toads/6" index="1"] -texture = ExtResource("2_xj4cw") -region_enabled = true -region_rect = Rect2(80, 0, 16, 32) - [node name="7" parent="Toads" index="6"] -self_modulate = Color(1, 1, 1, 0) sprite_frames = SubResource("SpriteFrames_08njn") animation = &"default" autoplay = "" @@ -230,11 +198,6 @@ force_properties = { "World": 7 } -[node name="Sprite2D" type="Sprite2D" parent="Toads/7" index="1"] -texture = ExtResource("2_xj4cw") -region_enabled = true -region_rect = Rect2(96, 0, 16, 32) - [node name="DiscoLevel" type="Node" parent="." index="13"] script = ExtResource("3_xj4cw") combo_meter_rate = 0.0 diff --git a/Scenes/Levels/SMBLL/LostLevelsEnding.tscn b/Scenes/Levels/SMBLL/LostLevelsEnding.tscn index 4d0def2..c4b1939 100644 --- a/Scenes/Levels/SMBLL/LostLevelsEnding.tscn +++ b/Scenes/Levels/SMBLL/LostLevelsEnding.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=4 uid="uid://b0omfelsiothx"] +[gd_scene load_steps=25 format=4 uid="uid://b0omfelsiothx"] [ext_resource type="Script" uid="uid://caugelxhwlvl0" path="res://Scripts/Parts/LostLevelsEnding.gd" id="1_qmhaw"] [ext_resource type="JSON" path="res://Assets/Audio/BGM/Ending.json" id="2_k7rel"] @@ -7,7 +7,6 @@ [ext_resource type="Texture2D" uid="uid://dkjam0jo2k2m0" path="res://Assets/Sprites/Backgrounds/Bushes/CastleBushNight.png" id="5_wr0ye"] [ext_resource type="PackedScene" uid="uid://cinr6kcbmo6gr" path="res://Scenes/Parts/DropShadowRenderer.tscn" id="6_g1x38"] [ext_resource type="FontVariation" uid="uid://djxdgxy1iv8yv" path="res://Resources/ThemedResources/FontLLMain.tres" id="9_1flm1"] -[ext_resource type="Texture2D" uid="uid://boivfkpqvnx45" path="res://Assets/Sprites/Players/Peach.png" id="10_1flm1"] [ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="10_iab5g"] [ext_resource type="JSON" path="res://Assets/Sprites/Players/PeachNPC.json" id="11_ecp1v"] [ext_resource type="Texture2D" uid="uid://fdn41mmtnhdt" path="res://Assets/Sprites/Players/ToadNPCLL.png" id="11_iab5g"] @@ -466,16 +465,13 @@ libraries = { } autoplay = "Main" -[node name="Sprite2D2" type="Sprite2D" parent="."] +[node name="Peach" type="AnimatedSprite2D" parent="."] position = Vector2(16, -15) -texture = ExtResource("10_1flm1") -region_rect = Rect2(0, 0, 16, 32) -[node name="ResourceSetterNew" type="Node" parent="Sprite2D2" node_paths=PackedStringArray("node_to_affect")] +[node name="ResourceSetterNew" type="Node" parent="Peach" node_paths=PackedStringArray("node_to_affect")] script = ExtResource("13_k7rel") node_to_affect = NodePath("..") -property_name = "texture" -mode = 1 +property_name = "sprite_frames" resource_json = ExtResource("11_ecp1v") metadata/_custom_type_script = "uid://cbal8ms2oe1ik"