🧪 Tested music setup with new music concept

2025-10-24 18:10:00 +02:00
parent 45d4b26b6a
commit 427db88474
25 changed files with 269 additions and 11 deletions
@@ -0,0 +1 @@
+Babushka
@@ -4,11 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://b3kyrsoobmkhp"
-valid=false
+path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"

 [deps]

 source_file="res://art/mockups/3d/best_house_blender.blend"
+dest_files=["res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"]

 [params]

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://iux86v7qmf33"
+path="res://.godot/imported/FightTest_Base.ogg-c2135a351140994f825ac3a4c95512e9.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Base.ogg"
+dest_files=["res://.godot/imported/FightTest_Base.ogg-c2135a351140994f825ac3a4c95512e9.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cimd2rvdwtfkv"
+path="res://.godot/imported/FightTest_Pattern1.ogg-366a24f1c5b2de03be94df3cb6e2b4db.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Pattern1.ogg"
+dest_files=["res://.godot/imported/FightTest_Pattern1.ogg-366a24f1c5b2de03be94df3cb6e2b4db.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://kpbkw64o86q4"
+path="res://.godot/imported/FightTest_Pattern2.ogg-deeb2006ba9921b2d3fd3c5e9154d31c.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Pattern2.ogg"
+dest_files=["res://.godot/imported/FightTest_Pattern2.ogg-deeb2006ba9921b2d3fd3c5e9154d31c.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cmyrgerm8m4nw"
+path="res://.godot/imported/FightTest_Pattern3.ogg-bc6fa475a04ff9ce3eb12d0e5a8b2946.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Pattern3.ogg"
+dest_files=["res://.godot/imported/FightTest_Pattern3.ogg-bc6fa475a04ff9ce3eb12d0e5a8b2946.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ddu3pxk121x87"
+path="res://.godot/imported/NightTest_Pattern1.ogg-3eb5d685e76ee80df0e3a06c333e5881.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/NightTest_Pattern1.ogg"
+dest_files=["res://.godot/imported/NightTest_Pattern1.ogg-3eb5d685e76ee80df0e3a06c333e5881.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ddxekmi71ekin"
+path="res://.godot/imported/NightTest_Pattern2.ogg-3f45cf34ddc5716cb6e571b63e7168e6.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/NightTest_Pattern2.ogg"
+dest_files=["res://.godot/imported/NightTest_Pattern2.ogg-3f45cf34ddc5716cb6e571b63e7168e6.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cjnt07ai5bed8"
+path="res://.godot/imported/NightTest_Pattern3.ogg-54521b103c362f6dfd049e0947d34740.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/NightTest_Pattern3.ogg"
+dest_files=["res://.godot/imported/NightTest_Pattern3.ogg-54521b103c362f6dfd049e0947d34740.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4
@@ -1075,9 +1075,8 @@ collision_mask = 4
 position = Vector2(145.5, -224)
 shape = SubResource("RectangleShape2D_0sfl7")

-[node name="InteractionArea" parent="YSorted/Brünnen" node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("27_klb81")]
+[node name="InteractionArea" parent="YSorted/Brünnen" instance=ExtResource("27_klb81")]
 _active = false
-_spriteToOutline = NodePath("..")
 _id = 1

 [node name="CollisionShape3D" parent="YSorted/Brünnen/InteractionArea/Area2D" index="0"]
@@ -1091,6 +1090,9 @@ position = Vector2(6095, 2087)
 [node name="SpawnWithItem" parent="YSorted/HoeGenericPickup" index="0"]
 _blueprint = ExtResource("26_ipqaa")

+[node name="PickupInteractionArea" parent="YSorted/HoeGenericPickup" index="3" node_paths=PackedStringArray("_spriteToOutline")]
+_spriteToOutline = []
+
 [node name="CollisionShape3D" parent="YSorted/HoeGenericPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_ycj14")

@@ -1100,6 +1102,9 @@ position = Vector2(8192, 3507)
 [node name="SpawnWithItem" parent="YSorted/CanGenericPickup" index="0"]
 _blueprint = ExtResource("28_ipqaa")

+[node name="PickupInteractionArea" parent="YSorted/CanGenericPickup" index="3" node_paths=PackedStringArray("_spriteToOutline")]
+_spriteToOutline = []
+
 [node name="CollisionShape3D" parent="YSorted/CanGenericPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_2065p")

@@ -1112,6 +1117,9 @@ position = Vector2(8391, 2060)
 [node name="SpawnWithItem" parent="YSorted/RakeGenericPickup" index="0"]
 _blueprint = ExtResource("28_6b2nr")

+[node name="PickupInteractionArea" parent="YSorted/RakeGenericPickup" index="3" node_paths=PackedStringArray("_spriteToOutline")]
+_spriteToOutline = []
+
 [node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_tm0yg")

@@ -1122,6 +1130,9 @@ position = Vector2(15642, 2158)
 [node name="SpawnWithItem" parent="YSorted/ScytheGenericPickup" index="0"]
 _blueprint = ExtResource("29_wtdui")

+[node name="PickupInteractionArea" parent="YSorted/ScytheGenericPickup" index="3" node_paths=PackedStringArray("_spriteToOutline")]
+_spriteToOutline = []
+
 [node name="CollisionShape3D" parent="YSorted/ScytheGenericPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_lbnqo")

@@ -1132,6 +1143,9 @@ position = Vector2(5454, 2049)
 [node name="SpawnWithItem" parent="YSorted/ShovelGenericPickup" index="0"]
 _blueprint = ExtResource("27_ipqaa")

+[node name="PickupInteractionArea" parent="YSorted/ShovelGenericPickup" index="3" node_paths=PackedStringArray("_spriteToOutline")]
+_spriteToOutline = []
+
 [node name="CollisionShape3D" parent="YSorted/ShovelGenericPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_l4wxt")

@@ -1156,10 +1170,9 @@ collision_mask = 6
 position = Vector2(-252.56, 231.32)
 polygon = PackedVector2Array(247.227, 43.5123, 44.7822, 43.5123, -87.2178, 45.123, -104.329, -55.2797, -154.107, -73.5347, -160.107, -380.38, -175.44, -400.783, -63.44, -512.461, 97.8934, -541.991, 261.671, -599.172, 374.782, -526.421, 502.338, -526.421, 637.893, -396.488, 598.56, -360.783, 596.338, -58.2327, 528.782, -58.2327, 501.449, 45.9283)

-[node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("27_klb81")]
+[node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" instance=ExtResource("27_klb81")]
 position = Vector2(5839, 2349)
 scale = Vector2(2.425, 2.425)
-_spriteToOutline = NodePath("DoorSprite")
 _id = 0

 [node name="DoorSprite" type="Sprite2D" parent="YSorted/Farm visuals/Static/EnterHouseInteraction"]
@@ -0,0 +1,16 @@
+using Godot;
+using System;
+
+public partial class Button : Godot.Button
+{
+    //[Export] private AudioStreamPlaybackInteractive _audioStreamInteractive;
+    [Export] private AudioStreamPlayer2D _palyer;
+
+    private int bla = 0;
+    public void Pressed()
+    {
+        bla = bla == 0 ? 1 : 0;
+        var s = ((AudioStreamPlaybackSynchronized)_palyer.GetStreamPlayback());
+    }
+    
+}
@@ -0,0 +1 @@
+uid://bfyhyjutba2o
@@ -0,0 +1,8 @@
+extends Button
+
+@export var i: 
+
+
+
+func _on_pressed() -> void:
+	pass # Replace with function body.
@@ -0,0 +1 @@
+uid://b126dduoht87j
@@ -0,0 +1,82 @@
+[gd_scene load_steps=14 format=3 uid="uid://b4cch0o4218rb"]
+
+[ext_resource type="AudioStream" uid="uid://iux86v7qmf33" path="res://audio/Music/TestingMusic/FightTest_Base.ogg" id="1_kcx1j"]
+[ext_resource type="AudioStream" uid="uid://cimd2rvdwtfkv" path="res://audio/Music/TestingMusic/FightTest_Pattern1.ogg" id="2_71etn"]
+[ext_resource type="AudioStream" uid="uid://kpbkw64o86q4" path="res://audio/Music/TestingMusic/FightTest_Pattern2.ogg" id="3_3u8ta"]
+[ext_resource type="AudioStream" uid="uid://cmyrgerm8m4nw" path="res://audio/Music/TestingMusic/FightTest_Pattern3.ogg" id="4_1dcxw"]
+[ext_resource type="AudioStream" uid="uid://ddu3pxk121x87" path="res://audio/Music/TestingMusic/NightTest_Pattern1.ogg" id="5_80mhq"]
+[ext_resource type="AudioStream" uid="uid://ddxekmi71ekin" path="res://audio/Music/TestingMusic/NightTest_Pattern2.ogg" id="6_ui405"]
+[ext_resource type="AudioStream" uid="uid://cjnt07ai5bed8" path="res://audio/Music/TestingMusic/NightTest_Pattern3.ogg" id="7_dpoqt"]
+[ext_resource type="AudioStream" uid="uid://bk5yqto8j3egp" path="res://audio/sfx/SFX_Quest_Fail_Placeholder_01.wav" id="8_71etn"]
+[ext_resource type="Script" uid="uid://bfyhyjutba2o" path="res://scenes/testing/Button.cs" id="9_3u8ta"]
+
+[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_ks5rm"]
+resource_name = "test"
+stream_count = 3
+stream_0/stream = ExtResource("2_71etn")
+stream_0/volume = 0.0
+stream_1/stream = ExtResource("3_3u8ta")
+stream_1/volume = 0.0
+stream_2/stream = ExtResource("4_1dcxw")
+stream_2/volume = 0.0
+
+[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_kt7r4"]
+stream_count = 3
+stream_0/stream = ExtResource("5_80mhq")
+stream_0/volume = 0.0
+stream_1/stream = ExtResource("6_ui405")
+stream_1/volume = 0.0
+stream_2/stream = ExtResource("7_dpoqt")
+stream_2/volume = 0.0
+
+[sub_resource type="AudioStreamInteractive" id="AudioStreamInteractive_nwvf5"]
+clip_count = 3
+clip_0/name = &"fight"
+clip_0/stream = SubResource("AudioStreamSynchronized_ks5rm")
+clip_0/auto_advance = 1
+clip_0/next_clip = 1
+clip_1/name = &"night"
+clip_1/stream = SubResource("AudioStreamSynchronized_kt7r4")
+clip_1/auto_advance = 1
+clip_1/next_clip = 0
+clip_2/name = &"fanfare"
+clip_2/stream = ExtResource("8_71etn")
+clip_2/auto_advance = 0
+_transitions = {
+Vector2i(0, 1): {
+"fade_beats": 1.0,
+"fade_mode": 4,
+"filler_clip": 2,
+"from_time": 0,
+"to_time": 0,
+"use_filler_clip": true
+}
+}
+
+[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_sv75a"]
+stream_count = 2
+stream_0/stream = ExtResource("1_kcx1j")
+stream_0/volume = 0.0
+stream_1/stream = SubResource("AudioStreamInteractive_nwvf5")
+stream_1/volume = 0.0
+
+[node name="Node2D" type="Node2D"]
+
+[node name="Music" type="AudioStreamPlayer2D" parent="."]
+stream = SubResource("AudioStreamSynchronized_sv75a")
+autoplay = true
+
+[node name="Button" type="Button" parent="." node_paths=PackedStringArray("_palyer")]
+offset_left = 56.0
+offset_top = 31.0
+offset_right = 349.0
+offset_bottom = 175.0
+script = ExtResource("9_3u8ta")
+_palyer = NodePath("../Music")
+
+[node name="Camera2D" type="Camera2D" parent="."]
+
+[node name="Camera3D" type="Camera3D" parent="."]
+fov = 104.538
+
+[connection signal="pressed" from="Button" to="Button" method="Pressed"]
@@ -0,0 +1 @@
+uid://du8cm2q5kwikl
@@ -0,0 +1 @@
+uid://iyarqwxuwoad
@@ -14,12 +14,12 @@ public partial class MinigameTestStarter : Node
        _minigameController.Run(
            new MinigameController.Builder<int>()
                .WithHitCount(5)
-                .AddRegion(1)
-                .AddRegion(2).RegionWithProportion(2)
-                .AddRegion(3)
-                .AddRegion(4).RegionWithProportion(2)
-                .AddRegion(5)
-                .AddRegion(6).RegionWithProportion(2)
+                .AddRegion(1).RegionWithText("Hello world").RegionWithTheme(MinigameController.RegionTheme.Normal)
+                .AddRegion(2).RegionWithProportion(2).RegionWithTheme(MinigameController.RegionTheme.NormalAlt1)
+                .AddRegion(3).RegionWithTheme(MinigameController.RegionTheme.NormalAlt2)
+                .AddRegion(4).RegionWithProportion(2).RegionWithTheme(MinigameController.RegionTheme.VeryGood)
+                .AddRegion(5).RegionWithTheme(MinigameController.RegionTheme.VeryBad)
+                .AddRegion(6).RegionWithProportion(2).RegionWithTheme(MinigameController.RegionTheme.Disabled)
        ).ContinueWith(task => OnEnd(task.Result));
    }