From 8319098784fdad9fa985afd344f894e702384cc8 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 28 Oct 2023 22:28:08 -0400 Subject: Map tweaks. --- game.scm | 4 +- level.tmx | 128 +++++++++++++++++++++++++++++++------------------------------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/game.scm b/game.scm index 6b83102..5f1d5d8 100644 --- a/game.scm +++ b/game.scm @@ -1437,11 +1437,11 @@ (set! *game-state* 'play) (scheduler-reset! *scheduler*) (set! *scroll* 0.0) - ;; (set! *scroll* (* 250.0 tile-height)) + ;; (set! *scroll* (* 345.0 tile-height)) (set! *last-scroll* 0.0) (set! *last-row-scanned* (level-height level)) ;; (set! *last-row-scanned* (- (level-height level) - ;; 250)) + ;; 345)) (bullet-pool-reset! player-bullets) (bullet-pool-reset! enemy-bullets) (enemy-pool-reset! enemies) diff --git a/level.tmx b/level.tmx index c9beff1..0a02fa4 100644 --- a/level.tmx +++ b/level.tmx @@ -47,8 +47,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,1,0, -0,1,1,0,0,0,0,0,0,0,0,0,1,1,0, -1,1,1,1,0,0,0,0,0,0,1,1,1,1,1, +0,1,1,2,0,0,0,0,0,0,0,3,1,1,0, +1,1,1,1,2,0,0,0,0,3,1,1,1,1,1, 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, @@ -72,19 +72,20 @@ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, -1,0,0,0,0,0,0,0,0,0,0,0,1,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,3,1, +1,0,0,0,0,0,0,0,0,0,0,0,3,1,1, 1,0,0,0,0,0,0,0,0,0,0,0,1,1,1, -1,1,0,0,0,0,0,0,0,0,0,0,1,1,1, -1,1,1,0,0,0,0,0,0,0,0,0,1,1,1, -1,1,1,0,0,0,0,0,1,1,0,1,1,1,1, +1,2,0,0,0,0,0,0,0,0,0,0,1,1,1, +1,1,2,0,0,0,0,0,0,0,0,0,1,1,1, +1,1,1,0,0,0,0,0,0,0,0,3,1,1,1, +1,1,1,2,0,0,0,3,1,1,0,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1, +1,1,1,1,1,1,1,1,1,5,0,4,1,1,1, 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1, 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1, 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1, @@ -94,17 +95,16 @@ 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1, 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1, 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1, -1,1,1,1,1,1,1,1,1,0,0,0,1,1,1, -1,1,1,1,0,0,0,0,0,0,0,0,1,1,1, -1,1,1,1,0,0,0,0,0,0,0,0,1,1,1, +1,1,1,1,5,0,0,0,0,0,0,0,1,1,1, 1,1,1,1,0,0,0,0,0,0,0,0,1,1,1, +1,1,1,1,0,0,0,0,0,0,0,3,1,1,1, 1,1,1,1,0,0,0,1,1,1,1,1,1,1,1, 1,1,1,1,0,0,0,1,1,1,1,1,1,1,1, 1,1,1,1,0,0,0,1,1,1,1,1,1,1,1, 1,1,1,1,0,0,0,1,1,1,1,1,1,1,1, +1,1,1,1,0,0,0,0,0,0,4,1,1,1,1, 1,1,1,1,0,0,0,0,0,0,0,1,1,1,1, -1,1,1,1,0,0,0,0,0,0,0,1,1,1,1, -1,1,1,1,0,0,0,0,0,0,0,1,1,1,1, +1,1,1,1,2,0,0,0,0,0,0,1,1,1,1, 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1, 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1, 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1, @@ -114,9 +114,9 @@ 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1, 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1, 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1, +1,1,1,1,1,1,1,1,0,0,0,0,0,4,1, 1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, -1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, -1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, +1,1,1,1,1,1,1,1,2,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1, @@ -127,17 +127,17 @@ 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1, +1,1,1,1,1,1,5,0,0,0,0,0,0,0,1, 1,1,1,1,1,1,0,0,0,0,0,0,0,0,1, -1,1,1,1,1,1,0,0,0,0,0,0,0,0,1, -1,1,1,1,1,1,0,0,0,0,0,0,0,0,1, +1,1,1,1,1,1,0,0,0,0,0,0,0,3,1, 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1, 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1, 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1, 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1, 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1, +1,1,5,0,0,0,0,0,0,1,1,1,1,1,1, 1,1,0,0,0,0,0,0,0,1,1,1,1,1,1, -1,1,0,0,0,0,0,0,0,1,1,1,1,1,1, -1,1,0,0,0,0,0,0,0,1,1,1,1,1,1, +1,1,0,0,0,0,0,0,3,1,1,1,1,1,1, 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1, 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1, 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1, @@ -157,6 +157,7 @@ 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1, 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1, 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1, +1,5,0,0,0,0,0,0,0,0,0,0,0,4,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, @@ -184,11 +185,10 @@ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,1,0,0,0,0,0,0,0,0,0,0,0,1,1, -1,1,1,0,0,0,0,0,0,0,0,0,1,1,1, -1,1,1,1,0,0,0,0,0,0,0,1,1,1,1, +1,2,0,0,0,0,0,0,0,0,0,0,0,3,1, +1,1,2,0,0,0,0,0,0,0,0,0,3,1,1, +1,1,1,2,0,0,0,0,0,0,0,3,1,1,1, +1,1,1,1,2,0,0,0,0,0,3,1,1,1,1, 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1, 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1, 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1, @@ -248,8 +248,8 @@ 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1, 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1, 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1, -1,1,1,0,0,0,0,0,0,0,0,0,1,1,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,1,5,0,0,0,0,0,0,0,4,1,1,1, +1,5,0,0,0,0,0,0,0,0,0,0,0,4,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, @@ -264,81 +264,81 @@ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,1,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,1,1,1,0,0,0,0,0,0,0,0,0,0,1, -1,1,1,1,1,1,0,0,0,0,0,0,0,0,1, -1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, +1,2,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,2,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,1,1,2,0,0,0,0,0,0,0,0,0,1, +1,1,1,1,1,1,2,0,0,0,0,0,0,0,1, +1,1,1,1,1,1,1,1,2,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,0,0,0,0,1, -1,1,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,5,0,0,0,0,0,0,0,0,0,0,0,1, +1,5,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,3,1, 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1, 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,4,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,2,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,0,0,0,0,1, -1,1,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,5,0,0,0,0,0,0,0,0,0,0,0,1, +1,5,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,3,1, +1,0,0,0,0,0,0,0,0,0,0,0,3,1,1, 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1, 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,4,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,4,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,1,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,2,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,2,0,0,0,0,0,0,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,1,0,0,0,0,1, -1,1,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,5,0,0,0,0,0,0,0,0,0,0,0,1, +1,5,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,3,1, +1,0,0,0,0,0,0,0,0,0,0,0,3,1,1, 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1, 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,4,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,4,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,1,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,2,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,1,2,0,0,0,0,0,0,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,0,0,0,0,0,1, 1,1,1,1,1,1,1,1,1,0,0,0,0,0,1, +1,5,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,3,1, +1,0,0,0,0,0,0,0,0,0,0,0,3,1,1, 1,0,0,0,1,1,1,1,1,1,1,1,1,1,1, -1,0,0,0,0,0,1,1,1,1,1,1,1,1,1, -1,0,0,0,0,0,0,0,1,1,1,1,1,1,1, -1,0,0,0,0,0,0,0,0,1,1,1,1,1,1, -1,0,0,0,0,0,0,0,0,0,1,1,1,1,1, +1,0,0,0,0,4,1,1,1,1,1,1,1,1,1, +1,0,0,0,0,0,0,4,1,1,1,1,1,1,1, +1,0,0,0,0,0,0,0,4,1,1,1,1,1,1, +1,0,0,0,0,0,0,0,0,4,1,1,1,1,1, 1,0,0,0,0,0,0,0,0,0,1,1,1,1,1, +1,0,0,0,0,0,0,0,0,0,4,1,1,1,1, 1,0,0,0,0,0,0,0,0,0,0,1,1,1,1, -1,0,0,0,0,0,0,0,0,0,0,1,1,1,1, -1,0,0,0,0,0,0,0,0,0,0,0,1,1,1, +1,0,0,0,0,0,0,0,0,0,0,4,1,1,1, 1,0,0,0,0,0,0,0,0,0,0,0,1,1,1, +1,0,0,0,0,0,0,0,0,0,0,0,4,1,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,1,1, -1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +1,0,0,0,0,0,0,0,0,0,0,0,0,4,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,1,0,0,0,1, 1,0,0,0,0,0,0,0,0,1,1,1,0,0,1, @@ -414,7 +414,7 @@ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +5,0,0,0,0,0,0,0,0,0,0,0,0,0,4, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -- cgit v1.2.3