Add noodle tomato sauce and cheese fills (#393)

4 files changed, 47 insertions, 1 deletions

diff --git a/client/map/items/noodles_cheese_fill.tscn b/client/map/items/noodles_cheese_fill.tscn
new file mode 100644
index 00000000..8a6ee873
--- /dev/null
+++ b/client/map/items/noodles_cheese_fill.tscn
@@ -0,0 +1,25 @@
+[gd_scene load_steps=2 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"]
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+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="."]
+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="."]
+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="."]
+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="."]
+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
new file mode 100644
index 00000000..efc97f6d
--- /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..57d022ec
--- /dev/null
+++ b/client/map/items/noodles_tomato_sauce_fill.tscn
@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 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"]
+
+[node name="Mesh" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.4543747, 0.03329535, -0.3680526, -0.10767557, 0.4247603, -0.035191447, 0.4288422, 0.071372986, 0.38112977, 0, -0.0066690147, 0)
+mesh = ExtResource("1_wu5sg")
diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd
index 088d8734..28856792 100644
--- a/client/map/items/plate.gd
+++ b/client/map/items/plate.gd
@@ -39,11 +39,21 @@ 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: String in contents:
@@ -55,6 +65,8 @@ func add_contents(contents: Array[String]):
 			"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)