From e2a23f7820fb7eb6fc9132b5673cfd0dace91530 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 26 May 2024 15:08:37 -0400 Subject: [PATCH] Update existing animations to use the new onesheet tileset. --- Makefile | 2 +- game.scm | 42 +++++++++++++++++------------------ modules/game/levels/rat-1.tmx | 4 ++-- modules/game/levels/tiles.tsx | 4 ++-- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 91b4ce3..b6e6989 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ serve: game.wasm bundle: game.wasm rm cirkoban.zip || true - zip cirkoban.zip -r assets/images/*.png \ + zip cirkoban.zip -r assets/images/cirkoban-onesheet.png \ assets/sounds/*.wav \ assets/fonts/*.woff2 \ reflect.js \ diff --git a/game.scm b/game.scm index c9ff485..b19c495 100644 --- a/game.scm +++ b/game.scm @@ -76,8 +76,8 @@ ;; Assets (define tileset - (make-tileset (make-image "assets/images/cirkoban.png") - 320 (* 240 4) + (make-tileset (make-image "assets/images/cirkoban-onesheet.png") + 320 240 (inexact->exact tile-width) (inexact->exact tile-height))) (define* (load-sound-effect name #:key (volume 0.25)) @@ -358,30 +358,28 @@ (define name (make-animation tileset (vector (make-frame tile duration) ...)))) (define-animation anim:player - (0 2.25) - (300 2.25) - (600 2.25) - (900 0.15)) + (0 6.75) + (40 0.15)) (define-animation anim:electron-head - (4 .25) - (304 .25) - (604 .25) - (904 .25)) + (4 .25) + (57 .25) + (77 .25) + (97 .25)) (define-animation anim:electron-tail - (5 .25) - (305 .25) - (605 .25) - (905 .25)) + (5 .25) + (58 .25) + (78 .25) + (98 .25)) (define-animation anim:gem - (28 .25) - (328 .25) - (628 .25) - (928 .25)) + (28 .25) + (55 .25) + (75 .25) + (95 .25)) (define-animation anim:ghost-gem - (49 .25) - (349 .25) - (649 .25) - (949 .25)) + (49 .25) + (56 .25) + (76 .25) + (96 .25)) (define number->string* (let ((cache (make-eq-hashtable))) ; assuming fixnums only diff --git a/modules/game/levels/rat-1.tmx b/modules/game/levels/rat-1.tmx index bdf975d..c0f55c5 100644 --- a/modules/game/levels/rat-1.tmx +++ b/modules/game/levels/rat-1.tmx @@ -7,7 +7,7 @@ 105,18,24,24,24,24,24,24,24,18,106,189,105,65,61,61,61,61,24,86, 105,24,31,24,24,24,87,103,102,103,104,189,105,62,24,24,24,24,3,106, 105,24,24,19,24,24,106,191,170,90,210,169,85,62,20,24,31,24,24,86, -101,103,103,103,88,24,86,131,190,81,83,82,108,62,31,15,324,31,24,106, +101,103,103,103,88,24,86,131,190,81,83,82,108,62,31,15,24,31,24,106, 191,209,130,209,85,24,86,151,171,105,65,61,61,63,24,24,19,24,24,106, 129,91,81,83,108,24,106,110,90,85,62,87,103,103,103,102,102,103,102,104, 191,189,105,24,24,24,106,171,189,105,62,106,149,210,89,171,91,81,82,84, @@ -20,7 +20,7 @@ 103,103,104,150,169,90,129,85,24,24,24,106,90,151,101,102,102,102,103,103 - + diff --git a/modules/game/levels/tiles.tsx b/modules/game/levels/tiles.tsx index dbe6f33..5595c8d 100644 --- a/modules/game/levels/tiles.tsx +++ b/modules/game/levels/tiles.tsx @@ -1,6 +1,6 @@ - - + +