Add sliced mushrooms for pizza topping

6 files changed, 43 insertions, 24 deletions

diff --git a/client/map/items/pizza.gd b/client/map/items/pizza.gd
index 1a6c1df8..fefd4fbc 100644
--- a/client/map/items/pizza.gd
+++ b/client/map/items/pizza.gd
@@ -25,4 +25,5 @@ func add_contents(contents: Array[String]):
 		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/raw_cheese_pizza.tscn b/client/map/items/pizza/cheese_pizza_topping.tscn
index 4349cb74..2bbe6013 100644
--- a/client/map/items/raw_cheese_pizza.tscn
+++ b/client/map/items/pizza/cheese_pizza_topping.tscn
@@ -1,33 +1,25 @@
-[gd_scene load_steps=4 format=3 uid="uid://746ly6kg6fym"]
+[gd_scene load_steps=2 format=3 uid="uid://746ly6kg6fym"]
 
-[ext_resource type="ArrayMesh" uid="uid://cwstqugiw76tc" path="res://map/items/pizza.res" id="1_nsa0n"]
-[ext_resource type="ArrayMesh" uid="uid://68yn4bguhuq3" path="res://map/items/cheese_bit.res" id="2_7p5p4"]
-[ext_resource type="Material" uid="uid://cg7o7rn06bve1" path="res://map/items/dough_material.tres" id="2_jcq6l"]
+[ext_resource type="ArrayMesh" uid="uid://68yn4bguhuq3" path="res://map/items/cheese_bit.res" id="1_tuxk6"]
 
-[node name="RawCheesePizza" type="Node3D"]
-
-[node name="Mesh" type="MeshInstance3D" parent="."]
-transform = Transform3D(0.3, 0, 0, 0, 0.05, 0, 0, 0, 0.3, 0, 0.05, 0)
-mesh = ExtResource("1_nsa0n")
-skeleton = NodePath("")
-surface_material_override/0 = ExtResource("2_jcq6l")
+[node name="CheesePizzaTopping" type="Node3D"]
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(0.7090622, 0, 0.24439889, 0, 0.5, 0, -0.24439889, 0, 0.7090622, 0, 0.0901646, 0)
-mesh = ExtResource("2_7p5p4")
+mesh = ExtResource("1_tuxk6")
 
 [node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
 transform = Transform3D(0.26293755, 0, -0.70239866, 0, 0.5, 0, 0.70239866, 0, 0.26293755, -0.13107976, 0.0901646, -0.08822491)
-mesh = ExtResource("2_7p5p4")
+mesh = ExtResource("1_tuxk6")
 
 [node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
 transform = Transform3D(0.59963775, 0, -0.4504826, 0, 0.5, 0, 0.4504826, 0, 0.59963775, -0.1088517, 0.0901646, 0.09697052)
-mesh = ExtResource("2_7p5p4")
+mesh = ExtResource("1_tuxk6")
 
 [node name="MeshInstance3D4" type="MeshInstance3D" parent="."]
 transform = Transform3D(-0.025716748, 0, 0.7495589, 0, 0.5, 0, -0.7495589, 0, -0.025716748, 0.09534076, 0.0901646, 0.10794736)
-mesh = ExtResource("2_7p5p4")
+mesh = ExtResource("1_tuxk6")
 
 [node name="MeshInstance3D5" type="MeshInstance3D" parent="."]
 transform = Transform3D(0.5133626, 0, 0.5467713, 0, 0.5, 0, -0.5467713, 0, 0.5133626, 0.09534076, 0.0901646, -0.14092311)
-mesh = ExtResource("2_7p5p4")
+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..346f1f8d
--- /dev/null
+++ b/client/map/items/pizza/mushroom_pizza_topping.tscn
@@ -0,0 +1,17 @@
+[gd_scene load_steps=2 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"]
+
+[node name="CookedMushroomSlice" parent="." 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="." 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="." 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="." 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
new file mode 100644
index 00000000..bbac7d99
--- /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..7ea2957b
--- /dev/null
+++ b/client/map/items/pizza/mushroom_slice.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 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"]
+
+[node name="Mesh" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.05)
+mesh = ExtResource("1_6tyh4")
+skeleton = NodePath("")
diff --git a/client/map/items/rolled_dough.gd b/client/map/items/rolled_dough.gd
index 691d8a35..fd6ae3d8 100644
--- a/client/map/items/rolled_dough.gd
+++ b/client/map/items/rolled_dough.gd
@@ -24,13 +24,12 @@ func add_contents(contents: Array[String]):
 	
 	if contents.is_empty():
 		base.add_child(load("res://map/items/rolled_dough.tscn").instantiate())
-		return
-	if contents == ["tomato-juice"]:
+	if contents.has("tomato-juice"):
 		base.add_child(load("res://map/items/raw_pizza.tscn").instantiate())
-		return
-	if contents == ["sliced-cheese","tomato-juice"]:
-		base.add_child(load("res://map/items/raw_cheese_pizza.tscn").instantiate())
-		return
 	
-	base.add_child(load("res://map/items/rolled_dough.tscn").instantiate())
-	base.add_child(UnknownItem.new(owned_by, ",".join(contents)))
+	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))