From 09c4b3c31b8fb85d4674eebb8a90838be99932f1 Mon Sep 17 00:00:00 2001 From: JHDev2006 Date: Wed, 1 Oct 2025 14:28:58 +0100 Subject: [PATCH] fixed some sfx's not being able to be replaced, via resource packs --- Scenes/Levels/ChallengeModeResults.tscn | 124 +++++++++--------- Scenes/Prefabs/LevelBG.tscn | 9 +- .../Prefabs/LevelObjects/BooRaceHandler.tscn | 5 +- 3 files changed, 77 insertions(+), 61 deletions(-) diff --git a/Scenes/Levels/ChallengeModeResults.tscn b/Scenes/Levels/ChallengeModeResults.tscn index 31c50a9..e7e11bc 100644 --- a/Scenes/Levels/ChallengeModeResults.tscn +++ b/Scenes/Levels/ChallengeModeResults.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=61 format=3 uid="uid://blv1d12smlibh"] +[gd_scene load_steps=62 format=3 uid="uid://blv1d12smlibh"] [ext_resource type="Script" uid="uid://bqhrq7sabq811" path="res://Scripts/UI/ChallengeModeResults.gd" id="1_3x4fv"] [ext_resource type="Texture2D" uid="uid://116yaio262mj" path="res://Assets/Sprites/UI/ChallengeResultsTemplate.png" id="3_um36a"] @@ -24,6 +24,7 @@ [ext_resource type="AudioStream" uid="uid://cl4e0p4fnpjn1" path="res://Assets/Audio/SFX/Yoshi.wav" id="19_n4lt1"] [ext_resource type="Texture2D" uid="uid://byy3k1pdrp77" path="res://Assets/Sprites/Particles/Smoke.png" id="20_n4lt1"] [ext_resource type="PackedScene" uid="uid://cinr6kcbmo6gr" path="res://Scenes/Parts/DropShadowRenderer.tscn" id="21_bob8r"] +[ext_resource type="Script" uid="uid://dmtw1jesw1vl7" path="res://Scripts/Classes/Components/PackStreamPlayer.gd" id="21_xk7j8"] [ext_resource type="JSON" path="res://Assets/Sprites/Players/Yoshi.json" id="23_vohx7"] [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="24_cq5a1"] [ext_resource type="Texture2D" uid="uid://ccb8wtuolj7i3" path="res://Assets/Sprites/Backgrounds/ChallengeModeResults/Results3.png" id="27_w3bjn"] @@ -150,44 +151,13 @@ tracks/8/keys = { "update": 1, "values": [&"Idle", &"Emote", &"Emote", &"Idle", &"Emote", &"Idle"] } -tracks/9/type = "audio" +tracks/9/type = "method" tracks/9/imported = false tracks/9/enabled = true -tracks/9/path = NodePath("TalkSFX") +tracks/9/path = NodePath(".") tracks/9/interp = 1 tracks/9/loop_wrap = true tracks/9/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("9_qaelr") -}, { -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("9_qaelr") -}, { -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("9_qaelr") -}, { -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("9_qaelr") -}, { -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("9_qaelr") -}], -"times": PackedFloat32Array(1.5, 3.5, 4.5, 7, 8) -} -tracks/9/use_blend = true -tracks/10/type = "method" -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/path = NodePath(".") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/keys = { "times": PackedFloat32Array(5.5, 6, 8.6, 9.5, 10), "transitions": PackedFloat32Array(1, 1, 1, 1, 1), "values": [{ @@ -207,33 +177,38 @@ tracks/10/keys = { "method": &"give_yoshi_medal" }] } -tracks/11/type = "audio" +tracks/10/type = "value" +tracks/10/imported = false +tracks/10/enabled = true +tracks/10/path = NodePath("Label2:visible") +tracks/10/interp = 1 +tracks/10/loop_wrap = true +tracks/10/keys = { +"times": PackedFloat32Array(11), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} +tracks/11/type = "value" tracks/11/imported = false tracks/11/enabled = true -tracks/11/path = NodePath("AudioStreamPlayer") +tracks/11/path = NodePath(".:can_exit") tracks/11/interp = 1 tracks/11/loop_wrap = true tracks/11/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("11_nym8o") -}, { -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("11_nym8o") -}], -"times": PackedFloat32Array(5.5, 8.5) +"times": PackedFloat32Array(11), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] } -tracks/11/use_blend = true tracks/12/type = "value" tracks/12/imported = false tracks/12/enabled = true -tracks/12/path = NodePath("Label2:visible") +tracks/12/path = NodePath("SpeechBubble/Coins/Node2D:visible") tracks/12/interp = 1 tracks/12/loop_wrap = true tracks/12/keys = { -"times": PackedFloat32Array(11), +"times": PackedFloat32Array(4.5), "transitions": PackedFloat32Array(1), "update": 1, "values": [true] @@ -241,26 +216,26 @@ tracks/12/keys = { tracks/13/type = "value" tracks/13/imported = false tracks/13/enabled = true -tracks/13/path = NodePath(".:can_exit") +tracks/13/path = NodePath("TalkSFX:playing") tracks/13/interp = 1 tracks/13/loop_wrap = true tracks/13/keys = { -"times": PackedFloat32Array(11), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 1.5, 3.5, 4.5, 7, 8), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1), "update": 1, -"values": [true] +"values": [false, true, true, true, true, true] } tracks/14/type = "value" tracks/14/imported = false tracks/14/enabled = true -tracks/14/path = NodePath("SpeechBubble/Coins/Node2D:visible") +tracks/14/path = NodePath("AudioStreamPlayer:playing") tracks/14/interp = 1 tracks/14/loop_wrap = true tracks/14/keys = { -"times": PackedFloat32Array(4.5), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(5.5, 8.5), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [true] +"values": [true, true] } [sub_resource type="Animation" id="Animation_y11uu"] @@ -409,6 +384,30 @@ tracks/11/keys = { "update": 1, "values": [false] } +tracks/12/type = "value" +tracks/12/imported = false +tracks/12/enabled = true +tracks/12/path = NodePath("TalkSFX:playing") +tracks/12/interp = 1 +tracks/12/loop_wrap = true +tracks/12/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} +tracks/13/type = "value" +tracks/13/imported = false +tracks/13/enabled = true +tracks/13/path = NodePath("AudioStreamPlayer:playing") +tracks/13/interp = 1 +tracks/13/loop_wrap = true +tracks/13/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_nud7a"] _data = { @@ -949,18 +948,25 @@ vframes = 4 script = ExtResource("3_xe6g7") metadata/_custom_type_script = "uid://364rywt44hy6" -[node name="TalkSFX" type="AudioStreamPlayer2D" parent="."] -volume_db = 5.0 +[node name="TalkSFX" type="AudioStreamPlayer" parent="."] +stream = ExtResource("9_qaelr") bus = &"SFX" +script = ExtResource("21_xk7j8") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] process_mode = 3 +stream = ExtResource("11_nym8o") bus = &"SFX" +script = ExtResource("21_xk7j8") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."] process_mode = 3 stream = ExtResource("16_eupxr") bus = &"SFX" +script = ExtResource("21_xk7j8") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="Yoshi" type="AnimatedSprite2D" parent="."] process_mode = 3 diff --git a/Scenes/Prefabs/LevelBG.tscn b/Scenes/Prefabs/LevelBG.tscn index ad651e6..cb068a1 100644 --- a/Scenes/Prefabs/LevelBG.tscn +++ b/Scenes/Prefabs/LevelBG.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=82 format=4 uid="uid://bksxgpygrdjl7"] +[gd_scene load_steps=83 format=4 uid="uid://bksxgpygrdjl7"] [ext_resource type="Script" uid="uid://erdjx03phltn" path="res://Scripts/Classes/LevelBGNew.gd" id="1_pkg8e"] [ext_resource type="Script" uid="uid://cq6f682453q6o" path="res://Scripts/Classes/Components/ResourceSetter.gd" id="3_6m0f5"] @@ -16,6 +16,7 @@ [ext_resource type="Texture2D" uid="uid://cx54ubn3schon" path="res://Assets/Sprites/Backgrounds/SecondaryTrees/SnowTrees.png" id="13_kf1vm"] [ext_resource type="Script" uid="uid://ca3bew33g45eq" path="res://Scripts/Classes/UI/PackTextureRect.gd" id="13_q0lxs"] [ext_resource type="Texture2D" uid="uid://wyrrj7wts6xe" path="res://Assets/Sprites/Backgrounds/SecondaryTrees/SnowTreesLL.png" id="14_ob0l2"] +[ext_resource type="Script" uid="uid://dmtw1jesw1vl7" path="res://Scripts/Classes/Components/PackStreamPlayer.gd" id="14_ugdi7"] [ext_resource type="Texture2D" uid="uid://d4kkcpn1bahcf" path="res://Assets/Sprites/Backgrounds/Hills/JungleLL.png" id="15_413gx"] [ext_resource type="AudioStream" uid="uid://mgub7yupxkau" path="res://Assets/Audio/SFX/ANNCheering1.wav" id="15_b1lev"] [ext_resource type="Texture2D" uid="uid://hiwsjulaojy1" path="res://Assets/Sprites/Backgrounds/CloudOverlays/CloudOverlay.png" id="15_whv0w"] @@ -569,16 +570,22 @@ process_mode = 1 process_mode = 1 stream = ExtResource("15_b1lev") bus = &"SFX" +script = ExtResource("14_ugdi7") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="Cheer2" type="AudioStreamPlayer" parent="DiscoBits"] process_mode = 1 stream = ExtResource("16_ugdi7") bus = &"SFX" +script = ExtResource("14_ugdi7") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="Cheer3" type="AudioStreamPlayer" parent="DiscoBits"] process_mode = 1 stream = ExtResource("17_aw4cr") bus = &"SFX" +script = ExtResource("14_ugdi7") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="SecondaryLayer" type="Parallax2D" parent="."] process_mode = 1 diff --git a/Scenes/Prefabs/LevelObjects/BooRaceHandler.tscn b/Scenes/Prefabs/LevelObjects/BooRaceHandler.tscn index 36c1709..08a84fe 100644 --- a/Scenes/Prefabs/LevelObjects/BooRaceHandler.tscn +++ b/Scenes/Prefabs/LevelObjects/BooRaceHandler.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://d1wjw5tobpb3w"] +[gd_scene load_steps=17 format=3 uid="uid://d1wjw5tobpb3w"] [ext_resource type="Script" uid="uid://toi3fh8d7cs4" path="res://Scripts/Classes/BooRaceHandler.gd" id="1_1pu8q"] [ext_resource type="Texture2D" uid="uid://d0jy2sbxh706d" path="res://Assets/Sprites/UI/RaceCountdown.png" id="2_csmob"] @@ -6,6 +6,7 @@ [ext_resource type="Script" uid="uid://cq6f682453q6o" path="res://Scripts/Classes/Components/ResourceSetter.gd" id="4_qeaax"] [ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="5_reyer"] [ext_resource type="AudioStream" uid="uid://bri3u342yy5hk" path="res://Assets/Audio/SFX/RaceCountdown.wav" id="6_qeaax"] +[ext_resource type="Script" uid="uid://dmtw1jesw1vl7" path="res://Scripts/Classes/Components/PackStreamPlayer.gd" id="7_reyer"] [sub_resource type="AtlasTexture" id="AtlasTexture_5ptkl"] atlas = ExtResource("2_csmob") @@ -168,6 +169,8 @@ metadata/_custom_type_script = "uid://cq6f682453q6o" stream = ExtResource("6_qeaax") autoplay = true bus = &"SFX" +script = ExtResource("7_reyer") +metadata/_custom_type_script = "uid://dmtw1jesw1vl7" [node name="Animation" type="AnimationPlayer" parent="."] libraries = {