sort and compact item/tile factory

2 files changed, 93 insertions, 174 deletions

diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index 27f6ce7c..1f564bfb 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -19,103 +19,57 @@ extends Object
 
 static func produce(name: String, owned_by: Node3D) -> Item:
 	match name:
-		"plate":
-			return Plate.new(owned_by)
-		"dirty-plate":
-			return PlateItems.DirtyP.new(owned_by)
-		"tomato":
-			return Tomato.new(owned_by)
-		"raw-steak":
-			return RawSteak.new(owned_by)
-		"sliced-tomato":
-			return SlicedTomato.new(owned_by)
-		"pot":
-			return Pot.new(owned_by)
-		"raw-steak-pot":
-			return PotItems.RawSteakP.new(owned_by)
-		"steak-pot":
-			return PotItems.SteakP.new(owned_by)
-		"steak-plate":
-			return PlateItems.SteakP.new(owned_by)
-		"foodprocessor":
-			return FoodProcessor.new(owned_by)
-		"tomato-foodprocessor":
-			return FoodProcessorItems.TomatoF.new(owned_by)
-		"tomato-juice-foodprocessor":
-			return FoodProcessorItems.TomatoJuiceF.new(owned_by)
-		"flour":
-			return Flour.new(owned_by)
-		"flour-foodprocessor":
-			return FoodProcessorItems.FlourF.new(owned_by)
-		"dough":
-			return Dough.new(owned_by)
-		"bread":
-			return Bread.new(owned_by)
-		"dough-foodprocessor":
-			return FoodProcessorItems.DoughF.new(owned_by)
-		"bread-slice":
-			return BreadSlice.new(owned_by)
-		"burned-pot":
-			return PotItems.BurnedP.new(owned_by)
-		"tomato-juice-pot":
-			return PotItems.TomatoJuiceP.new(owned_by)
-		"leek":
-			return Leek.new(owned_by)
-		"leek-pot":
-			return PotItems.LeekP.new(owned_by)
-		"leek-tomato-juice-pot":
-			return PotItems.LeekTomatoJuiceP.new(owned_by)
-		"tomato-soup-pot":
-			return PotItems.TomatoSoupP.new(owned_by)
-		"tomato-soup-plate":
-			return PlateItems.TomatoSoupP.new(owned_by)
-		"burned":
-			return Burned.new(owned_by)
-		"bread-slice-plate":
-			return PlateItems.BreadSliceP.new(owned_by)
-		"bread-slice-steak-plate":
-			return PlateItems.BreadSliceSteakP.new(owned_by)
-		"bread-slice-sliced-tomato-plate":
-			return PlateItems.BreadSliceSlicedTomatoP.new(owned_by)
-		"bread-slice-sliced-tomato-steak-plate":
-			return PlateItems.BreadSliceSlicedTomatoSteakP.new(owned_by)
-		"sliced-tomato-plate":
-			return PlateItems.SlicedTomatoP.new(owned_by)
-		"sliced-tomato-steak-plate":
-			return PlateItems.SlicedTomatoSteakP.new(owned_by)
-		"fish":
-			return Fish.new(owned_by)
-		"sliced-fish":
-			return SlicedFish.new(owned_by)
-		"rice":
-			return Rice.new(owned_by)
-		"rice-pot":
-			return PotItems.RiceP.new(owned_by)
-		"cooked-rice-pot":
-			return PotItems.CookedRice.new(owned_by)
-		"rice-foodprocessor":
-			return FoodProcessorItems.RiceF.new(owned_by)
-		"rice-flour-foodprocessor":
-			return FoodProcessorItems.RiceFlourF.new(owned_by)
-		"rice-flour-pot":
-			return PotItems.RiceFlourP.new(owned_by)
-		"mochi-dough-pot":
-			return PotItems.MochiDoughP.new(owned_by)
-		"nigiri":
-			return Nigiri.new(owned_by)
-		"nigiri-plate":
-			return PlateItems.NigiriP.new(owned_by)
-		"coconut":
-			return Coconut.new(owned_by)
-		"coconut-foodprocessor":
-			return FoodProcessorItems.CoconutF.new(owned_by)
-		"strawberry":
-			return Strawberry.new(owned_by)
-		"strawberry-foodprocessor":
-			return FoodProcessorItems.StrawberryF.new(owned_by)
-		"strawberry-puree-foodprocessor":
-			return FoodProcessorItems.StrawberryPureeF.new(owned_by)
-		"milk-foodprocessor":
-			return FoodProcessorItems.MilkF.new(owned_by)
-		var t:
-			return GenericItem.new(owned_by, t)
+		"bread-slice": return BreadSlice.new(owned_by)
+		"bread": return Bread.new(owned_by)
+		"burned": return Burned.new(owned_by)
+		"coconut": return Coconut.new(owned_by)
+		"dough": return Dough.new(owned_by)
+		"fish": return Fish.new(owned_by)
+		"flour": return Flour.new(owned_by)
+		"leek": return Leek.new(owned_by)
+		"nigiri": return Nigiri.new(owned_by)
+		"raw-steak": return RawSteak.new(owned_by)
+		"rice": return Rice.new(owned_by)
+		"sliced-fish": return SlicedFish.new(owned_by)
+		"sliced-tomato-plate": return PlateItems.SlicedTomatoP.new(owned_by)
+		"sliced-tomato-steak-plate": return PlateItems.SlicedTomatoSteakP.new(owned_by)
+		"sliced-tomato": return SlicedTomato.new(owned_by)
+		"strawberry": return Strawberry.new(owned_by)
+		"tomato": return Tomato.new(owned_by)
+
+		"pot": return Pot.new(owned_by)
+		"burned-pot": return PotItems.BurnedP.new(owned_by)
+		"cooked-rice-pot": return PotItems.CookedRice.new(owned_by)
+		"leek-pot": return PotItems.LeekP.new(owned_by)
+		"leek-tomato-juice-pot": return PotItems.LeekTomatoJuiceP.new(owned_by)
+		"mochi-dough-pot": return PotItems.MochiDoughP.new(owned_by)
+		"raw-steak-pot": return PotItems.RawSteakP.new(owned_by)
+		"rice-flour-pot": return PotItems.RiceFlourP.new(owned_by)
+		"rice-pot": return PotItems.RiceP.new(owned_by)
+		"steak-pot": return PotItems.SteakP.new(owned_by)
+		"tomato-juice-pot": return PotItems.TomatoJuiceP.new(owned_by)
+		"tomato-soup-pot": return PotItems.TomatoSoupP.new(owned_by)
+
+		"foodprocessor": return FoodProcessor.new(owned_by)
+		"coconut-foodprocessor": return FoodProcessorItems.CoconutF.new(owned_by)
+		"dough-foodprocessor": return FoodProcessorItems.DoughF.new(owned_by)
+		"flour-foodprocessor": return FoodProcessorItems.FlourF.new(owned_by)
+		"milk-foodprocessor": return FoodProcessorItems.MilkF.new(owned_by)
+		"rice-flour-foodprocessor": return FoodProcessorItems.RiceFlourF.new(owned_by)
+		"rice-foodprocessor": return FoodProcessorItems.RiceF.new(owned_by)
+		"strawberry-foodprocessor": return FoodProcessorItems.StrawberryF.new(owned_by)
+		"strawberry-puree-foodprocessor": return FoodProcessorItems.StrawberryPureeF.new(owned_by)
+		"tomato-foodprocessor": return FoodProcessorItems.TomatoF.new(owned_by)
+		"tomato-juice-foodprocessor": return FoodProcessorItems.TomatoJuiceF.new(owned_by)
+
+		"plate": return Plate.new(owned_by)
+		"bread-slice-plate": return PlateItems.BreadSliceP.new(owned_by)
+		"bread-slice-sliced-tomato-plate": return PlateItems.BreadSliceSlicedTomatoP.new(owned_by)
+		"bread-slice-sliced-tomato-steak-plate": return PlateItems.BreadSliceSlicedTomatoSteakP.new(owned_by)
+		"bread-slice-steak-plate": return PlateItems.BreadSliceSteakP.new(owned_by)
+		"dirty-plate": return PlateItems.DirtyP.new(owned_by)
+		"nigiri-plate": return PlateItems.NigiriP.new(owned_by)
+		"steak-plate": return PlateItems.SteakP.new(owned_by)
+		"tomato-soup-plate": return PlateItems.TomatoSoupP.new(owned_by)
+
+		var t: return GenericItem.new(owned_by, t)
diff --git a/client/map/tile_factory.gd b/client/map/tile_factory.gd
index 9f157b78..9580bd66 100644
--- a/client/map/tile_factory.gd
+++ b/client/map/tile_factory.gd
@@ -18,80 +18,45 @@ extends Object
 
 static func produce(tile_name: String, node_name: String, neighbors: Array) -> Tile:
 	match tile_name:
