From ff15472fe58a3a2018495610a77963a40ed76574 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 3 Jul 2023 20:40:30 +1000 Subject: [PATCH] Tweak --- assets/scripts/init.toy | 23 ++++++++++++++++++++++- assets/scripts/tilemap/generator.toy | 14 -------------- assets/scripts/tilemap/renderer.toy | 13 ------------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/assets/scripts/init.toy b/assets/scripts/init.toy index a2cf745..587563a 100644 --- a/assets/scripts/init.toy +++ b/assets/scripts/init.toy @@ -1,17 +1,38 @@ //Globals go here + + +//constants for generating maps +var ROOM_MIN_WIDTH: int const = 4; //minimum safe value 4 +var ROOM_MIN_HEIGHT: int const = 4; + +var ROOM_MAX_WIDTH: int const = 12; +var ROOM_MAX_HEIGHT: int const = 12; + +var CELL_WIDTH: int const = 16; //minimum safe value ROOM_MAX_* + 4 +var CELL_HEIGHT: int const = 16; + +var CELL_COUNT_X: int const = 3; +var CELL_COUNT_Y: int const = 3; + + +//constants for rendering tiles var TILE_PIXEL_WIDTH: int const = 16; var TILE_PIXEL_HEIGHT: int const = 16; + +//camera controls var CAMERA_SCREEN_W: int const = 1080; var CAMERA_SCREEN_H: int const = 720; var CAMERA_SCALE_X: float const = 1.0; var CAMERA_SCALE_Y: float const = 1.0; -//this is a very odd pattern... + +//this is a very bad habit... var globalCameraX: int = 0; var globalCameraY: int = 0; + //A quirk of the setup is that anything defined in the root of `init.toy` becomes a global object //To resolve that, the configuration is inside a block scope { diff --git a/assets/scripts/tilemap/generator.toy b/assets/scripts/tilemap/generator.toy index 060325b..c9dbe1d 100644 --- a/assets/scripts/tilemap/generator.toy +++ b/assets/scripts/tilemap/generator.toy @@ -33,20 +33,6 @@ var themes: [string] const = [ ]; -//constants for generating maps -var ROOM_MIN_WIDTH: int const = 4; //minimum safe value 4 -var ROOM_MIN_HEIGHT: int const = 4; - -var ROOM_MAX_WIDTH: int const = 12; -var ROOM_MAX_HEIGHT: int const = 12; - -var CELL_WIDTH: int const = 16; //minimum safe value ROOM_MAX_* + 4 -var CELL_HEIGHT: int const = 16; - -var CELL_COUNT_X: int const = 3; -var CELL_COUNT_Y: int const = 3; - - //raw string data var tilemap: [int] = null; diff --git a/assets/scripts/tilemap/renderer.toy b/assets/scripts/tilemap/renderer.toy index 83635cc..f84a051 100644 --- a/assets/scripts/tilemap/renderer.toy +++ b/assets/scripts/tilemap/renderer.toy @@ -2,19 +2,6 @@ import standard; import engine; import node; -//constants for generating maps -var ROOM_MIN_WIDTH: int const = 4; //minimum safe value 4 -var ROOM_MIN_HEIGHT: int const = 4; - -var ROOM_MAX_WIDTH: int const = 12; -var ROOM_MAX_HEIGHT: int const = 12; - -var CELL_WIDTH: int const = 16; //minimum safe value ROOM_MAX_* + 4 -var CELL_HEIGHT: int const = 16; - -var CELL_COUNT_X: int const = 3; -var CELL_COUNT_Y: int const = 3; - var tilemap: [int] = null; //lifecycle functions