diff options
Diffstat (limited to 'client/map/items')
151 files changed, 527 insertions, 273 deletions
diff --git a/client/map/items/basket.gd b/client/map/items/basket.gd index df37b5dd..4da74aca 100644 --- a/client/map/items/basket.gd +++ b/client/map/items/basket.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -26,11 +26,15 @@ func _init(owned_by_: Node3D): base.add_child(bubbles) base.position.z = -.075 +func is_round(): return false + func add_contents(contents: Array[String]): for i in contents: match i: "french-fries": base.add_child(load("res://map/items/french_fries_basket.tscn").instantiate()) + "dough": + base.add_child(load("res://map/items/donut/donut.tscn").instantiate()) _: super([i]) diff --git a/client/map/items/basket.tscn b/client/map/items/basket.tscn index 4a3e046d..628e4bd6 100644 --- a/client/map/items/basket.tscn +++ b/client/map/items/basket.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://bu0o7coy26rwx"] +[gd_scene format=3 uid="uid://bu0o7coy26rwx"] [ext_resource type="ArrayMesh" uid="uid://bqwi4qvtgjlk5" path="res://map/items/deep_fryer_basket.res" id="1_7yj46"] -[node name="Basket" type="Node3D"] +[node name="Basket" type="Node3D" unique_id=606292015] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1069269296] transform = Transform3D(-0.75, 0, -6.556708e-08, 0, 0.75, 0, 6.556708e-08, 0, -0.75, 0, 0, 0) mesh = ExtResource("1_7yj46") diff --git a/client/map/items/bun.gd b/client/map/items/bun.gd index 38fd582d..0423d7e6 100644 --- a/client/map/items/bun.gd +++ b/client/map/items/bun.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/bun.res b/client/map/items/bun.res Binary files differindex 3f1821df..ec6cbe4e 100644 --- a/client/map/items/bun.res +++ b/client/map/items/bun.res diff --git a/client/map/items/bun.tscn b/client/map/items/bun.tscn index 88483ee3..650a1efb 100644 --- a/client/map/items/bun.tscn +++ b/client/map/items/bun.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dgifus08aktx0"] +[gd_scene format=3 uid="uid://dgifus08aktx0"] [ext_resource type="ArrayMesh" uid="uid://ke5s5itvrqce" path="res://map/items/bun.res" id="1_limvy"] -[node name="Bun" type="Node3D"] +[node name="Bun" type="Node3D" unique_id=1561269631] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=338156627] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_limvy") -skeleton = NodePath("") diff --git a/client/map/items/burned.gd b/client/map/items/burned.gd index 2646a551..2ed456a6 100644 --- a/client/map/items/burned.gd +++ b/client/map/items/burned.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/burned.res b/client/map/items/burned.res Binary files differindex 8305ca6e..3cff4081 100644 --- a/client/map/items/burned.res +++ b/client/map/items/burned.res diff --git a/client/map/items/burned.tscn b/client/map/items/burned.tscn index 241bbf77..a37d45b8 100644 --- a/client/map/items/burned.tscn +++ b/client/map/items/burned.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://b48ximtiqbwvo"] +[gd_scene format=3 uid="uid://b48ximtiqbwvo"] [ext_resource type="ArrayMesh" uid="uid://bpndpup4f6g6v" path="res://map/items/burned.res" id="1_wu5eo"] -[node name="Burned" type="Node3D"] +[node name="Burned" type="Node3D" unique_id=2043673784] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1570232437] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_wu5eo") -skeleton = NodePath("") diff --git a/client/map/items/cheese.res b/client/map/items/cheese.res Binary files differindex eac705e5..1936b0c8 100644 --- a/client/map/items/cheese.res +++ b/client/map/items/cheese.res diff --git a/client/map/items/cheese.tscn b/client/map/items/cheese.tscn index 515262c8..9702b324 100644 --- a/client/map/items/cheese.tscn +++ b/client/map/items/cheese.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://0lbjf2sie4rk"] +[gd_scene format=3 uid="uid://0lbjf2sie4rk"] [ext_resource type="ArrayMesh" uid="uid://cshqtme8isvmw" path="res://map/items/cheese.res" id="1_p24nf"] -[node name="Cheese" type="Node3D"] +[node name="Cheese" type="Node3D" unique_id=93481419] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=595142792] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_p24nf") -skeleton = NodePath("") diff --git a/client/map/items/cheese_bit.res b/client/map/items/cheese_bit.res Binary files differnew file mode 100644 index 00000000..78c32494 --- /dev/null +++ b/client/map/items/cheese_bit.res diff --git a/client/map/items/coconut.res b/client/map/items/coconut.res Binary files differindex 63778607..0719fec4 100644 --- a/client/map/items/coconut.res +++ b/client/map/items/coconut.res diff --git a/client/map/items/coconut.tscn b/client/map/items/coconut.tscn index 679bf9b5..19fb7b80 100644 --- a/client/map/items/coconut.tscn +++ b/client/map/items/coconut.tscn @@ -1,10 +1,16 @@ -[gd_scene load_steps=2 format=3 uid="uid://cmsirxgv7iqnk"] +[gd_scene format=3 uid="uid://cmsirxgv7iqnk"] [ext_resource type="ArrayMesh" uid="uid://djenv8k2nnqyt" path="res://map/items/coconut.res" id="1_c4upd"] +[ext_resource type="Texture2D" uid="uid://dgcs4wkxsxe6a" path="res://map/textures/palette.png" id="2_e3g14"] -[node name="Coconut" type="Node3D"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qtcu3"] +resource_name = "Material.001" +cull_mode = 2 +albedo_texture = ExtResource("2_e3g14") -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Coconut" type="Node3D" unique_id=1082368642] + +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1732359079] transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0.2, 0) mesh = ExtResource("1_c4upd") -skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_qtcu3") diff --git a/client/map/items/cooked_cheese_pizza.tscn b/client/map/items/cooked_cheese_pizza.tscn new file mode 100644 index 00000000..de677b2a --- /dev/null +++ b/client/map/items/cooked_cheese_pizza.tscn @@ -0,0 +1,33 @@ +[gd_scene format=3 uid="uid://cl1etmr26p262"] + +[ext_resource type="ArrayMesh" uid="uid://cwstqugiw76tc" path="res://map/items/pizza.res" id="1_vnyro"] + +[sub_resource type="Gradient" id="Gradient_xogo6"] +offsets = PackedFloat32Array(0, 0.14086306, 0.84237576, 1) +colors = PackedColorArray(0.52, 0.104000024, 0, 1, 0.7294118, 0.23921569, 0.11764706, 1, 1, 0.7391868, 0.13702077, 1, 1, 0.88600004, 0.43, 1) + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_7am5t"] +frequency = 0.0139 +fractal_octaves = 3 +fractal_gain = 0.2 + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_gf4r2"] +width = 256 +height = 256 +noise = SubResource("FastNoiseLite_7am5t") +color_ramp = SubResource("Gradient_xogo6") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vnyro"] +resource_name = "Material.001" +cull_mode = 2 +albedo_texture = SubResource("NoiseTexture2D_gf4r2") +uv1_scale = Vector3(0.5, 0.5, 0.5) +uv1_offset = Vector3(0.5, 0, 0.5) +uv1_triplanar = true + +[node name="CookedCheesePizza" type="Node3D" unique_id=1618397990] + +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=2039708425] +transform = Transform3D(0.3, 0, 0, 0, 0.05, 0, 0, 0, 0.3, 0, 0.05, 0) +mesh = ExtResource("1_vnyro") +surface_material_override/1 = SubResource("StandardMaterial3D_vnyro") diff --git a/client/map/items/cooked_noodles.res b/client/map/items/cooked_noodles.res Binary files differindex f98b4976..4ba4012c 100644 --- a/client/map/items/cooked_noodles.res +++ b/client/map/items/cooked_noodles.res diff --git a/client/map/items/cooked_noodles.tscn b/client/map/items/cooked_noodles.tscn index 419e5eaa..895e1edd 100644 --- a/client/map/items/cooked_noodles.tscn +++ b/client/map/items/cooked_noodles.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://ct4f8jtnvfn56"] +[gd_scene format=3 uid="uid://ct4f8jtnvfn56"] [ext_resource type="ArrayMesh" uid="uid://cwhr8luqwpo7a" path="res://map/items/cooked_noodles.res" id="1_ahfxi"] -[node name="CookedNoodles" type="Node3D"] +[node name="CookedNoodles" type="Node3D" unique_id=663842765] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=675901793] transform = Transform3D(0.378, 0, 0, 0, 0.378, 0, 0, 0, 0.378, -0.027, 0, 0.095) mesh = ExtResource("1_ahfxi") -skeleton = NodePath("") diff --git a/client/map/items/cooked_rice_fill.tscn b/client/map/items/cooked_rice_fill.tscn index 825e1f63..d55ee61e 100644 --- a/client/map/items/cooked_rice_fill.tscn +++ b/client/map/items/cooked_rice_fill.tscn @@ -1,14 +1,14 @@ -[gd_scene load_steps=3 format=3 uid="uid://c17tdqcs3a33i"] +[gd_scene format=3 uid="uid://c17tdqcs3a33i"] [ext_resource type="PackedScene" uid="uid://do4qxd1d1x7cc" path="res://map/items/rice_content.tscn" id="1_mteor"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vr3i3"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wuevv"] resource_local_to_scene = true albedo_color = Color(0.933333, 0.933333, 0.666667, 1) -[node name="CookedRiceFIll" type="Node3D"] +[node name="CookedRiceFIll" type="Node3D" unique_id=1097928494] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) -[node name="RiceContent" parent="." instance=ExtResource("1_mteor")] +[node name="RiceContent" parent="." unique_id=1357077206 instance=ExtResource("1_mteor")] transform = Transform3D(0.3, 0, 0, 0, 0.15, 0, 0, 0, 0.562, 0.194, 0.07, 0) -surface_material_override/0 = SubResource("StandardMaterial3D_vr3i3") +surface_material_override/0 = SubResource("StandardMaterial3D_wuevv") diff --git a/client/map/items/cut.tscn b/client/map/items/cut.tscn index d465d788..69fad628 100644 --- a/client/map/items/cut.tscn +++ b/client/map/items/cut.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=3 uid="uid://bbjair4iw1841"] +[gd_scene format=3 uid="uid://bbjair4iw1841"] [sub_resource type="Curve" id="Curve_3m5vp"] _data = [Vector2(0, 0), 0.0, 9.741706, 0, 0, Vector2(0.24820146, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), -1.9750195, 0.0, 0, 0] @@ -20,7 +20,7 @@ curve = SubResource("Curve_3m5vp") _data = [Vector2(0.7027972, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] point_count = 2 -[node name="Cut" type="CPUParticles3D"] +[node name="Cut" type="CPUParticles3D" unique_id=1642709239] cast_shadow = 0 emitting = false amount = 15 diff --git a/client/map/items/cuttable.gd b/client/map/items/cuttable.gd index e106a96d..4eb48e19 100644 --- a/client/map/items/cuttable.gd +++ b/client/map/items/cuttable.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/deep_fryer_basket.res b/client/map/items/deep_fryer_basket.res Binary files differindex 40f1c05d..f31999e7 100644 --- a/client/map/items/deep_fryer_basket.res +++ b/client/map/items/deep_fryer_basket.res diff --git a/client/map/items/deep_frying.tscn b/client/map/items/deep_frying.tscn index 81a4ccfb..1cf5de19 100644 --- a/client/map/items/deep_frying.tscn +++ b/client/map/items/deep_frying.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://c2g5ncvn45263"] +[gd_scene format=3 uid="uid://c2g5ncvn45263"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3xkdk"] albedo_color = Color(0.9153118, 0.62961817, 0.44200557, 1) @@ -9,7 +9,7 @@ material = SubResource("StandardMaterial3D_3xkdk") radius = 0.1 height = 0.2 -[node name="DeepFrying" type="CPUParticles3D"] +[node name="DeepFrying" type="CPUParticles3D" unique_id=1522889960] emitting = false mesh = SubResource("SphereMesh_iygiy") emission_shape = 6 diff --git a/client/map/items/dirt.res b/client/map/items/dirt.res Binary files differindex 3043f8d8..a9b64efe 100644 --- a/client/map/items/dirt.res +++ b/client/map/items/dirt.res diff --git a/client/map/items/dirt.tscn b/client/map/items/dirt.tscn index 18956b3d..e3d1cdc1 100644 --- a/client/map/items/dirt.tscn +++ b/client/map/items/dirt.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cluraed43qoeb"] +[gd_scene format=3 uid="uid://cluraed43qoeb"] [ext_resource type="ArrayMesh" uid="uid://dla7bxb6byk48" path="res://map/items/dirt.res" id="1_xmsre"] -[node name="Dirt" type="Node3D"] +[node name="Dirt" type="Node3D" unique_id=913711020] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=114452767] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.015, 0) mesh = ExtResource("1_xmsre") -skeleton = NodePath("") diff --git a/client/map/items/donut/donut-dough.res b/client/map/items/donut/donut-dough.res Binary files differnew file mode 100644 index 00000000..cae6e975 --- /dev/null +++ b/client/map/items/donut/donut-dough.res diff --git a/client/map/items/donut/donut-glaze.res b/client/map/items/donut/donut-glaze.res Binary files differnew file mode 100644 index 00000000..6a8dac5b --- /dev/null +++ b/client/map/items/donut/donut-glaze.res diff --git a/client/map/items/donut/donut.tscn b/client/map/items/donut/donut.tscn new file mode 100644 index 00000000..6815828c --- /dev/null +++ b/client/map/items/donut/donut.tscn @@ -0,0 +1,11 @@ +[gd_scene format=3 uid="uid://cvnkxd1tslqvf"] + +[ext_resource type="ArrayMesh" uid="uid://cy1ifpobr21c0" path="res://map/items/donut/donut-dough.res" id="1_65l5f"] +[ext_resource type="Material" uid="uid://cg7o7rn06bve1" path="res://map/items/dough_material.tres" id="2_65l5f"] + +[node name="Donut" type="Node3D" unique_id=517668687] + +[node name="Dough" type="MeshInstance3D" parent="." unique_id=697273469] +transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0) +mesh = ExtResource("1_65l5f") +surface_material_override/0 = ExtResource("2_65l5f") diff --git a/client/map/items/donut/glazed-donut.tscn b/client/map/items/donut/glazed-donut.tscn new file mode 100644 index 00000000..913a9ab5 --- /dev/null +++ b/client/map/items/donut/glazed-donut.tscn @@ -0,0 +1,14 @@ +[gd_scene format=3 uid="uid://dglrxvp3126g4"] + +[ext_resource type="ArrayMesh" uid="uid://cy1ifpobr21c0" path="res://map/items/donut/donut-dough.res" id="1_1ef7l"] +[ext_resource type="ArrayMesh" uid="uid://dauwp2akjkafa" path="res://map/items/donut/donut-glaze.res" id="2_1jama"] + +[node name="Donut" type="Node3D" unique_id=1096172423] + +[node name="Dough" type="MeshInstance3D" parent="." unique_id=218737516] +transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0) +mesh = ExtResource("1_1ef7l") + +[node name="Glaze" type="MeshInstance3D" parent="." unique_id=267596717] +transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0) +mesh = ExtResource("2_1jama") diff --git a/client/map/items/dough.res b/client/map/items/dough.res Binary files differindex 9ccb0c48..7df7ca56 100644 --- a/client/map/items/dough.res +++ b/client/map/items/dough.res diff --git a/client/map/items/dough.tscn b/client/map/items/dough.tscn index 73f8c494..6ffec7a5 100644 --- a/client/map/items/dough.tscn +++ b/client/map/items/dough.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dw5gdtilcsdcc"] +[gd_scene format=3 uid="uid://dw5gdtilcsdcc"] [ext_resource type="ArrayMesh" uid="uid://duv7fs8jmwjn5" path="res://map/items/dough.res" id="1_fe02r"] -[node name="Dough" type="Node3D"] +[node name="Dough" type="Node3D" unique_id=1817119001] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1090567646] transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0) mesh = ExtResource("1_fe02r") -skeleton = NodePath("") diff --git a/client/map/items/fish.res b/client/map/items/fish.res Binary files differindex 65f099bb..e75acfb0 100644 --- a/client/map/items/fish.res +++ b/client/map/items/fish.res diff --git a/client/map/items/fish.tscn b/client/map/items/fish.tscn index 2ca59cf9..6ec64459 100644 --- a/client/map/items/fish.tscn +++ b/client/map/items/fish.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dom5n7h7l7sr8"] +[gd_scene format=3 uid="uid://dom5n7h7l7sr8"] [ext_resource type="ArrayMesh" uid="uid://dgsvwyghdj0es" path="res://map/items/fish.res" id="1_ysgnj"] -[node name="Fish" type="Node3D"] +[node name="Fish" type="Node3D" unique_id=291512971] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=120424767] transform = Transform3D(-4.37114e-10, 0.01, 0, -0.01, -4.37114e-10, 0, 0, 0, 0.01, 0, 0.0754571, 0) mesh = ExtResource("1_ysgnj") -skeleton = NodePath("") diff --git a/client/map/items/flour.res b/client/map/items/flour.res Binary files differindex 19f2db82..f04dd757 100644 --- a/client/map/items/flour.res +++ b/client/map/items/flour.res diff --git a/client/map/items/flour.tscn b/client/map/items/flour.tscn index c283eae5..6557cd24 100644 --- a/client/map/items/flour.tscn +++ b/client/map/items/flour.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dgo8cknr1o6ml"] +[gd_scene format=3 uid="uid://dgo8cknr1o6ml"] [ext_resource type="ArrayMesh" uid="uid://b76c6o88lkei2" path="res://map/items/flour.res" id="1_55ndm"] -[node name="Flour" type="Node3D"] +[node name="Flour" type="Node3D" unique_id=540926944] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=191664914] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_55ndm") -skeleton = NodePath("") diff --git a/client/map/items/food_processor.gd b/client/map/items/food_processor.gd index 0a78904f..fab8bd48 100644 --- a/client/map/items/food_processor.gd +++ b/client/map/items/food_processor.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -16,7 +16,6 @@ class_name FoodProcessor extends Item -var time := 0. var processing: CPUParticles3D = load("res://map/items/processing.tscn").instantiate() func _init(owned_by_: Node3D): @@ -25,6 +24,8 @@ func _init(owned_by_: Node3D): add_child(load("res://map/items/food_processor.tscn").instantiate()) add_child(processing) +func is_round(): return false + func add_contents(contents: Array[String]): for i in contents: match i: @@ -34,36 +35,40 @@ func add_contents(contents: Array[String]): add_child(FoodProcessorFill.new(self, Color(1.,1.,.8))) "rice": processing.color = Color(1.,1.,.8) - base.add_child(load("res://map/items/rice.tscn").instantiate()) + super([i]) "flour": processing.color = Color(.9, .9, .9) - base.add_child(load("res://map/items/flour.tscn").instantiate()) + super([i]) + "mushroom": + processing.color = Color(0.596, 0.341, 0.259) + super([i]) "dough": add_child(FoodProcessorFill.new(self, Color8(200, 180, 160))) "coconut": add_child(FoodProcessorFill.new(self, Color(.8, .5, .4))) - base.add_child(load("res://map/items/coconut.tscn").instantiate()) + super([i]) "strawberry": processing.color = Color(.9, .0, .0) - base.add_child(load("res://map/items/strawberry.tscn").instantiate()) + super([i]) "strawberry-shake": add_child(FoodProcessorFill.new(self, Color8(250, 140, 180))) "strawberry-icecream": add_child(FoodProcessorFill.new(self, Color8(250, 180, 210))) "strawberry-puree": add_child(FoodProcessorFill.new(self, Color8(200, 80, 80))) + "processed-mushroom": + add_child(FoodProcessorFill.new(self, Color(0.596, 0.341, 0.259))) "tomato": processing.color = Color(1.,0.,0.) - base.add_child(load("res://map/items/tomato.tscn").instantiate()) + super([i]) "tomato-juice": add_child(FoodProcessorFill.new(self, Color(1., .0, .0))) _: super([i]) func _process(delta: float): super(delta) - time += delta - processing.rotation.y += time * TAU - base.rotation.y += time * TAU + processing.rotation.y += delta * TAU * 10 + base.rotation.y += delta * TAU * 15 func progress(position_: float, speed: float, warn: bool): super(position_, speed, warn) diff --git a/client/map/items/food_processor.res b/client/map/items/food_processor.res Binary files differindex 726a7868..3b85f78b 100644 --- a/client/map/items/food_processor.res +++ b/client/map/items/food_processor.res diff --git a/client/map/items/food_processor.tscn b/client/map/items/food_processor.tscn index bb95d580..8082930a 100644 --- a/client/map/items/food_processor.tscn +++ b/client/map/items/food_processor.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://daxjpvycs85ec"] +[gd_scene format=3 uid="uid://daxjpvycs85ec"] [ext_resource type="ArrayMesh" uid="uid://bpjl5dlst6yg" path="res://map/items/food_processor.res" id="1_65ilg"] -[node name="FoodProcessor" type="Node3D"] +[node name="FoodProcessor" type="Node3D" unique_id=1181054569] -[node name="FoodProcessor" type="MeshInstance3D" parent="."] +[node name="FoodProcessor" type="MeshInstance3D" parent="." unique_id=68402722] transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0.3, 0) mesh = ExtResource("1_65ilg") -skeleton = NodePath("") diff --git a/client/map/items/food_processor_fill.gd b/client/map/items/food_processor_fill.gd index 25d634da..ed695a99 100644 --- a/client/map/items/food_processor_fill.gd +++ b/client/map/items/food_processor_fill.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/food_processor_fill.res b/client/map/items/food_processor_fill.res Binary files differindex 7511cc75..46dc32a0 100644 --- a/client/map/items/food_processor_fill.res +++ b/client/map/items/food_processor_fill.res diff --git a/client/map/items/food_processor_fill.tscn b/client/map/items/food_processor_fill.tscn index fa85e40a..21d74c57 100644 --- a/client/map/items/food_processor_fill.tscn +++ b/client/map/items/food_processor_fill.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://di5nq2vgvostp"] +[gd_scene format=3 uid="uid://di5nq2vgvostp"] [ext_resource type="ArrayMesh" uid="uid://vkd0ty7khthl" path="res://map/items/food_processor_fill.res" id="1_tcr3k"] @@ -6,8 +6,7 @@ resource_local_to_scene = true cull_mode = 1 -[node name="FoodProcessorFill" type="MeshInstance3D"] +[node name="FoodProcessorFill" type="MeshInstance3D" unique_id=2135483159] transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0.3, 0) mesh = ExtResource("1_tcr3k") -skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_0xb6r") diff --git a/client/map/items/french_fries.res b/client/map/items/french_fries.res Binary files differindex 8019c006..2c312e36 100644 --- a/client/map/items/french_fries.res +++ b/client/map/items/french_fries.res diff --git a/client/map/items/french_fries_basket.tscn b/client/map/items/french_fries_basket.tscn index 516efe0a..71ce3676 100644 --- a/client/map/items/french_fries_basket.tscn +++ b/client/map/items/french_fries_basket.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dfxksiofrs477"] +[gd_scene 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="FrenchFriesBasket" type="Node3D" unique_id=1793149830] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=972639015] 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 Binary files differindex f9bd5e0a..e7b78a46 100644 --- a/client/map/items/french_fries_fill.res +++ b/client/map/items/french_fries_fill.res diff --git a/client/map/items/french_fries_fill.tscn b/client/map/items/french_fries_fill.tscn index 10684f67..8c98cfe7 100644 --- a/client/map/items/french_fries_fill.tscn +++ b/client/map/items/french_fries_fill.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://buxshcsyokc3y"] +[gd_scene 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="FrenchFriesFill" type="Node3D" unique_id=87677793] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=802219019] 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/generic_item.gd b/client/map/items/generic_item.gd index 5f101646..e20385ef 100644 --- a/client/map/items/generic_item.gd +++ b/client/map/items/generic_item.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/glass.gd b/client/map/items/glass.gd index b9582a3a..8b0208e1 100644 --- a/client/map/items/glass.gd +++ b/client/map/items/glass.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/glass.res b/client/map/items/glass.res Binary files differindex 8386865f..400ca1cd 100644 --- a/client/map/items/glass.res +++ b/client/map/items/glass.res diff --git a/client/map/items/glass.tscn b/client/map/items/glass.tscn index 29bdda8b..877946a2 100644 --- a/client/map/items/glass.tscn +++ b/client/map/items/glass.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://c875kaj4v7nfv"] +[gd_scene format=3 uid="uid://c875kaj4v7nfv"] [ext_resource type="ArrayMesh" uid="uid://dywkxdkny1urs" path="res://map/items/glass.res" id="1_v2eeu"] -[node name="Glass" type="Node3D"] +[node name="Glass" type="Node3D" unique_id=1014845055] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1301902472] transform = Transform3D(0.125, 0, 0, 0, 0.125, 0, 0, 0, 0.125, 0, 0.125, 0) mesh = ExtResource("1_v2eeu") -skeleton = NodePath("") diff --git a/client/map/items/glass_fill.gd b/client/map/items/glass_fill.gd index 27cceb1f..4331965d 100644 --- a/client/map/items/glass_fill.gd +++ b/client/map/items/glass_fill.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/glass_fill.res b/client/map/items/glass_fill.res Binary files differindex 8226fb04..4845b3da 100644 --- a/client/map/items/glass_fill.res +++ b/client/map/items/glass_fill.res diff --git a/client/map/items/glass_fill.tscn b/client/map/items/glass_fill.tscn index dbcc1a61..a33d77de 100644 --- a/client/map/items/glass_fill.tscn +++ b/client/map/items/glass_fill.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://dvdwxct8qu2fm"] +[gd_scene format=3 uid="uid://dvdwxct8qu2fm"] [ext_resource type="ArrayMesh" uid="uid://byebq6oifi2jk" path="res://map/items/glass_fill.res" id="1_apxu2"] @@ -8,9 +8,8 @@ resource_name = "Material.002" cull_mode = 2 metallic_specular = 0.0 -[node name="GlassFill" type="MeshInstance3D"] +[node name="GlassFill" type="MeshInstance3D" unique_id=652949023] transform = Transform3D(0.125, 0, 0, 0, 0.125, 0, 0, 0, 0.125, 0, 0.125, 0) lod_bias = 3.0 mesh = ExtResource("1_apxu2") -skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_g0wwk") diff --git a/client/map/items/glass_items.gd b/client/map/items/glass_items.gd index 970b25d1..b3a5542b 100644 --- a/client/map/items/glass_items.gd +++ b/client/map/items/glass_items.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/icecream.gd b/client/map/items/icecream.gd index 19e3c91d..c29f6ef3 100644 --- a/client/map/items/icecream.gd +++ b/client/map/items/icecream.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/icecream.res b/client/map/items/icecream.res Binary files differindex af888a45..1d867b07 100644 --- a/client/map/items/icecream.res +++ b/client/map/items/icecream.res diff --git a/client/map/items/icecream.tscn b/client/map/items/icecream.tscn index 97eb32cf..d727e0c7 100644 --- a/client/map/items/icecream.tscn +++ b/client/map/items/icecream.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=4 uid="uid://c7peyvvr7rgko"] +[gd_scene format=4 uid="uid://c7peyvvr7rgko"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fah5o"] resource_name = "Sprinkles" @@ -67,8 +67,7 @@ resource_name = "Ice" cull_mode = 2 roughness = 0.690035 -[node name="IceCream" type="MeshInstance3D"] +[node name="IceCream" type="MeshInstance3D" unique_id=1714074191] transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 0.2, 0) mesh = SubResource("ArrayMesh_vb1ms") -skeleton = NodePath("") surface_material_override/1 = SubResource("StandardMaterial3D_2ckef") diff --git a/client/map/items/item.gd b/client/map/items/item.gd index 39c7afc1..bad9c7cf 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -58,30 +58,35 @@ func _init(owned_by_: Node3D): add_child(base) owned_by = owned_by_ +# is_round is used to determine if the cursor should be rotated to match the +# item's rotation (rotate if it's not round) +func is_round(): return true + func add_contents(contents: Array[String]): for i in contents: - match i: - _: - base.add_child(ItemFactory.produce(i, self)) + base.add_child(ItemFactory.produce(i, self)) func animate_spawn(): creation_timer = 0.0 scale = Vector3.ONE * 0.001 # setting to zero breaks assertions somewhere in the engine func _process(delta): - if not is_instance_valid(owned_by): return - if owned_by.get_parent() is Item or owned_by is Item: return - var player_owned = owned_by.get_parent().get_parent() is Player - player_owned_timer = player_owned_timer + delta if player_owned else 0. - var anim_speed = 10.0 * exp(player_owned_timer * 3.0) # infinity is fine. G.interpolate can handle it - position = G.interpolate(position, position_target, delta * anim_speed) - rotation.y = G.interpolate_angle(rotation.y, rotation_target, delta * anim_speed) + # Update position + if is_instance_valid(owned_by): + if owned_by.get_parent() is Item or owned_by is Item: return + var player_owned = owned_by.get_parent().get_parent() is Player + player_owned_timer = player_owned_timer + delta if player_owned else 0. + var anim_speed = 10.0 * exp(player_owned_timer * 3.0) # infinity is fine. G.interpolate can handle it + position = G.interpolate(position, position_target, delta * anim_speed) + rotation.y = G.interpolate_angle(rotation.y, rotation_target, delta * anim_speed) + # Fade in if creation_timer != null: creation_timer += delta * 10.0 if creation_timer > 1: scale = Vector3.ONE creation_timer = null else: scale = Vector3.ONE * creation_timer + # Fade out if destroy_timeout != null: destroy_timeout -= delta * 5.0 if is_instance_valid(progress_instance): progress_instance.hide() diff --git a/client/map/items/leek.res b/client/map/items/leek.res Binary files differindex 16c45f6f..3fcafcd2 100644 --- a/client/map/items/leek.res +++ b/client/map/items/leek.res diff --git a/client/map/items/leek.tscn b/client/map/items/leek.tscn index 4967246a..cd70ffa5 100644 --- a/client/map/items/leek.tscn +++ b/client/map/items/leek.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cmpwfkdnrm6e6"] +[gd_scene format=3 uid="uid://cmpwfkdnrm6e6"] [ext_resource type="ArrayMesh" uid="uid://cix4ji823kitw" path="res://map/items/leek.res" id="1_sum7m"] -[node name="Leek" type="Node3D"] +[node name="Leek" type="Node3D" unique_id=490278594] -[node name="leek" type="MeshInstance3D" parent="."] +[node name="leek" type="MeshInstance3D" parent="." unique_id=1208900817] transform = Transform3D(-4.371139e-08, 0.75, -4.371139e-08, 0, -3.278354e-08, -1, -1, -3.278354e-08, 1.9106855e-15, -0.25, 0.1, 0) mesh = ExtResource("1_sum7m") -skeleton = NodePath("") diff --git a/client/map/items/lettuce.res b/client/map/items/lettuce.res Binary files differindex 0ae1a660..066494fe 100644 --- a/client/map/items/lettuce.res +++ b/client/map/items/lettuce.res diff --git a/client/map/items/lettuce.tscn b/client/map/items/lettuce.tscn index c4ca7cb9..35f4aeb2 100644 --- a/client/map/items/lettuce.tscn +++ b/client/map/items/lettuce.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cuf8vwqk6xujk"] +[gd_scene format=3 uid="uid://cuf8vwqk6xujk"] [ext_resource type="ArrayMesh" uid="uid://cyomlupimgm43" path="res://map/items/lettuce.res" id="1_axcdp"] -[node name="Lettuce" type="Node3D"] +[node name="Lettuce" type="Node3D" unique_id=337328089] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1106316228] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_axcdp") -skeleton = NodePath("") diff --git a/client/map/items/lettuce_crate.gd.uid b/client/map/items/lettuce_crate.gd.uid deleted file mode 100644 index d206a1e3..00000000 --- a/client/map/items/lettuce_crate.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b3oxc5pyij02s diff --git a/client/map/items/mochi.gd b/client/map/items/mochi.gd index 9ec98658..dc3a860d 100644 --- a/client/map/items/mochi.gd +++ b/client/map/items/mochi.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/mochi.res b/client/map/items/mochi.res Binary files differindex d9a4a97b..63af04da 100644 --- a/client/map/items/mochi.res +++ b/client/map/items/mochi.res diff --git a/client/map/items/mochi.tscn b/client/map/items/mochi.tscn index aaf20af6..0d9ed7e7 100644 --- a/client/map/items/mochi.tscn +++ b/client/map/items/mochi.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=3 format=3 uid="uid://2warur3hlxao"] +[gd_scene format=3 uid="uid://2warur3hlxao"] [ext_resource type="ArrayMesh" uid="uid://c3s71kxt7nhfb" path="res://map/items/mochi.res" id="1_ygb5f"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_c143l"] -[node name="Mochi" type="MeshInstance3D"] +[node name="Mochi" type="MeshInstance3D" unique_id=1419288615] transform = Transform3D(0.15, 0, 0, 0, 0.104, 0, 0, 0, 0.15, 0, 0.075, 0) mesh = ExtResource("1_ygb5f") -skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_c143l") diff --git a/client/map/items/mushroom.res b/client/map/items/mushroom.res Binary files differindex ad8dbc46..d4ce1bc1 100644 --- a/client/map/items/mushroom.res +++ b/client/map/items/mushroom.res diff --git a/client/map/items/mushroom.tscn b/client/map/items/mushroom.tscn index 7c8ab942..ec3237bb 100644 --- a/client/map/items/mushroom.tscn +++ b/client/map/items/mushroom.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cc0jqiiywrrc0"] +[gd_scene format=3 uid="uid://cc0jqiiywrrc0"] [ext_resource type="ArrayMesh" uid="uid://fmglxabrvyld" path="res://map/items/mushroom.res" id="1_3saxa"] -[node name="Mushroom" type="Node3D"] +[node name="Mushroom" type="Node3D" unique_id=513538861] -[node name="Mesh" type="MeshInstance3D" parent="."] -transform = Transform3D(1.7207295, 5.5918704e-08, 2.4574564, 2.4574564, -1.07418835e-07, -1.7207295, 5.5918697e-08, 3.0000005, -1.0741883e-07, 0.125, 0.035, 0) +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1807329182] +transform = Transform3D(1.2167394, -2.1213207, 1.7376841, 2.4574564, -1.07418835e-07, -1.7207295, 1.2167397, 2.1213207, 1.7376841, 0.125, 0.035, 0.125) mesh = ExtResource("1_3saxa") -skeleton = NodePath("") diff --git a/client/map/items/mushroom_plate_fill.tscn b/client/map/items/mushroom_plate_fill.tscn new file mode 100644 index 00000000..5c4f20bc --- /dev/null +++ b/client/map/items/mushroom_plate_fill.tscn @@ -0,0 +1,17 @@ +[gd_scene format=3 uid="uid://dvh0w2l8ly53e"] + +[ext_resource type="PackedScene" uid="uid://da3d6rgfss3su" path="res://map/items/pizza/mushroom_slice.tscn" id="1_iihb3"] + +[node name="MushroomPlateTopping" type="Node3D" unique_id=764525280] + +[node name="CookedMushroomSlice" parent="." unique_id=397861394 instance=ExtResource("1_iihb3")] +transform = Transform3D(-0.53290087, 0.09379602, 0.8409631, 0.111597665, 0.9929469, -0.040030282, -0.8387864, 0.07251734, -0.5396097, 0.083272, 0.020344693, -0.06993499) + +[node name="CookedMushroomSlice2" parent="." unique_id=913110476 instance=ExtResource("1_iihb3")] +transform = Transform3D(0.8638758, -0.24161705, 0.44197255, 0.2151002, 0.97037166, 0.11004867, -0.45546728, 0, 0.89025253, -0.06327816, 0.024188552, -0.060519822) + +[node name="CookedMushroomSlice3" parent="." unique_id=653241564 instance=ExtResource("1_iihb3")] +transform = Transform3D(-0.95794797, -0.20063338, 0.20513889, -0.19618548, 0.9796664, 0.04201196, -0.20939668, 0, -0.97783077, 0.08738138, 0.020179842, 0.036596574) + +[node name="CookedMushroomSlice4" parent="." unique_id=1676048566 instance=ExtResource("1_iihb3")] +transform = Transform3D(0.8235921, 0, -0.5671827, -0.12658499, 0.9747768, -0.18381096, 0.5528766, 0.2231821, 0.8028185, -0.08654484, 0.023021702, 0.08201364) diff --git a/client/map/items/nigiri.res b/client/map/items/nigiri.res Binary files differindex ffe47e3e..bd64e3d1 100644 --- a/client/map/items/nigiri.res +++ b/client/map/items/nigiri.res diff --git a/client/map/items/nigiri.tscn b/client/map/items/nigiri.tscn index 0a616eed..25e0324c 100644 --- a/client/map/items/nigiri.tscn +++ b/client/map/items/nigiri.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://d34n41tk304ey"] +[gd_scene format=3 uid="uid://d34n41tk304ey"] [ext_resource type="ArrayMesh" uid="uid://g2ko273otndc" path="res://map/items/nigiri.res" id="1_my3m1"] -[node name="Nigiri" type="Node3D"] +[node name="Nigiri" type="Node3D" unique_id=713001924] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=916811039] transform = Transform3D(0.144, 0, 0, 0, -2.27299e-09, -0.073, 0, 0.052, -3.19093e-09, 0, 0.1, 0) mesh = ExtResource("1_my3m1") -skeleton = NodePath("") diff --git a/client/map/items/noodles.res b/client/map/items/noodles.res Binary files differindex 9f8d6347..1a5013bb 100644 --- a/client/map/items/noodles.res +++ b/client/map/items/noodles.res diff --git a/client/map/items/noodles.tscn b/client/map/items/noodles.tscn index cad0b17b..37d59dcd 100644 --- a/client/map/items/noodles.tscn +++ b/client/map/items/noodles.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cfc4wyxsgtnuy"] +[gd_scene format=3 uid="uid://cfc4wyxsgtnuy"] [ext_resource type="ArrayMesh" uid="uid://c7nmboj44jn7a" path="res://map/items/noodles.res" id="1_7j6yk"] -[node name="Noodles" type="Node3D"] +[node name="Noodles" type="Node3D" unique_id=32514619] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1535551693] transform = Transform3D(0.378, 0, 0, 0, 0.378, 0, 0, 0, 0.378, -0.027, 0, 0.095) mesh = ExtResource("1_7j6yk") -skeleton = NodePath("") diff --git a/client/map/items/noodles_cheese_fill.tscn b/client/map/items/noodles_cheese_fill.tscn new file mode 100644 index 00000000..fb5c10d9 --- /dev/null +++ b/client/map/items/noodles_cheese_fill.tscn @@ -0,0 +1,25 @@ +[gd_scene format=3 uid="uid://3l14rutbc6ma"] + +[ext_resource type="ArrayMesh" uid="uid://68yn4bguhuq3" path="res://map/items/cheese_bit.res" id="1_1dqn5"] + +[node name="NoodlesCheeseFill" type="Node3D" unique_id=1485282420] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=73653329] +transform = Transform3D(0.5177467, -0.21455958, -0.6909487, -0.07600415, 0.9169244, -0.38597953, 0.53727245, 0.33647275, 0.61123633, -0.125, 0.108, 0.096) +mesh = ExtResource("1_1dqn5") + +[node name="MeshInstance3D5" type="MeshInstance3D" parent="." unique_id=1909498497] +transform = Transform3D(0.74895734, 0.019033965, -0.049147546, -0.013184706, 0.9993994, 0.029855367, 0.037264794, -0.028949905, 0.9983451, -0.009, 0.165, -0.025) +mesh = ExtResource("1_1dqn5") + +[node name="MeshInstance3D2" type="MeshInstance3D" parent="." unique_id=833722459] +transform = Transform3D(0.6929721, 0.34747887, 0.1598467, -0.22719976, 0.9199635, -0.24879485, -0.17512806, 0.18145435, 0.9552748, 0.071, 0.113, 0.078) +mesh = ExtResource("1_1dqn5") + +[node name="MeshInstance3D3" type="MeshInstance3D" parent="." unique_id=1585980071] +transform = Transform3D(0.47207838, 0.50925, -0.58691764, -0.11057563, 0.81986195, 0.5532535, 0.57220167, -0.26170707, 0.5911329, 0.105, 0.113, -0.09) +mesh = ExtResource("1_1dqn5") + +[node name="MeshInstance3D4" type="MeshInstance3D" parent="." unique_id=665036024] +transform = Transform3D(0.7185697, 0, -0.28645763, 0.057966992, 0.9629134, 0.2585037, 0.20687544, -0.26981068, 0.9225605, -0.082, 0.149, -0.128) +mesh = ExtResource("1_1dqn5") diff --git a/client/map/items/noodles_tomato_sauce_fill.res b/client/map/items/noodles_tomato_sauce_fill.res Binary files differnew file mode 100644 index 00000000..2bf8fad6 --- /dev/null +++ b/client/map/items/noodles_tomato_sauce_fill.res diff --git a/client/map/items/noodles_tomato_sauce_fill.tscn b/client/map/items/noodles_tomato_sauce_fill.tscn new file mode 100644 index 00000000..aac0ccd4 --- /dev/null +++ b/client/map/items/noodles_tomato_sauce_fill.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://cxwoxg732tgd8"] + +[ext_resource type="ArrayMesh" uid="uid://kwctvv8h54xj" path="res://map/items/noodles_tomato_sauce_fill.res" id="1_wu5sg"] + +[node name="NoodlesTomatoSauceFill" type="Node3D" unique_id=1260606454] + +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1027670850] +transform = Transform3D(-0.60932875, -0.0051440885, -0.022176262, -0.014863605, 0.24028103, 0.038889483, 0.024445973, 0.017876228, -0.5291095, -0.007, 0.023, 0.011) +mesh = ExtResource("1_wu5sg") diff --git a/client/map/items/pan.gd b/client/map/items/pan.gd index 497d8832..99be1805 100644 --- a/client/map/items/pan.gd +++ b/client/map/items/pan.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -23,6 +23,13 @@ func _init(owned_by_: Node3D): add_child(load("res://map/items/pan.tscn").instantiate()) base.add_child(steam) +func add_contents(contents: Array[String]): + for i: String in contents: + if i == "steak" or i == "seared-steak": + base.add_child(ItemFactory.produce(i, self, .85)) + else: + super([i]) + func progress(position_: float, speed: float, warn: bool): super(position_, speed, warn) steam.emitting = true diff --git a/client/map/items/pan.res b/client/map/items/pan.res Binary files differindex 03dcf8f9..307df9ce 100644 --- a/client/map/items/pan.res +++ b/client/map/items/pan.res diff --git a/client/map/items/pan.tscn b/client/map/items/pan.tscn index 661814d9..908471f0 100644 --- a/client/map/items/pan.tscn +++ b/client/map/items/pan.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://b1fuw04fcbko8"] +[gd_scene format=3 uid="uid://b1fuw04fcbko8"] [ext_resource type="ArrayMesh" uid="uid://be0d8a6no06na" path="res://map/items/pan.res" id="1_m08s2"] -[node name="Pan" type="Node3D"] +[node name="Pan" type="Node3D" unique_id=1343705456] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=2018580953] transform = Transform3D(-2.18557e-08, 0, -0.5, 0, 0.5, 0, 0.5, 0, -2.18557e-08, 0, 0, 0) mesh = ExtResource("1_m08s2") -skeleton = NodePath("") diff --git a/client/map/items/patty.res b/client/map/items/patty.res Binary files differindex 87880285..3ac0a9f1 100644 --- a/client/map/items/patty.res +++ b/client/map/items/patty.res diff --git a/client/map/items/patty.tscn b/client/map/items/patty.tscn index 2d1bdab6..494f623f 100644 --- a/client/map/items/patty.tscn +++ b/client/map/items/patty.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://b1grk3gj58qbn"] +[gd_scene format=3 uid="uid://b1grk3gj58qbn"] [ext_resource type="ArrayMesh" uid="uid://wp3747kxnah1" path="res://map/items/patty.res" id="1_7tkah"] -[node name="Patty" type="Node3D"] +[node name="Patty" type="Node3D" unique_id=2110034130] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1300893752] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_7tkah") -skeleton = NodePath("") diff --git a/client/map/items/pizza.gd b/client/map/items/pizza.gd new file mode 100644 index 00000000..a6c1a2ee --- /dev/null +++ b/client/map/items/pizza.gd @@ -0,0 +1,29 @@ +# Hurry Curry! - a game about cooking +# Copyright (C) 2026 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 Pizza +extends Item + +func _init(owned_by_: Node3D): + super(owned_by_) + +func add_contents(contents: Array[String]): + base.add_child(load("res://map/items/cooked_cheese_pizza.tscn").instantiate()) + for c: String in contents: + match c: + "sliced-cheese": continue + "tomato-juice": continue + "sliced-mushroom": base.add_child(load("res://map/items/pizza/mushroom_pizza_topping.tscn").instantiate()) + _: base.add_child(UnknownItem.new(owned_by, c)) diff --git a/client/map/items/pizza.gd.uid b/client/map/items/pizza.gd.uid new file mode 100644 index 00000000..0a7a85c5 --- /dev/null +++ b/client/map/items/pizza.gd.uid @@ -0,0 +1 @@ +uid://3ptl5whwr0s5 diff --git a/client/map/items/pizza.res b/client/map/items/pizza.res Binary files differnew file mode 100644 index 00000000..ef8b7e68 --- /dev/null +++ b/client/map/items/pizza.res diff --git a/client/map/items/pizza/cheese_pizza_topping.tscn b/client/map/items/pizza/cheese_pizza_topping.tscn new file mode 100644 index 00000000..45f73056 --- /dev/null +++ b/client/map/items/pizza/cheese_pizza_topping.tscn @@ -0,0 +1,25 @@ +[gd_scene format=3 uid="uid://746ly6kg6fym"] + +[ext_resource type="ArrayMesh" uid="uid://68yn4bguhuq3" path="res://map/items/cheese_bit.res" id="1_tuxk6"] + +[node name="CheesePizzaTopping" type="Node3D" unique_id=1491104077] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=571985640] +transform = Transform3D(0.7090622, 0, 0.24439889, 0, 0.5, 0, -0.24439889, 0, 0.7090622, 0, 0.0901646, 0) +mesh = ExtResource("1_tuxk6") + +[node name="MeshInstance3D2" type="MeshInstance3D" parent="." unique_id=2125195768] +transform = Transform3D(0.26293755, 0, -0.70239866, 0, 0.5, 0, 0.70239866, 0, 0.26293755, -0.13107976, 0.0901646, -0.08822491) +mesh = ExtResource("1_tuxk6") + +[node name="MeshInstance3D3" type="MeshInstance3D" parent="." unique_id=2077733221] +transform = Transform3D(0.59963775, 0, -0.4504826, 0, 0.5, 0, 0.4504826, 0, 0.59963775, -0.1088517, 0.0901646, 0.09697052) +mesh = ExtResource("1_tuxk6") + +[node name="MeshInstance3D4" type="MeshInstance3D" parent="." unique_id=508222957] +transform = Transform3D(-0.025716748, 0, 0.7495589, 0, 0.5, 0, -0.7495589, 0, -0.025716748, 0.09534076, 0.0901646, 0.10794736) +mesh = ExtResource("1_tuxk6") + +[node name="MeshInstance3D5" type="MeshInstance3D" parent="." unique_id=348571710] +transform = Transform3D(0.5133626, 0, 0.5467713, 0, 0.5, 0, -0.5467713, 0, 0.5133626, 0.09534076, 0.0901646, -0.14092311) +mesh = ExtResource("1_tuxk6") diff --git a/client/map/items/pizza/mushroom_pizza_topping.tscn b/client/map/items/pizza/mushroom_pizza_topping.tscn new file mode 100644 index 00000000..2dbe8e3d --- /dev/null +++ b/client/map/items/pizza/mushroom_pizza_topping.tscn @@ -0,0 +1,17 @@ +[gd_scene format=3 uid="uid://b8md64r8oddij"] + +[ext_resource type="PackedScene" uid="uid://da3d6rgfss3su" path="res://map/items/pizza/mushroom_slice.tscn" id="1_m4x3a"] + +[node name="MushroomPizzaTopping" type="Node3D" unique_id=1982303343] + +[node name="CookedMushroomSlice" parent="." unique_id=1762083109 instance=ExtResource("1_m4x3a")] +transform = Transform3D(0.44027928, 0, 1.2274243, 0, 1.304, 0, -1.2274243, 0, 0.44027928, 0.09475949, 0.075, -0.090857096) + +[node name="CookedMushroomSlice2" parent="." unique_id=1383642696 instance=ExtResource("1_m4x3a")] +transform = Transform3D(1.1608893, 0, 0.59392935, 0, 1.304, 0, -0.59392935, 0, 1.1608893, -0.088593446, 0.075, -0.07241271) + +[node name="CookedMushroomSlice3" parent="." unique_id=1087751451 instance=ExtResource("1_m4x3a")] +transform = Transform3D(-1.2750913, 0, 0.27305326, 0, 1.304, 0, -0.27305326, 0, -1.2750913, 0.090249225, 0.075, 0.075857505) + +[node name="CookedMushroomSlice4" parent="." unique_id=298075280 instance=ExtResource("1_m4x3a")] +transform = Transform3D(1.0739639, 0, -0.73960626, 0, 1.304, 0, 0.73960626, 0, 1.0739639, -0.11389688, 0.075, 0.098924026) diff --git a/client/map/items/pizza/mushroom_slice.res b/client/map/items/pizza/mushroom_slice.res Binary files differnew file mode 100644 index 00000000..e50c5a19 --- /dev/null +++ b/client/map/items/pizza/mushroom_slice.res diff --git a/client/map/items/pizza/mushroom_slice.tscn b/client/map/items/pizza/mushroom_slice.tscn new file mode 100644 index 00000000..fbe1379b --- /dev/null +++ b/client/map/items/pizza/mushroom_slice.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://da3d6rgfss3su"] + +[ext_resource type="ArrayMesh" uid="uid://b24bxvhik0ab2" path="res://map/items/pizza/mushroom_slice.res" id="1_6tyh4"] + +[node name="CookedMushroomSlice" type="Node3D" unique_id=1237055269] + +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=964430930] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.05) +mesh = ExtResource("1_6tyh4") diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd index e5b86df2..e71b7d0a 100644 --- a/client/map/items/plate.gd +++ b/client/map/items/plate.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -39,33 +39,54 @@ func add_contents(contents: Array[String]): contents.append("bun-small") # Tomato + lettuce salad has a custom mesh - if contents.has("sliced-tomato") and contents.has("sliced-lettuce") and contents.size() == 2: + if G.unordered_array_eq(contents, ["sliced-tomato", "sliced-lettuce"]): contents.erase("sliced-tomato") contents.erase("sliced-lettuce") contents.append("tomato-lettuce-salad") + # Noodles + tomato soup has a custom tomato sauce mesh + if G.unordered_array_subset(["cooked-noodles", "tomato-soup"], contents): + contents.erase("tomato-soup") + contents.append("noodles-tomato-fill") + + # Noodles + sliced cheese has a custom cheese mesh + if G.unordered_array_subset(["cooked-noodles", "sliced-cheese"], contents): + contents.erase("sliced-cheese") + contents.append("noodles-cheese-fill") + # Stack content items on top of each other var height_sum := 0. - for c in contents: + for c: String in contents: var item: Item match c: "curry": add_child(PlateFill.new(self, Color(.75, .45, .1))) - "cheese-leek-soup": add_child(PlateFill.new(self, Color(0.747, 0.77, 0.493))) + "cheese-leek-soup": + add_child(PlateFill.new(self, Color(0.747, 0.77, 0.493))) + add_child(load("res://map/items/sliced_leek/leek_ring_fill.tscn").instantiate()) + "mushroom-soup": + add_child(PlateFill.new(self, Color(0.747, 0.454, 0.36))) + add_child(load("res://map/items/mushroom_plate_fill.tscn").instantiate()) "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))) + "noodles-tomato-fill": add_child(load("res://map/items/noodles_tomato_sauce_fill.tscn").instantiate()) + "noodles-cheese-fill": add_child(load("res://map/items/noodles_cheese_fill.tscn").instantiate()) "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) bun.scale *= 0.5 bun.position += Vector3(-.1, 0, -.1) + "seared-steak": base.add_child(ItemFactory.produce(c, base, .85)) "seared-steak-small": var seared_steak = ItemFactory.produce("seared-steak", base) base.add_child(seared_steak) seared_steak.scale *= 0.5 seared_steak.position += Vector3(.1, 0, .1) - _: item = ItemFactory.produce(c, base) + _: + item = ItemFactory.produce(c, base) + if c.contains("pizza"): + item.scale = Vector3(.7, .7, .7) if item != null: base.add_child(item) item.position.y = height_sum diff --git a/client/map/items/plate.res b/client/map/items/plate.res Binary files differindex b57844c3..2890171a 100644 --- a/client/map/items/plate.res +++ b/client/map/items/plate.res diff --git a/client/map/items/plate.tscn b/client/map/items/plate.tscn index 8503fe81..ca4aac58 100644 --- a/client/map/items/plate.tscn +++ b/client/map/items/plate.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://daxh3hgia7qyp"] +[gd_scene format=3 uid="uid://daxh3hgia7qyp"] [ext_resource type="ArrayMesh" uid="uid://bnku7g8g0ts81" path="res://map/items/plate.res" id="1_70hux"] -[node name="Plate" type="Node3D"] +[node name="Plate" type="Node3D" unique_id=351447493] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=279311129] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_70hux") -skeleton = NodePath("") diff --git a/client/map/items/plate_fill.gd b/client/map/items/plate_fill.gd index 057fc11f..fc2a3310 100644 --- a/client/map/items/plate_fill.gd +++ b/client/map/items/plate_fill.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/plate_fill.res b/client/map/items/plate_fill.res Binary files differindex 8aad5797..fb198090 100644 --- a/client/map/items/plate_fill.res +++ b/client/map/items/plate_fill.res diff --git a/client/map/items/plate_fill.tscn b/client/map/items/plate_fill.tscn index 1ba34231..29264c86 100644 --- a/client/map/items/plate_fill.tscn +++ b/client/map/items/plate_fill.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=3 format=3 uid="uid://btktb7yb1y0yq"] +[gd_scene format=3 uid="uid://btktb7yb1y0yq"] [ext_resource type="ArrayMesh" uid="uid://c8l6gbfjikyv3" path="res://map/items/plate_fill.res" id="1_dgygv"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_q0leg"] resource_local_to_scene = true -[node name="PlateFill" type="MeshInstance3D"] +[node name="PlateFill" type="MeshInstance3D" unique_id=601792816] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_dgygv") -skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_q0leg") diff --git a/client/map/items/pot.gd b/client/map/items/pot.gd index 77c8ebd1..06b63f58 100644 --- a/client/map/items/pot.gd +++ b/client/map/items/pot.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -26,6 +26,8 @@ func _init(owned_by_: Node3D): func add_contents(contents: Array[String]): for i in contents: match i: + "cheese": + add_child(PotFill.new(self, Color(0.99, 0.75, 0.337, 1.0))) "cheese-leek-soup": add_child(PotFill.new(self, Color(0.747, 0.77, 0.493))) "mochi-dough": @@ -43,6 +45,15 @@ func add_contents(contents: Array[String]): leek.rotation_degrees = Vector3(-75.5, 0, -25) leek.position = Vector3(.03, .1, .25) base.add_child(leek) + "cooked-noodles": + base.add_child(ItemFactory.produce(i, self, .85)) + "noodles": + add_child(PotFillTransparent.new(self, Color(0.46, 0.68, 0.73, 0.392))) # water + base.add_child(ItemFactory.produce(i, self, .85)) + "processed-mushroom": + add_child(PotFill.new(self, Color(0.596, 0.341, 0.259))) + "mushroom-soup": + add_child(PotFill.new(self, Color(0.747, 0.454, 0.36, 1.0))) "cooked-rice": add_child(PotFill.new(self, Color(1.,1.,1.))) "curry": diff --git a/client/map/items/pot.res b/client/map/items/pot.res Binary files differindex df67fed3..827e6e28 100644 --- a/client/map/items/pot.res +++ b/client/map/items/pot.res diff --git a/client/map/items/pot.tscn b/client/map/items/pot.tscn index f823cae2..68a6f440 100644 --- a/client/map/items/pot.tscn +++ b/client/map/items/pot.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://df0hhdcyubyid"] +[gd_scene format=3 uid="uid://df0hhdcyubyid"] [ext_resource type="ArrayMesh" uid="uid://dm14h4sasn2bm" path="res://map/items/pot.res" id="1_41enh"] -[node name="Pot" type="Node3D"] +[node name="Pot" type="Node3D" unique_id=1778291833] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=955140522] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_41enh") -skeleton = NodePath("") diff --git a/client/map/items/pot_fill.gd b/client/map/items/pot_fill.gd index 0a59038d..e8dfaa1e 100644 --- a/client/map/items/pot_fill.gd +++ b/client/map/items/pot_fill.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/pot_fill.res b/client/map/items/pot_fill.res Binary files differindex 06c8590c..94942edb 100644 --- a/client/map/items/pot_fill.res +++ b/client/map/items/pot_fill.res diff --git a/client/map/items/pot_fill.tscn b/client/map/items/pot_fill.tscn index 2b3a1eda..674899ad 100644 --- a/client/map/items/pot_fill.tscn +++ b/client/map/items/pot_fill.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=3 format=3 uid="uid://cwo8o5a6f5p4i"] +[gd_scene format=3 uid="uid://cwo8o5a6f5p4i"] [ext_resource type="ArrayMesh" uid="uid://bduftri3viodq" path="res://map/items/pot_fill.res" id="1_5suf6"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_djkvw"] resource_local_to_scene = true -[node name="PotFill" type="MeshInstance3D"] +[node name="PotFill" type="MeshInstance3D" unique_id=1219055572] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_5suf6") -skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_djkvw") diff --git a/client/map/items/lettuce_crate.gd b/client/map/items/pot_fill_transparent.gd index 2a0ff5a5..f8585733 100644 --- a/client/map/items/lettuce_crate.gd +++ b/client/map/items/pot_fill_transparent.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -13,9 +13,10 @@ # 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 LettuceCrate -extends Crate +class_name PotFillTransparent +extends PotFill -func _init(ctx: TileFactory.TileCC): - super(ctx) - base.add_child(load("res://map/tiles/lettuce_crate.tscn").instantiate()) +func _init(owned_by_: Node3D, c: Color): + super(owned_by_, c) + var mat: BaseMaterial3D = fill.get_active_material(0) + mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA diff --git a/client/map/items/pot_fill_transparent.gd.uid b/client/map/items/pot_fill_transparent.gd.uid new file mode 100644 index 00000000..863ef626 --- /dev/null +++ b/client/map/items/pot_fill_transparent.gd.uid @@ -0,0 +1 @@ +uid://b7mtr0omy3nx4 diff --git a/client/map/items/potato.res b/client/map/items/potato.res Binary files differindex 1a920e6f..3e54bece 100644 --- a/client/map/items/potato.res +++ b/client/map/items/potato.res diff --git a/client/map/items/potato.tscn b/client/map/items/potato.tscn index b57b2bbf..7d97b648 100644 --- a/client/map/items/potato.tscn +++ b/client/map/items/potato.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dw24qu0oscohw"] +[gd_scene format=3 uid="uid://dw24qu0oscohw"] [ext_resource type="ArrayMesh" uid="uid://hj2dib0t8em3" path="res://map/items/potato.res" id="1_rg7i5"] -[node name="Potato" type="Node3D"] +[node name="Potato" type="Node3D" unique_id=1149637460] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=544200943] transform = Transform3D(-0.07814168, -2.3085807e-08, -0.44316345, -0.44316345, -1.937129e-08, 0.07814168, -2.3085807e-08, 0.45, -1.937129e-08, 0, 0.1, 0) mesh = ExtResource("1_rg7i5") -skeleton = NodePath("") diff --git a/client/map/items/processing.tscn b/client/map/items/processing.tscn index f8deb6be..28f785fa 100644 --- a/client/map/items/processing.tscn +++ b/client/map/items/processing.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://sk5i14bxi0qr"] +[gd_scene format=3 uid="uid://sk5i14bxi0qr"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tqrr3"] vertex_color_use_as_albedo = true @@ -8,7 +8,7 @@ material = SubResource("StandardMaterial3D_tqrr3") radius = 0.1 height = 0.2 -[node name="Processing" type="CPUParticles3D"] +[node name="Processing" type="CPUParticles3D" unique_id=412007652] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0) emitting = false amount = 15 @@ -19,6 +19,7 @@ emission_ring_axis = Vector3(0, 1, 0) emission_ring_height = 0.2 emission_ring_radius = 0.1 emission_ring_inner_radius = 0.0 +emission_ring_cone_angle = 90.0 direction = Vector3(0, 1, 0) spread = 180.0 gravity = Vector3(0, 0, 0) diff --git a/client/map/items/raw_pizza.tscn b/client/map/items/raw_pizza.tscn new file mode 100644 index 00000000..5b7359cf --- /dev/null +++ b/client/map/items/raw_pizza.tscn @@ -0,0 +1,11 @@ +[gd_scene format=3 uid="uid://d18w3kwuaehvv"] + +[ext_resource type="ArrayMesh" uid="uid://cwstqugiw76tc" path="res://map/items/pizza.res" id="1_lcgk8"] +[ext_resource type="Material" uid="uid://cg7o7rn06bve1" path="res://map/items/dough_material.tres" id="2_snge3"] + +[node name="RawPizza" type="Node3D" unique_id=1513785364] + +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=449857524] +transform = Transform3D(0.3, 0, 0, 0, 0.05, 0, 0, 0, 0.3, 0, 0.05, 0) +mesh = ExtResource("1_lcgk8") +surface_material_override/0 = ExtResource("2_snge3") diff --git a/client/map/items/rice.res b/client/map/items/rice.res Binary files differindex f9a6a81c..d57d301b 100644 --- a/client/map/items/rice.res +++ b/client/map/items/rice.res diff --git a/client/map/items/rice.tscn b/client/map/items/rice.tscn index bb41f3e8..03f69422 100644 --- a/client/map/items/rice.tscn +++ b/client/map/items/rice.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://rs4b17lp80cx"] +[gd_scene format=3 uid="uid://rs4b17lp80cx"] [ext_resource type="ArrayMesh" uid="uid://cclj4k0d1d1qk" path="res://map/items/rice.res" id="1_fmn8b"] -[node name="Rice" type="Node3D"] +[node name="Rice" type="Node3D" unique_id=132148842] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1049224626] transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) mesh = ExtResource("1_fmn8b") -skeleton = NodePath("") diff --git a/client/map/items/rice_content.res b/client/map/items/rice_content.res Binary files differindex 0f5dd44d..9aba9cfc 100644 --- a/client/map/items/rice_content.res +++ b/client/map/items/rice_content.res diff --git a/client/map/items/rice_content.tscn b/client/map/items/rice_content.tscn index 71038a4e..cc042d0a 100644 --- a/client/map/items/rice_content.tscn +++ b/client/map/items/rice_content.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://do4qxd1d1x7cc"] +[gd_scene format=3 uid="uid://do4qxd1d1x7cc"] [ext_resource type="ArrayMesh" uid="uid://dfvubawp7vieh" path="res://map/items/rice_content.res" id="1_r5kmu"] @@ -6,8 +6,7 @@ resource_local_to_scene = true albedo_color = Color(0.933333, 0.933333, 0.666667, 1) -[node name="RiceContent" type="MeshInstance3D"] +[node name="RiceContent" type="MeshInstance3D" unique_id=867972096] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_r5kmu") -skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_ce6yj") diff --git a/client/map/items/rolled_dough.gd b/client/map/items/rolled_dough.gd index cd59d907..3d0b5d25 100644 --- a/client/map/items/rolled_dough.gd +++ b/client/map/items/rolled_dough.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 @@ -16,10 +16,20 @@ class_name RolledDough extends Item - func _init(owned_by_: Node3D): super(owned_by_) - add_child(load("res://map/items/rolled_dough.tscn").instantiate()) func add_contents(contents: Array[String]): - super(contents) + contents.sort() + + if contents.has("tomato-juice"): + base.add_child(load("res://map/items/raw_pizza.tscn").instantiate()) + else: + base.add_child(load("res://map/items/rolled_dough.tscn").instantiate()) + + for c: String in contents: + match c: + "tomato-juice": continue + "sliced-cheese": base.add_child(load("res://map/items/pizza/cheese_pizza_topping.tscn").instantiate()) + "sliced-mushroom": base.add_child(load("res://map/items/pizza/mushroom_pizza_topping.tscn").instantiate()) + _: base.add_child(UnknownItem.new(owned_by, c)) diff --git a/client/map/items/rolled_dough.res b/client/map/items/rolled_dough.res Binary files differindex 2759b731..c432a638 100644 --- a/client/map/items/rolled_dough.res +++ b/client/map/items/rolled_dough.res diff --git a/client/map/items/rolled_dough.tscn b/client/map/items/rolled_dough.tscn index 04577c96..0fc9c103 100644 --- a/client/map/items/rolled_dough.tscn +++ b/client/map/items/rolled_dough.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dwfvdvvgenyn5"] +[gd_scene format=3 uid="uid://dwfvdvvgenyn5"] [ext_resource type="ArrayMesh" uid="uid://dtqjpqwxq5mvn" path="res://map/items/rolled_dough.res" id="1_uyf2v"] -[node name="RolledDough" type="Node3D"] +[node name="RolledDough" type="Node3D" unique_id=1623668918] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1841908103] transform = Transform3D(0.3, 0, 0, 0, 0.05, 0, 0, 0, 0.3, 0, 0.05, 0) mesh = ExtResource("1_uyf2v") -skeleton = NodePath("") diff --git a/client/map/items/seared_patty.res b/client/map/items/seared_patty.res Binary files differindex 255b95df..d7ac0a30 100644 --- a/client/map/items/seared_patty.res +++ b/client/map/items/seared_patty.res diff --git a/client/map/items/seared_patty.tscn b/client/map/items/seared_patty.tscn index 7ffe65f2..d72e2681 100644 --- a/client/map/items/seared_patty.tscn +++ b/client/map/items/seared_patty.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dfriokxmga3c8"] +[gd_scene format=3 uid="uid://dfriokxmga3c8"] [ext_resource type="ArrayMesh" uid="uid://dl8hstmmdkog4" path="res://map/items/seared_patty.res" id="1_gy1aa"] -[node name="SearedPatty" type="Node3D"] +[node name="SearedPatty" type="Node3D" unique_id=580728218] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1808379124] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_gy1aa") -skeleton = NodePath("") diff --git a/client/map/items/seared_steak.res b/client/map/items/seared_steak.res Binary files differindex 32c784fb..b91da335 100644 --- a/client/map/items/seared_steak.res +++ b/client/map/items/seared_steak.res diff --git a/client/map/items/seared_steak.tscn b/client/map/items/seared_steak.tscn index 8592e851..ee7797f4 100644 --- a/client/map/items/seared_steak.tscn +++ b/client/map/items/seared_steak.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://c70af18pms3gw"] +[gd_scene format=3 uid="uid://c70af18pms3gw"] [ext_resource type="ArrayMesh" uid="uid://kfod37qy5sx" path="res://map/items/seared_steak.res" id="1_keoxi"] -[node name="Steak" type="Node3D"] +[node name="Steak" type="Node3D" unique_id=201918396] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=151167089] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_keoxi") -skeleton = NodePath("") diff --git a/client/map/items/sliced_bun.tscn b/client/map/items/sliced_bun.tscn index 961d0f70..48b0b303 100644 --- a/client/map/items/sliced_bun.tscn +++ b/client/map/items/sliced_bun.tscn @@ -1,16 +1,14 @@ -[gd_scene load_steps=3 format=3 uid="uid://cm88wpf64l4fu"] +[gd_scene format=3 uid="uid://cm88wpf64l4fu"] [ext_resource type="ArrayMesh" uid="uid://c1qyv55xpv30n" path="res://map/items/sliced_bun_bottom.res" id="1_plvi5"] [ext_resource type="ArrayMesh" uid="uid://dy180cecs6rb1" path="res://map/items/sliced_bun_top.res" id="2_l6cg2"] -[node name="SlicedBun" type="Node3D"] +[node name="SlicedBun" type="Node3D" unique_id=289245464] -[node name="MeshBottom" type="MeshInstance3D" parent="."] +[node name="MeshBottom" type="MeshInstance3D" parent="." unique_id=2050604098] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_plvi5") -skeleton = NodePath("") -[node name="MeshTop" type="MeshInstance3D" parent="."] +[node name="MeshTop" type="MeshInstance3D" parent="." unique_id=1553309169] transform = Transform3D(0.433013, 0.25, 0, -0.25, 0.433013, 0, 0, 0, 0.5, 0.18, 0.08, 0) mesh = ExtResource("2_l6cg2") -skeleton = NodePath("") diff --git a/client/map/items/sliced_bun_bottom.res b/client/map/items/sliced_bun_bottom.res Binary files differindex df7bab99..350e9693 100644 --- a/client/map/items/sliced_bun_bottom.res +++ b/client/map/items/sliced_bun_bottom.res diff --git a/client/map/items/sliced_bun_bottom.tscn b/client/map/items/sliced_bun_bottom.tscn index 573dba13..45e7af68 100644 --- a/client/map/items/sliced_bun_bottom.tscn +++ b/client/map/items/sliced_bun_bottom.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://djtfnj11lljke"] +[gd_scene format=3 uid="uid://djtfnj11lljke"] [ext_resource type="ArrayMesh" uid="uid://c1qyv55xpv30n" path="res://map/items/sliced_bun_bottom.res" id="1_ekr5f"] -[node name="SlicedBunBottom" type="Node3D"] +[node name="SlicedBunBottom" type="Node3D" unique_id=1954514598] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=234719865] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_ekr5f") -skeleton = NodePath("") diff --git a/client/map/items/sliced_bun_top.res b/client/map/items/sliced_bun_top.res Binary files differindex fc88dcbe..4d4d57fc 100644 --- a/client/map/items/sliced_bun_top.res +++ b/client/map/items/sliced_bun_top.res diff --git a/client/map/items/sliced_bun_top.tscn b/client/map/items/sliced_bun_top.tscn index 403ecea7..b57c72ef 100644 --- a/client/map/items/sliced_bun_top.tscn +++ b/client/map/items/sliced_bun_top.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cpmnp5sy6fwbe"] +[gd_scene format=3 uid="uid://cpmnp5sy6fwbe"] [ext_resource type="ArrayMesh" uid="uid://dy180cecs6rb1" path="res://map/items/sliced_bun_top.res" id="1_q5w8k"] -[node name="SlicedBunTop" type="Node3D"] +[node name="SlicedBunTop" type="Node3D" unique_id=45817428] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=487537457] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_q5w8k") -skeleton = NodePath("") diff --git a/client/map/items/sliced_cheese.res b/client/map/items/sliced_cheese.res Binary files differindex ece9c0e0..799e4508 100644 --- a/client/map/items/sliced_cheese.res +++ b/client/map/items/sliced_cheese.res diff --git a/client/map/items/sliced_cheese.tscn b/client/map/items/sliced_cheese.tscn index 4e9ba406..22a6df5f 100644 --- a/client/map/items/sliced_cheese.tscn +++ b/client/map/items/sliced_cheese.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cfdfhxgo4ot7m"] +[gd_scene format=3 uid="uid://cfdfhxgo4ot7m"] [ext_resource type="ArrayMesh" uid="uid://2qsg2dadmf1y" path="res://map/items/sliced_cheese.res" id="1_bbycg"] -[node name="SlicedCheese" type="Node3D"] +[node name="SlicedCheese" type="Node3D" unique_id=1506920915] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1120946141] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.04, 0) mesh = ExtResource("1_bbycg") -skeleton = NodePath("") diff --git a/client/map/items/sliced_fish.res b/client/map/items/sliced_fish.res Binary files differindex 9937a93b..a7d27cf5 100644 --- a/client/map/items/sliced_fish.res +++ b/client/map/items/sliced_fish.res diff --git a/client/map/items/sliced_fish.tscn b/client/map/items/sliced_fish.tscn index 5e60f301..d6ed4bec 100644 --- a/client/map/items/sliced_fish.tscn +++ b/client/map/items/sliced_fish.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dxs04puo5ow7u"] +[gd_scene format=3 uid="uid://dxs04puo5ow7u"] [ext_resource type="ArrayMesh" uid="uid://c3pxaxxbv721y" path="res://map/items/sliced_fish.res" id="1_nt0xc"] -[node name="SlicedFish" type="Node3D"] +[node name="SlicedFish" type="Node3D" unique_id=1546314626] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1817309076] transform = Transform3D(0.1, 0, 0, 0, -4.37114e-09, -0.1, 0, 0.1, -4.37114e-09, 0, 0.045, 0) mesh = ExtResource("1_nt0xc") -skeleton = NodePath("") diff --git a/client/map/items/sliced_leek/leek_ring.res b/client/map/items/sliced_leek/leek_ring.res Binary files differnew file mode 100644 index 00000000..78d57354 --- /dev/null +++ b/client/map/items/sliced_leek/leek_ring.res diff --git a/client/map/items/sliced_leek/leek_ring.tscn b/client/map/items/sliced_leek/leek_ring.tscn new file mode 100644 index 00000000..a8575b05 --- /dev/null +++ b/client/map/items/sliced_leek/leek_ring.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://b25ajkbydfoi8"] + +[ext_resource type="ArrayMesh" uid="uid://ck1dtslyq0xqk" path="res://map/items/sliced_leek/leek_ring.res" id="1_wdt75"] + +[node name="LeekRing" type="Node3D" unique_id=6349426] + +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=207039888] +transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) +mesh = ExtResource("1_wdt75") diff --git a/client/map/items/sliced_leek/leek_ring_fill.tscn b/client/map/items/sliced_leek/leek_ring_fill.tscn new file mode 100644 index 00000000..83fc2542 --- /dev/null +++ b/client/map/items/sliced_leek/leek_ring_fill.tscn @@ -0,0 +1,14 @@ +[gd_scene format=3 uid="uid://y7mg0uh4ghxe"] + +[ext_resource type="PackedScene" uid="uid://b25ajkbydfoi8" path="res://map/items/sliced_leek/leek_ring.tscn" id="1_cb47f"] + +[node name="LeekRingFill" type="Node3D" unique_id=1649292111] + +[node name="LeekRing" parent="." unique_id=601839974 instance=ExtResource("1_cb47f")] +transform = Transform3D(0.5, 0, 0, 0, 0.4, 0, 0, 0, 0.5, 0.053702652, 0.04, -0.082) + +[node name="LeekRing2" parent="." unique_id=871702627 instance=ExtResource("1_cb47f")] +transform = Transform3D(0.5, 0, 0, 0, 0.4, 0, 0, 0, 0.5, -0.09291987, 0.04, 0.0293293) + +[node name="LeekRing3" parent="." unique_id=1947059454 instance=ExtResource("1_cb47f")] +transform = Transform3D(0.5, 0, 0, 0, 0.4, 0, 0, 0, 0.5, 0.05727595, 0.04, 0.08234578) diff --git a/client/map/items/sliced_leek/sliced_leek.tscn b/client/map/items/sliced_leek/sliced_leek.tscn index 701f4844..8d8bc2d7 100644 --- a/client/map/items/sliced_leek/sliced_leek.tscn +++ b/client/map/items/sliced_leek/sliced_leek.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://dght3ftij5nx6"] +[gd_scene format=3 uid="uid://dght3ftij5nx6"] [ext_resource type="ArrayMesh" uid="uid://bjb2vxii3mkny" path="res://map/items/sliced_leek/sliced_leek_1.res" id="1_ub7pe"] [ext_resource type="ArrayMesh" uid="uid://bthgt3jvyaet5" path="res://map/items/sliced_leek/sliced_leek_2.res" id="2_krib3"] @@ -6,32 +6,27 @@ [ext_resource type="ArrayMesh" uid="uid://deqd1uok1ahtn" path="res://map/items/sliced_leek/sliced_leek_4.res" id="4_eia2k"] [ext_resource type="ArrayMesh" uid="uid://cl36j3pufjfil" path="res://map/items/sliced_leek/sliced_leek_5.res" id="5_26kjl"] -[node name="SlicedLeek" type="Node3D"] +[node name="SlicedLeek" type="Node3D" unique_id=754926403] -[node name="Node3D" type="Node3D" parent="."] +[node name="Node3D" type="Node3D" parent="." unique_id=1618880656] transform = Transform3D(-7.649493e-08, 0, 1.75, 0, 1.75, 0, -1.75, 0, -7.649493e-08, 0, 0, 0) -[node name="leek_001" type="MeshInstance3D" parent="Node3D"] +[node name="leek_001" type="MeshInstance3D" parent="Node3D" unique_id=1739603265] transform = Transform3D(1, 0, 0, 0, 0.591008, 0.61566144, 0, -0.4617461, 0.7880107, 0, 0.03454741, 0.09892485) mesh = ExtResource("1_ub7pe") -skeleton = NodePath("") -[node name="leek_002" type="MeshInstance3D" parent="Node3D"] +[node name="leek_002" type="MeshInstance3D" parent="Node3D" unique_id=10737438] transform = Transform3D(1, 0, 0, 0, 0.591008, 0.61566144, 0, -0.4617461, 0.7880107, -2.0835932e-06, 0.03454531, 0.04651942) mesh = ExtResource("2_krib3") -skeleton = NodePath("") -[node name="leek_003" type="MeshInstance3D" parent="Node3D"] +[node name="leek_003" type="MeshInstance3D" parent="Node3D" unique_id=1275702161] transform = Transform3D(1, 0, 0, 0, 0.591008, 0.61566144, 0, -0.4617461, 0.7880107, -2.0874368e-06, 0.034545287, -0.004093088) mesh = ExtResource("3_eq1cv") -skeleton = NodePath("") -[node name="leek_004" type="MeshInstance3D" parent="Node3D"] +[node name="leek_004" type="MeshInstance3D" parent="Node3D" unique_id=2052531974] transform = Transform3D(1, 0, 0, 0, 0.591008, 0.61566144, 0, -0.4617461, 0.7880107, -2.085316e-06, 0.03454527, -0.05421468) mesh = ExtResource("4_eia2k") -skeleton = NodePath("") -[node name="leek_005" type="MeshInstance3D" parent="Node3D"] +[node name="leek_005" type="MeshInstance3D" parent="Node3D" unique_id=1421505896] transform = Transform3D(1, 0, 0, 0, 0.591008, 0.61566144, 0, -0.4617461, 0.7880107, -2.0847467e-06, 0.034545254, -0.10421119) mesh = ExtResource("5_26kjl") -skeleton = NodePath("") diff --git a/client/map/items/sliced_leek/sliced_leek_1.res b/client/map/items/sliced_leek/sliced_leek_1.res Binary files differindex 9a786370..dc5275d5 100644 --- a/client/map/items/sliced_leek/sliced_leek_1.res +++ b/client/map/items/sliced_leek/sliced_leek_1.res diff --git a/client/map/items/sliced_leek/sliced_leek_2.res b/client/map/items/sliced_leek/sliced_leek_2.res Binary files differindex 3234cd54..c0d7ccd3 100644 --- a/client/map/items/sliced_leek/sliced_leek_2.res +++ b/client/map/items/sliced_leek/sliced_leek_2.res diff --git a/client/map/items/sliced_leek/sliced_leek_3.res b/client/map/items/sliced_leek/sliced_leek_3.res Binary files differindex 2165204a..2fe303a4 100644 --- a/client/map/items/sliced_leek/sliced_leek_3.res +++ b/client/map/items/sliced_leek/sliced_leek_3.res diff --git a/client/map/items/sliced_leek/sliced_leek_4.res b/client/map/items/sliced_leek/sliced_leek_4.res Binary files differindex 05d54114..32c02690 100644 --- a/client/map/items/sliced_leek/sliced_leek_4.res +++ b/client/map/items/sliced_leek/sliced_leek_4.res diff --git a/client/map/items/sliced_leek/sliced_leek_5.res b/client/map/items/sliced_leek/sliced_leek_5.res Binary files differindex 90f4d4b2..93f9e009 100644 --- a/client/map/items/sliced_leek/sliced_leek_5.res +++ b/client/map/items/sliced_leek/sliced_leek_5.res diff --git a/client/map/items/sliced_leek/sliced_leek_6.res b/client/map/items/sliced_leek/sliced_leek_6.res Binary files differindex db0baeda..1cd6c906 100644 --- a/client/map/items/sliced_leek/sliced_leek_6.res +++ b/client/map/items/sliced_leek/sliced_leek_6.res diff --git a/client/map/items/sliced_lettuce.res b/client/map/items/sliced_lettuce.res Binary files differindex 1a748947..40cb0702 100644 --- a/client/map/items/sliced_lettuce.res +++ b/client/map/items/sliced_lettuce.res diff --git a/client/map/items/sliced_lettuce.tscn b/client/map/items/sliced_lettuce.tscn index f2840059..d5ec39ed 100644 --- a/client/map/items/sliced_lettuce.tscn +++ b/client/map/items/sliced_lettuce.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=2 format=3 uid="uid://c8tjoqcdn1gpj"] +[gd_scene format=3 uid="uid://c8tjoqcdn1gpj"] [ext_resource type="ArrayMesh" uid="uid://jkb0e8d584uo" path="res://map/items/sliced_lettuce.res" id="1_y7x7n"] -[node name="SlicedLettuce" type="Node3D"] +[node name="SlicedLettuce" type="Node3D" unique_id=814161375] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.01, 0) -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=189735380] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.01, 0) mesh = ExtResource("1_y7x7n") -skeleton = NodePath("") diff --git a/client/map/items/sliced_mushroom.res b/client/map/items/sliced_mushroom.res Binary files differnew file mode 100644 index 00000000..94b17fe4 --- /dev/null +++ b/client/map/items/sliced_mushroom.res diff --git a/client/map/items/sliced_mushroom.tscn b/client/map/items/sliced_mushroom.tscn new file mode 100644 index 00000000..17945fc0 --- /dev/null +++ b/client/map/items/sliced_mushroom.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://8waoyr3a7c6q"] + +[ext_resource type="ArrayMesh" uid="uid://13uivbfdn4kb" path="res://map/items/sliced_mushroom.res" id="1_4k44b"] + +[node name="SlicedMushroom" type="Node3D" unique_id=771921867] + +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1483580511] +transform = Transform3D(0.8, 0, 0, 0, -0.7250462, -0.33809468, 0, 0.33809468, -0.7250462, 0, 0.059715845, 0.1) +mesh = ExtResource("1_4k44b") diff --git a/client/map/items/sliced_potato.tscn b/client/map/items/sliced_potato.tscn index ec48414d..f64eafd3 100644 --- a/client/map/items/sliced_potato.tscn +++ b/client/map/items/sliced_potato.tscn @@ -1,14 +1,13 @@ -[gd_scene load_steps=3 format=3 uid="uid://b85iw6rv2snx8"] +[gd_scene 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="SlicedPotato" type="Node3D" unique_id=552755740] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=983811931] 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") diff --git a/client/map/items/sliced_tomato.res b/client/map/items/sliced_tomato.res Binary files differindex 3594e6f9..37996910 100644 --- a/client/map/items/sliced_tomato.res +++ b/client/map/items/sliced_tomato.res diff --git a/client/map/items/sliced_tomato.tscn b/client/map/items/sliced_tomato.tscn index 28ba45f4..9ea93827 100644 --- a/client/map/items/sliced_tomato.tscn +++ b/client/map/items/sliced_tomato.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://8u4yp0323kiw"] +[gd_scene format=3 uid="uid://8u4yp0323kiw"] [ext_resource type="ArrayMesh" uid="uid://cwjqxolxw0ttl" path="res://map/items/sliced_tomato.res" id="1_6yvlk"] -[node name="SlicedTomato" type="Node3D"] +[node name="SlicedTomato" type="Node3D" unique_id=1212521096] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=642983217] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_6yvlk") -skeleton = NodePath("") diff --git a/client/map/items/sliced_tomato_sliced_lettuce_fill.tscn b/client/map/items/sliced_tomato_sliced_lettuce_fill.tscn index 75ef95f1..4d0c4c4f 100644 --- a/client/map/items/sliced_tomato_sliced_lettuce_fill.tscn +++ b/client/map/items/sliced_tomato_sliced_lettuce_fill.tscn @@ -1,35 +1,35 @@ -[gd_scene load_steps=3 format=3 uid="uid://cy12k7ghclh2g"] +[gd_scene format=3 uid="uid://cy12k7ghclh2g"] [ext_resource type="ArrayMesh" uid="uid://cwjqxolxw0ttl" path="res://map/items/sliced_tomato.res" id="1_gnakr"] [ext_resource type="ArrayMesh" uid="uid://jkb0e8d584uo" path="res://map/items/sliced_lettuce.res" id="3_6hedi"] -[node name="SlicedTomatoFill" type="Node3D"] +[node name="SlicedTomatoFill" type="Node3D" unique_id=1588553817] -[node name="Mesh8" type="MeshInstance3D" parent="."] +[node name="Mesh8" type="MeshInstance3D" parent="." unique_id=1786817704] transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, -0.1, 0.04, 0) mesh = ExtResource("1_gnakr") -[node name="Mesh11" type="MeshInstance3D" parent="."] +[node name="Mesh11" type="MeshInstance3D" parent="." unique_id=64683158] transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0.1, 0.04, 0) mesh = ExtResource("1_gnakr") -[node name="Mesh12" type="MeshInstance3D" parent="."] +[node name="Mesh12" type="MeshInstance3D" parent="." unique_id=1975270560] transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0.04, 0.1) mesh = ExtResource("1_gnakr") -[node name="Mesh13" type="MeshInstance3D" parent="."] +[node name="Mesh13" type="MeshInstance3D" parent="." unique_id=1081920419] transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0.04, -0.1) mesh = ExtResource("1_gnakr") -[node name="Mesh9" type="MeshInstance3D" parent="."] +[node name="Mesh9" type="MeshInstance3D" parent="." unique_id=1635978560] transform = Transform3D(0.28, 0, 0, 0, 0.28, 0, 0, 0, 0.28, 0.0815632, 0.0377627, -0.0198822) visible = false mesh = ExtResource("1_gnakr") -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=364673189] transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, 0, 0.025, 0) mesh = ExtResource("3_6hedi") -[node name="MeshInstance3D4" type="MeshInstance3D" parent="."] +[node name="MeshInstance3D4" type="MeshInstance3D" parent="." unique_id=196525840] transform = Transform3D(0.279, 0, 0, 0, 0.279, 0, 0, 0, 0.279, 0, 0.075, 0) mesh = ExtResource("3_6hedi") diff --git a/client/map/items/steak.res b/client/map/items/steak.res Binary files differindex 8deb7f8a..21d27302 100644 --- a/client/map/items/steak.res +++ b/client/map/items/steak.res diff --git a/client/map/items/steak.tscn b/client/map/items/steak.tscn index 59846d8a..8efb2b19 100644 --- a/client/map/items/steak.tscn +++ b/client/map/items/steak.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://c8ylx2rsklp2y"] +[gd_scene format=3 uid="uid://c8ylx2rsklp2y"] [ext_resource type="ArrayMesh" uid="uid://tuorjx63f0ij" path="res://map/items/steak.res" id="1_iei2f"] -[node name="Steak" type="Node3D"] +[node name="Steak" type="Node3D" unique_id=273592414] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=683408760] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_iei2f") -skeleton = NodePath("") diff --git a/client/map/items/steam.tscn b/client/map/items/steam.tscn index a6114124..2097c1ee 100644 --- a/client/map/items/steam.tscn +++ b/client/map/items/steam.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://g1wsqgb56o1o"] +[gd_scene format=3 uid="uid://g1wsqgb56o1o"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e1q7j"] transparency = 1 @@ -13,7 +13,7 @@ height = 0.2 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0.10989), 0.0, 0.0, 0, 0] point_count = 2 -[node name="Steam" type="CPUParticles3D"] +[node name="Steam" type="CPUParticles3D" unique_id=1010015344] emitting = false amount = 25 lifetime = 2.0 diff --git a/client/map/items/strawberry.res b/client/map/items/strawberry.res Binary files differindex 60da68ed..b92780ef 100644 --- a/client/map/items/strawberry.res +++ b/client/map/items/strawberry.res diff --git a/client/map/items/strawberry.tscn b/client/map/items/strawberry.tscn index 90df0c3c..cc9464e0 100644 --- a/client/map/items/strawberry.tscn +++ b/client/map/items/strawberry.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://df1xktleeqg3m"] +[gd_scene format=3 uid="uid://df1xktleeqg3m"] [ext_resource type="ArrayMesh" uid="uid://c2uwqjxx7mnqp" path="res://map/items/strawberry.res" id="1_8dx1o"] -[node name="Strawberry" type="Node3D"] +[node name="Strawberry" type="Node3D" unique_id=613205790] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1524130613] transform = Transform3D(-5.68248e-10, 1.1365e-09, 0.013, 0, -0.013, 1.1365e-09, 0.013, 4.96778e-17, 5.68248e-10, 0, 0.125, 0) mesh = ExtResource("1_8dx1o") -skeleton = NodePath("") diff --git a/client/map/items/tomato.res b/client/map/items/tomato.res Binary files differindex aafc8738..77d921cf 100644 --- a/client/map/items/tomato.res +++ b/client/map/items/tomato.res diff --git a/client/map/items/tomato.tscn b/client/map/items/tomato.tscn index 4589cca5..e68801d8 100644 --- a/client/map/items/tomato.tscn +++ b/client/map/items/tomato.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://cvgmmrm8xqg4t"] +[gd_scene format=3 uid="uid://cvgmmrm8xqg4t"] [ext_resource type="ArrayMesh" uid="uid://bh5t6gqdxv1t8" path="res://map/items/tomato.res" id="1_8xuup"] -[node name="Tomato" type="Node3D"] +[node name="Tomato" type="Node3D" unique_id=256268001] -[node name="Mesh" type="MeshInstance3D" parent="."] +[node name="Mesh" type="MeshInstance3D" parent="." unique_id=1541018452] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_8xuup") -skeleton = NodePath("") diff --git a/client/map/items/unknown_item.gd b/client/map/items/unknown_item.gd index ec6cab1a..da43eb08 100644 --- a/client/map/items/unknown_item.gd +++ b/client/map/items/unknown_item.gd @@ -1,5 +1,5 @@ # Hurry Curry! - a game about cooking -# Copyright (C) 2025 Hurry Curry! contributors +# Copyright (C) 2026 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 diff --git a/client/map/items/unknown_item.tscn b/client/map/items/unknown_item.tscn index 5e8b317a..fa838e9b 100644 --- a/client/map/items/unknown_item.tscn +++ b/client/map/items/unknown_item.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://cw54drt6oqxpd"] +[gd_scene format=3 uid="uid://cw54drt6oqxpd"] [sub_resource type="BoxMesh" id="BoxMesh_e6d7n"] @@ -7,9 +7,9 @@ albedo_color = Color(1, 0, 1, 1) emission_enabled = true emission = Color(1, 0, 1, 1) -[node name="UnknownItem" type="Node3D"] +[node name="UnknownItem" type="Node3D" unique_id=1035215297] -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=1034064644] transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0.2, 0) mesh = SubResource("BoxMesh_e6d7n") surface_material_override/0 = SubResource("StandardMaterial3D_voy47") diff --git a/client/map/items/unknown_order.tscn b/client/map/items/unknown_order.tscn index 24116387..558be6f4 100644 --- a/client/map/items/unknown_order.tscn +++ b/client/map/items/unknown_order.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://dgg7srscxmtmy"] +[gd_scene format=3 uid="uid://dgg7srscxmtmy"] [ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="1_3pq52"] @@ -8,9 +8,9 @@ variation_opentype = { 2003265652: 700 } -[node name="UnknownOrder" type="Node3D"] +[node name="UnknownOrder" type="Node3D" unique_id=1440369537] -[node name="Label3D" type="Label3D" parent="."] +[node name="Label3D" type="Label3D" parent="." unique_id=717159416] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.189058, 0) pixel_size = 0.0025 billboard = 1 |