Separate map navigation from game logic

Now our game logic is down to pretty much the minimum needed

Author: platz1de

src/game/Game.ts

@@ -1,7 +1,6 @@
 import type {GameMap} from "../map/GameMap";
 import type {GameMode} from "./mode/GameMode";
 import type {GameResult} from "./result/GameResult";
-import {mapNavigationHandler} from "./action/MapNavigationHandler";
 import {territoryManager} from "./TerritoryManager";
 import {playerManager} from "./player/PlayerManager";
 import {Player} from "./player/Player";
@@ -27,15 +26,14 @@ import {gameTicker} from "./GameTicker";
 export function startGame(map: GameMap, mode: GameMode, seed: number, players: { name: string }[], clientId: number, isLocal: boolean) {
 	initGameData(map, mode, isLocal);
 	gameLoadRegistry.broadcast();
-	mapNavigationHandler.enable();
 	territoryManager.reset();
 	const maxPlayers = spawnManager.init(500);
 	borderManager.reset(maxPlayers);
 	attackActionHandler.init(maxPlayers);
 	playerManager.init(players.map((p, i) => new (i === clientId ? ClientPlayer : Player)(i, p.name, HSLColor.fromRGB(0, 200, 200))), clientId, maxPlayers);
 
 	random.reset(seed);
-	gameInitHandler.broadcast();
+	gameInitRegistry.broadcast();
 	playerManager.randomizeSpawnPoints();
 }
 