-		"trash":
-			return Trash.new(node_name, neighbors)
-		"tomato-crate":
-			return TomatoCrate.new(node_name, neighbors)
-		"cuttingboard":
-			return CuttingBoard.new(node_name, neighbors)
-		"counter":
-			return CounterBase.new(node_name, neighbors)
-		"flour-crate":
-			return FlourCrate.new(node_name, neighbors)
-		"fish-crate":
-			return FishCrate.new(node_name, neighbors)
-		"oven":
-			return Oven.new(node_name, neighbors)
-		"raw-steak-crate":
-			return RawSteakCrate.new(node_name, neighbors)
-		"stove":
-			return Stove.new(node_name, neighbors)
-		"sink":
-			return Sink.new(node_name, neighbors)
-		"dirty-plate-crate":
-			return CounterBase.new(node_name, neighbors)
-		"wall":
-			return Wall.new(node_name, neighbors)
-		"chair":
-			return Chair.new(node_name, neighbors)
-		"table":
-			return Table.new(node_name, neighbors)
-		"floor":
-			return Floor.new(node_name, neighbors)
-		"counter-window":
-			return CounterWindow.new(node_name, neighbors)
-		"wall-window":
-			return WallWindow.new(node_name, neighbors)
-		"door":
-			return Door.new(node_name, neighbors)
-		"leek-crate":
-			return LeekCrate.new(node_name, neighbors)
-		"tree":
-			return ExteriorTree.new(node_name, neighbors)
-		"grass":
-			return Grass.new(node_name, neighbors)
-		"path":
-			return Path.new(node_name, neighbors)
-		"fence":
-			return Fence.new(node_name, neighbors)
-		"book":
-			return Book.new(node_name, neighbors)
-		"conveyor":
-			return Conveyor.new(node_name, neighbors)
-		"black-hole-counter":
-			return ItemPortal.new(node_name, neighbors, false)
-		"white-hole-counter":
-			return ItemPortal.new(node_name, neighbors, true)
-		"black-hole":
-			return PlayerPortal.new(node_name, neighbors, false)
-		"white-hole":
-			return PlayerPortal.new(node_name, neighbors, true)
-		"lamp":
-			return Lamp.new(node_name, neighbors)
-		"chandelier":
-			return Chandelier.new(node_name, neighbors)
-		"ceiling-lamp":
-			return CeilingLamp.new(node_name, neighbors)
-		"street":
-			return Street.new(node_name, neighbors)
-		"rice-crate":
-			return RiceCrate.new(node_name, neighbors)
-		"strawberry-crate":
-			return StrawberryCrate.new(node_name, neighbors)
-		"coconut-crate":
-			return CoconutCrate.new(node_name, neighbors)
-		"freezer":
-			return Freezer.new(node_name, neighbors)
+		"black-hole-counter": return ItemPortal.new(node_name, neighbors, false)
+		"black-hole": return PlayerPortal.new(node_name, neighbors, false)
+		"book": return Book.new(node_name, neighbors)
+		"ceiling-lamp": return CeilingLamp.new(node_name, neighbors)
+		"chair": return Chair.new(node_name, neighbors)
+		"chandelier": return Chandelier.new(node_name, neighbors)
+		"conveyor": return Conveyor.new(node_name, neighbors)
+		"counter-window": return CounterWindow.new(node_name, neighbors)
+		"counter": return CounterBase.new(node_name, neighbors)
+		"cuttingboard": return CuttingBoard.new(node_name, neighbors)
+		"door": return Door.new(node_name, neighbors)
+		"fence": return Fence.new(node_name, neighbors)
+		"floor": return Floor.new(node_name, neighbors)
+		"freezer": return Freezer.new(node_name, neighbors)
+		"grass": return Grass.new(node_name, neighbors)
+		"lamp": return Lamp.new(node_name, neighbors)
+		"oven": return Oven.new(node_name, neighbors)
+		"path": return Path.new(node_name, neighbors)
+		"sink": return Sink.new(node_name, neighbors)
+		"stove": return Stove.new(node_name, neighbors)
+		"street": return Street.new(node_name, neighbors)
+		"table": return Table.new(node_name, neighbors)
+		"trash": return Trash.new(node_name, neighbors)
+		"tree": return ExteriorTree.new(node_name, neighbors)
+		"wall-window": return WallWindow.new(node_name, neighbors)
+		"wall": return Wall.new(node_name, neighbors)
+		"white-hole-counter": return ItemPortal.new(node_name, neighbors, true)
+		"white-hole": return PlayerPortal.new(node_name, neighbors, true)
+
+		"coconut-crate": return CoconutCrate.new(node_name, neighbors)
+		"dirty-plate-crate": return CounterBase.new(node_name, neighbors)
+		"fish-crate": return FishCrate.new(node_name, neighbors)
+		"flour-crate": return FlourCrate.new(node_name, neighbors)
+		"leek-crate": return LeekCrate.new(node_name, neighbors)
+		"raw-steak-crate": return RawSteakCrate.new(node_name, neighbors)
+		"rice-crate": return RiceCrate.new(node_name, neighbors)
+		"strawberry-crate": return StrawberryCrate.new(node_name, neighbors)
+		"tomato-crate": return TomatoCrate.new(node_name, neighbors)
+
 		var t:
 			push_warning("tile %s unknown" % t)
 			return GenericTile.new(node_name, neighbors, t)