From 51bc034756dae4da5ab7d5413b10d87be9e16e20 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Fri, 24 May 2024 12:00:17 -0400 Subject: [PATCH] Change the kind of non-copper walls to inert --- modules/game/level.scm | 2 +- modules/game/levels/level-2.tmx | 30 +++++++++++++------------- modules/game/levels/level-3.tmx | 16 +++++++------- modules/game/levels/tiles.tsx | 37 ++++++++++++++------------------- scripts/compile-map.scm | 4 ++-- 5 files changed, 42 insertions(+), 47 deletions(-) diff --git a/modules/game/level.scm b/modules/game/level.scm index 3f0ee31..95cea99 100644 --- a/modules/game/level.scm +++ b/modules/game/level.scm @@ -66,7 +66,7 @@ (y (bytevector-u8-ref objects (+ i 1))) (id (bytevector-u8-ref objects (+ i 2))) (obj (match id - (1 (spawn ^wall x y 'brick)) + (1 (spawn ^wall x y 'inert)) (2 (spawn ^wall x y 'copper)) (3 (spawn ^player x y)) (4 (spawn ^exit x y)) diff --git a/modules/game/levels/level-2.tmx b/modules/game/levels/level-2.tmx index 0c8ac10..5f15d26 100644 --- a/modules/game/levels/level-2.tmx +++ b/modules/game/levels/level-2.tmx @@ -3,21 +3,21 @@ -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, -23,23,23,23,23,23,24,24,24,28,24,24,24,24,23,23,23,23,23,23, -23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, -23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, -23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,24,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,24,24,24,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,24,24,24,24,24,24,23,23,23,23,23,23,23, -23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, -23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, -23,23,23,23,23,23,23,24,24,24,24,24,24,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 +130,211,129,170,171,190,109,191,129,191,191,171,91,190,110,211,171,209,150,130, +189,211,210,89,111,81,82,82,82,82,82,83,83,82,84,91,151,91,129,209, +211,209,209,171,111,105,24,24,24,24,24,24,24,24,86,210,89,130,191,170, +170,209,91,170,111,105,24,24,24,28,24,24,24,24,86,131,129,129,170,131, +130,209,89,129,211,105,24,24,24,24,24,24,24,24,106,209,211,90,211,149, +111,89,191,151,151,105,24,24,24,24,24,24,24,24,106,131,150,151,91,149, +109,191,169,209,89,85,24,24,24,24,24,24,24,24,86,211,130,150,129,190, +91,171,151,131,211,101,102,102,81,82,24,83,84,102,104,189,211,189,169,109, +89,170,150,209,131,171,81,83,108,24,24,24,107,84,169,151,131,111,191,191, +130,129,190,209,91,81,108,24,24,24,24,24,24,107,84,131,111,109,189,211, +171,190,149,189,211,105,24,24,24,24,24,24,24,24,106,131,129,89,90,170, +191,170,91,169,210,105,24,24,24,24,24,24,24,24,86,129,211,110,191,129, +130,149,129,109,171,101,88,24,24,24,24,24,24,87,104,111,169,190,110,150, +149,129,89,129,111,190,101,102,102,102,103,102,102,104,91,90,211,190,151,169, +150,111,131,210,151,151,130,211,111,210,90,90,130,150,190,109,129,90,190,169 diff --git a/modules/game/levels/level-3.tmx b/modules/game/levels/level-3.tmx index fe492a7..3f309bd 100644 --- a/modules/game/levels/level-3.tmx +++ b/modules/game/levels/level-3.tmx @@ -3,8 +3,8 @@ -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -81,83,83,82,83,83,83,82,83,83,83,83,82,83,83,84,23,23,23,23, +170,130,151,211,150,151,171,110,190,91,91,189,171,111,130,150,170,150,210,150, +81,83,83,82,83,83,83,82,83,83,83,83,82,83,83,84,131,89,169,109, 85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,81,82,82,84, 105,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,24,24,86, 105,24,24,3,3,24,3,3,3,3,3,3,24,24,24,106,105,24,24,106, @@ -12,12 +12,12 @@ 85,24,24,24,24,24,24,3,3,3,3,3,24,24,24,24,24,24,24,106, 85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,24,24,106, 85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,28,24,86, -105,24,24,24,24,24,24,24,24,24,24,24,24,24,81,104,105,24,24,86, -105,24,3,3,24,61,61,66,24,24,24,24,24,24,106,23,105,24,24,86, -85,24,24,24,24,24,24,64,61,61,24,3,3,24,86,23,101,102,102,104, -101,103,103,102,102,102,103,102,103,103,102,102,102,102,104,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 +105,24,24,24,24,24,24,24,24,24,24,24,24,24,87,104,105,24,24,86, +105,24,3,3,24,61,61,66,24,24,24,24,24,24,106,130,105,24,24,86, +85,24,24,24,24,24,24,64,61,61,24,3,3,24,86,109,101,102,102,104, +101,103,103,102,102,102,103,102,103,103,102,102,102,102,104,170,189,131,150,189, +91,191,211,110,171,209,170,110,170,111,91,111,171,211,110,210,149,89,109,130, +170,151,171,111,209,110,89,150,90,90,111,209,189,131,130,110,171,211,209,169 diff --git a/modules/game/levels/tiles.tsx b/modules/game/levels/tiles.tsx index b8335e5..a19bdcc 100644 --- a/modules/game/levels/tiles.tsx +++ b/modules/game/levels/tiles.tsx @@ -6,90 +6,85 @@ - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/scripts/compile-map.scm b/scripts/compile-map.scm index 160b8b3..be2c868 100644 --- a/scripts/compile-map.scm +++ b/scripts/compile-map.scm @@ -547,7 +547,7 @@ the default ORIENTATION value of 'orthogonal' is supported." (y-loop (1+ y)))) bv)) -(define obj:wall:brick 1) +(define obj:wall:inert 1) (define obj:wall:copper 2) (define obj:player-spawn 3) (define obj:exit 4) @@ -579,7 +579,7 @@ the default ORIENTATION value of 'orthogonal' is supported." (#f #f) ("wall" (match (assq-ref (tile-properties tile) 'kind) - ("brick" (list x y obj:wall:brick)) + ("inert" (list x y obj:wall:inert)) ("copper" (list x y obj:wall:copper)) (kind (error "unsupported wall kind" kind)))) ("exit" (list x y obj:exit))