aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/map/item_factory.gd6
-rw-r--r--client/map/items/bread.gd21
-rw-r--r--client/map/items/bread.resbin0 -> 7285 bytes
-rw-r--r--client/map/items/bread.tscn10
-rw-r--r--client/map/items/dough.gd21
-rw-r--r--client/map/items/dough.resbin0 -> 7291 bytes
-rw-r--r--client/map/items/dough.tscn10
-rw-r--r--client/map/items/dough_food_processor.gd21
-rw-r--r--client/menu/error_menu.tscn2
-rw-r--r--client/po/de.po46
-rw-r--r--client/project.godot2
11 files changed, 136 insertions, 3 deletions
diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index 3a2c67f8..b5357b66 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -46,5 +46,11 @@ static func produce(name: String, owned_by: Node3D) -> Item:
return Flour.new(owned_by)
"flour-foodprocessor":
return FlourFoodProcessor.new(owned_by)
+ "dough":
+ return Dough.new(owned_by)
+ "bread":
+ return Bread.new(owned_by)
+ "dough-foodprocessor":
+ return DoughFoodProcessor.new(owned_by)
var t:
return GenericItem.new(owned_by, t)
diff --git a/client/map/items/bread.gd b/client/map/items/bread.gd
new file mode 100644
index 00000000..db277a72
--- /dev/null
+++ b/client/map/items/bread.gd
@@ -0,0 +1,21 @@
+# Undercooked - a game about cooking
+# Copyright 2024 nokoe
+#
+# 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/>.
+#
+class_name Bread
+extends Item
+
+func _init(owned_by_: Node3D):
+ super(owned_by_)
+ base.add_child(load("res://map/items/bread.tscn").instantiate())
diff --git a/client/map/items/bread.res b/client/map/items/bread.res
new file mode 100644
index 00000000..4fe2dd65
--- /dev/null
+++ b/client/map/items/bread.res
Binary files differ
diff --git a/client/map/items/bread.tscn b/client/map/items/bread.tscn
new file mode 100644
index 00000000..a787bb44
--- /dev/null
+++ b/client/map/items/bread.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=3 uid="uid://dsrhcbmij58ck"]
+
+[ext_resource type="ArrayMesh" uid="uid://cuym17dskutc8" path="res://map/items/bread.res" id="1_0eevh"]
+
+[node name="Bread" type="Node3D"]
+
+[node name="Mesh" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0, 0, 0)
+mesh = ExtResource("1_0eevh")
+skeleton = NodePath("")
diff --git a/client/map/items/dough.gd b/client/map/items/dough.gd
new file mode 100644
index 00000000..adcfa5d5
--- /dev/null
+++ b/client/map/items/dough.gd
@@ -0,0 +1,21 @@
+# Undercooked - a game about cooking
+# Copyright 2024 nokoe
+#
+# 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/>.
+#
+class_name Dough
+extends Item
+
+func _init(owned_by_: Node3D):
+ super(owned_by_)
+ base.add_child(load("res://map/items/dough.tscn").instantiate())
diff --git a/client/map/items/dough.res b/client/map/items/dough.res
new file mode 100644
index 00000000..4f76f149
--- /dev/null
+++ b/client/map/items/dough.res
Binary files differ
diff --git a/client/map/items/dough.tscn b/client/map/items/dough.tscn
new file mode 100644
index 00000000..11a81194
--- /dev/null
+++ b/client/map/items/dough.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=3 uid="uid://dw5gdtilcsdcc"]
+
+[ext_resource type="ArrayMesh" uid="uid://bdbn7skeegtqq" path="res://map/items/dough.res" id="1_fe02r"]
+
+[node name="Dough" type="Node3D"]
+
+[node name="Mesh" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0, 0, 0)
+mesh = ExtResource("1_fe02r")
+skeleton = NodePath("")
diff --git a/client/map/items/dough_food_processor.gd b/client/map/items/dough_food_processor.gd
new file mode 100644
index 00000000..2d9cd8b7
--- /dev/null
+++ b/client/map/items/dough_food_processor.gd
@@ -0,0 +1,21 @@
+# Undercooked - a game about cooking
+# Copyright 2024 nokoe
+#
+# 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/>.
+#
+class_name DoughFoodProcessor
+extends FoodProcessorContent
+
+func _init(owned_by_: Node3D):
+ super(owned_by_)
+ set_color(Color8(198, 195, 180))
diff --git a/client/menu/error_menu.tscn b/client/menu/error_menu.tscn
index 0b86cceb..42396b4e 100644
--- a/client/menu/error_menu.tscn
+++ b/client/menu/error_menu.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://cimgn07lbcs4v"]
+[gd_scene load_steps=5 format=3 uid="uid://cclkimst14r12"]
[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_cabdu"]
[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_5fxol"]
diff --git a/client/po/de.po b/client/po/de.po
index e53c89f9..1e71c03d 100644
--- a/client/po/de.po
+++ b/client/po/de.po
@@ -37,6 +37,50 @@ msgstr "Einstellungen"
msgid "Credits"
msgstr "Anerkennung"
-#: menu/main_menu.tscn
+#: menu/main_menu.tscn menu/ingame_menu.tscn
msgid "Quit"
msgstr "Verlassen"
+
+#: menu/character_menu.tscn
+msgid "This textbox is useless."
+msgstr "Diese Textbox ist nutzlos."
+
+#: menu/character_menu.tscn menu/credits_menu.tscn
+msgid "Back"
+msgstr "Zurück"
+
+#: menu/credits_menu.tscn
+msgid ""
+"[center][b]undercooked - a game about cooking[/b]\n"
+"\n"
+"by\n"
+"\n"
+"[b]tpart, nokoe, metamuffin[/b]\n"
+"\n"
+"using various models from kenney.nl\n"
+"[/center]"
+msgstr ""
+"[center][b]undercooked - ein Spiel rund ums Kochen[/b]\n"
+"\n"
+"von\n"
+"\n"
+"[b]tpart, nokoe, metamuffin[/b]\n"
+"\n"
+"verwendet verschiedenste Modelle von kenney.nl\n"
+"[/center]"
+
+#: menu/error_menu.tscn
+msgid "Error"
+msgstr "Fehler"
+
+#: menu/error_menu.tscn
+msgid "This should be the error message."
+msgstr "Dies sollte die Fehlernachricht sein."
+
+#: menu/error_menu.tscn
+msgid "Return to Main Menu"
+msgstr "Zurück zum Hauptmenü"
+
+#: menu/ingame_menu.tscn
+msgid "Main Menu"
+msgstr "Hauptmenü"
diff --git a/client/project.godot b/client/project.godot
index d05e56e7..1ce7fb4a 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -75,7 +75,7 @@ pause={
[internationalization]
locale/translations=PackedStringArray("res://po/de.po")
-locale/translations_pot_files=PackedStringArray("res://menu/main_menu.tscn")
+locale/translations_pot_files=PackedStringArray("res://menu/main_menu.tscn", "res://menu/character_menu.tscn", "res://menu/credits_menu.tscn", "res://menu/error_menu.tscn", "res://menu/ingame_menu.tscn")
[rendering]