From 5d9e8f820ff4a03b251b528209bc1afa4e7fb904 Mon Sep 17 00:00:00 2001
From: "Sean S. LeBlanc" <sean.s.leblanc@gmail.com>
Date: Sat, 23 Jul 2022 09:08:08 -0400
Subject: [PATCH] fix: update to bitsy 8.1

---
 package.json                                |  2 +-
 src/test/{Bitsy 8.0.html => Bitsy 8.1.html} | 36 +++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)
 rename src/test/{Bitsy 8.0.html => Bitsy 8.1.html} (99%)

diff --git a/package.json b/package.json
index a11cdff4..037cc90c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 	],
 	"main": "index.mjs",
 	"version": "21.0.0",
-	"bitsyVersion": "8.0",
+	"bitsyVersion": "8.1",
 	"scripts": {
 		"build": "rollup -c",
 		"test": "jest --runInBand",
diff --git a/src/test/Bitsy 8.0.html b/src/test/Bitsy 8.1.html
similarity index 99%
rename from src/test/Bitsy 8.0.html
rename to src/test/Bitsy 8.1.html
index 87df7895..60c3b4a0 100644
--- a/src/test/Bitsy 8.0.html	
+++ b/src/test/Bitsy 8.1.html	
@@ -11,10 +11,10 @@
 <script type="text/bitsyGameData" id="exportedGameData">
 Write your game's title here
 
-# BITSY VERSION 8.0
+# BITSY VERSION 8.1
 
 ! VER_MAJ 8
-! VER_MIN 0
+! VER_MIN 1
 ! ROOM_FORMAT 1
 ! DLG_COMPAT 0
 ! TXT_MODE 0
@@ -990,6 +990,8 @@
 
 		self._poke(self._buttonBlock, self.BTN_MENU,
 			(input.isRestartComboPressed()) ? 1 : 0);
+
+		input.resetTapReleased();
 	}
 
 	function updateSound(dt) {
@@ -4628,6 +4630,10 @@
 			initRoom(state.room);
 		}
 
+		if (dialogRenderer) {
+			dialogRenderer.updateTextboxPosition();
+		}
+
 		// resume dialog script
 		onReturn(state.room);
 	};
@@ -6760,6 +6766,10 @@
 		shouldDrawArrow = true;
 	}
 
+	this.updateTextboxPosition = function() {
+		shouldUpdateTextboxSettings = true;
+	};
+
 	// this.CharsPerRow = function() {
 	// 	return textboxInfo.charsPerRow;
 	// }
@@ -7817,7 +7827,7 @@
 /* VERSION */
 var version = {
 	major: 8, // major changes
-	minor: 0, // smaller changes
+	minor: 1, // smaller changes
 	devBuildPhase: "RELEASE",
 };
 function getEngineVersion() {
@@ -9317,6 +9327,24 @@
 	}
 }
 
+function drawRoomForegroundTile(room, frameIndex, x, y) {
+	// draw items
+	for (var i = 0; i < room.items.length; i++) {
+		var itm = room.items[i];
+		if (itm.x === x && itm.y === y) {
+			drawItem(getItemFrame(item[itm.id], frameIndex), itm.x, itm.y);
+		}
+	}
+
+	// draw sprites
+	for (id in sprite) {
+		var spr = sprite[id];
+		if (id != playerId && spr.room === room.id && spr.x === x && spr.y === y) {
+			drawSprite(getSpriteFrame(spr, frameIndex), spr.x, spr.y);
+		}
+	}
+}
+
 function drawRoom(room, args) {
 	if (room === undefined || isNarrating) {
 		// protect against invalid rooms
@@ -9331,6 +9359,8 @@
 	// if *only* redrawing the avatar, first clear its previous position
 	if (redrawAvatar) {
 		setTile(bitsy.MAP2, playerPrevX, playerPrevY, 0);
+		// also redraw any sprite or item that might be "under" the player (todo: possible perf issue?)
+		drawRoomForegroundTile(room, frameIndex, playerPrevX, playerPrevY);
 	}
 
 	// draw background & foreground tiles