From a60f0f249f3ce6a0c740f898a67dd97ec66da202 Mon Sep 17 00:00:00 2001 From: tpart Date: Tue, 16 Sep 2025 23:16:43 +0200 Subject: Add custom tomato lettuce salad model to make it more visually recognizable --- client/map/items/plate.gd | 7 +++++ client/map/items/sliced_lettuce.tscn | 1 + .../items/sliced_tomato_sliced_lettuce_fill.tscn | 35 ++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 client/map/items/sliced_tomato_sliced_lettuce_fill.tscn (limited to 'client/map/items') diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd index 5fbc0339..60903ab3 100644 --- a/client/map/items/plate.gd +++ b/client/map/items/plate.gd @@ -36,6 +36,12 @@ func _init(owned_by_: Node3D, contents: Array): contents.erase("bun") 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: + contents.erase("sliced-tomato") + contents.erase("sliced-lettuce") + contents.append("tomato-lettuce-salad") + # Stack content items on top of each other var height_sum := 0. for c in contents: @@ -43,6 +49,7 @@ func _init(owned_by_: Node3D, contents: Array): match c: "curry": add_child(PlateFill.new(self, Color(.75, .45, .1))) "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))) "bun-small": var bun = ItemFactory.produce("bun", base) diff --git a/client/map/items/sliced_lettuce.tscn b/client/map/items/sliced_lettuce.tscn index f04b7a3a..f2840059 100644 --- a/client/map/items/sliced_lettuce.tscn +++ b/client/map/items/sliced_lettuce.tscn @@ -3,6 +3,7 @@ [ext_resource type="ArrayMesh" uid="uid://jkb0e8d584uo" path="res://map/items/sliced_lettuce.res" id="1_y7x7n"] [node name="SlicedLettuce" type="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.01, 0) [node name="Mesh" type="MeshInstance3D" parent="."] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.01, 0) diff --git a/client/map/items/sliced_tomato_sliced_lettuce_fill.tscn b/client/map/items/sliced_tomato_sliced_lettuce_fill.tscn new file mode 100644 index 00000000..75ef95f1 --- /dev/null +++ b/client/map/items/sliced_tomato_sliced_lettuce_fill.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=3 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="Mesh8" type="MeshInstance3D" parent="."] +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="."] +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="."] +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="."] +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="."] +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="."] +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="."] +transform = Transform3D(0.279, 0, 0, 0, 0.279, 0, 0, 0, 0.279, 0, 0.075, 0) +mesh = ExtResource("3_6hedi") -- cgit v1.2.3-70-g09d2