resolving upgrade regressions

This commit is contained in:
betalars 2024-09-19 12:29:35 +02:00
parent 86a8fdcbd9
commit a3a1ad96b2
4 changed files with 62 additions and 52 deletions

View File

@ -843,7 +843,7 @@ length = 151.0
tracks/0/type = "audio" tracks/0/type = "audio"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("ScenePlayer/Lisa") tracks/0/path = NodePath("ScenePlayer/Draven")
tracks/0/interp = 1 tracks/0/interp = 1
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -858,16 +858,16 @@ tracks/0/use_blend = true
tracks/1/type = "audio" tracks/1/type = "audio"
tracks/1/imported = false tracks/1/imported = false
tracks/1/enabled = true tracks/1/enabled = true
tracks/1/path = NodePath("ScenePlayer/Jui_Jutsu") tracks/1/path = NodePath("ScenePlayer/IntroMusic")
tracks/1/interp = 1 tracks/1/interp = 1
tracks/1/loop_wrap = true tracks/1/loop_wrap = true
tracks/1/keys = { tracks/1/keys = {
"clips": [{ "clips": [{
"end_offset": 0.0, "end_offset": 0.0,
"start_offset": 0.0, "start_offset": 1.78,
"stream": ExtResource("8_fos5c") "stream": ExtResource("8_fos5c")
}], }],
"times": PackedFloat32Array(-1.3) "times": PackedFloat32Array(1.1)
} }
tracks/1/use_blend = true tracks/1/use_blend = true
tracks/2/type = "value" tracks/2/type = "value"
@ -2325,7 +2325,7 @@ offset_bottom = 100.0
shortcut = SubResource("Shortcut_b3maf") shortcut = SubResource("Shortcut_b3maf")
text = "You have completed text = "You have completed
ordering your thoughts. ordering your thoughts.
This is as far as the alpha goes. This is as far as the demo goes.
Press x or [ ] to wrap up." Press x or [ ] to wrap up."
[node name="picker" parent="logic/UI" groups=["animation_player"] instance=ExtResource("19_a4n1o")] [node name="picker" parent="logic/UI" groups=["animation_player"] instance=ExtResource("19_a4n1o")]
@ -2350,6 +2350,12 @@ libraries = {
autoplay = "RESET" autoplay = "RESET"
script = SubResource("GDScript_tfc2r") script = SubResource("GDScript_tfc2r")
[node name="Draven" type="AudioStreamPlayer" parent="logic/ScenePlayer"]
bus = &"text"
[node name="IntroMusic" type="AudioStreamPlayer" parent="logic/ScenePlayer"]
bus = &"music"
[node name="Lisa" type="AudioStreamPlayer" parent="logic/ScenePlayer"] [node name="Lisa" type="AudioStreamPlayer" parent="logic/ScenePlayer"]
bus = &"text" bus = &"text"
@ -2603,6 +2609,7 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="PanelContainer" type="PanelContainer" parent="logic/ScenePlayer/jui_jutsu"] [node name="PanelContainer" type="PanelContainer" parent="logic/ScenePlayer/jui_jutsu"]
self_modulate = Color(1, 1, 1, 0.247083)
layout_mode = 2 layout_mode = 2
mouse_filter = 1 mouse_filter = 1
@ -2637,7 +2644,7 @@ custom_minimum_size = Vector2(800, 800)
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 4 size_flags_horizontal = 4
size_flags_vertical = 4 size_flags_vertical = 4
mouse_filter = 2 mouse_filter = 0
scroll_vertical = 638 scroll_vertical = 638
horizontal_scroll_mode = 0 horizontal_scroll_mode = 0
vertical_scroll_mode = 3 vertical_scroll_mode = 3

View File

@ -193,7 +193,7 @@ func transition():
var out_str:Array[String] = [] var out_str:Array[String] = []
for card in output: for card in output:
out_str.append(card.name) out_str.append(card.name)
emit_signal("cards_picked", out_str) cards_picked.emit(out_str)
print(out_str) print(out_str)
selection_state = DONE selection_state = DONE
State.leave_stage(self) State.leave_stage(self)

View File

@ -26,6 +26,9 @@ func _process(delta):
emit_signal("skip") emit_signal("skip")
pressed = false pressed = false
time_pressed = 0 time_pressed = 0
if get_parent().get_parent().name == "draeven":
await(get_tree().create_timer(0.1).timeout)
get_parent().get_parent().get_parent().queue("intro")
func _input(event): func _input(event):
if visible: if visible: