From 1f9ad7a27b8788083863000426ba2367c47d0899 Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Wed, 29 Oct 2025 17:27:42 -0700
Subject: [PATCH 01/12] point to public server

---
 editor/script/system/multiplayer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/script/system/multiplayer.js b/editor/script/system/multiplayer.js
index 840267d..dbf04fe 100644
--- a/editor/script/system/multiplayer.js
+++ b/editor/script/system/multiplayer.js
@@ -11,7 +11,7 @@ import { BrowserWebSocketClientAdapter } from "https://esm.sh/@automerge/automer
 import { Resources } from "../generated/resources.js"
 import { Store } from "../store.js"
 
-export const DEBUG_LOCAL = true
+export const DEBUG_LOCAL = false
 export const serverURL = DEBUG_LOCAL ? "http://localhost:3030" : "https://duck-composed-closely.ngrok-free.app"
 
 export const updateText = AutomergeRepo.updateText

From 6c4eddcc332872e5520d21259d2050d80e16bd1b Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Fri, 13 Mar 2026 12:43:57 -0700
Subject: [PATCH 02/12] update from main

---
 .gitignore                          |   3 +-
 README.md                           |  16 +++-
 editor/index.html                   |   4 +
 editor/script/card.js               |   8 +-
 editor/script/dialog_editor.js      |   8 +-
 editor/script/editor.js             |  49 +++++-----
 editor/script/engine/transition.js  |   9 +-
 editor/script/inventory.js          |   8 +-
 editor/script/paint.js              |  15 +--
 editor/script/room_markers.js       |  27 +++---
 editor/script/system/multiplayer.js | 137 ++++++++++++++++++++++++----
 11 files changed, 205 insertions(+), 79 deletions(-)

diff --git a/.gitignore b/.gitignore
index a72697b..73b2e9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ dist/*
 build/*
 cache/*
 experiments/node_modules/*
-.amrg/*
\ No newline at end of file
+.amrg/*
+.node-persist/*
\ No newline at end of file
diff --git a/README.md b/README.md
index 1ee3bad..8a4e4b4 100644
--- a/README.md
+++ b/README.md
@@ -5,19 +5,25 @@
 ## make a game with bitsy
 
 ```
+git submodule update --init
+cd automerge-repo-sync-server
+npm install
+cd ..
 npm install
 npm run dev
 ```
-or
-```
-npm run client && server
-```
-Server runs on `localhost:3000` by default. Open the client at `localhost:8080`.
+Open the client at `localhost:8080`. Server runs on `localhost:3000` by default.
 
 The address bar will now have your instance string, e.g.  
 `http://localhost:8080/?instance=4CDQ9qsgqS4bQ1gfxUwFhy8q5WHX`  
 Copy this address to another client to join the shared session.
 
+Or, use the public multiplayer-bitsy server.
+```
+git checkout public-demo
+npm install --only=prod
+npm run client
+```
 
 ## credits 
 [bitsy](https://github.com/le-doux/bitsy) by Adam LeDoux and contributors  
diff --git a/editor/index.html b/editor/index.html
index d634ee3..4599651 100644
--- a/editor/index.html
+++ b/editor/index.html
@@ -51,6 +51,10 @@
 						<div class="titleWidgetContainer"></div>
 					</div>
 
+					<div id="titleFlexItem" class="bitsy-playmode-disable">
+						<div class="instanceNameContainer"></div>
+					</div>
+
 					<!-- show tools -->
 					<input type="checkbox" value="toolsPanel" id="toolsCheck" autocomplete="off" />
 					<label title="show / hide toolbar" for="toolsCheck" id="toolsCheckLabel" class="bitsy-menu-label">
diff --git a/editor/script/card.js b/editor/script/card.js
index cfe2140..6833326 100644
--- a/editor/script/card.js
+++ b/editor/script/card.js
@@ -296,7 +296,7 @@ function createNavControls(findTool, localization, options) {
 			else {
 				category.setItemName(selectedId, null);
 			}
-			refreshGameData(options.system._name);
+			refreshGameData('card '+ options.system._name);
 		},
 	});
 	navDiv.appendChild(nameInput);
@@ -380,7 +380,7 @@ function createNavControls(findTool, localization, options) {
 		onclick : function() {
 			setBitsy(options.system); // hack to use correct system
 			options.add();
-			refreshGameData(options.system._name);
+			refreshGameData('card '+ options.system._name);
 			selectAtIndex(-1);
 		},
 	});
@@ -391,7 +391,7 @@ function createNavControls(findTool, localization, options) {
 		description : "duplicate " + category.getCategoryName(),
 		onclick : function() {
 			options.duplicate(selectedId);
-			refreshGameData(options.system._name);
+			refreshGameData('card '+ options.system._name);
 			selectAtIndex(-1);
 		},
 	});
@@ -406,7 +406,7 @@ function createNavControls(findTool, localization, options) {
 			if (confirm("are you sure you want to delete this " + category.getCategoryName() + "?")) {
 				var curIndex = getCurIndex();
 				options.delete(selectedId);
-				refreshGameData(options.system._name);
+				refreshGameData('card '+ options.system._name);
 				selectAtIndex(curIndex);
 			}
 		},
diff --git a/editor/script/dialog_editor.js b/editor/script/dialog_editor.js
index 4c10429..c25cf6f 100644
--- a/editor/script/dialog_editor.js
+++ b/editor/script/dialog_editor.js
@@ -67,7 +67,7 @@ export function DialogTool(localization, sortedDialogIdList) {
 
 		titleTextInput.onchange = function() {
 			setTitle(titleTextInput.value);
-			refreshGameData();
+			refreshGameData('dialog');
 			events.Raise("dialog_update", { dialogId:titleDialogId, editorId:editorId });
 		}
 
@@ -228,7 +228,7 @@ export function DialogTool(localization, sortedDialogIdList) {
 			if (onChange != null) {
 				onChange(dialogId);
 			}
-			refreshGameData();
+			refreshGameData('dialog');
 		}
 
 		var dialogIdSelect = document.createElement("select");
@@ -410,7 +410,7 @@ export function DialogTool(localization, sortedDialogIdList) {
 
 			dialog[dialogId].src = dialogStr;
 
-			refreshGameData();
+			refreshGameData('dialog');
 
 			events.Raise("dialog_update", { dialogId:dialogId, editorId:editorId });
 			if (didMakeNewDialog) {
@@ -499,7 +499,7 @@ export function DialogTool(localization, sortedDialogIdList) {
 
 			dialog[dialogId].src = dialogStr;
 
-			refreshGameData();
+			refreshGameData('dialog');
 
 			events.Raise("dialog_update", { dialogId:dialogId, editorId:editorId });
 		}
diff --git a/editor/script/editor.js b/editor/script/editor.js
index 1845758..a9324fe 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -249,7 +249,7 @@ export function makeDrawing(type, id, imageData) {
 /* EVENTS */
 export function on_change_title(e) {
 	setTitle(e.target.value);
-	refreshGameData();
+	refreshGameData('title');
 
 	// make sure all editors with a title know to update
 	events.Raise("dialog_update", { dialogId:titleDialogId, editorId:null });
@@ -394,7 +394,7 @@ export function onDialogNameChange(event) {
 	else {
 		dialog[curDialogEditorId].name = null;
 	}
-	refreshGameData();
+	refreshGameData('dialog name');
 }
 
 export function nextDialog() {
@@ -459,7 +459,7 @@ export function addNewDialog() {
 	var id = nextAvailableDialogId();
 
 	dialog[id] = { src:" ", name:null };
-	refreshGameData();
+	refreshGameData('dialog new');
 
 	openDialogTool(id);
 
@@ -472,7 +472,7 @@ export function duplicateDialog() {
 	if (curDialogEditorId != null) {
 		var id = nextAvailableDialogId();
 		dialog[id] = { src: dialog[curDialogEditorId].src.slice(), name: null, id: id, };
-		refreshGameData();
+		refreshGameData('dialog dupe');
 
 		openDialogTool(id);
 
@@ -519,7 +519,7 @@ export function deleteDialog() {
 		}
 
 		delete dialog[tempDialogId];
-		refreshGameData();
+		refreshGameData('dialog delete');
 
 		alwaysShowDrawingDialog = document.getElementById("dialogAlwaysShowDrawingCheck").checked = false;
 
@@ -553,7 +553,7 @@ function reloadDialogUI() {
 			CreateFromEmptyTextBox: true,
 			OnCreateNewDialog: function(id) {
 				obj.dlg = id;
-				refreshGameData();
+				refreshGameData('dialog create');
 			},
 			GetDefaultName: function() {
 				var desc = getDrawingNameOrDescription(drawing);
@@ -842,10 +842,10 @@ export async function start() {
 	document.getElementById("colorPaletteOptionBackground").checked = true;
 	paletteTool = new PaletteTool(colorPicker,["colorPaletteLabelBackground", "colorPaletteLabelTile", "colorPaletteLabelSprite"],"paletteName");
 	events.Listen("palette_change", function(event) {
-		refreshGameData();
+		refreshGameData('palette');
 	});
 	events.Listen("palette_list_change", function(event) {
-		refreshGameData();
+		refreshGameData('palette');
 	});
 
 	if (!browserFeatures.fileDownload) {
@@ -915,11 +915,20 @@ export async function start() {
 	Store.set('engine_version', version);
 
 	// create title widgets
-	var titleTextWidgets = document.getElementsByClassName("titleWidgetContainer");
+	let titleTextWidgets = document.getElementsByClassName("titleWidgetContainer");
 	for (var i = 0; i < titleTextWidgets.length; i++) {
 		var widget = dialogTool.CreateTitleWidget();
 		titleTextWidgets[i].appendChild(widget.GetElement());
 	}
+	
+	let instanceNameWidget = document.getElementsByClassName("instanceNameContainer")[0];
+	let instanceTextInput = document.createElement("input");
+	instanceTextInput.classList.add("textInputField");
+	instanceTextInput.style.width = "calc(100% - 15px)"
+	instanceTextInput.type = "text";
+	instanceTextInput.readOnly = true;
+	instanceTextInput.value = Store.get("instance_name")
+	instanceNameWidget.appendChild(instanceTextInput);
 
 	// prepare dialog tool
 	openDialogTool(titleDialogId, undefined, false); // start with the title open
@@ -1059,7 +1068,7 @@ export function on_drawing_name_change() {
 		// renderPaintThumbnail( drawing.id ); // hacky way to update name
 	}
 
-	refreshGameData();
+	refreshGameData('drawing name');
 	bitsyLog(newName, "editor");
 }
 
@@ -1516,7 +1525,7 @@ export function roomPaletteChange(event) {
 	// hacky?
 	initRoom(state.room);
 
-	refreshGameData();
+	refreshGameData('room');
 
 	paintTool.updateCanvas();
 }
@@ -1914,7 +1923,7 @@ export function on_change_adv_dialog() {
 
 export function reload_game_data() {
 	// FIXME: why does palette revert?
-	console.log(roomTool?.selectedId, getRoomPal(roomTool?.selectedId))
+	// console.log(roomTool?.selectedId, getRoomPal(roomTool?.selectedId))
 
 	// same as core, but doesn't reset editor state
 	var gamedataStorage = Store.get("game_data");
@@ -1924,12 +1933,10 @@ export function reload_game_data() {
 	loadWorldFromGameData(gamedataStorage);
 
 	events.Raise("game_data_change"); // who consumes this?
-	// refreshGameData();
 }
 
 export function on_game_data_change() {
 	on_game_data_change_core();
-	// refreshGameData();
 
 	// reset find tool (a bit heavy handed?)
 	resetFindTool();
@@ -1938,7 +1945,7 @@ export function on_game_data_change() {
 export function on_game_data_change_core() {
 	var gamedataStorage = Store.get("game_data");
 	bitsyLog(gamedataStorage, "editor");
-	console.log(mutex[userId])
+	console.log('which tool?: ' + mutex[userId])
 
 	// FIXME: don't clobber the tool we're holding
 	let roomId = roomTool?.getSelectedId() || 0,  
@@ -2448,7 +2455,7 @@ export function addSpriteAnimation() {
 	renderer.ClearCache();
 
 	//refresh data model
-	refreshGameData();
+	refreshGameData('paint sprite');
 	paintTool.reloadDrawing();
 
 	// reset animations
@@ -2473,7 +2480,7 @@ export function removeSpriteAnimation() {
 	renderer.ClearCache();
 
 	//refresh data model
-	refreshGameData();
+	refreshGameData('paint sprite');
 	paintTool.reloadDrawing();
 
 	// reset animations
@@ -2503,7 +2510,7 @@ export function addTileAnimation() {
 	renderer.ClearCache();
 
 	//refresh data model
-	refreshGameData();
+	refreshGameData('paint tile');
 	paintTool.reloadDrawing();
 
 	// reset animations
@@ -2528,7 +2535,7 @@ export function removeTileAnimation() {
 	renderer.ClearCache();
 
 	//refresh data model
-	refreshGameData();
+	refreshGameData('paint tile');
 	paintTool.reloadDrawing();
 
 	// reset animations
@@ -2559,7 +2566,7 @@ function addItemAnimation() {
 	renderer.ClearCache();
 
 	//refresh data model
-	refreshGameData();
+	refreshGameData('paint item');
 	paintTool.reloadDrawing();
 
 	// reset animations
@@ -2584,7 +2591,7 @@ export function removeItemAnimation() {
 	renderer.ClearCache();
 
 	//refresh data model (TODO : these should really be a shared method)
-	refreshGameData();
+	refreshGameData('paint item');
 	paintTool.reloadDrawing();
 
 	// reset animations
diff --git a/editor/script/engine/transition.js b/editor/script/engine/transition.js
index 3379e7a..ee20d9b 100644
--- a/editor/script/engine/transition.js
+++ b/editor/script/engine/transition.js
@@ -1,5 +1,6 @@
-import { getPal } from "./bitsy.js";
+import { getPal, player, room, tile, renderer, sprite, updatePaletteWithTileColors } from "./bitsy.js"
 import { tileColorStartIndex } from "./world.js"
+import { bitsy } from "../system/system.js"
 
 export var TransitionManager = function() {
 	var transitionStart = null;
@@ -381,8 +382,8 @@ export var TransitionManager = function() {
 		}
 
 		//draw tiles
-		for (i in room.tilemap) {
-			for (j in room.tilemap[i]) {
+		for (let i in room.tilemap) {
+			for (let j in room.tilemap[i]) {
 				var id = room.tilemap[i][j];
 				var x = parseInt(j);
 				var y = parseInt(i);
@@ -412,7 +413,7 @@ export var TransitionManager = function() {
 		}
 
 		//draw sprites
-		for (id in sprite) {
+		for (let id in sprite) {
 			var spr = sprite[id];
 			if (spr.room === room.id) {
 				drawTileInPixelBuffer(
diff --git a/editor/script/inventory.js b/editor/script/inventory.js
index 1ed5c48..bb76a4b 100644
--- a/editor/script/inventory.js
+++ b/editor/script/inventory.js
@@ -31,7 +31,7 @@ export function updateInventoryItemUI(localization){
 				player().inventory[id] = parseFloat( event.target.value );
 			}
 			if(!isPlayMode)
-				refreshGameData();
+				refreshGameData('inventory');
 		}
 	}
 
@@ -83,7 +83,7 @@ function updateInventoryVariableUI(localization){
 			}
 			else {
 				variable[varInfo.id] = event.target.value;
-				refreshGameData();
+				refreshGameData('inventory');
 			}
 		};
 	}
@@ -104,7 +104,7 @@ function updateInventoryVariableUI(localization){
 			else {
 				variable[event.target.value] = "" + variable[varInfo.id] + "";
 				var oldId = varInfo.id;
-				setTimeout(function() {delete variable[oldId]; refreshGameData();}, 0); //hack to avoid some kind of delete race condition? (there has to be a better way)
+				setTimeout(function() {delete variable[oldId]; refreshGameData('inventory');}, 0); //hack to avoid some kind of delete race condition? (there has to be a better way)
 
 				varInfo.id = event.target.value;
 				varDiv.id = "inventoryVariable_" + varInfo.id;
@@ -120,7 +120,7 @@ function updateInventoryVariableUI(localization){
 			}
 			else {
 				delete variable[varInfo.id];
-				refreshGameData();
+				refreshGameData('inventory');
 				updateInventoryVariableUI();
 			}
 		}
diff --git a/editor/script/paint.js b/editor/script/paint.js
index f3a7766..15db1b5 100644
--- a/editor/script/paint.js
+++ b/editor/script/paint.js
@@ -102,7 +102,7 @@ export function PaintTool(canvas, menuElement) {
 			isPainting = false;
 
 			this.updateDrawingData();
-			refreshGameData();
+			refreshGameData('paint');
 
 			self.updateCanvas();
 
@@ -260,7 +260,7 @@ export function PaintTool(canvas, menuElement) {
 
 		drawing.isWall = checked;
 
-		refreshGameData();
+		refreshGameData('paint');
 
 		if (toggleWallUI != null && toggleWallUI != undefined) { // a bit hacky
 			toggleWallUI(checked);
@@ -313,6 +313,7 @@ export function PaintTool(canvas, menuElement) {
 		self.reloadDrawing(); //hack for ui consistency (hack x 2: order matters for animated tiles)
 
 		self.updateCanvas();
+		refreshGameData('paint tile');
 
 		setTileIndex(Object.keys(tile).length - 1);
 	}
@@ -326,6 +327,7 @@ export function PaintTool(canvas, menuElement) {
 		self.reloadDrawing(); //hack (order matters for animated tiles)
 
 		self.updateCanvas();
+		refreshGameData('paint sprite');
 
 		setSpriteIndex(Object.keys(sprite).length - 1);
 	}
@@ -340,6 +342,7 @@ export function PaintTool(canvas, menuElement) {
 
 		self.updateCanvas();
 		updateInventoryItemUI();
+		refreshGameData('paint item');
 
 		setItemIndex(Object.keys(item).length - 1);
 	}
@@ -359,7 +362,7 @@ export function PaintTool(canvas, menuElement) {
 				delete tile[drawing.id];
 
 				findAndReplaceTileInAllRooms(drawing.id, "0");
-				refreshGameData();
+				refreshGameData('paint tile');
 
 				nextTile();
 			}
@@ -375,7 +378,7 @@ export function PaintTool(canvas, menuElement) {
 				delete sprite[drawing.id];
 
 				deleteUnreferencedDialog(dlgId);
-				refreshGameData();
+				refreshGameData('paint sprite');
 
 				nextSprite();
 			}
@@ -391,7 +394,7 @@ export function PaintTool(canvas, menuElement) {
 
 				deleteUnreferencedDialog(dlgId);
 				removeAllItems(drawing.id);
-				refreshGameData();
+				refreshGameData('paint item');
 
 				nextItem();
 				updateInventoryItemUI();
@@ -427,7 +430,7 @@ export function PaintTool(canvas, menuElement) {
 					else {
 						drawing.blip = e.target.value;
 					}
-					refreshGameData();
+					refreshGameData('paint');
 				}
 			});
 			self.menu.pop({ control: "group" });
diff --git a/editor/script/room_markers.js b/editor/script/room_markers.js
index 1025076..63b0611 100644
--- a/editor/script/room_markers.js
+++ b/editor/script/room_markers.js
@@ -3,6 +3,7 @@ import {scale, mapsize} from "./system/system.js"
 import { room } from "./engine/bitsy.js"
 import { createExitData, createEndingData } from "./engine/world.js"
 import { clamp, deleteUnreferencedDialog } from "./util.js"
+import { selectRoom } from "./editor.js"
 
 import {iconUtils, events, localization} from "./editor_state.js"
 import {createRoomThumbnailRenderer, getContrastingColor, refreshGameData,
@@ -104,7 +105,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 
 		markerList = GatherMarkerList();
 		SelectMarker(markerList.find(function(m) { return m.type == MarkerType.Exit && m.exit == newExit; }));
-		refreshGameData();
+		refreshGameData('marker add');
 	};
 
 	this.AddEnding = function() {
@@ -122,7 +123,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 
 		markerList = GatherMarkerList();
 		SelectMarker(markerList.find(function(m) { return m.type == MarkerType.Ending && m.ending == newEnding; }));
-		refreshGameData();
+		refreshGameData('marker add');
 	}
 
 	// todo : handle two-way exits (and collisions!)
@@ -146,7 +147,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 
 			markerList = GatherMarkerList();
 			SelectMarker(markerList.find(function(m) { return m.type == MarkerType.Exit && m.exit == newExit; }));
-			refreshGameData();
+			refreshGameData('marker dupe');
 		}
 		else if (curMarker.type === MarkerType.Ending) {
 			var newEnding = copyEndingData(curMarker.ending);
@@ -163,7 +164,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 
 			markerList = GatherMarkerList();
 			SelectMarker(markerList.find(function(m) { return m.type == MarkerType.Ending && m.ending == newEnding; }));
-			refreshGameData();
+			refreshGameData('marker dupe');
 		}
 	}
 
@@ -340,7 +341,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 								input.value,
 								curPos.x,
 								curPos.y);
-							refreshGameData();
+							refreshGameData('marker place');
 							RenderMarkerSelection();
 						}
 					}(i, editRoomSelect);
@@ -355,7 +356,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 								curPos.room,
 								parseInt(input.value),
 								curPos.y);
-							refreshGameData();
+							refreshGameData('marker place');
 							RenderMarkerSelection();
 						}
 					}(i, editPosX);
@@ -370,7 +371,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 								curPos.room,
 								curPos.x,
 								parseInt(input.value));
-							refreshGameData();
+							refreshGameData('marker place');
 							RenderMarkerSelection();
 						}
 					}(i, editPosY);
@@ -553,7 +554,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 			{
 				OnCreateNewDialog : function(id) {
 					exit.dlg = id;
-					refreshGameData();
+					refreshGameData('marker text');
 				},
 				Presets : [
 					{
@@ -600,7 +601,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 
 		var exit = (exitIndex == 1 && curMarker.hasReturn) ? curMarker.return : curMarker.exit;
 		exit.transition_effect = effectId === "none" ? null : effectId;
-		refreshGameData();
+		refreshGameData('marker transition');
 	}
 
 	this.ToggleExitOptions = function(exitIndex, visibility) {
@@ -633,7 +634,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 
 		markerList = GatherMarkerList();
 		SelectMarker(markerList.length > 0 ? markerList[0] : null);
-		refreshGameData();
+		refreshGameData('marker remove');
 	}
 
 	this.IsPlacingMarker = function () {
@@ -772,7 +773,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 	this.PlaceMarker = function(x, y) {
 		if (curMarker != null) {
 			curMarker.PlaceMarker(placementMode,selectedRoom,x,y);
-			refreshGameData();
+			refreshGameData('marker place');
 			ResetMarkerList();
 		}
 
@@ -935,7 +936,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 		if (dragMarker != null) {
 			dragMarker.EndDrag();
 			dragMarker = null;
-			refreshGameData();
+			refreshGameData('marker place');
 			RenderMarkerSelection();
 		}
 	}
@@ -953,7 +954,7 @@ export function RoomMarkerTool(markerCanvas1, markerCanvas2) {
 		if (curMarker != null && curMarker.type == MarkerType.Exit) {
 			curMarker.ChangeLink();
 
-			refreshGameData();
+			refreshGameData('marker swap');
 			RenderMarkerSelection();
 		}
 	}
diff --git a/editor/script/system/multiplayer.js b/editor/script/system/multiplayer.js
index 46a9a53..dbf04fe 100644
--- a/editor/script/system/multiplayer.js
+++ b/editor/script/system/multiplayer.js
@@ -11,48 +11,103 @@ import { BrowserWebSocketClientAdapter } from "https://esm.sh/@automerge/automer
 import { Resources } from "../generated/resources.js"
 import { Store } from "../store.js"
 
+export const DEBUG_LOCAL = false
+export const serverURL = DEBUG_LOCAL ? "http://localhost:3030" : "https://duck-composed-closely.ngrok-free.app"
+
 export const updateText = AutomergeRepo.updateText
 export let userId = Store.get('multiplayer_bitsy_user_id')
+if (!userId) {
+    userId = uuidv4();
+    Store.set('multiplayer_bitsy_user_id', userId)
+}
 
 export async function attachServer(debug = false) {
     // Then set up an automerge repo (loading with our annoying WASM hack)
     const repo = new AutomergeRepo.Repo({
         storage: new IndexedDBStorageAdapter(),
-        network: [new BrowserWebSocketClientAdapter("wss://duck-composed-closely.ngrok-free.app/")],
+        network: [new BrowserWebSocketClientAdapter(serverURL)],
     })
     const params = new URLSearchParams(window.location.search);
 
     let handle
-    if (params.get('instance')) {
-        handle = await repo.find('automerge:' + params.get('instance'))
-        if (debug) console.log('attached to instance:', params.get('instance'))
+    let instanceRaw = params.get('instance')
+    let instance = instanceRaw
+    let instanceName
+
+    const headers = { "Content-Type": "application/json", }
+    if (instanceRaw) {
+        // try handle lookup by instance slug
+        let req = await fetchOrElse(`${serverURL}/api/handle`, {
+            method: "POST",
+            headers,
+            body: JSON.stringify({"iid": instanceRaw})
+        })
+        let res = (await req.json()).result
+        if (res) {
+            instance = res
+            instanceName = instanceRaw
+        }
+        console.log(instance)
+
+        // otherwise, try handle lookup by raw identifier
+        try {
+            handle = await repo.find('automerge:' + instance)
+        }
+        catch (e) {
+            console.log("Couldn't look up instance. Defaulting to new instance.")
+        }
     }
+    if (debug && handle) console.log('attached to instance:', instanceRaw)
 
-    // if there's no session here, spin one up
     if (!handle) {
+        // if there's no matching handle, spin up a new session
 	    var defaultData = Resources["defaultGameData.bitsy"]; // too much clutter from orphaned instances
 
+        while (true) {
+            // HACK: generate new slugs until we discover a free one
+            instanceName = generateSlug();
+            let req = await fetchOrElse(`${serverURL}/api/handle`, {
+                method: "POST",
+                headers,
+                body: JSON.stringify({"iid": instanceName})
+            })
+            let res = (await req.json()).result
+            if (!res)
+                break;
+        }
+
         handle = repo.create()
-        handle.change(doc => { doc.bitsy = defaultData; doc.mutex = {}; doc.mutex[userId] = 'none' })
+        handle.change(doc => {
+            doc.bitsy = defaultData;
+            doc.mutex = {};
+            doc.mutex[userId] = 'none';
+            doc.instance = instanceName; // assign instance slug
+        })
 
         let res = handle.url.split(':')[1]
-        if (debug) console.log('created new instance:', res)
         params.set('instance', res)
+        if (debug) console.log('created new instance:', res)
 
-        // update url slug: https://stackoverflow.com/a/56777426
-        history.pushState({}, '', `${location.pathname}?${params.toString()}${location.hash}`)
+        // tell the server our instance slug
+        fetchOrElse(`${serverURL}/api/assign`, {method: "POST", headers,
+            body: JSON.stringify({"handle": res, "iid": instanceName})})
     }
     else {
-        let res = {...handle.doc().mutex}
-        res[userId] = 'none'
-        handle.change(doc => { doc.mutex = res; })
-        if (debug) console.log(res)
+        instanceName = handle.doc().instance;
+
+        let loc = {...handle.doc().mutex}
+        // append my userId to the mutex. userId should be unique across all clients
+        loc[userId] = 'none'
+        handle.change(doc => { doc.mutex = loc; })
+        
+        let res = handle.url.split(':')[1]
+        params.set('instance', res)
     }
+    // update url: https://stackoverflow.com/a/56777426
+    history.pushState({}, '', `${location.pathname}?${params.toString()}${location.hash}`)
     
-    if (!userId) {
-        userId = uuidv4();
-        Store.set('multiplayer_bitsy_user_id', userId)
-    }
+    Store.set("instance_name", instanceName)
+    console.log("got instance name: " + instanceName)
     return {repo, handle}
 }
 
@@ -62,3 +117,51 @@ function uuidv4() {
     (+c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> +c / 4).toString(16)
   );
 }
+
+// skip POST if DEBUG_LOCAL says we're on localhost, since CORS will fail
+function fetchOrElse(url, options) {
+    if (DEBUG_LOCAL) { return {json: () => ({}) }; }
+    return fetch(url, options)
+}
+
+ const generateSlug = () => {
+    const randomAdverb = adverbs[Math.floor(Math.random() * adverbs.length)];
+    const randomAnimal = animals[Math.floor(Math.random() * animals.length)];
+    const randomNoun = nouns[Math.floor(Math.random() * nouns.length)];
+    return `${randomAdverb}-${randomAnimal}-${randomNoun}`;
+};
+
+const adverbs = [
+    'happy', 'brave', 'calm', 'clever', 'eager', 'fierce', 'gentle', 'honest', 'jolly', 'keen', 'lively', 'modest',
+    'natural', 'patient', 'quiet', 'steady', 'thoughtful', 'unique', 'wise', 'youthful', 'bold', 'bright', 'careful',
+    'cheerful', 'daring', 'elegant', 'focused', 'friendly', 'graceful', 'humble', 'ideal', 'innocent', 'joyful',
+    'kindly', 'logical', 'mighty', 'nimble', 'noble', 'orderly', 'peaceful', 'playful', 'precise', 'quick', 'radiant',
+    'resilient', 'rustic', 'silent', 'stellar', 'subtle', 'tactful', 'tranquil', 'ultimate', 'valiant', 'vibrant',
+    'vigilant', 'vivid', 'wild', 'witty', 'wonderful', 'zealous', 'active', 'agile', 'alert', 'animated', 'bashful',
+    'bouncy', 'brilliant', 'bubbly', 'cosmic', 'dazzling', 'delicate', 'dynamic', 'electric', 'energetic', 'fluent',
+    'gleaming', 'glorious', 'heroic', 'infinite', 'jovial', 'knowing', 'luminous', 'lyrical', 'magnetic',
+    'mysterious', 'nocturnal', 'fluent', 'optimistic', 'fluent', 'electric', 'quirky', 'subtle', 'spirited',
+    'sunny', 'rustic', 'urbane', 'upbeat', 'vivid', 'zesty']
+
+const animals = [
+  'groundhog', 'aardvark', 'badger', 'cheetah', 'dolphin', 'elephant', 'falcon', 'giraffe', 'hamster', 'iguana',
+  'jaguar', 'koala', 'lemur', 'mongoose', 'narwhal', 'octopus', 'panda', 'quail', 'raccoon', 'seahorse',
+  'tiger', 'urchin', 'viper', 'walrus', 'xerus', 'yak', 'zebra', 'alpaca', 'bison', 'capybara',
+  'dingo', 'emu', 'fennec', 'gecko', 'heron', 'impala', 'jellyfish', 'kiwi', 'lynx', 'meerkat',
+  'newt', 'ocelot', 'penguin', 'quokka', 'raven', 'sloth', 'toucan',   'urchin', 'vulture', 'wombat',
+  'axolotl', 'bear', 'crane', 'dragonfly', 'eagle', 'flamingo', 'gazelle', 'hedgehog', 'ibis', 'jackal',
+  'kestrel', 'leopard', 'macaw', 'nightingale', 'osprey', 'pelican', 'quail', 'reindeer', 'salamander', 'tapir',
+  'owl', 'vicuna', 'wolverine', 'fox', 'yellowjacket', 'zorilla', 'antelope', 'butterfly', 'chameleon', 'dugong',
+  'egret', 'firefly', 'gorilla', 'hummingbird', 'inchworm', 'jaybird', 'kangaroo', 'lobster', 'mantis', 'numbat',
+  'otter', 'puffin', 'rabbit', 'rhino', 'starfish', 'tortoise', 'shark', 'vole', 'weasel', 'finch'
+];
+
+const nouns = ['highway', 'mountain', 'river', 'forest', 'ocean', 'desert', 'valley', 'canyon', 'island',
+    'bridge', 'castle', 'tower', 'garden', 'meadow', 'field', 'lake', 'stream', 'waterfall', 'volcano',
+    'glacier', 'temple', 'palace', 'fortress', 'lighthouse', 'harbor', 'village', 'pathway', 'tunnel', 'cavern',
+    'crater', 'summit', 'plateau', 'ridge', 'cliff', 'shore', 'bay', 'lagoon', 'marsh', 'swamp', 'prairie', 'tundra',
+    'savanna', 'jungle', 'reef', 'trench', 'basin', 'delta', 'peninsula', 'archipelago', 'atoll', 'dune', 'oasis',
+    'geyser', 'spring', 'rapids', 'fjord', 'strait', 'channel', 'inlet', 'cove', 'peak', 'knoll', 'hill', 'slope',
+    'gorge', 'ravine', 'bluff', 'mesa', 'butte', 'rock', 'boulder', 'stone', 'pebble', 'sand', 'dust', 'cloud', 'storm',
+    'thunder', 'lightning', 'rainbow', 'sunrise', 'sunset', 'twilight', 'dawn', 'dusk', 'noon', 'midnight', 'eclipse',
+    'comet', 'meteor', 'star', 'moon', 'galaxy', 'nebula', 'cosmos', 'horizon', 'zenith', 'void', 'abyss', 'sanctuary']
\ No newline at end of file

From f4ce249e7001e9811f34fe33e93a41bd30020b9d Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Thu, 30 Apr 2026 16:57:46 -0700
Subject: [PATCH 03/12] Feature: everyone's mouse pointer is shared (but not
 panel layout)

---
 editor/index.html                 |  3 +-
 editor/index.js                   |  5 +-
 editor/script/editor.js           | 84 +++++++++++++++++++++++++++++--
 editor/style/bitsyEditorStyle.css | 10 +++-
 4 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/editor/index.html b/editor/index.html
index 4599651..3f063ae 100644
--- a/editor/index.html
+++ b/editor/index.html
@@ -125,7 +125,7 @@
 			</div>
 		</div>
 
-		<div id="editorWindow" > <!-- FIXME: onmousewheel="blockScrollBackpage(event);" -->
+		<div id="editorWindow" >
 			<div id="editorContent">
 
 				<div id="aboutPanel" class="bitsy-card bitsy-card-m bitsy-workbench-item">
@@ -833,6 +833,7 @@
 			</div> <!-- Editor Content -->
 		</div> <!-- Editor Window -->
 
+		<canvas id="pointerOverlay" class="overlay"></canvas>
 		</div>
 
 	</body>
diff --git a/editor/index.js b/editor/index.js
index ce64e75..3f17af4 100644
--- a/editor/index.js
+++ b/editor/index.js
@@ -6,8 +6,8 @@ import {start,
     openFindToolWithCurrentPaintCategory, togglePaintGrid, on_paint_frame1, on_paint_frame2, prevPalette, nextPalette, newPalette,
     duplicatePalette, deletePalette, changeColorPickerIndex, prevDialog, nextDialog, addNewDialog, duplicateDialog, deleteDialog, openFindTool,
     toggleAlwaysShowDrawingDialog, showInventoryItem, showInventoryVariable, startRecordingGif, stopRecordingGif, takeSnapshotGif, toggleSnapshotMode,
-    toggleExitOptions, grabCard, onDialogNameChange, onChangeExitTransitionEffect,
-    on_drawing_name_change, on_toggle_wall, on_toggle_animated, on_palette_name_change 
+    toggleExitOptions, grabCard, onDialogNameChange, onChangeExitTransitionEffect, blockScrollBackpage,
+    on_drawing_name_change, on_toggle_wall, on_toggle_animated, on_palette_name_change
 } from "./script/editor.js"
 import {aboutOpenTab} from "./script/tools/about.js"
 import {showPanel, hidePanel} from "./script/editor_state.js"
@@ -23,6 +23,7 @@ export function bindToolDialogs () {
     // I get called during editor initialization by start()
     
     document.querySelectorAll(".bitsy-card-title").forEach(u => u.addEventListener("onmousedown", grabCard))
+    document.querySelector("#editorWindow").addEventListener("onmousewheel", blockScrollBackpage)
 
     document.querySelector("#dialogShowCodeCheck").addEventListener("click", toggleDialogCode)
     document.querySelector("#toolsCheck").addEventListener("click", toggleToolBar)
diff --git a/editor/script/editor.js b/editor/script/editor.js
index 0a8a441..82f3337 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -641,6 +641,12 @@ function Timer() {
 }
 
 var editMode = EditMode.Edit; // TODO : move to core.js?
+const editorWindow = document.querySelector("#editorWindow")
+
+/* MULTIPLAYER */
+export let server
+export let copresenceContext
+export const peerCursors = {}
 
 /* TOOL CONTROLLERS */
 export let roomTool;
@@ -739,7 +745,6 @@ export function resetFindTool() {
 	});
 }
 
-export let server
 export async function start() {
 	initSystem();
 
@@ -751,6 +756,9 @@ export async function start() {
 	});
 	detectBrowserFeatures();
 
+	resizeCanvasOverlay()
+	copresenceContext = document.getElementById('pointerOverlay').getContext('2d');
+
 	// enable multiplayer editing
 	server = await attachServer(true)
 	let handle = server.handle
@@ -798,6 +806,45 @@ export async function start() {
 		on_game_data_change_core()
 		// reload_game_data(); // causes flicker
     })
+	
+	const cursorIcon = bakeCursor()
+    handle.on("ephemeral-message", ({handle, senderId, message}) => {
+		let ctx = copresenceContext
+
+		// HACK: initialize peers on connection, not in the mousemove handler
+		let u = peerCursors[senderId]
+		if (u === undefined) {
+			let randomColor = '#000'
+			console.log('saw peer with color ' + handle[senderId])
+			if (!handle[senderId])
+				handle[senderId] = randomColor
+			peerCursors[senderId] = {color: handle[senderId]};
+		}
+		peerCursors[senderId].mouseX = message.mouseX;
+		peerCursors[senderId].mouseY = message.mouseY;
+		peerCursors[senderId].age = 0;
+
+		// clear out timed-out peers
+		for (let i in peerCursors) {
+			if (peerCursors[i].age > 500)
+				delete peerCursors[i]
+		}
+
+		ctx.clearRect(0, 0, window.innerWidth, window.innerHeight);
+		ctx.fillStyle = '#fff'
+		for (let i in peerCursors) {
+			let msg = peerCursors[i]
+			++msg.age;
+			ctx.strokeStyle = msg.color;
+
+			ctx.save();
+			ctx.translate(msg.mouseX - editorWindow.scrollLeft,
+							msg.mouseY - editorWindow.scrollTop);
+			ctx.fill(cursorIcon);
+			ctx.stroke(cursorIcon); // TODO: set color
+			ctx.restore();
+		}
+	})
 
 	// now world data like `sprite` and `tile` is loaded
 	// let's make the find tool so that tool cards can use it
@@ -969,6 +1016,27 @@ export async function start() {
 	bindToolDialogs();
 }
 
+function bakeCursor(scale = 1) {
+  const p = new Path2D();
+  p.moveTo(0, 0);           // tip (hotspot)
+  p.lineTo(0, 16 * scale);  // left edge bottom
+  p.lineTo(4 * scale, 12 * scale);  // inner notch
+  p.lineTo(7 * scale, 18 * scale);  // stylus tip
+  p.lineTo(9 * scale, 17 * scale);  // stylus right
+  p.lineTo(6 * scale, 11 * scale);  // back to body
+  p.lineTo(11 * scale, 11 * scale); // right shoulder
+  p.closePath();
+  return p;
+}
+
+
+function resizeCanvasOverlay() {
+	let canvas = document.getElementById('pointerOverlay')
+	canvas.width = window.innerWidth;
+	canvas.height = window.innerHeight;
+}
+window.addEventListener('resize', resizeCanvasOverlay, false)
+
 export function newDrawing() {
 	paintTool.newDrawing();
 }
@@ -2754,7 +2822,7 @@ export function panel_onMouseMove(e) {
 
 	bitsyLog("********", "editor")
 }
-document.addEventListener("mousemove",panel_onMouseMove);
+document.addEventListener("mousemove", panel_onMouseMove);
 
 export function panel_onMouseUp(e) {
 	if (grabbedPanel.card == null) return;
@@ -2799,7 +2867,7 @@ export function getElementSize(e) { /* gets visible size */
 }
 
 // sort of a hack to avoid accidentally activating backpage and nextpage while scrolling through editor panels 
-function blockScrollBackpage(e) {
+export function blockScrollBackpage(e) {
 	var el = document.getElementById("editorWindow");
 	var maxX = el.scrollWidth - el.offsetWidth;
 
@@ -2810,6 +2878,16 @@ function blockScrollBackpage(e) {
 	// }
 }
 
+// show other peoples' cursors in multiplayer
+export function cursorOverlay(e) {	
+	server.handle.broadcast({
+		mouseX: e.pageX + editorWindow.scrollLeft,
+		mouseY: e.pageY + editorWindow.scrollTop
+	})
+
+}
+document.addEventListener("mousemove", cursorOverlay)
+
 
 export function toggleDialogCode(e) {
 	console.log('toggling dialogue code')
diff --git a/editor/style/bitsyEditorStyle.css b/editor/style/bitsyEditorStyle.css
index 6c4d5a1..9bfd167 100644
--- a/editor/style/bitsyEditorStyle.css
+++ b/editor/style/bitsyEditorStyle.css
@@ -56,6 +56,14 @@ body {
 }
 
 /* canvas */
+#pointerOverlay {
+  position: absolute;
+  z-index: 2;
+  pointer-events: none;
+  margin-bottom: 0;
+  height: 100%;
+}
+
 canvas {
 	width: 100%;
 	margin-bottom: var(--bitsy-space-s);
@@ -97,7 +105,7 @@ textarea {
 	background: black;
 	color: white;
 	resize: none;
-	border: none
+	border: none;
 	padding: var(--bitsy-space-s);
 	border-radius: var(--bitsy-space-xs);
 	flex-grow: 1;

From 75351c14ac27cafaa71f646c8a3c877b5550586a Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Thu, 30 Apr 2026 17:19:38 -0700
Subject: [PATCH 04/12] update new game / save game / save data

---
 editor/script/editor.js     |  6 +++---
 editor/script/exporter.js   |  6 ++++--
 editor/script/tools/game.js | 17 +++++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/editor/script/editor.js b/editor/script/editor.js
index 82f3337..c641fb6 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -666,7 +666,7 @@ export function setItemIndex(idx) { itemIndex = idx; }
 var roomIndex = 0;
 
 /* BROWSER COMPATIBILITY */
-var browserFeatures = {
+export var browserFeatures = {
 	colorPicker : false,
 	fileDownload : false,
 	blobURL : false
@@ -677,8 +677,8 @@ var gifencoder = new gif();
 var gifFrameData = [];
 
 /* EXPORT HTML */
-var makeURL = null;
-var exporter = new Exporter();
+export var makeURL = null;
+export var exporter = new Exporter();
 
 function detectBrowserFeatures() {
 	bitsyLog("BROWSER FEATURES", "editor");
diff --git a/editor/script/exporter.js b/editor/script/exporter.js
index c7eb13d..6d9c80c 100644
--- a/editor/script/exporter.js
+++ b/editor/script/exporter.js
@@ -1,4 +1,6 @@
-import {Resources} from "./generated/resources.js"
+import { Resources } from "./generated/resources.js"
+import { fontManager } from "../script/editor_state.js"
+import { browserFeatures, makeURL } from "../script/editor.js"
 
 export function Exporter() {
 
@@ -142,7 +144,7 @@ this.importGame = function( html ) {
 
 } // Exporter()
 
-var ExporterUtils = {
+export var ExporterUtils = {
 	DownloadFile : function(filename, text) {
 
 		if( browserFeatures.blobURL ) {
diff --git a/editor/script/tools/game.js b/editor/script/tools/game.js
index 179f9d3..979efa0 100644
--- a/editor/script/tools/game.js
+++ b/editor/script/tools/game.js
@@ -1,11 +1,13 @@
 import { fontName, setFont, serializeWorld } from "../engine/bitsy.js";
 import { makeToolCard } from "../card.js"
 import { Store } from "../store.js";
-import { flags, setTextDirection } from "../engine/bitsy.js";
+import { flags, setTextDirection, getTitle } from "../engine/bitsy.js";
 import { TextDirection } from "../engine/world.js";
 import { bitsy, bitsyLog } from "../system/system.js";
+import { ExporterUtils } from "../exporter.js"
 
-import { server, grabCard, findTool, togglePanelAnimated, refreshGameData, setDefaultGameState, updateEditorTextDirection} from "../editor.js"
+import { server, grabCard, findTool, togglePanelAnimated, refreshGameData,
+	setDefaultGameState, updateEditorTextDirection, exporter} from "../editor.js"
 import { fontManager } from "../editor_state.js";
 import { updateText } from "../system/multiplayer.js";
 
@@ -224,11 +226,18 @@ export function makeGameTool(localization) {
 		}
 
 		window.newGameDialog = function newGameDialog() {
-			var resetMessage = localization.GetStringOrFallback("reset_game_message", "Starting a new game will erase your old data. Consider exporting your work first! Are you sure you want to start over?");
+			// TODO: extend localization to multiplayer Bitsy features
+			// localization.getStringOrFallback("reset_game_message", ...)
+			var resetMessage = "Save this URL if you want to find this instance again. Really start a new instance?";
 			// todo : move the confirm dialog into tool.menu code?
 			if (confirm(resetMessage)) {
 				// todo : move into file.js
-				resetGameData();
+				// resetGameData();
+
+    			const url = new URL(window.location.href);
+        		url.searchParams.delete('instance');
+				window.history.pushState({}, document.title, url);
+				location.reload();
 			}
 		}
 

From d1f728719eabf8ff367aee445bf793ae87d25bc9 Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Thu, 30 Apr 2026 17:55:46 -0700
Subject: [PATCH 05/12] button to copy readable instance URL

---
 editor/index.html       |  7 ++++++-
 editor/index.js         |  4 +++-
 editor/script/editor.js | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/editor/index.html b/editor/index.html
index 3f063ae..ae6e648 100644
--- a/editor/index.html
+++ b/editor/index.html
@@ -51,9 +51,14 @@
 						<div class="titleWidgetContainer"></div>
 					</div>
 
-					<div id="titleFlexItem" class="bitsy-playmode-disable">
+					<div style="width: 400px;" id="instanceFlexItem">
 						<div class="instanceNameContainer"></div>
 					</div>
+					<button style="height: 25px;" id="instanceNameCopy">
+					<label title="copy instance URL" for="instanceNameCopy" id="instanceNameCopyLabel" class="bitsy-menu-label">
+						<span class="bitsy_icon">open_tool</span>
+					</label>
+					</button>
 
 					<!-- show tools -->
 					<input type="checkbox" value="toolsPanel" id="toolsCheck" autocomplete="off" />
diff --git a/editor/index.js b/editor/index.js
index 3f17af4..b980563 100644
--- a/editor/index.js
+++ b/editor/index.js
@@ -6,7 +6,7 @@ import {start,
     openFindToolWithCurrentPaintCategory, togglePaintGrid, on_paint_frame1, on_paint_frame2, prevPalette, nextPalette, newPalette,
     duplicatePalette, deletePalette, changeColorPickerIndex, prevDialog, nextDialog, addNewDialog, duplicateDialog, deleteDialog, openFindTool,
     toggleAlwaysShowDrawingDialog, showInventoryItem, showInventoryVariable, startRecordingGif, stopRecordingGif, takeSnapshotGif, toggleSnapshotMode,
-    toggleExitOptions, grabCard, onDialogNameChange, onChangeExitTransitionEffect, blockScrollBackpage,
+    toggleExitOptions, grabCard, onDialogNameChange, onChangeExitTransitionEffect, blockScrollBackpage, copyInstanceURL,
     on_drawing_name_change, on_toggle_wall, on_toggle_animated, on_palette_name_change
 } from "./script/editor.js"
 import {aboutOpenTab} from "./script/tools/about.js"
@@ -119,4 +119,6 @@ export function bindToolDialogs () {
     document.querySelector("#wallCheckbox").addEventListener("change", on_toggle_wall)
     document.querySelector("#animatedCheckbox").addEventListener("change", on_toggle_animated)
     document.querySelector("#paletteName").addEventListener("change", on_palette_name_change)
+
+    document.querySelector("#instanceNameCopy").addEventListener("click", copyInstanceURL)
 }
\ No newline at end of file
diff --git a/editor/script/editor.js b/editor/script/editor.js
index c641fb6..c3a841b 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -642,6 +642,7 @@ function Timer() {
 
 var editMode = EditMode.Edit; // TODO : move to core.js?
 const editorWindow = document.querySelector("#editorWindow")
+let instanceTextInput
 
 /* MULTIPLAYER */
 export let server
@@ -969,7 +970,7 @@ export async function start() {
 	}
 	
 	let instanceNameWidget = document.getElementsByClassName("instanceNameContainer")[0];
-	let instanceTextInput = document.createElement("input");
+	instanceTextInput = document.createElement("input");
 	instanceTextInput.classList.add("textInputField");
 	instanceTextInput.style.width = "calc(100% - 15px)"
 	instanceTextInput.type = "text";
@@ -1029,7 +1030,6 @@ function bakeCursor(scale = 1) {
   return p;
 }
 
-
 function resizeCanvasOverlay() {
 	let canvas = document.getElementById('pointerOverlay')
 	canvas.width = window.innerWidth;
@@ -1037,6 +1037,16 @@ function resizeCanvasOverlay() {
 }
 window.addEventListener('resize', resizeCanvasOverlay, false)
 
+export function copyInstanceURL() {
+    navigator.clipboard.writeText(`${location.origin}${location.pathname}?instance=${Store.get("instance_name")}`)
+    instanceTextInput.value = "Copied instance URL!"
+	this.readOnly = true
+	setTimeout(() => {
+		instanceTextInput.value = Store.get("instance_name")
+		this.readOnly = false
+	}, 1000);
+}
+
 export function newDrawing() {
 	paintTool.newDrawing();
 }

From b2e1f714c466126d9f1979af7a41d9c051bbfd41 Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Thu, 30 Apr 2026 18:10:05 -0700
Subject: [PATCH 06/12] show where peers click

---
 editor/script/editor.js | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/editor/script/editor.js b/editor/script/editor.js
index c3a841b..ef9f95b 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -821,9 +821,13 @@ export async function start() {
 				handle[senderId] = randomColor
 			peerCursors[senderId] = {color: handle[senderId]};
 		}
-		peerCursors[senderId].mouseX = message.mouseX;
-		peerCursors[senderId].mouseY = message.mouseY;
-		peerCursors[senderId].age = 0;
+
+		// update this peer's cursor ghost
+		if (message.type == "mousemove") {
+			u.mouseX = message.mouseX;
+			u.mouseY = message.mouseY;
+			u.age = 0;
+		}
 
 		// clear out timed-out peers
 		for (let i in peerCursors) {
@@ -831,18 +835,31 @@ export async function start() {
 				delete peerCursors[i]
 		}
 
+		// redraw cursors
 		ctx.clearRect(0, 0, window.innerWidth, window.innerHeight);
 		ctx.fillStyle = '#fff'
+
+		if (message.type == "mousedown") {
+			ctx.save()
+			ctx.fillStyle = '#ffa7'
+			ctx.translate(u.mouseX - editorWindow.scrollLeft,
+							u.mouseY - editorWindow.scrollTop);
+			ctx.beginPath()
+			ctx.arc(0, 0, 10, 0, 2*Math.PI)
+			ctx.fill()
+			ctx.restore()
+		}
+
 		for (let i in peerCursors) {
 			let msg = peerCursors[i]
 			++msg.age;
-			ctx.strokeStyle = msg.color;
+			ctx.strokeStyle = msg.color; // always black
 
 			ctx.save();
 			ctx.translate(msg.mouseX - editorWindow.scrollLeft,
 							msg.mouseY - editorWindow.scrollTop);
 			ctx.fill(cursorIcon);
-			ctx.stroke(cursorIcon); // TODO: set color
+			ctx.stroke(cursorIcon);
 			ctx.restore();
 		}
 	})
@@ -2891,12 +2908,20 @@ export function blockScrollBackpage(e) {
 // show other peoples' cursors in multiplayer
 export function cursorOverlay(e) {	
 	server.handle.broadcast({
+		type: "mousemove",
 		mouseX: e.pageX + editorWindow.scrollLeft,
 		mouseY: e.pageY + editorWindow.scrollTop
 	})
+}
+export function cursorDownOverlay(e) {
+	server.handle.broadcast({
+		type: "mousedown",
+		target: e.target
+	})
 
 }
 document.addEventListener("mousemove", cursorOverlay)
+document.addEventListener("mousedown", cursorDownOverlay)
 
 
 export function toggleDialogCode(e) {

From 44be21e0133d96a73375e692b6ac6f1fca382d6a Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Thu, 30 Apr 2026 19:21:59 -0700
Subject: [PATCH 07/12] fix branching dialogs and nondeterministic icon loading

---
 editor/index.js                |  3 ++-
 editor/script/dialog_editor.js |  4 +++-
 editor/script/editor.js        | 10 ++++++----
 editor/script/editor_state.js  | 19 ++++++++++---------
 editor/script/engine/script.js |  2 +-
 editor/script/room_markers.js  |  2 +-
 editor/script/thumbnail.js     |  5 +++--
 editor/script/tools/room.js    |  3 ++-
 8 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/editor/index.js b/editor/index.js
index b980563..d383ac4 100644
--- a/editor/index.js
+++ b/editor/index.js
@@ -10,8 +10,9 @@ import {start,
     on_drawing_name_change, on_toggle_wall, on_toggle_animated, on_palette_name_change
 } from "./script/editor.js"
 import {aboutOpenTab} from "./script/tools/about.js"
-import {showPanel, hidePanel} from "./script/editor_state.js"
+import {showPanel, hidePanel, loadIcons} from "./script/editor_state.js"
 
+loadIcons()
 start()
 
 export function testShim (gameTool) {
diff --git a/editor/script/dialog_editor.js b/editor/script/dialog_editor.js
index c25cf6f..31e8210 100644
--- a/editor/script/dialog_editor.js
+++ b/editor/script/dialog_editor.js
@@ -1,6 +1,8 @@
 import { rgbToHex } from "./util.js"
 import { scriptInterpreter, scriptUtils, titleDialogId } from "./engine/world.js"
-import { getTitle, getPal, curDefaultPal, sprite, tile, room, item, dialog, palette, setTitle } from "./engine/bitsy.js"
+import { getTitle, getPal, curDefaultPal, sprite, tile, room, item, dialog, palette, blip, tune,
+	setTitle } from "./engine/bitsy.js"
+import { tilesize } from "./system/system.js"
 
 import { ThumbnailRenderer } from "./thumbnail.js"
 import { iconUtils, events } from "./editor_state.js" 
diff --git a/editor/script/editor.js b/editor/script/editor.js
index ef9f95b..d9f61d0 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -5,7 +5,7 @@ import { Resources } from "./generated/resources.js"
 import { clearGameData, getPal, getRoomPal, animationTime, initRoom,
 	curDefaultPal, sprite, tile, room, item, renderer, state, dialog, palette, flags,
 	setInventoryCallback, setVariableCallback, setGameResetCallback, setInitRoomCallback, textDirection,
-	loadWorldFromGameData, serializeWorld, updateNamesFromCurData } from "./engine/bitsy.js"
+	loadWorldFromGameData, serializeWorld, updateNamesFromCurData, resetAllAnimations } from "./engine/bitsy.js"
 import { titleDialogId, version, defaultFontName,
 	createDrawingData, createExitData, createEndingData} from "./engine/world.js"
 
@@ -808,6 +808,11 @@ export async function start() {
 		// reload_game_data(); // causes flicker
     })
 	
+	// share my cursor
+	document.addEventListener("mousemove", cursorOverlay)
+	document.addEventListener("mousedown", cursorDownOverlay)
+
+	// render shared cursors
 	const cursorIcon = bakeCursor()
     handle.on("ephemeral-message", ({handle, senderId, message}) => {
 		let ctx = copresenceContext
@@ -2918,10 +2923,7 @@ export function cursorDownOverlay(e) {
 		type: "mousedown",
 		target: e.target
 	})
-
 }
-document.addEventListener("mousemove", cursorOverlay)
-document.addEventListener("mousedown", cursorDownOverlay)
 
 
 export function toggleDialogCode(e) {
diff --git a/editor/script/editor_state.js b/editor/script/editor_state.js
index 140596b..c137784 100644
--- a/editor/script/editor_state.js
+++ b/editor/script/editor_state.js
@@ -46,16 +46,17 @@ export function readUrlParameters() {
 
 /* ICONS */
 export let iconUtils = new IconUtils()
+export function loadIcons() {
+	// load icons and replace placeholder elements
+	var elements = document.getElementsByClassName("bitsy_icon");
+	for(var i = 0; i < elements.length; i++) {
+		iconUtils.LoadIcon(elements[i]);
+	}
 
-// load icons and replace placeholder elements
-var elements = document.getElementsByClassName("bitsy_icon");
-for(var i = 0; i < elements.length; i++) {
-	iconUtils.LoadIcon(elements[i]);
-}
-
-var elements = document.getElementsByClassName("bitsy_icon_anim");
-for(var i = 0; i < elements.length; i++) {
-	iconUtils.LoadIconAnimated(elements[i]);
+	var elements = document.getElementsByClassName("bitsy_icon_anim");
+	for(var i = 0; i < elements.length; i++) {
+		iconUtils.LoadIconAnimated(elements[i]);
+	}
 }
 
 /* EVENTS */
diff --git a/editor/script/engine/script.js b/editor/script/engine/script.js
index 5d2a4f6..d5ea270 100644
--- a/editor/script/engine/script.js
+++ b/editor/script/engine/script.js
@@ -1,4 +1,4 @@
-import { initRoom } from "./bitsy.js";
+import { initRoom, names } from "./bitsy.js";
 import { bitsy } from "../system/system.js";
 import { events, isPlayerEmbeddedInEditor } from "../editor_state.js"
 
diff --git a/editor/script/room_markers.js b/editor/script/room_markers.js
index f87749c..f740150 100644
--- a/editor/script/room_markers.js
+++ b/editor/script/room_markers.js
@@ -1,6 +1,6 @@
 import {bitsyLog} from "./system/system.js"
 import {scale, mapsize} from "./system/system.js"
-import { room } from "./engine/bitsy.js"
+import { room, dialog } from "./engine/bitsy.js"
 import { createExitData, createEndingData } from "./engine/world.js"
 import { clamp, deleteUnreferencedDialog } from "./util.js"
 import {iconUtils, events, localization} from "./editor_state.js"
diff --git a/editor/script/thumbnail.js b/editor/script/thumbnail.js
index f7b0b83..5e4d268 100644
--- a/editor/script/thumbnail.js
+++ b/editor/script/thumbnail.js
@@ -2,7 +2,9 @@ import {TileType, labelElementFactory, rgbToHex} from "./util.js"
 import {gif} from "./gif.js"
 
 import {bitsyLog, tilesize, scale} from "./system/system.js"
-import { state, room, getPal, getRoomPal, animationTime } from "./engine/bitsy.js";
+import { state, room, item, tile, getPal, getRoomPal, animationTime,
+	getSpriteFrame, getItemFrame, getTileFrame
+ } from "./engine/bitsy.js";
 import { roomTool, getDrawingImageSource } from "./editor.js";
 
 // renders a tile to canvas (kind of hackily recreates some of the TileRenderer logic - oh well)
@@ -299,7 +301,6 @@ export function ThumbnailControl(iconUtils, options) {
 	this.LoadThumbnailImage = function() {
 		if (id && renderer) {
 			var entry = renderer.GetCacheEntry(id);
-
 			if (entry.uri != null) {
 				renderOptions.callback(entry.uri);
 			}
diff --git a/editor/script/tools/room.js b/editor/script/tools/room.js
index 43a55f8..ccb7f9a 100644
--- a/editor/script/tools/room.js
+++ b/editor/script/tools/room.js
@@ -11,7 +11,8 @@ import { drawGrid } from "../paint.js"
 import { MarkerType, LinkState } from "../room_markers.js"
 import { grabCard, findTool, markerTool, paintTool, isPlayMode, nextObjectId, sortedBase36IdList, sortedPaletteIdList, sortedRoomIdList,
 	togglePanelAnimated, getContrastingColor, isColorDark, isSnapshotInProgress, refreshGameData,
-	on_paint_sprite_ui_update, on_paint_avatar_ui_update, on_paint_tile_ui_update, on_paint_item_ui_update } from "../editor.js"
+	on_paint_sprite_ui_update, on_paint_avatar_ui_update, on_paint_tile_ui_update, on_paint_item_ui_update,
+	CreateDefaultName } from "../editor.js"
 import { getPanelSetting, setPanelSetting } from "../editor_state.js"
 
 export function makeRoomTool(localization, showPanelRef) {

From 0794ffc0cc18ec4cc701d41aa15c078abf209696 Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Thu, 30 Apr 2026 19:42:37 -0700
Subject: [PATCH 08/12] fix scripted games

---
 editor/script/editor.js        |  2 +-
 editor/script/engine/bitsy.js  | 12 ++++++------
 editor/script/engine/script.js |  6 ++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/editor/script/editor.js b/editor/script/editor.js
index d9f61d0..263f5e5 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -2,7 +2,7 @@ import { TileType, labelElementFactory, rgbToHex, rgbToHsl, getDrawingDialogId,
 import { initSystem, bitsyLog, tilesize, scale, mapsize, width, attachCanvas, loadGame, quitGame } from "./system/system.js"
 import { Resources } from "./generated/resources.js"
 
-import { clearGameData, getPal, getRoomPal, animationTime, initRoom,
+import { clearGameData, getPal, getRoomPal, animationTime, initRoom, soundPlayer,
 	curDefaultPal, sprite, tile, room, item, renderer, state, dialog, palette, flags,
 	setInventoryCallback, setVariableCallback, setGameResetCallback, setInitRoomCallback, textDirection,
 	loadWorldFromGameData, serializeWorld, updateNamesFromCurData, resetAllAnimations } from "./engine/bitsy.js"
diff --git a/editor/script/engine/bitsy.js b/editor/script/engine/bitsy.js
index 93aad13..4bc1501 100644
--- a/editor/script/engine/bitsy.js
+++ b/editor/script/engine/bitsy.js
@@ -122,7 +122,7 @@ export function clearGameData() {
 }
 
 // engine event hooks for the editor
-var onInventoryChanged = null;
+export var onInventoryChanged = null;
 var onVariableChanged = null;
 var onGameReset = null;
 var onInitRoom = null;
@@ -663,7 +663,7 @@ export function movePlayer(direction, isFirstMove) {
 	}
 }
 
-var transition;
+export var transition;
 if (engineFeatureFlags.isTransitionEnabled) {
 	transition = new TransitionManager();
 }
@@ -1710,12 +1710,12 @@ export function getRoomPal(roomId) {
 }
 
 var isDialogMode = false;
-var isNarrating = false;
-var isEnding = false;
+export var isNarrating = false;
+export var isEnding = false;
 
 var dialogModule;
-var dialogRenderer;
-var dialogBuffer;
+export var dialogRenderer;
+export var dialogBuffer;
 if (engineFeatureFlags.isDialogEnabled) {
 	dialogModule = new Dialog();
 	dialogRenderer = dialogModule.CreateRenderer();
diff --git a/editor/script/engine/script.js b/editor/script/engine/script.js
index d5ea270..3bed1be 100644
--- a/editor/script/engine/script.js
+++ b/editor/script/engine/script.js
@@ -1,6 +1,8 @@
-import { initRoom, names } from "./bitsy.js";
+import { initRoom, names, fontName, sprite, tile, item, state, tune, blip,
+	 player, transition, dialogRenderer, dialogBuffer, soundPlayer,
+	onInventoryChanged, isEnding, isNarrating, updatePalette, drawRoom } from "./bitsy.js";
 import { bitsy } from "../system/system.js";
-import { events, isPlayerEmbeddedInEditor } from "../editor_state.js"
+import { events, isPlayerEmbeddedInEditor, fontManager } from "../editor_state.js"
 
 export function Script() {
 

From 2a9a51dd763d0c00f244ba810292473a9d58de85 Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Wed, 27 May 2026 10:59:18 -0700
Subject: [PATCH 09/12] hotfix graphics cache overflow

---
 editor/script/editor.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/editor/script/editor.js b/editor/script/editor.js
index 263f5e5..cfefc2d 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -804,8 +804,8 @@ export async function start() {
 
 		mutex = handle.doc().mutex
 
-		on_game_data_change_core()
-		// reload_game_data(); // causes flicker
+		// on_game_data_change_core()
+		reload_game_data(); // causes flicker
     })
 	
 	// share my cursor
@@ -2024,12 +2024,14 @@ export function on_change_adv_dialog() {
 export function reload_game_data() {
 	// FIXME: why does palette revert?
 	// console.log(roomTool?.selectedId, getRoomPal(roomTool?.selectedId))
+	console.log("reload_game_data")
 
 	// same as core, but doesn't reset editor state
 	var gamedataStorage = Store.get("game_data");
 	bitsyLog(gamedataStorage, "editor");
 	
 	clearGameData();
+	renderer.ClearCache();
 	loadWorldFromGameData(gamedataStorage);
 
 	events.Raise("game_data_change"); // who consumes this?
@@ -2045,6 +2047,7 @@ export function on_game_data_change() {
 export function on_game_data_change_core() {
 	var gamedataStorage = Store.get("game_data");
 	bitsyLog(gamedataStorage, "editor");
+	console.log("on_game_data_change_core")
 	console.log('which tool?: ' + mutex[userId])
 
 	// FIXME: don't clobber the tool we're holding

From f024618ee42c1882e25fc91f5f0244351b6b641d Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Sun, 7 Jun 2026 17:44:13 -0700
Subject: [PATCH 10/12] fontmanager fixes

---
 editor/script/editor.js        | 8 +++-----
 editor/script/engine/world.js  | 1 +
 editor/script/exporter.js      | 1 +
 editor/script/localization.js  | 2 +-
 editor/script/system/system.js | 1 +
 editor/script/tools/game.js    | 9 +++++----
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/editor/script/editor.js b/editor/script/editor.js
index cfefc2d..0da1bd0 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -529,7 +529,7 @@ export function deleteDialog() {
 
 // TODO : move into the paint tool
 var paintDialogWidget = null;
-function reloadDialogUI() {
+export function reloadDialogUI() {
 	var dialogContent = document.getElementById("dialog");
 	dialogContent.innerHTML = "";
 
@@ -2059,6 +2059,7 @@ export function on_game_data_change_core() {
 		spriteId = sortedSpriteIdList().filter(function (id) { return id != "A"; })[spriteIndex];
 		
 	clearGameData();
+	renderer.ClearCache();
 	loadWorldFromGameData(gamedataStorage); // reparse world if user directly manipulates game data
 
 	/*
@@ -2103,9 +2104,6 @@ export function on_game_data_change_core() {
 	}
 	*/
 
-	// refresh images
-	renderer.ClearCache();
-
 	// try not to clobber editor state
 	/* roomIndex = 0;
 
@@ -3056,7 +3054,7 @@ export function hackUpdateEditorToolMenusOnLanguageChange() {
 }
 
 var curEditorLanguageCode = "en";
-function updateEditorLanguageStyle(newCode) {
+export function updateEditorLanguageStyle(newCode) {
 	document.body.classList.remove("lang_" + curEditorLanguageCode);
 	curEditorLanguageCode = newCode;
 	document.body.classList.add("lang_" + curEditorLanguageCode);
diff --git a/editor/script/engine/world.js b/editor/script/engine/world.js
index d272e11..10629b1 100644
--- a/editor/script/engine/world.js
+++ b/editor/script/engine/world.js
@@ -1,5 +1,6 @@
 import {bitsy} from "../system/system.js"
 import {Script} from "./script.js"
+import { fontManager } from "../editor_state.js";
 
 /* BITSY VERSION */
 // is this the right place for this to live?
diff --git a/editor/script/exporter.js b/editor/script/exporter.js
index 6d9c80c..ea1796b 100644
--- a/editor/script/exporter.js
+++ b/editor/script/exporter.js
@@ -1,6 +1,7 @@
 import { Resources } from "./generated/resources.js"
 import { fontManager } from "../script/editor_state.js"
 import { browserFeatures, makeURL } from "../script/editor.js"
+import { bitsyLog } from "./system/system.js"
 
 export function Exporter() {
 
diff --git a/editor/script/localization.js b/editor/script/localization.js
index b5b3153..514d363 100644
--- a/editor/script/localization.js
+++ b/editor/script/localization.js
@@ -178,7 +178,7 @@ this.GetStringOrFallback = function(id, englishFallback) {
 }
 
 function localizationContains(id, text) { // TODO : rename to be more descriptive?
-	for (lang in localizationStrings) {
+	for (var lang in localizationStrings) {
 		var locString = getLocaleString(lang, id);
 		if (locString != null && locString.length > 0 && locString === text) {
 			return true;
diff --git a/editor/script/system/system.js b/editor/script/system/system.js
index 316c214..f4a604d 100644
--- a/editor/script/system/system.js
+++ b/editor/script/system/system.js
@@ -464,6 +464,7 @@ export function BitsySystem(name) {
 
 		memory.changed[next] = false;
 
+		// bitsy.log('_allocate', next, memory.blocks) // Error().stack
 		return next;
 	};
 
diff --git a/editor/script/tools/game.js b/editor/script/tools/game.js
index 979efa0..96d8411 100644
--- a/editor/script/tools/game.js
+++ b/editor/script/tools/game.js
@@ -1,14 +1,15 @@
-import { fontName, setFont, serializeWorld } from "../engine/bitsy.js";
 import { makeToolCard } from "../card.js"
 import { Store } from "../store.js";
-import { flags, setTextDirection, getTitle } from "../engine/bitsy.js";
+import { fontName, setFont, serializeWorld, flags, setTextDirection, getTitle, setTitle } from "../engine/bitsy.js";
 import { TextDirection } from "../engine/world.js";
 import { bitsy, bitsyLog } from "../system/system.js";
 import { ExporterUtils } from "../exporter.js"
 
-import { server, grabCard, findTool, togglePanelAnimated, refreshGameData,
-	setDefaultGameState, updateEditorTextDirection, exporter} from "../editor.js"
+import { server, grabCard, findTool, togglePanelAnimated, refreshGameData, reloadDialogUI,
+	setDefaultGameState, updateEditorTextDirection, exporter, updateEditorLanguageStyle,
+	hackUpdatePlaceholderText, hackUpdateEditorToolMenusOnLanguageChange } from "../editor.js"
 import { fontManager } from "../editor_state.js";
+import { updateInventoryUI } from "../inventory.js";
 import { updateText } from "../system/multiplayer.js";
 
 

From 7f86d95215bec5b032d2c61d02ac0a354a3bff99 Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Tue, 9 Jun 2026 15:17:41 -0700
Subject: [PATCH 11/12] clean animation frames

---
 editor/script/editor.js       | 31 ++++++++++++++++---------------
 editor/script/editor_state.js |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/editor/script/editor.js b/editor/script/editor.js
index 0da1bd0..8742238 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -3,7 +3,7 @@ import { initSystem, bitsyLog, tilesize, scale, mapsize, width, attachCanvas, lo
 import { Resources } from "./generated/resources.js"
 
 import { clearGameData, getPal, getRoomPal, animationTime, initRoom, soundPlayer,
-	curDefaultPal, sprite, tile, room, item, renderer, state, dialog, palette, flags,
+	curDefaultPal, sprite, tile, room, item, renderer, state, dialog, palette, flags, fontName,
 	setInventoryCallback, setVariableCallback, setGameResetCallback, setInitRoomCallback, textDirection,
 	loadWorldFromGameData, serializeWorld, updateNamesFromCurData, resetAllAnimations } from "./engine/bitsy.js"
 import { titleDialogId, version, defaultFontName,
@@ -30,7 +30,7 @@ import { makeTuneTool } from "./tools/tune.js"
 import { makeBlipTool } from "./tools/blip.js"
 
 import { setAboutPage, initAbout } from "./tools/about.js" // FIXME
-import { localization, readUrlParameters, iconUtils, fontManager,
+import { localization, readUrlParameters, iconUtils, fontManager, defaultFonts,
 	events, getPanelPrefs, showPanel, updatePanelPrefs, togglePanel, togglePanelCore } from "./editor_state.js"
 
 import { attachServer, updateText, userId } from "./system/multiplayer.js" // FIXME
@@ -324,7 +324,7 @@ export let curDialogEditor = null;
 export let curPlaintextDialogEditor = null; // the duplication is a bit weird, but better than recreating editors all the time?
 
 export function openDialogTool(dialogId, insertNextToId, showIfHidden) { // todo : rename since it doesn't always "open" it?
-	// console.log(new Error("who opened the dialog tool?"))
+	console.log("dialog tool reload: " + new Error().stack)
 
 	if (showIfHidden === undefined || showIfHidden === null) {
 		showIfHidden = true;
@@ -750,11 +750,11 @@ export async function start() {
 	initSystem();
 
 	// TODO : I need to get rid of this event system... it's too hard to debug
-	events.Listen("game_data_change", function(event) {
+	/* events.Listen("game_data_change", function(event) {
 		// TODO : refactor "openDialogTool" to split out the actual opening from reloading
 		// force re-load the dialog tool
-		openDialogTool(titleDialogId, /*insertNextToId*/ null, /*showIfHidden*/ false);
-	});
+		openDialogTool(titleDialogId, null, false); // titleDialogId, insertNextToId, showIfHidden
+	}); */
 	detectBrowserFeatures();
 
 	resizeCanvasOverlay()
@@ -797,15 +797,14 @@ export async function start() {
 	
     // listen to multiplayer server
     handle.on("change", () => {
-		// console.log('sync crdt')
-
 		var gamedataChanged = handle.doc().bitsy;
         Store.set("game_data", gamedataChanged)
 
 		mutex = handle.doc().mutex
+		console.log('sync crdt: update from ' + Object.entries(mutex))
 
 		// on_game_data_change_core()
-		reload_game_data(); // causes flicker
+		reload_game_data();
     })
 	
 	// share my cursor
@@ -2033,8 +2032,10 @@ export function reload_game_data() {
 	clearGameData();
 	renderer.ClearCache();
 	loadWorldFromGameData(gamedataStorage);
+	// reset animations
+	resetAllAnimations();
 
-	events.Raise("game_data_change"); // who consumes this?
+	// events.Raise("game_data_change"); // causes start() to reload all the editors
 }
 
 export function on_game_data_change() {
@@ -2084,6 +2085,7 @@ export function on_game_data_change_core() {
 	if (drawing) {
 		curPaintMode = drawing.type;
 	}
+	*/
  
 	//fallback if there are no tiles, sprites, map
 	// TODO : switch to using stored default file data (requires separated parser / game data code)
@@ -2102,10 +2104,9 @@ export function on_game_data_change_core() {
 	if (Object.keys(item).length == 0) {
 		makeItem("0");
 	}
-	*/
 
 	// try not to clobber editor state
-	/* roomIndex = 0;
+	// roomIndex = 0;
 
 	/*
 	var curPaintMode = TileType.Avatar;
@@ -2128,17 +2129,17 @@ export function on_game_data_change_core() {
 
 	// paintTool.reloadDrawing(); // this reloads the dialog UI
 	updateInventoryUI(localization);
-   */
+	*/
 
 	// FIXME: catch undefined fontName on startup
 	// if user pasted in a custom font into game data - update the stored custom font
-	/* if (defaultFonts.indexOf(fontName + fontManager.GetExtension()) == -1) {
+	if (defaultFonts.indexOf(fontName + fontManager.GetExtension()) == -1) {
 		var fontStorage = {
 			name : fontName,
 			fontdata : fontManager.GetData(fontName)
 		};
 		Store.set('custom_font', fontStorage);
-	} */
+	}
 
 	// TODO -- start using this for more things
 	// events.Raise("game_data_change"); // this event reloads all the panels, which we don't want
diff --git a/editor/script/editor_state.js b/editor/script/editor_state.js
index c137784..2e7179c 100644
--- a/editor/script/editor_state.js
+++ b/editor/script/editor_state.js
@@ -8,7 +8,7 @@ import {EventManager} from "./event_manager.js"
 export let isPlayerEmbeddedInEditor = true  // FIXME: flag for game player to make changes specific to editor
 
 /* FONT MANAGER */
-var defaultFonts = [
+export var defaultFonts = [
 		"ascii_small.bitsyfont",
 		"unicode_european_small.bitsyfont",
 		"unicode_european_large.bitsyfont",

From 7bd3d02e9e91fcf713b8a543ad500831522e5ff4 Mon Sep 17 00:00:00 2001
From: JazzTap <ottojasmine@gmail.com>
Date: Tue, 23 Jun 2026 09:53:22 -0700
Subject: [PATCH 12/12] fix transient tile renderer confusion

---
 editor/script/editor.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/editor/script/editor.js b/editor/script/editor.js
index 8742238..0b6a140 100644
--- a/editor/script/editor.js
+++ b/editor/script/editor.js
@@ -750,11 +750,11 @@ export async function start() {
 	initSystem();
 
 	// TODO : I need to get rid of this event system... it's too hard to debug
-	/* events.Listen("game_data_change", function(event) {
+	events.Listen("game_data_change", function(event) {
 		// TODO : refactor "openDialogTool" to split out the actual opening from reloading
 		// force re-load the dialog tool
-		openDialogTool(titleDialogId, null, false); // titleDialogId, insertNextToId, showIfHidden
-	}); */
+		// openDialogTool(titleDialogId, null, false); // titleDialogId, insertNextToId, showIfHidden
+	});
 	detectBrowserFeatures();
 
 	resizeCanvasOverlay()
@@ -2030,12 +2030,13 @@ export function reload_game_data() {
 	bitsyLog(gamedataStorage, "editor");
 	
 	clearGameData();
-	renderer.ClearCache();
 	loadWorldFromGameData(gamedataStorage);
+
 	// reset animations
 	resetAllAnimations();
+	renderer.ClearCache(); // reset the renderer after loading the world to avoid nondeterminism
 
-	// events.Raise("game_data_change"); // causes start() to reload all the editors
+	// events.Raise("game_data_change"); // callback defined in start()
 }
 
 export function on_game_data_change() {