Remove village, new map "scattred"

4 files changed, 78 insertions, 76 deletions

diff --git a/data/index.yaml b/data/index.yaml
index e75433d3..fcb176b2 100644
--- a/data/index.yaml
+++ b/data/index.yaml
@@ -33,7 +33,7 @@ maps:
     salad: { name: "Salad Store", players: 2, difficulty: 1 }
     sushibar: { name: "Sushi Bar", players: 2, difficulty: 2 }
     teeny: { name: "Teeny", players: 3, difficulty: 2 }
-    village: { name: "Village", players: 4, difficulty: 2 }
+    scattered: { name: "Scattered", players: 3, difficulty: 3 }
     bar: { name: "Bar", players: 3, difficulty: 2 }
     duplex: { name: "Duplex", players: 2, difficulty: 3 }
     bus: { name: "Bus", players: 5, difficulty: 3 }
diff --git a/data/maps/scattered.yaml b/data/maps/scattered.yaml
new file mode 100644
index 00000000..1cebd7ef
--- /dev/null
+++ b/data/maps/scattered.yaml
@@ -0,0 +1,76 @@
+# Hurry Curry! - a game about cooking
+# Copyright (C) 2025 Hurry Curry! contributors
+#
+# 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/>.
+#
+score_baseline: 200
+hand_count: 2
+map:
+    - "''''''''''''''''''''''''"
+    - "''''''''''''''''''''''''"
+    - "''''................''''"
+    - "''''.hf..ei..ap..cF.''''"
+    - "''''.A#..od..E#..#g.''''"
+    - "''''.......~........''''"
+    - "''''................''''"
+    - "''''.cf..#C..bd..bh.''''"
+    - "''''.aB..oo..#a..eG.''''"
+    - "''''................''''"
+    - "''''................''''"
+    - "''''.oe..#D..o#..#c.''''"
+    - "''''.Io..fp..H#..po.''''"
+    - "''''................''''"
+    - "''''''''''''''''''''''''"
+    - "''=^t^'^t^'__'^t^'^t^=''"
+    - "''=^t^'^t^'__'^t^'^t^=''"
+    - "''='________________'=''"
+    - "''=^t^'^t^'__'^t^'^t^=''"
+    - "''=^t^'^t^'__'^t^'^t^=''"
+    - "''=========__=========''"
+    - "'''''''''''_!'''''''''''"
+
+tiles:
+    "#": counter
+    "o": counter -i=plate
+    "p": counter -i=glass
+    "t": table
+    "a": cutting-board
+    "b": rolling-board
+    "c": oven -x
+    "d": freezer -x
+    "e": stove -i=pot
+    "f": counter -i=foodprocessor
+    "g": book --book
+    "h": sink
+    "i": trash -x
+    "A": fish-crate -x
+    "B": mushroom-crate -x
+    "C": flour-crate -x
+    "D": rice-crate -x
+    "E": leek-crate -x
+    "F": tomato-crate -x
+    "G": coconut-crate -x
+    "H": cheese-crate -x
+    "I": strawberry-crate -x
+
+    "^": chair -w
+    "'": grass -w
+    ".": floor -w
+    "~": floor -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "=": fence -c
+
+entities:
+    - !customers
+      scaling_factor: 0.2
diff --git a/data/maps/village.yaml b/data/maps/village.yaml
deleted file mode 100644
index 8dcecc7e..00000000
--- a/data/maps/village.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# 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/>.
-#
-score_baseline: 200
-hand_count: 2
-map:
-    - "''''''''''''''~_''''''''''''''"
-    - "''''''''''''''__''''''''''''''"
-    - "'''█████'█████__█████'█████'''"
-    - "'''█#CC█'█UU#█__█#oo█'█SS#█'''"
-    - "'''█#..d_d..#█__█#..d_d..#█'''"
-    - "'''█#..d_d..X█__█X..d_d..#█'''"
-    - "'''█████_█████__█████_█████'''"
-    - "''''''''______________''''''''"
-    - "'''█████_█████__█████_█████'''"
-    - "'''█p..d_d..p█__█f..d_d..p█'''"
-    - "'''█D..d_d..K█__█f..d_d..p█'''"
-    - "'''█#LR█'█FT#█__█#ss█'█ppb█'''"
-    - "'''█████'█████__█████'█████'''"
-    - "'''=ctc'''ctc'__'ctc'''ctc='''"
-    - "'''=ctc'''ctc'__'ctc'''ctc='''"
-    - "'''='____________________'='''"
-    - "'''=ctc'''ctc'__'ctc'''ctc='''"
-    - "'''=ctc'''ctc'__'ctc'''ctc='''"
-    - "'''='____________________'='''"
-    - "'''=ctc'''ctc'__'ctc'''ctc='''"
-    - "'''=ctc'''ctc'__'ctc'''ctc='''"
-    - "'''===========__==========='''"
-    - "''''''''''''''_!''''''''''''''"
-
-tiles:
-    "#": counter
-    "f": counter -i=foodprocessor
-    "p": counter -i=plate
-    "t": table
-    "s": sink
-    "o": oven -x
-    "S": stove -i=pot
-    "U": stove -i=pan
-    "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
-    "K": lettuce-crate -x
-    "D": cheese-crate -x
-    "X": trash -x
-    "b": book --book
-
-    "c": chair -w
-    ".": floor -w
-    "'": grass -w
-    "~": path -w --chef-spawn
-    "!": path -w --customer-spawn
-    "_": path -w
-    "d": door -w
-    "█": wall -c
-    "=": fence -c
-
-entities:
-    - !customers
-      scaling_factor: 0.1
diff --git a/data/recipes/default.js b/data/recipes/default.js
index 5a707b17..d3f08cf1 100644
--- a/data/recipes/default.js
+++ b/data/recipes/default.js
@@ -295,7 +295,7 @@ edible("burger",
     group_hidden(combine(PL, sliced_bun, sear(patty), cut(cheese), cut(lettuce))),
     group_hidden(combine(PL, sliced_bun, cut(cheese), cut(lettuce), cut(tomato))),
     group_hidden(combine(PL, sliced_bun, cut(lettuce), cut(tomato))),
-    group_hidden(combine(PL, sliced_bun, cut(fish)))
+    combine(PL, sliced_bun, cut(fish))
 )
 
 // Soup