diff options
| -rw-r--r-- | client/menu/ingame_menu.tscn | 2 | ||||
| -rw-r--r-- | client/menu/main_menu.gd | 10 | ||||
| -rw-r--r-- | client/menu/main_menu.tscn | 2 | ||||
| -rw-r--r-- | client/menu/settings_menu.gd | 19 | ||||
| -rw-r--r-- | client/menu/settings_menu.tscn | 65 | ||||
| -rw-r--r-- | data/demands.yaml | 8 | ||||
| -rw-r--r-- | data/recipes.ts | 3 |
7 files changed, 98 insertions, 11 deletions
diff --git a/client/menu/ingame_menu.tscn b/client/menu/ingame_menu.tscn index da0767ff..44471db2 100644 --- a/client/menu/ingame_menu.tscn +++ b/client/menu/ingame_menu.tscn @@ -72,7 +72,7 @@ anchors_preset = 9 anchor_bottom = 1.0 offset_left = -400.0 offset_right = -90.0 -offset_bottom = 3888.0 +offset_bottom = 4536.0 grow_vertical = 2 [node name="margin" type="MarginContainer" parent="side"] diff --git a/client/menu/main_menu.gd b/client/menu/main_menu.gd index b19d72a6..99fe1858 100644 --- a/client/menu/main_menu.gd +++ b/client/menu/main_menu.gd @@ -1,19 +1,19 @@ # Undercooked - a game about cooking # Copyright 2024 metamuffin # Copyright 2024 tpart -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, version 3 of the License only. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -# +# extends Control @onready var quick_connect = $side/margin/options/quick_connect @@ -51,3 +51,5 @@ func connect_to(url): func _on_change_character_pressed(): $SceneTransition.transition_to("res://menu/character_menu.tscn") +func _on_settings_pressed(): + $SceneTransition.transition_to("res://menu/settings_menu.tscn") diff --git a/client/menu/main_menu.tscn b/client/menu/main_menu.tscn index d7922ee6..32a5bb24 100644 --- a/client/menu/main_menu.tscn +++ b/client/menu/main_menu.tscn @@ -105,6 +105,6 @@ layout_mode = 1 [connection signal="pressed" from="side/margin/options/quick_connect" to="." method="_on_quick_connect_pressed"] [connection signal="pressed" from="side/margin/options/connect/connect" to="." method="_on_connect_pressed"] [connection signal="pressed" from="side/margin/options/change_character" to="." method="_on_change_character_pressed"] -[connection signal="pressed" from="side/margin/options/settings" to="." method="_on_credits_pressed"] +[connection signal="pressed" from="side/margin/options/settings" to="." method="_on_settings_pressed"] [connection signal="pressed" from="side/margin/options/credits" to="." method="_on_credits_pressed"] [connection signal="pressed" from="side/margin/options/quit" to="." method="_on_quit_pressed"] diff --git a/client/menu/settings_menu.gd b/client/menu/settings_menu.gd new file mode 100644 index 00000000..a023cf36 --- /dev/null +++ b/client/menu/settings_menu.gd @@ -0,0 +1,19 @@ +# Undercooked - a game about cooking +# Copyright 2024 metamuffin +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. +# +extends Control + +func _on_back_pressed(): + $SceneTransition.transition_to("res://menu/main_menu.tscn") diff --git a/client/menu/settings_menu.tscn b/client/menu/settings_menu.tscn new file mode 100644 index 00000000..18a32759 --- /dev/null +++ b/client/menu/settings_menu.tscn @@ -0,0 +1,65 @@ +[gd_scene load_steps=5 format=3 uid="uid://8ic77jmadadj"] + +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_foq3a"] +[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="1_wi8ti"] +[ext_resource type="Script" path="res://menu/settings_menu.gd" id="2_3hgm8"] +[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="2_t0one"] + +[node name="SettingsMenu" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme = ExtResource("1_foq3a") +script = ExtResource("2_3hgm8") + +[node name="MenuBackground" parent="." instance=ExtResource("1_wi8ti")] + +[node name="outer_gap" type="MarginContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/margin_left = 40 +theme_override_constants/margin_top = 40 +theme_override_constants/margin_right = 40 +theme_override_constants/margin_bottom = 40 + +[node name="panel" type="Panel" parent="outer_gap"] +layout_mode = 2 + +[node name="inner_gap" type="MarginContainer" parent="outer_gap/panel"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/margin_left = 40 +theme_override_constants/margin_top = 40 +theme_override_constants/margin_right = 40 +theme_override_constants/margin_bottom = 40 + +[node name="options" type="VBoxContainer" parent="outer_gap/panel/inner_gap"] +layout_mode = 2 + +[node name="title" type="Label" parent="outer_gap/panel/inner_gap/options"] +layout_mode = 2 +size_flags_horizontal = 0 +theme_override_font_sizes/font_size = 36 +text = "Settings" + +[node name="back" type="Button" parent="outer_gap/panel/inner_gap"] +layout_mode = 2 +size_flags_vertical = 8 +text = "Back to Main Menu" + +[node name="SceneTransition" parent="." instance=ExtResource("2_t0one")] +visible = false +layout_mode = 1 + +[connection signal="pressed" from="outer_gap/panel/inner_gap/back" to="." method="_on_back_pressed"] diff --git a/data/demands.yaml b/data/demands.yaml index fdc66fda..0a2b9706 100644 --- a/data/demands.yaml +++ b/data/demands.yaml @@ -13,14 +13,14 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. # -- { from: bread-plate, to: dirty-plate, duration: 10 } +- { from: bread-slice-plate, to: dirty-plate, duration: 10 } - { from: steak-plate, to: dirty-plate, duration: 10 } - { from: sliced-tomato-plate, to: dirty-plate, duration: 10 } -- { from: bread-steak-plate, to: dirty-plate, duration: 15 } -- { from: bread-sliced-tomato-plate, to: dirty-plate, duration: 15 } +- { from: bread-slice-steak-plate, to: dirty-plate, duration: 15 } +- { from: bread-slice-sliced-tomato-plate, to: dirty-plate, duration: 15 } - { from: sliced-tomato-steak-plate, to: dirty-plate, duration: 15 } -- { from: bread-sliced-tomato-steak-plate, to: dirty-plate, duration: 20 } +- { from: bread-slice-sliced-tomato-steak-plate, to: dirty-plate, duration: 20 } - { from: tomato-soop-plate, to: dirty-plate, duration: 20 } diff --git a/data/recipes.ts b/data/recipes.ts index 90307e88..8ae9bcd4 100644 --- a/data/recipes.ts +++ b/data/recipes.ts @@ -126,7 +126,8 @@ crate("herbs") cut("tomato") cook("raw-steak", "steak") -combine("plate", "steak-pot", "sliced-tomato", "bread") +cut("bread", "bread-slice") +combine("plate", "steak-pot", "sliced-tomato", "bread-slice") process("flour", "dough") out({ action: "instant", inputs: ["dough-foodprocessor"], outputs: ["foodprocessor", "dough"] }) |