@@ -86,7 +84,7 @@ export function quitGame() {
  * If {@link GameTicker.isPaused} is false this event was fired along gameInit or gameResult.
  */
 export const gameLoadRegistry = new EventHandlerRegistry<[]>();
-export const gameInitHandler = new EventHandlerRegistry<[]>();
+export const gameInitRegistry = new EventHandlerRegistry<[]>();
 export const gameStartRegistry = new EventHandlerRegistry<[]>();
 export const gamePauseRegistry = new EventHandlerRegistry<[]>();
 export const gameResumeRegistry = new EventHandlerRegistry<[]>();

src/game/GameStats.ts

@@ -1,11 +1,11 @@
 import type {Player} from "./player/Player";
 import {gameTicker} from "./GameTicker";
-import {gameInitHandler} from "./Game";
+import {gameInitRegistry} from "./Game";
 import {playerManager} from "./player/PlayerManager";
 
 export let largestPlayers: Player[] = [];
 
-gameInitHandler.register(() => {
+gameInitRegistry.register(() => {
 	largestPlayers = [...playerManager.getPlayers()];
 });
 

src/game/action/MapActionHandler.ts

@@ -9,7 +9,7 @@ import {hasBorderWith} from "../attack/AttackActionValidator";
 import {isLocalGame, isPlaying} from "../GameData";
 import {sendPacket, submitGameAction} from "../../network/NetworkManager";
 import {SpawnRequestPacket} from "../../network/protocol/packet/game/SpawnRequestPacket";
-import {gameInitHandler, gameStartRegistry} from "../Game";
+import {gameInitRegistry, gameStartRegistry} from "../Game";
 import {gameTicker} from "../GameTicker";
 import {AttackActionPacket} from "../../network/protocol/packet/game/AttackActionPacket";
 import {findStartingPoint} from "../../map/area/BoatPathfinding";
@@ -78,5 +78,5 @@ export const mapActionHandler = new MapActionHandler();
 
 interactionManager.click.register(mapActionHandler, -100);
 
-gameInitHandler.register(() => mapActionHandler.setAction(MapActionHandler.spawnSelectAction));
+gameInitRegistry.register(() => mapActionHandler.setAction(MapActionHandler.spawnSelectAction));
 gameStartRegistry.register(() => mapActionHandler.setAction(MapActionHandler.attackAction));

src/game/action/MapNavigationHandler.ts

@@ -3,6 +3,7 @@ import {interactionManager} from "../../event/InteractionManager";
 import {mapTransformHandler} from "../../event/MapTransformHandler";
 import {gameMap, isPlaying} from "../GameData";
 import {windowResizeHandler} from "../../event/WindowResizeHandler";
+import {gameInitRegistry, gameQuitRegistry} from "../Game";
 
 /**
  * Default map navigation handler.
@@ -120,4 +121,6 @@ class MapNavigationHandler implements ScrollEventListener, DragEventListener, Mu
 
 export const mapNavigationHandler = new MapNavigationHandler();
 
-windowResizeHandler.register(() => isPlaying && mapNavigationHandler.onDragMove(0, 0, 0, 0));
+windowResizeHandler.register(() => isPlaying && mapNavigationHandler.onDragMove(0, 0, 0, 0));
+gameInitRegistry.register(() => mapNavigationHandler.enable());
+gameQuitRegistry.register(() => mapNavigationHandler.disable());

src/game/boat/BoatManager.ts

@@ -8,7 +8,7 @@ import {packetRegistry, validatePacket} from "../../network/PacketManager";
 import {bordersTile} from "../../util/MathUtil";
 import {gameMap} from "../GameData";
 import {triggerDebugEvent} from "../../util/DebugData";
-import {gameInitHandler} from "../Game";
+import {gameInitRegistry} from "../Game";
 
 class BoatManager {
 	private readonly boats: Boat[] = [];
@@ -111,7 +111,7 @@ class BoatManager {
 export const boatManager = new BoatManager();
 
 gameTicker.registry.register(boatManager.tick);
-gameInitHandler.register(boatManager.reset);
+gameInitRegistry.register(boatManager.reset);
 
 validatePacket(BoatActionPacket, packet => {
 	return playerManager.validatePlayer(packet.player)

src/renderer/GameRenderer.ts

@@ -1,6 +1,6 @@
 import type {RendererLayer} from "./layer/RendererLayer";
 import {windowResizeHandler} from "../event/WindowResizeHandler";
-import {gameInitHandler} from "../game/Game";
+import {gameInitRegistry} from "../game/Game";
 import {EventHandlerRegistry} from "../event/EventHandlerRegistry";
 import {GameGLContext} from "./GameGLContext";
 import {SortedArray} from "../util/SortedArray";
@@ -85,4 +85,4 @@ export const gameRenderer = new GameRenderer();
 export const renderingContextInit = new EventHandlerRegistry<[number, GameGLContext]>();
 
 windowResizeHandler.register(gameRenderer.resize);
-gameInitHandler.register(() => gameRenderer.switchContext(rendererContextGameplay));
+gameInitRegistry.register(() => gameRenderer.switchContext(rendererContextGameplay));

src/renderer/manager/PlayerNameRenderingManager.ts

@@ -4,7 +4,7 @@ import {territoryManager} from "../../game/TerritoryManager";
 import {gameMap} from "../../game/GameData";
 import {playerManager} from "../../game/player/PlayerManager";
 import {borderManager} from "../../game/BorderManager";
-import {gameInitHandler} from "../../game/Game";
+import {gameInitRegistry} from "../../game/Game";
 import {registerTransactionExecutor} from "../../game/transaction/TransactionExecutors";
 import {TerritoryTransaction} from "../../game/transaction/TerritoryTransaction";
 
@@ -207,7 +207,7 @@ export class PlayerNameRenderingData {
 
 export const playerNameRenderingManager = new PlayerNameRenderingManager();
 
-gameInitHandler.register(() => playerNameRenderingManager.reset(playerManager.getPlayers()));
+gameInitRegistry.register(() => playerNameRenderingManager.reset(playerManager.getPlayers()));
 
 registerTransactionExecutor(TerritoryTransaction, function (this: TerritoryTransaction) {
 	const attackerName = new PlayerNameUpdate(this.attacker?.id ?? -1, false);

src/ui/element/GameHud.ts

@@ -6,7 +6,7 @@ import {hideAllUIElements, loadStaticElement, showUIElement} from "../UIManager"
 import {interactionManager} from "../../event/InteractionManager";
 import {resolveElement} from "../UIElement";
 import {mapActionHandler} from "../../game/action/MapActionHandler";
-import {gameResultRegistry, gameInitHandler} from "../../game/Game";
+import {gameResultRegistry, gameInitRegistry} from "../../game/Game";
 import {clientPlayer} from "../../game/player/PlayerManager";
 import {showPanel} from "../type/UIPanel";
 import {t} from "../../util/Lang";
@@ -62,7 +62,7 @@ gameTicker.registry.register(() => {
 	densityElement.innerText = (clientPlayer.getTroops() / clientPlayer.getTerritorySize()).toFixed(2) + "%";
 });
 
-gameInitHandler.register(() => {
+gameInitRegistry.register(() => {
 	hideAllUIElements();
 	showUIElement("GameHud");
 	setSliderValue(0.5);

src/ui/element/MainMenu.ts

@@ -10,18 +10,18 @@ import {loadStaticElement} from "../UIManager";
 import {t} from "../../util/Lang";
 import {buildButton} from "../type/TextNode";
 import {buildContainer} from "../type/ContentField";
-import {openMultiplayerLobby} from "./MultiplayerLobby";
+//import {openMultiplayerLobby} from "./MultiplayerLobby";
 
 //@module ui
 
 loadStaticElement("MainMenu")
 
-const btnStartMultiplayer: HTMLButtonElement = (window.document.getElementById("btnStartMultiplayer") as HTMLButtonElement);
+//const btnStartMultiplayer: HTMLButtonElement = (window.document.getElementById("btnStartMultiplayer") as HTMLButtonElement);
 const btnStartSingleplayer: HTMLButtonElement = (window.document.getElementById("btnStartSingleplayer") as HTMLButtonElement);
 
 const playerNameValidationExp: RegExp = /^[a-zA-Z0-9\u00A0-\u00FF\u0100-\u024F\u1E00-\u1EFF\-_. ({)}<>]*$/;
 
-registerClickListener("btnStartMultiplayer", () => openMultiplayerLobby());
+//registerClickListener("btnStartMultiplayer", () => openMultiplayerLobby());
 
 registerClickListener("btnStartSingleplayer", () => {
 	showPanel(t("menu.map.select"), buildContainer("grid", "grid-3col").setContent(...getDefaultMapIds().map(map =>
@@ -34,7 +34,7 @@ registerClickListener("linkPrivacy", () => showPanel("Privacy Policy"));
 
 loadValidatedInput("playerNameInput", "playerNameInputValidation")
 	.onInput((_value, valid) => {
-		btnStartMultiplayer.disabled = !valid;
+		//btnStartMultiplayer.disabled = !valid;
 		btnStartSingleplayer.disabled = !valid;
 	})
 	.mutate(value => value.trim())