Fixing map drawing for construction thanks to Graham once again :)

Author: Tynarus

src/game-engine/net/outbound-packets.ts

@@ -13,6 +13,7 @@ import { LandscapeObject } from '@runejs/filestore';
 import { xteaRegions } from '@engine/config';
 import { world } from '@engine/game-server';
 import { ConstructedMap } from '@engine/world/map/region';
+import { map } from 'rxjs/operators';
 
 /**
  * A helper class for sending various network packets back to the game client.
@@ -576,14 +577,51 @@ export class OutboundPackets {
 
         packet.openBitBuffer();
 
+        // @TODO build around the player!
+        // House room offsets and junk no matter where they are within the instance
+
+        const mapWorldX = mapData.position.x;
+        const mapWorldY = mapData.position.y;
+
+        const topCornerMapChunk = world.chunkManager.getChunkForWorldPosition(new Position(mapWorldX, mapWorldY, this.player.position.level));
+        const playerChunk = world.chunkManager.getChunkForWorldPosition(this.player.position);
+
+        const offsetX = playerChunk.position.x - (topCornerMapChunk.position.x - 2);
+        const offsetY = playerChunk.position.y - (topCornerMapChunk.position.y - 2);
+
+        const centerChunkX = 6;
+        const centerChunkY = 6;
+
+        const centerOffsetX = offsetX - centerChunkX;
+        const centerOffsetY = offsetY - centerChunkY;
+
+        console.log(topCornerMapChunk.position.x, topCornerMapChunk.position.y);
+        console.log(playerChunk.position.x, playerChunk.position.y);
+
         for(let level = 0; level < 4; level++) {
             for(let x = 0; x < 13; x++) {
                 for(let y = 0; y < 13; y++) {
-                    const tileData: number | null = mapData.tileData[level][x][y];
-                    packet.putBits(1, tileData === null ? 0 : 1);
+                    let mapTileOffsetX = x + centerOffsetX;
+                    let mapTileOffsetY = y + centerOffsetY;
+                    if(mapTileOffsetX < 0) {
+                        mapTileOffsetX = 0;
+                    }
+                    if(mapTileOffsetX > 12) {
+                        mapTileOffsetX = 12;
+                    }
+                    if(mapTileOffsetY < 0) {
+                        mapTileOffsetY = 0;
+                    }
+                    if(mapTileOffsetY > 12) {
+                        mapTileOffsetY = 12;
+                    }
+                    const tileData: number | null = mapData.tileData[level][mapTileOffsetX][mapTileOffsetY];
+                    packet.putBits(1, tileData === null && !mapData.emptySpace ? 0 : 1);
 
                     if(tileData !== null) {
                         packet.putBits(26, tileData);
+                    } else if(mapData.emptySpace) {
+                        packet.putBits(26, mapData.emptySpace);
                     }
                 }
             }

src/game-engine/world/map/region.ts

@@ -25,5 +25,6 @@ export const regionSizes: RegionSizeMap = {
 
 export interface ConstructedMap {
     position: Position;
+    emptySpace?: number;
     tileData: number[][][];
 }

src/plugins/skills/construction/construction.plugin.ts

@@ -84,12 +84,13 @@ class House {
 
 
 const instance1 = new Position(6400, 6400);
-const instance1PohSpawn = new Position(6432, 6432);
-const instance1Max = new Position(6464, 6464);
+const instance1PohSpawn = new Position(6400 + 36, 6400 + 36);
+const instance1Max = new Position(6400 + 64, 6400 + 64);
+
+const instance2 = new Position(6400, 6464);
+const instance2PohSpawn = new Position(6400 + 36, 6464 + 36);
+const instance2Max = new Position(6400 + 64, 6464 + 64);
 
-const instance2 = new Position(6464, 6400);
-const instance2PohSpawn = new Position(6496, 6432);
-const instance2Max = new Position(6528, 6464);
 
 
 const openHouse = async (player: Player): Promise<void> => {
@@ -104,39 +105,35 @@ const openHouse = async (player: Player): Promise<void> => {
 
     for(let x = 0; x < MAX_HOUSE_SIZE; x++) {
         for(let y = 0; y < MAX_HOUSE_SIZE; y++) {
-            if(x <= 1 || y <= 1 || x >= 11 || y >= 11) {
-                continue;
-            }
-
             if(x === 6 && y === 6) {
                 house.rooms[0][x][y] = gardenPortal;
             } else if((x === 7 && y === 6) || (x === 6 && y === 7) || (x === 5 && y === 6)) {
                 house.rooms[0][x][y] = firstParlor;
-            } else {
-                house.rooms[0][x][y] = emptySpace;
             }
         }
     }
 
-    let pohPosition: Position = instance1PohSpawn;
+    let pohPosition: Position = instance1;
+    let playerSpawn: Position = instance1PohSpawn;
 
     if(player.position.within(instance1, instance1Max, false)) {
-        player.teleport(player.position.copy().setX(player.position.x + 64));
-        pohPosition = instance2PohSpawn;
+        playerSpawn = player.position.copy().setY(player.position.y + 64);
+        pohPosition = instance2;
     } else if(player.position.within(instance2, instance2Max, false)) {
-        player.teleport(player.position.copy().setX(player.position.x - 64));
-    } else {
-        player.teleport(instance1PohSpawn);
+        playerSpawn = player.position.copy().setY(player.position.y - 64);
     }
 
-    player.sendMessage(player.position.key);
-    player.sendMessage(`${player.position.chunkLocalX},${player.position.chunkLocalY}`);
+    player.teleport(playerSpawn);
 
     player.metadata.customMap = {
         position: pohPosition,
+        emptySpace: emptySpace.roomData,
         tileData: house.getRoomData()
     } as ConstructedMap;
 
+    player.sendMessage(player.position.key);
+    player.sendMessage(`${player.position.chunkLocalX},${player.position.chunkLocalY}`);
+
     player.sendMessage(`Welcome home.`);
 };