make the carcadr level an _actual_ carcadr level

1 files changed, 31 insertions, 13 deletions

diff --git a/src/engine/levels/CarCadr.ts b/src/engine/levels/CarCadr.ts
index e3d1eb9..07c6f11 100644
--- a/src/engine/levels/CarCadr.ts
+++ b/src/engine/levels/CarCadr.ts
@@ -38,21 +38,39 @@ export class CarCadr extends Level {
     const entities = [
       ...grasses,
       new Player({ x: 9, y: 5 }),
-      new Wall({ x: 4, y: 3 }),
-      new Wall({ x: 4, y: 4 }),
-      new LambdaFactory({ x: 6, y: 4 }, "(\\ (x) . x)", 1),
-      new FunctionApplication({ x: 5, y: 5 }, "(_INPUT _KEY)"),
+      // Cadr
+      new Wall({ x: 2, y: 3 }),
+      new Wall({ x: 2, y: 4 }),
+      new Wall({ x: 5, y: 3 }),
+      new LambdaFactory({ x: 4, y: 4 }, "(\\ (x) . x)", 1),
+      new FunctionApplication({ x: 3, y: 5 }, "(_INPUT _KEY)"),
+      new Wall({ x: 2, y: 5 }),
       new Wall({ x: 4, y: 5 }),
-      new Wall({ x: 6, y: 5 }),
-      new FunctionApplication({ x: 4, y: 6 }, "(_INPUT _NULL)"),
-      new Wall({ x: 6, y: 7 }),
-      new Wall({ x: 5, y: 7 }),
+      new FunctionApplication({ x: 2, y: 6 }, "(_INPUT _EMPTY)"),
       new Wall({ x: 4, y: 7 }),
-      new LockedDoor({ x: 3, y: 8 }),
-      new Curry({ x: 3, y: 9 }),
-      new Wall({ x: 2, y: 9 }),
-      new Wall({ x: 4, y: 9 }),
-      new Wall({ x: 3, y: 10 }),
+      new Wall({ x: 3, y: 7 }),
+      new Wall({ x: 2, y: 7 }),
+      new Wall({ x: 9, y: 3 }),
+      // Car
+      new LambdaFactory({ x: 10, y: 4 }, "(\\ (x) . x)", 1),
+      new Wall({ x: 12, y: 4 }),
+      new FunctionApplication({ x: 11, y: 5 }, "(_INPUT _EMPTY)"),
+      new Wall({ x: 10, y: 5 }),
+      new Wall({ x: 12, y: 5 }),
+      new Wall({ x: 12, y: 3 }),
+      new FunctionApplication({ x: 12, y: 6 }, "(_INPUT _KEY)"),
+      new Wall({ x: 10, y: 7 }),
+      new Wall({ x: 11, y: 7 }),
+      new Wall({ x: 12, y: 7 }),
+      // solve!
+      new LockedDoor({ x: 7, y: 8 }),
+      new LockedDoor({ x: 7, y: 9 }),
+      new Curry({ x: 7, y: 10 }),
+      new Wall({ x: 6, y: 9 }),
+      new Wall({ x: 8, y: 9 }),
+      new Wall({ x: 6, y: 10 }),
+      new Wall({ x: 8, y: 10 }),
+      new Wall({ x: 7, y: 11 }),
     ];
 
     entities.forEach((entity) => game.addEntity(entity));