aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/map/item_factory.gd1
-rw-r--r--client/map/items/basket.gd4
-rw-r--r--client/map/items/basket.tscn2
-rw-r--r--client/map/items/deep_fryer_basket.res (renamed from client/map/deep_fryer_basket.res)bin14274 -> 14274 bytes
-rw-r--r--client/map/items/french_fries.resbin0 -> 12400 bytes
-rw-r--r--client/map/items/french_fries_basket.tscn10
-rw-r--r--client/map/items/french_fries_fill.resbin0 -> 12383 bytes
-rw-r--r--client/map/items/french_fries_fill.tscn10
-rw-r--r--client/map/items/plate.gd1
-rw-r--r--client/map/items/sliced_potato.gd21
-rw-r--r--client/map/items/sliced_potato.gd.uid1
-rw-r--r--client/map/items/sliced_potato.tscn14
12 files changed, 62 insertions, 2 deletions
diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index 0ebc3367..ac1a03c9 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -64,6 +64,7 @@ static func produce_inner(raw_name: String, owned_by: Node3D) -> Item:
"lettuce": return Lettuce.new(owned_by)
"sliced-lettuce": return SlicedLettuce.new(owned_by)
"potato": return Potato.new(owned_by)
+ "sliced-potato": return SlicedPotato.new(owned_by)
"dirty-plate": return Plate.new(owned_by, ["dirt"])
"pot": return Pot.new(owned_by, item.contents)
diff --git a/client/map/items/basket.gd b/client/map/items/basket.gd
index d90ab25e..3434727e 100644
--- a/client/map/items/basket.gd
+++ b/client/map/items/basket.gd
@@ -24,10 +24,12 @@ func _init(owned_by_: Node3D, contents: Array):
add_child(load("res://map/items/basket.tscn").instantiate())
base.add_child(steam)
base.add_child(bubbles)
- base.position.y = .15
+ base.position.z = -.075
for i in contents:
match i:
+ "french-fries":
+ base.add_child(load("res://map/items/french_fries_basket.tscn").instantiate())
_:
base.add_child(ItemFactory.produce(i, self))
diff --git a/client/map/items/basket.tscn b/client/map/items/basket.tscn
index 2fcd336d..4a3e046d 100644
--- a/client/map/items/basket.tscn
+++ b/client/map/items/basket.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://bu0o7coy26rwx"]
-[ext_resource type="ArrayMesh" uid="uid://bqwi4qvtgjlk5" path="res://map/deep_fryer_basket.res" id="1_7yj46"]
+[ext_resource type="ArrayMesh" uid="uid://bqwi4qvtgjlk5" path="res://map/items/deep_fryer_basket.res" id="1_7yj46"]
[node name="Basket" type="Node3D"]
diff --git a/client/map/deep_fryer_basket.res b/client/map/items/deep_fryer_basket.res
index 40f1c05d..40f1c05d 100644
--- a/client/map/deep_fryer_basket.res
+++ b/client/map/items/deep_fryer_basket.res
Binary files differ
diff --git a/client/map/items/french_fries.res b/client/map/items/french_fries.res
new file mode 100644
index 00000000..8019c006
--- /dev/null
+++ b/client/map/items/french_fries.res
Binary files differ
diff --git a/client/map/items/french_fries_basket.tscn b/client/map/items/french_fries_basket.tscn
new file mode 100644
index 00000000..516efe0a
--- /dev/null
+++ b/client/map/items/french_fries_basket.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=3 uid="uid://dfxksiofrs477"]
+
+[ext_resource type="ArrayMesh" uid="uid://b4ayvyhakbe7t" path="res://map/items/french_fries.res" id="1_skqej"]
+
+[node name="FrenchFriesBasket" 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.112)
+mesh = ExtResource("1_skqej")
+skeleton = NodePath("")
diff --git a/client/map/items/french_fries_fill.res b/client/map/items/french_fries_fill.res
new file mode 100644
index 00000000..f9bd5e0a
--- /dev/null
+++ b/client/map/items/french_fries_fill.res
Binary files differ
diff --git a/client/map/items/french_fries_fill.tscn b/client/map/items/french_fries_fill.tscn
new file mode 100644
index 00000000..10684f67
--- /dev/null
+++ b/client/map/items/french_fries_fill.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=3 uid="uid://buxshcsyokc3y"]
+
+[ext_resource type="ArrayMesh" uid="uid://cl5aobuv0duao" path="res://map/items/french_fries_fill.res" id="1_bt0td"]
+
+[node name="FrenchFriesFill" type="Node3D"]
+
+[node name="Mesh" type="MeshInstance3D" parent="."]
+transform = Transform3D(-0.64, 0, -5.5950576e-08, 0, 0.64, 0, 5.5950576e-08, 0, -0.64, 0.01, -0.031, 0.025)
+mesh = ExtResource("1_bt0td")
+skeleton = NodePath("")
diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd
index 60903ab3..fb4e52f6 100644
--- a/client/map/items/plate.gd
+++ b/client/map/items/plate.gd
@@ -51,6 +51,7 @@ func _init(owned_by_: Node3D, contents: Array):
"cooked-rice": add_child(load("res://map/items/cooked_rice_fill.tscn").instantiate())
"tomato-lettuce-salad": add_child(load("res://map/items/sliced_tomato_sliced_lettuce_fill.tscn").instantiate())
"tomato-soup": add_child(PlateFill.new(self, Color(1., .3, .2)))
+ "french-fries": base.add_child(load("res://map/items/french_fries_fill.tscn").instantiate())
"bun-small":
var bun = ItemFactory.produce("bun", base)
base.add_child(bun)
diff --git a/client/map/items/sliced_potato.gd b/client/map/items/sliced_potato.gd
new file mode 100644
index 00000000..313edb7a
--- /dev/null
+++ b/client/map/items/sliced_potato.gd
@@ -0,0 +1,21 @@
+# Hurry Curry! - a game about cooking
+# Copyright (C) 2025 Hurry Curry! contributors
+#
+# 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 SlicedPotato
+extends Item
+
+func _init(owned_by_: Node3D):
+ super(owned_by_)
+ base.add_child(load("res://map/items/sliced_potato.tscn").instantiate())
diff --git a/client/map/items/sliced_potato.gd.uid b/client/map/items/sliced_potato.gd.uid
new file mode 100644
index 00000000..849cfbc2
--- /dev/null
+++ b/client/map/items/sliced_potato.gd.uid
@@ -0,0 +1 @@
+uid://bhx0wq44st62o
diff --git a/client/map/items/sliced_potato.tscn b/client/map/items/sliced_potato.tscn
new file mode 100644
index 00000000..ec48414d
--- /dev/null
+++ b/client/map/items/sliced_potato.tscn
@@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=3 uid="uid://b85iw6rv2snx8"]
+
+[ext_resource type="ArrayMesh" uid="uid://b4ayvyhakbe7t" path="res://map/items/french_fries.res" id="1_ikao7"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qhqrd"]
+albedo_color = Color(0.88, 0.7546, 0.484, 1)
+
+[node name="SlicedPotato" 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.112)
+mesh = ExtResource("1_ikao7")
+skeleton = NodePath("")
+surface_material_override/0 = SubResource("StandardMaterial3D_qhqrd")
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-07 22:03:43 +0000