add second campaign level

3 files changed, 113 insertions, 29 deletions

diff --git a/data/maps/campaign/01.yaml b/data/maps/campaign/01.yaml
index 8fe64c5b..3c844d44 100644
--- a/data/maps/campaign/01.yaml
+++ b/data/maps/campaign/01.yaml
@@ -13,16 +13,17 @@
 # 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: 100
+score_baseline: 15
+default_timer: 60
 map:
     - "*''''*'''*'''''*'''"
     - "'''*''''*'*'*'''*'*"
-    - "''████▒█████▒███'*"
-    - "*'█tc....█..~.s█''"
-    - "''▒c.ctc.d....⌷█'*"
-    - "'*█tc.c..█....C█'*"
-    - "''█c.....█XTppp█''"
-    - "*'████dd████████''"
+    - "''████▒█████▒███'*'"
+    - "*'█tc....█..~.s█'''"
+    - "''▒c.ctc.d....⌷█''*"
+    - "'*█tc.c..█....C█'*'"
+    - "''█c.....█XLppp█'''"
+    - "*'████dd████████'''"
     - "'*''''__'''''''''''"
     - "'''*''____________!"
     - "'*'''''''''''''''''"
@@ -31,10 +32,9 @@ tiles:
     "⌷": counter
     "p": counter
     "t": table
-    "w": counter-window
     "s": sink
     "C": cuttingboard
-    "T": tomato-crate
+    "L": lettuce-crate
     "X": trash
 
     "c": chair
diff --git a/data/maps/campaign/02.yaml b/data/maps/campaign/02.yaml
new file mode 100644
index 00000000..7efe9c96
--- /dev/null
+++ b/data/maps/campaign/02.yaml
@@ -0,0 +1,72 @@
+# Hurry Curry! - a game about cooking
+# Copyright 2024 metamuffin
+#
+# 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: 30
+default_timer: 120
+map:
+    - "*''''*'''*'''''*'''"
+    - "'''*''''*'*'*'''*'*"
+    - "''████▒█████▒████'*"
+    - "*'█tc....█..~..s█''"
+    - "''▒c.ct..d.....p█'*"
+    - "'*█c..c..█.....p█'*"
+    - "''█tc...c█.....p█''"
+    - "''█c....t█XC⌷SS⌷█''"
+    - "*'████dd█████████''"
+    - "'*''''__'''''''''''"
+    - "'''*''____________!"
+    - "'*'''''''''''''''''"
+
+tiles:
+    "⌷": counter
+    "p": counter
+    "t": table
+    "s": sink
+    "S": stove
+    "C": steak-crate
+    "X": trash
+
+    "c": chair
+    "~": floor
+    ".": floor
+    "'": grass
+    "*": tree
+    "!": path
+    "_": path
+    "d": door
+    "▒": wall-window
+    "█": wall
+
+items:
+    "S": pan
+    "p": plate
+
+entities:
+    - !customers
+
+chef_spawn: "~"
+customer_spawn: "!"
+
+walkable:
+    - door
+    - floor
+    - chair
+    - grass
+    - path
+
+collider:
+    - wall
+    - wall-window
+    - tree
diff --git a/data/maps/campaign/lobby.yaml b/data/maps/campaign/lobby.yaml
index 39dde694..128e1040 100644
--- a/data/maps/campaign/lobby.yaml
+++ b/data/maps/campaign/lobby.yaml
@@ -15,33 +15,39 @@
 #
 score_baseline: 0
 map:
-    - "'*''''''''''''*'"
-    - "*'''''*'''*'''''"
-    - "'*''*''''*'*'*'*"
-    - "*'''''''█████*''"
-    - "*'''''''█.1.█**'"
-    - "''''''''█...█'''"
-    - "''*'''''██a██*'*"
-    - "'*'''''~''''''''"
-    - "''''''''''''''*'"
-    - "'*'''''''''''*''"
-    - "''*'''''''''''*'"
-    - "''''b''''''''*''"
-    - "'*'''''''''''*''"
-    - "''*'''*'''*''*''"
-    - "'*''*''**'''**''"
-    - "*'''''''''*''''*"
+    - "'*''''''''''''''''''''*'''''*'"
+    - "*'''''*'''*'''*'''*'''''*'''''"
+    - "'*''*''''*'''''*'''''''''*'*'*"
+    - "*'''''''███████████████████*''"
+    - "*'''''''█.1.█.2.█.3.4.█.5.█**'"
+    - "''''''''█...█...█.....█...█'''"
+    - "''*'''''██.███a████b████c██*'*"
+    - "'*''''''''''''''''''''''''''''"
+    - "''''''''''''''''''''''''''''*'"
+    - "'*'''''''''''''''''''''''''*''"
+    - "''*'''''''''''''''''''''''''*'"
+    - "''''§'''''~''''''''''''''''*''"
+    - "'*'''''''''''''''''''''''''*''"
+    - "''*'''*'''*'''*'''*'*'''*''*''"
+    - "'*''*''**'''*'''*'''''*'''**''"
+    - "*'''''''''*'''*'''*'*'''*''''*"
 
 tiles:
     "t": table
     "T": table
     "s": sink
     "c": chair
-    "~": floor
+    "~": grass
     ".": floor
     "1": floor
+    "2": floor
+    "3": floor
+    "4": floor
+    "5": floor
     "a": floor
-    "b": book
+    "b": floor
+    "c": floor
+    "§": book
     "'": grass
     "*": tree
     "█": wall
@@ -51,8 +57,14 @@ customer_spawn: "!"
 
 tile_entities:
     "1": !map { name: "campaign/01" }
-    "a": !gate { condition: !all [!stars [sophomore, 2], !stars [paris, 1]] }
-    "b": !book
+    "2": !map { name: "campaign/02" }
+    "3": !map { name: "campaign/03" }
+    "4": !map { name: "campaign/04" }
+    "5": !map { name: "campaign/05" }
+    "a": !gate { condition: !stars [campaign/01, 1] }
+    "b": !gate { condition: !all [!stars [campaign/01, 3], !stars [campaign/02, 1]] }
+    "c": !gate { condition: !any [!stars [campaign/03, 3], !stars [campaign/04, 3]] }
+    "§": !book
 
 walkable:
     - floor