betalars
/
frame-of-mind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/base-environments/youth_room/youth_room.tscn
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"
@ -1564,47 +1564,47 @@ var has_stage
var is_repeating = false var is_repeating = false
func start_soundtrack(): func start_soundtrack():
$Moving.play(70) $Moving.play(70)
$Childhood.play(70) $Childhood.play(70)
$VoiceTraining.play(70) $VoiceTraining.play(70)
func play_scene(id: int, repeat = false): func play_scene(id: int, repeat = false):
get_tree().call_group(\"interactables\", \"collapse\") get_tree().call_group(\"interactables\", \"collapse\")
State.pass_stage_to(self, false, true) State.pass_stage_to(self, false, true)
is_repeating = repeat is_repeating = repeat
Input.mouse_mode = Input.MOUSE_MODE_HIDDEN Input.mouse_mode = Input.MOUSE_MODE_HIDDEN
match id: match id:
Scenes.id.YOUTH_CHILDHOOD: Scenes.id.YOUTH_CHILDHOOD:
play(\"childhood\") play(\"childhood\")
Scenes.id.YOUTH_VOICE_TRAINING: Scenes.id.YOUTH_VOICE_TRAINING:
play(\"voice training\") play(\"voice training\")
Scenes.id.YOUTH_JUI_JUTSU: Scenes.id.YOUTH_JUI_JUTSU:
play(\"jui_jutsu\") play(\"jui_jutsu\")
Scenes.id.YOUTH_DRAEVEN: Scenes.id.YOUTH_DRAEVEN:
play(\"draeven\") play(\"draeven\")
func _on_ini_room(): func _on_ini_room():
pass pass
func on_childhood_done(): func on_childhood_done():
get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_CHILDHOOD, is_repeating) get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_CHILDHOOD, is_repeating)
$childhood.hide() $childhood.hide()
func on_voice_training_done(): func on_voice_training_done():
get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_VOICE_TRAINING, is_repeating) get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_VOICE_TRAINING, is_repeating)
$\"Voice Training\".hide() $\"Voice Training\".hide()
func on_jui_jutsu_done(): func on_jui_jutsu_done():
get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_JUI_JUTSU, is_repeating) get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_JUI_JUTSU, is_repeating)
$jui_jutsu.hide() $jui_jutsu.hide()
func on_draeven_done(): func on_draeven_done():
get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_DRAEVEN, is_repeating) get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_DRAEVEN, is_repeating)
$draeven.hide() $draeven.hide()
queue(\"intro\") queue(\"intro\")
func scene_finished(_id): func scene_finished(_id):
queue(\"RESET\") queue(\"RESET\")
" "
[sub_resource type="ViewportTexture" id="ViewportTexture_2cudi"] [sub_resource type="ViewportTexture" id="ViewportTexture_2cudi"]
@ -2054,24 +2054,24 @@ auto_exposure_min_sensitivity = 100.0
script/source = "extends WorldEnvironment script/source = "extends WorldEnvironment
func _ready(): func _ready():
focus_env() focus_env()
func focus_env(): func focus_env():
var dof_strength_tween: Tween = create_tween() var dof_strength_tween: Tween = create_tween()
dof_strength_tween.tween_property(camera_attributes, \"dof_blur_amount\", 0, 1) dof_strength_tween.tween_property(camera_attributes, \"dof_blur_amount\", 0, 1)
await(dof_strength_tween.finished) await(dof_strength_tween.finished)
camera_attributes.dof_blur_near_enabled = false camera_attributes.dof_blur_near_enabled = false
func focus_object(): func focus_object():
camera_attributes.dof_blur_near_enabled = true camera_attributes.dof_blur_near_enabled = true
var dof_strength_tween: Tween = create_tween() var dof_strength_tween: Tween = create_tween()
dof_strength_tween.tween_property(camera_attributes, \"dof_blur_amount\", 0.4, 1) dof_strength_tween.tween_property(camera_attributes, \"dof_blur_amount\", 0.4, 1)
func play_scene(_id: int, _repeat): func play_scene(_id: int, _repeat):
focus_object() focus_object()
func _on_picker_cards_picked(_cards): func _on_picker_cards_picked(_cards):
focus_env() focus_env()
" "
[sub_resource type="ArrayMesh" id="ArrayMesh_laf32"] [sub_resource type="ArrayMesh" id="ArrayMesh_laf32"]
@ -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

8
src/dev-util/testing.tscn
View File

@ -6,18 +6,18 @@ script/source = "extends Node3D
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
await get_tree().create_timer(1).timeout await get_tree().create_timer(1).timeout
$AnimationPlayer.advance(10) $AnimationPlayer.advance(10)
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):
pass pass
func _on_animation_player_animation_finished(anim_name): func _on_animation_player_animation_finished(anim_name):
print(\"yay\") print(\"yay\")
" "
[sub_resource type="Animation" id="Animation_kdstq"] [sub_resource type="Animation" id="Animation_kdstq"]

2
src/logic-scenes/card_picker/card_picker.gd
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)

3
src/logic-scenes/misc/skip_control.gd
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: