merge pot and fp items into single files

26 files changed, 187 insertions, 499 deletions

diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index 5a8c93e7..6b13883a 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -32,41 +32,41 @@ static func produce(name: String, owned_by: Node3D) -> Item:
 		"pot":
 			return Pot.new(owned_by)
 		"raw-steak-pot":
-			return RawSteakPot.new(owned_by)
+			return PotItems.RawSteakP.new(owned_by)
 		"steak-pot":
-			return SteakPot.new(owned_by)
+			return PotItems.SteakP.new(owned_by)
 		"steak-plate":
 			return SteakPlate.new(owned_by)
 		"foodprocessor":
 			return FoodProcessor.new(owned_by)
 		"tomato-foodprocessor":
-			return TomatoFoodProcessor.new(owned_by)
+			return FoodProcessorItems.TomatoF.new(owned_by)
 		"tomato-juice-foodprocessor":
-			return TomatoJuiceFoodProcessor.new(owned_by)
+			return FoodProcessorItems.TomatoJuiceF.new(owned_by)
 		"flour":
 			return Flour.new(owned_by)
 		"flour-foodprocessor":
-			return FlourFoodProcessor.new(owned_by)
+			return FoodProcessorItems.FlourF.new(owned_by)
 		"dough":
 			return Dough.new(owned_by)
 		"bread":
 			return Bread.new(owned_by)
 		"dough-foodprocessor":
-			return DoughFoodProcessor.new(owned_by)
+			return FoodProcessorItems.DoughF.new(owned_by)
 		"bread-slice":
 			return BreadSlice.new(owned_by)
 		"burned-pot":
-			return BurnedPot.new(owned_by)
+			return PotItems.BurnedP.new(owned_by)
 		"tomato-juice-pot":
-			return TomatoJuicePot.new(owned_by)
+			return PotItems.TomatoJuiceP.new(owned_by)
 		"leek":
 			return Leek.new(owned_by)
 		"leek-pot":
-			return LeekPot.new(owned_by)
+			return PotItems.LeekP.new(owned_by)
 		"leek-tomato-juice-pot":
-			return LeekTomatoJuicePot.new(owned_by)
+			return PotItems.LeekTomatoJuiceP.new(owned_by)
 		"tomato-soup-pot":
-			return TomatoSoupPot.new(owned_by)
+			return PotItems.TomatoSoupP.new(owned_by)
 		"tomato-soup-plate":
 			return TomatoSoupPlate.new(owned_by)
 		"burned":
@@ -90,17 +90,17 @@ static func produce(name: String, owned_by: Node3D) -> Item:
 		"rice":
 			return Rice.new(owned_by)
 		"rice-pot":
-			return RicePot.new(owned_by)
+			return PotItems.RiceP.new(owned_by)
 		"cooked-rice-pot":
-			return CookedRicePot.new(owned_by)
+			return PotItems.CookedRice.new(owned_by)
 		"rice-foodprocessor":
-			return RiceFoodProcessor.new(owned_by)
+			return FoodProcessorItems.RiceF.new(owned_by)
 		"rice-flour-foodprocessor":
-			return RiceFlourFoodProcessor.new(owned_by)
+			return FoodProcessorItems.RiceFlourF.new(owned_by)
 		"rice-flour-pot":
-			return RiceFlourPot.new(owned_by)
+			return PotItems.RiceFlourP.new(owned_by)
 		"mochi-dough-pot":
-			return MochiDoughPot.new(owned_by)
+			return PotItems.MochiDoughP.new(owned_by)
 		"nigiri":
 			return Nigiri.new(owned_by)
 		"nigiri-plate":
@@ -108,14 +108,14 @@ static func produce(name: String, owned_by: Node3D) -> Item:
 		"coconut":
 			return Coconut.new(owned_by)
 		"coconut-foodprocessor":
-			return CoconutFoodProcessor.new(owned_by)
+			return FoodProcessorItems.CoconutF.new(owned_by)
 		"strawberry":
 			return Strawberry.new(owned_by)
 		"strawberry-foodprocessor":
-			return StrawberryFoodProcessor.new(owned_by)
+			return FoodProcessorItems.StrawberryF.new(owned_by)
 		"strawberry-puree-foodprocessor":
-			return StrawberryPureeFoodProcessor.new(owned_by)
+			return FoodProcessorItems.StrawberryPureeF.new(owned_by)
 		"milk-foodprocessor":
-			return MilkFoodProcessor.new(owned_by)
+			return FoodProcessorItems.MilkF.new(owned_by)
 		var t:
 			return GenericItem.new(owned_by, t)
diff --git a/client/map/items/burned_pot.gd b/client/map/items/burned_pot.gd
deleted file mode 100644
index 8a77d08d..00000000
--- a/client/map/items/burned_pot.gd
+++ /dev/null
@@ -1,25 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 BurnedPot
-extends PotFill
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	steam.color = Color(0., 0., 0.)
-	set_color(Color(.1, .1, .1))
-
-func _ready():
-	steam.emitting = true
diff --git a/client/map/items/coconut_food_processor.gd b/client/map/items/coconut_food_processor.gd
deleted file mode 100644
index c21ebabf..00000000
--- a/client/map/items/coconut_food_processor.gd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 CoconutFoodProcessor
-extends FoodProcessor
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	processing.color = Color(.8, .5, .4)
-	base.add_child(load("res://map/items/coconut.tscn").instantiate())
diff --git a/client/map/items/cooked_rice_pot.gd b/client/map/items/cooked_rice_pot.gd
deleted file mode 100644
index 0181eaed..00000000
--- a/client/map/items/cooked_rice_pot.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 CookedRicePot
-extends RicePot
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., 1., 1.))
diff --git a/client/map/items/dough_food_processor.gd b/client/map/items/dough_food_processor.gd
deleted file mode 100644
index d72e4c58..00000000
--- a/client/map/items/dough_food_processor.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 DoughFoodProcessor
-extends FoodProcessorContent
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color8(200, 180, 160))
diff --git a/client/map/items/flour_food_processor.gd b/client/map/items/flour_food_processor.gd
deleted file mode 100644
index dadd4b65..00000000
--- a/client/map/items/flour_food_processor.gd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 FlourFoodProcessor
-extends FoodProcessor
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	processing.color = Color(.9, .9, .9)
-	base.add_child(load("res://map/items/flour.tscn").instantiate())
diff --git a/client/map/items/food_processor_items.gd b/client/map/items/food_processor_items.gd
new file mode 100644
index 00000000..615ea9e4
--- /dev/null
+++ b/client/map/items/food_processor_items.gd
@@ -0,0 +1,72 @@
+# Hurry Curry! - a game about cooking
+# Copyright 2024 metamuffin
+# Copyright 2024 nokoe
+#
+# 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 FoodProcessorItems
+
+class MilkF extends FoodProcessorContent:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color8(250, 250, 250))
+
+class RiceFlourF extends FoodProcessorContent:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,1.,.8))
+
+class RiceF extends FoodProcessor:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		processing.color = Color(1.,1.,.8)
+		base.add_child(load("res://map/items/rice.tscn").instantiate())
+
+class FlourF extends FoodProcessor:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		processing.color = Color(.9, .9, .9)
+		base.add_child(load("res://map/items/flour.tscn").instantiate())
+
+class DoughF extends FoodProcessorContent:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color8(200, 180, 160))
+
+class CoconutF extends FoodProcessor:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		processing.color = Color(.8, .5, .4)
+		base.add_child(load("res://map/items/coconut.tscn").instantiate())
+
+class StrawberryF extends FoodProcessor:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		processing.color = Color(.9, .0, .0)
+		base.add_child(load("res://map/items/strawberry.tscn").instantiate())
+
+class StrawberryPureeF extends FoodProcessorContent:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color8(200, 80, 80))
+
+class TomatoF extends FoodProcessor:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		processing.color = Color(1.,0.,0.)
+		base.add_child(load("res://map/items/tomato.tscn").instantiate())
+
+class TomatoJuiceF extends FoodProcessorContent:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,0.,0.))
diff --git a/client/map/items/leek_pot.gd b/client/map/items/leek_pot.gd
deleted file mode 100644
index 3e5b7def..00000000
--- a/client/map/items/leek_pot.gd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 LeekPot
-extends Pot
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	var leek: Node3D = load("res://map/items/leek.tscn").instantiate()
-	leek.rotation_degrees = Vector3(14.5, 0, -25)
-	leek.position.x = .03
-	base.add_child(leek)
diff --git a/client/map/items/leek_tomato_juice_pot.gd b/client/map/items/leek_tomato_juice_pot.gd
deleted file mode 100644
index 26a614b5..00000000
--- a/client/map/items/leek_tomato_juice_pot.gd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 LeekTomatoJuicePot
-extends TomatoJuicePot
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	var leek: Node3D = load("res://map/items/leek.tscn").instantiate()
-	leek.rotation_degrees = Vector3(14.5, 0, -25)
-	leek.position.x = .03
-	base.add_child(leek)
diff --git a/client/map/items/milk_food_processor.gd b/client/map/items/milk_food_processor.gd
deleted file mode 100644
index 4be2553b..00000000
--- a/client/map/items/milk_food_processor.gd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 metamuffin
-# Copyright 2024 nokoe
-#
-# 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 MilkFoodProcessor
-extends FoodProcessorContent
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color8(250,250,250))
diff --git a/client/map/items/mochi_dough_pot.gd b/client/map/items/mochi_dough_pot.gd
deleted file mode 100644
index 1b7e3e33..00000000
--- a/client/map/items/mochi_dough_pot.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 MochiDoughPot
-extends PotFill
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., 1., .3))
diff --git a/client/map/items/pot.gd b/client/map/items/pot.gd
index 4fb065cd..dd5a6c6f 100644
--- a/client/map/items/pot.gd
+++ b/client/map/items/pot.gd
@@ -29,7 +29,7 @@ func progress(p: float, warn: bool):
 	if warn:
 		steam.color = Color(.2, .2, .2)
 	else:
