From 93f06a29ad2cd14e23bc7a5477fa2d5bb671db94 Mon Sep 17 00:00:00 2001
From: Tom Camp <tc13270@my.bristol.ac.uk>
Date: Fri, 20 Oct 2023 14:02:38 +0100
Subject: [PATCH] Add initial map instantiation on player join (#24)

---
 app/ArcadeUI.ts                               |  7 ++++---
 app/arcade-ui-helpers/ArcadeContestHandler.ts |  2 +-
 app/games/rps/AblyHandler.ts                  | 17 ++++++++++++++++-
 app/games/rps/Game.ts                         |  9 +++++++--
 app/games/rps/Player.ts                       |  2 +-
 app/script.ts                                 |  3 ++-
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app/ArcadeUI.ts b/app/ArcadeUI.ts
index 9f3f3fc..de9bf35 100644
--- a/app/ArcadeUI.ts
+++ b/app/ArcadeUI.ts
@@ -34,13 +34,14 @@ export class ArcadeUI {
     spectatorStart.addEventListener("click", () => { this.startContest(); });
 
     qrContainer.addEventListener("click", (e) => {
-        const parent = e.target.closest(".qr-code-container")
-      console.log(123, e.target, parent)
+        const parent = e.target.closest(".qr-code-container");
+      console.log(123, e.target, parent);
       parent.classList.toggle("minimise");
     });
 
     this.contestHandler = new ArcadeContestHandler(
-        this.arcadeInstanceId, () => { this.onEndContest(); });
+        this.arcadeInstanceId, () => { this.onEndContest(); }
+    );
 
     this.eventListenerController = new AbortController();
   }
diff --git a/app/arcade-ui-helpers/ArcadeContestHandler.ts b/app/arcade-ui-helpers/ArcadeContestHandler.ts
index c686da5..243745a 100644
--- a/app/arcade-ui-helpers/ArcadeContestHandler.ts
+++ b/app/arcade-ui-helpers/ArcadeContestHandler.ts
@@ -113,7 +113,7 @@ export class ArcadeContestHandler {
 
     await this.messages.display("Game over!", 5000);
   }
-
+ 
   private async updateGlobalLeaderboard() {
     const history = await this.scoreChannel.history();
     const historyPage = history.items[0];
diff --git a/app/games/rps/AblyHandler.ts b/app/games/rps/AblyHandler.ts
index ac50d3e..683dfb1 100644
--- a/app/games/rps/AblyHandler.ts
+++ b/app/games/rps/AblyHandler.ts
@@ -1,4 +1,4 @@
-import { Realtime, Types } from 'ably';
+import { Realtime, Rest, Types } from 'ably';
 import { Player } from './Player';
 
 export class AblyHandler {
@@ -45,6 +45,21 @@ export class AblyHandler {
         return await this.stateChannel.presence.get();
     }
 
+    public async getMap(gameId: string) {
+        const rest = new Rest.Promise({ authUrl: '/api/ably-token-request' });
+        const stateChannel = rest.channels.get("control-messages:" + gameId);
+        const history = await stateChannel.history();
+        const historyMessage = history.items[0];
+        const previousStateData = historyMessage?.data || [];
+        
+        if (!previousStateData || previousStateData === undefined) {
+        console.log("Oh no! Map lost! Not updating.", history);
+        return;
+        }
+        
+        return previousStateData.seed;
+    }
+
     private toPlayerMetadata(player: Player) {
         return {
             'id': player.id,
diff --git a/app/games/rps/Game.ts b/app/games/rps/Game.ts
index f73f232..70d6f8d 100644
--- a/app/games/rps/Game.ts
+++ b/app/games/rps/Game.ts
@@ -38,8 +38,8 @@ export class Game implements IGame {
     public constructor(gameId: string, gameRoot: HTMLElement, spectator: boolean = false, assetSource: IAssetSource = null) {
         this.gameId = gameId;
         this.spectator = spectator;
+        this.ablyHandler = new AblyHandler();
 
-        this.map = new GameMap(Level[0]);
         this.renderer = new Renderer(gameRoot, spectator, assetSource);
         this.tickRate = 10;
 
@@ -51,9 +51,14 @@ export class Game implements IGame {
         this.keybindings.set(Keyboard.UP, (d) => { d.y = -1 });
         this.keybindings.set(Keyboard.DOWN, (d) => { d.y = 1 });
 
-        this.ablyHandler = new AblyHandler();
         this.colorChangeInterval = 5_000;
     }
+    
+    public async loadMap() {
+        const seed = await this.ablyHandler.getMap(this.gameId);
+        const mapSelection = Math.floor(seed % (Level.length - 1));
+        this.map = new GameMap(Level[mapSelection]);
+    }
 
     public async preStart(playerName: string = null) {
         await this.renderer.init();
diff --git a/app/games/rps/Player.ts b/app/games/rps/Player.ts
index b5fee21..0e12f1a 100644
--- a/app/games/rps/Player.ts
+++ b/app/games/rps/Player.ts
@@ -136,7 +136,7 @@ export class Player {
     }
 
     public static spectator(map: Map) {
-        return new Player(map, "Spectator", 0, 0, true);
+        return new Player(map, "Spectator", -10, -10, true);
     }
 
     public static spawnPlayerInSafeLocation(map: Map, name: string) {
diff --git a/app/script.ts b/app/script.ts
index 7039c43..0866a4d 100644
--- a/app/script.ts
+++ b/app/script.ts
@@ -37,12 +37,13 @@ if (requireSignup) {
     arcadeUi.showGame();
 }
 
-function startGame(spectator: boolean = false) {
+async function startGame(spectator: boolean = false) {
     if (runner) {
         runner.stop();
     }
 
     const game = new Game(arcadeInstanceId, arcadeUi.gameRoot, spectator);
+    await game.loadMap();
     runner = new GameRunner(game);
     runner.run(arcadeUi.playerName);
     arcadeUi.bind(runner);