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

cleanup overlooked merge issues

This commit is contained in:
betalars 2025-05-16 14:30:52 +02:00
parent 90a836fa23
commit da96f496a6
3 changed files with 8 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/logic-scenes/board/card-board.gd
View File

@ -337,13 +337,13 @@ func _input(event):
get_viewport().set_input_as_handled() get_viewport().set_input_as_handled()
if event is InputEventMouse: if event is InputEventMouse:
# makes sure to pass release events so notes do not get attached to the mouse while the cursor leaves the area. # makes sure to pass release events so notes do not get attached to the mouse while the cursor leaves the area.
if event is InputEventMouseButton and current_context == DRAG: if event is InputEventMouseButton and current_context == DRAG:
if event.button_index == MOUSE_BUTTON_LEFT and not event.pressed: if event.button_index == MOUSE_BUTTON_LEFT and not event.pressed:
handle_mouse_button(event) handle_mouse_button(event)
get_viewport().set_input_as_handled() get_viewport().set_input_as_handled()
else: else:
return return
if current_context != DRAG: if current_context != DRAG:
if event.is_action_pressed("ui_up"): if event.is_action_pressed("ui_up"):

256
src/main.tscn
View File

@ -1473,260 +1473,4 @@ h5 = SubResource("Resource_qsp4k")
h6 = SubResource("Resource_kq58d") h6 = SubResource("Resource_kq58d")
metadata/_custom_type_script = "uid://dr7xhgd53cvmf" metadata/_custom_type_script = "uid://dr7xhgd53cvmf"
[node name="CreditsRoll2" type="RichTextLabel" parent="."]
visible = false
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -645.0
offset_top = -110.0
offset_right = 645.0
offset_bottom = 16.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 4
size_flags_vertical = 4
bbcode_enabled = true
text = "[center]
[font_size=36]Thanks for Playing[/font_size]
... the public demo version.
We are sorry you were not yet able to resolve Lisas thoughts.
But we would like to hear yours.
Is there something that you think needs to be changed?
You can provide feedback by [url=https://discord.gg/WjduEh4htP]joining our Discord[/url].
This game was made by betalars, but it is yours to adapt and change.
\"Frame of Mind - a game of thoughts.\"
uses a Creative Commons, Attribution, Share Alike, Non-Commercial license.
[img]res://import/interface-elements/cc-by-sa-nc.png[/img]
"
fit_content = true
script = ExtResource("10_viehl")
markdown_text = "[center]
# Thanks for Playing
... the public demo version.
We are sorry you were not yet able to resolve Lisas thoughts.
But we would like to hear yours.
Is there something that you think needs to be changed?
You can provide feedback by [joining our Discord](https://discord.gg/WjduEh4htP).
This game was made by betalars, but it is yours to adapt and change.
\"Frame of Mind - a game of thoughts.\"
uses a Creative Commons, Attribution, Share Alike, Non-Commercial license.
![](res://import/interface-elements/cc-by-sa-nc.png)
"
h1 = SubResource("Resource_qi5jr")
h2 = SubResource("Resource_xrkju")
h3 = SubResource("Resource_70jti")
h4 = SubResource("Resource_rxa4w")
h5 = SubResource("Resource_nv3rj")
h6 = SubResource("Resource_11oh2")
[node name="DemoMenue" type="Panel" parent="."]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = SubResource("GDScript_t6jj1")
[node name="HSplitContainer" type="HSplitContainer" parent="DemoMenue"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -629.0
offset_top = -312.0
offset_right = 677.0
offset_bottom = 126.0
grow_horizontal = 2
grow_vertical = 2
split_offset = 100
[node name="TextureRect" type="TextureRect" parent="DemoMenue/HSplitContainer"]
layout_mode = 2
size_flags_horizontal = 0
texture = ExtResource("19_madrp")
expand_mode = 3
[node name="DisclaimerLabel" type="RichTextLabel" parent="DemoMenue/HSplitContainer"]
unique_name_in_owner = true
layout_mode = 2
bbcode_enabled = true
text = "Demo-intro-text"
script = ExtResource("10_viehl")
markdown_text = "Demo-intro-text"
h1 = SubResource("Resource_308k2")
h2 = SubResource("Resource_g0gc1")
h3 = SubResource("Resource_13vyj")
h4 = SubResource("Resource_n30at")
h5 = SubResource("Resource_sikh0")
h6 = SubResource("Resource_4no5n")
[node name="TextureRect2" type="TextureRect" parent="DemoMenue"]
visible = false
layout_mode = 1
anchors_preset = 3
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -295.0
offset_top = -286.0
offset_right = 117.0
offset_bottom = 126.0
grow_horizontal = 0
grow_vertical = 0
scale = Vector2(0.54, 0.54)
size_flags_horizontal = 0
texture = ExtResource("20_ku514")
expand_mode = 3
[node name="DemoStartButton" type="Button" parent="DemoMenue"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -223.5
offset_top = -362.0
offset_right = 223.5
offset_bottom = -279.0
grow_horizontal = 2
grow_vertical = 0
theme_override_font_sizes/font_size = 50
disabled = true
text = "Loading ..."
[node name="Label" type="Label" parent="DemoMenue"]
visible = false
layout_mode = 1
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -808.0
offset_top = 23.0
offset_right = 808.0
offset_bottom = 201.0
grow_horizontal = 2
theme_type_variation = &"HeaderMedium"
text = "Hinweis für die USK-Prüfung:
Es ist geplant, dass zum Zeitpunkt der Messe
auch die volle Vertonung auf deutsch lokalisiert wurde.
Str+Shift+R setzt die Demo zurück."
horizontal_alignment = 1
[node name="Lang" type="VSplitContainer" parent="DemoMenue"]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -349.0
offset_top = -168.0
offset_right = 350.0
offset_bottom = -92.0
grow_horizontal = 2
grow_vertical = 0
[node name="LocaleButton" type="Button" parent="DemoMenue/Lang"]
layout_mode = 2
size_flags_horizontal = 4
text = "🇩🇪 Text auf deutsch umstellen"
[node name="Label" type="Label" parent="DemoMenue/Lang"]
layout_mode = 2
text = "Dieses Spiel hat aktuell keine deutsche Sprachausgabe."
horizontal_alignment = 1
[node name="CenterContainer" type="CenterContainer" parent="."]
visible = false
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="TextureRect" type="TextureRect" parent="CenterContainer"]
material = SubResource("ShaderMaterial_knlqd")
layout_mode = 2
texture = SubResource("GradientTexture2D_swtmc")
[node name="PauseMenu" type="PanelContainer" parent="CenterContainer"]
unique_name_in_owner = true
layout_mode = 2
script = ExtResource("9_ihfph")
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/PauseMenu"]
modulate = Color(1, 1, 1, 0)
layout_mode = 2
[node name="Label" type="Label" parent="CenterContainer/PauseMenu/VBoxContainer"]
layout_mode = 2
theme_type_variation = &"HeaderLarge"
text = "Game Paused"
[node name="ResumeButton" type="Button" parent="CenterContainer/PauseMenu/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "Resume"
[node name="BugButton" type="Button" parent="CenterContainer/PauseMenu/VBoxContainer"]
layout_mode = 2
script = ExtResource("22_ryguw")
metadata/_custom_type_script = "uid://sa15wakvpj2e"
[node name="ToMenuButton" type="Button" parent="CenterContainer/PauseMenu/VBoxContainer"]
unique_name_in_owner = true
visible = false
layout_mode = 2
text = "Return to Menu"
[node name="ToSettingsButton" type="Button" parent="CenterContainer/PauseMenu/VBoxContainer"]
unique_name_in_owner = true
visible = false
layout_mode = 2
text = "Open Settings"
[node name="ToDesktopButton" type="Button" parent="CenterContainer/PauseMenu/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "Quit to Desktop"
[node name="HSeparator" type="HSeparator" parent="CenterContainer/PauseMenu/VBoxContainer"]
custom_minimum_size = Vector2(0, 20)
layout_mode = 2
[node name="FindHelplineButton" type="Button" parent="CenterContainer/PauseMenu/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "Find Help-Lines"
[node name="Label2" type="Label" parent="CenterContainer/PauseMenu/VBoxContainer"]
layout_mode = 2
text = "opens findahelpline.com"
horizontal_alignment = 1
[node name="SkipStoryButton" type="Button" parent="CenterContainer/PauseMenu/VBoxContainer"]
unique_name_in_owner = true
visible = false
layout_mode = 2
text = "Skip this Story"
[connection signal="room_loaded" from="." to="DemoMenue" method="_on_main_room_loaded"]
[connection signal="on_read" from="Disclaimer" to="Startup Menu" method="starting"] [connection signal="on_read" from="Disclaimer" to="Startup Menu" method="starting"]
[connection signal="pressed" from="DemoMenue/DemoStartButton" to="." method="start_demo"]
[connection signal="pressed" from="DemoMenue/Lang/LocaleButton" to="DemoMenue" method="_on_locale_button_pressed"]

2
src/singletons/global_state.gd
View File

@ -183,7 +183,7 @@ func save_settings():
"music_volume": music_volume, "music_volume": music_volume,
"speech_volume": speech_volume, "speech_volume": speech_volume,
"speech_language": speech_language, "speech_language": speech_language,
"text_language": text_language "text_language": text_language,
"force_stereo": force_stereo "force_stereo": force_stereo
}, },
"gameplay": { "gameplay": {