-		steam.color = Color(1., 1., 1.)
+		steam.color = Color(1.,1.,1.)
 
 func finish(warn: bool):
 	super(warn)
@@ -40,4 +40,4 @@ func setup_sounds():
 	put_sound.setup([preload("res://map/items/sounds/pot_put.ogg")])
 
 static func base_position() -> Vector3:
-	return Vector3(0., 0.015, 0.)
+	return Vector3(0.,0.015, 0.)
diff --git a/client/map/items/pot_items.gd b/client/map/items/pot_items.gd
new file mode 100644
index 00000000..65ee1bd8
--- /dev/null
+++ b/client/map/items/pot_items.gd
@@ -0,0 +1,92 @@
+# Hurry Curry! - a game about cooking
+# Copyright 2024 metamuffin
+# Copyright 2024 nokoe
+#
+# 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 PotItems
+
+class MochiDoughP extends PotFill:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,1.,.3))
+
+class RiceP extends Pot:
+	var fill: MeshInstance3D = load("res://map/items/rice_content.tscn").instantiate()
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,1.,.8))
+		add_child(fill)
+	func set_color(c: Color):
+		var mat: BaseMaterial3D = fill.get_active_material(0)
+		mat.albedo_color = c
+
+class RiceFlourP extends PotFill:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,1.,.8))
+
+class TomatoJuiceP extends PotFill:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,0.,0.))
+
+class TomatoSoupP extends PotFill:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,.3, .2))
+
+class RawSteakP extends Pot:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		base.add_child(preload("res://map/items/raw_steak.tscn").instantiate())
+
+	func progress(p: float, warn: bool):
+		super(p, warn)
+		if sound_id == null:
+			sound_id = Sound.item_progress(self, preload("res://map/items/sounds/frying.ogg"), null)
+
+class LeekP extends Pot:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		var leek: Node3D = load("res://map/items/leek.tscn").instantiate()
+		leek.rotation_degrees = Vector3(14.5, 0, -25)
+		leek.position.x = .03
+		base.add_child(leek)
+
+class LeekTomatoJuiceP extends TomatoJuiceP:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		var leek: Node3D = load("res://map/items/leek.tscn").instantiate()
+		leek.rotation_degrees = Vector3(14.5, 0, -25)
+		leek.position.x = .03
+		base.add_child(leek)
+
+class CookedRice extends RiceP:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		set_color(Color(1.,1.,1.))
+
+class BurnedP extends PotFill:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		steam.color = Color(0.,0.,0.)
+		set_color(Color(.1, .1, .1))
+
+	func _ready():
+		steam.emitting = true
+
+class SteakP extends Pot:
+	func _init(owned_by_: Node3D):
+		super(owned_by_)
+		base.add_child(load("res://map/items/steak.tscn").instantiate())
diff --git a/client/map/items/raw_steak_pot.gd b/client/map/items/raw_steak_pot.gd
deleted file mode 100644
index 6c3d4717..00000000
--- a/client/map/items/raw_steak_pot.gd
+++ /dev/null
@@ -1,30 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 RawSteakPot
-extends Pot
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	base.add_child(preload("res://map/items/raw_steak.tscn").instantiate())
-
-func progress(p: float, warn: bool):
-	super(p, warn)
-	if sound_id == null:
-		sound_id = Sound.item_progress(
-			self,
-			preload("res://map/items/sounds/frying.ogg"),
-			null
-		)
diff --git a/client/map/items/rice_flour_food_processor.gd b/client/map/items/rice_flour_food_processor.gd
deleted file mode 100644
index e70af0fc..00000000
--- a/client/map/items/rice_flour_food_processor.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 RiceFlourFoodProcessor
-extends FoodProcessorContent
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., 1., .8))
diff --git a/client/map/items/rice_flour_pot.gd b/client/map/items/rice_flour_pot.gd
deleted file mode 100644
index ee5afccc..00000000
--- a/client/map/items/rice_flour_pot.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 RiceFlourPot
-extends PotFill
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., 1., .8))
diff --git a/client/map/items/rice_food_processor.gd b/client/map/items/rice_food_processor.gd
deleted file mode 100644
index 205a6c7b..00000000
--- a/client/map/items/rice_food_processor.gd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 RiceFoodProcessor
-extends FoodProcessor
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	processing.color = Color(1., 1., .8)
-	base.add_child(load("res://map/items/rice.tscn").instantiate())
diff --git a/client/map/items/rice_pot.gd b/client/map/items/rice_pot.gd
deleted file mode 100644
index 42bcd166..00000000
--- a/client/map/items/rice_pot.gd
+++ /dev/null
@@ -1,28 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 RicePot
-extends Pot
-
-var fill: MeshInstance3D = load("res://map/items/rice_content.tscn").instantiate()
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., 1., .8))
-	add_child(fill)
-
-func set_color(c: Color):
-	var mat: BaseMaterial3D = fill.get_active_material(0)
-	mat.albedo_color = c
diff --git a/client/map/items/steak_pot.gd b/client/map/items/steak_pot.gd
deleted file mode 100644
index 32dbea5c..00000000
--- a/client/map/items/steak_pot.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 SteakPot
-extends Pot
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	base.add_child(load("res://map/items/steak.tscn").instantiate())
diff --git a/client/map/items/strawberry_food_processor.gd b/client/map/items/strawberry_food_processor.gd
deleted file mode 100644
index 416da224..00000000
--- a/client/map/items/strawberry_food_processor.gd
+++ /dev/null
@@ -1,23 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 metamuffin
-# Copyright 2024 nokoe
-#
-# 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 StrawberryFoodProcessor
-extends FoodProcessor
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	processing.color = Color(.9, .0, .0)
-	base.add_child(load("res://map/items/strawberry.tscn").instantiate())
diff --git a/client/map/items/strawberry_puree_food_processor.gd b/client/map/items/strawberry_puree_food_processor.gd
deleted file mode 100644
index 5e3d97a3..00000000
--- a/client/map/items/strawberry_puree_food_processor.gd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 metamuffin
-# Copyright 2024 nokoe
-#
-# 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 StrawberryPureeFoodProcessor
-extends FoodProcessorContent
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color8(200, 80, 80))
diff --git a/client/map/items/tomato_food_processor.gd b/client/map/items/tomato_food_processor.gd
deleted file mode 100644
index 296a996c..00000000
--- a/client/map/items/tomato_food_processor.gd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 TomatoFoodProcessor
-extends FoodProcessor
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	processing.color = Color(1., 0., 0.)
-	base.add_child(load("res://map/items/tomato.tscn").instantiate())
diff --git a/client/map/items/tomato_juice_food_processor.gd b/client/map/items/tomato_juice_food_processor.gd
deleted file mode 100644
index d6767786..00000000
--- a/client/map/items/tomato_juice_food_processor.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 TomatoJuiceFoodProcessor
-extends FoodProcessorContent
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., 0., 0.))
diff --git a/client/map/items/tomato_juice_pot.gd b/client/map/items/tomato_juice_pot.gd
deleted file mode 100644
index 7219b51a..00000000
--- a/client/map/items/tomato_juice_pot.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 TomatoJuicePot
-extends PotFill
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., 0., 0.))
diff --git a/client/map/items/tomato_soup_pot.gd b/client/map/items/tomato_soup_pot.gd
deleted file mode 100644
index c77c5dc3..00000000
--- a/client/map/items/tomato_soup_pot.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright 2024 nokoe
-#
-# 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 TomatoSoupPot
-extends PotFill
-
-func _init(owned_by_: Node3D):
-	super(owned_by_)
-	set_color(Color(1., .3, .2))
diff --git a/client/project.godot b/client/project.godot
index ec53efd8..64e4aa2e 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -28,7 +28,6 @@ DisableWrongJoypads="*res://disable_wrong_joypads.gd"
 
 window/stretch/mode="canvas_items"
 window/stretch/aspect="expand"
-display_server/driver.linuxbsd="wayland"
 
 [input]