Merge pull request #307 from Displee/feature/construction

Fix grass on other levels.

Author: Tynarus

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

@@ -14,6 +14,7 @@ import { xteaRegions } from '@engine/config';
 import { world } from '@engine/game-server';
 import { ConstructedMap } from '@engine/world/map/region';
 import { map } from 'rxjs/operators';
+import { Room } from '@plugins/skills/construction/con-house';
 
 /**
  * A helper class for sending various network packets back to the game client.
@@ -606,14 +607,15 @@ export class OutboundPackets {
                     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);
+
+                    const room: Room | null = mapData.rooms[level][x][y];
+                    packet.putBits(1, room === null ? 0 : 1)
+                    if (room !== null) {
+                        packet.putBits(2, room.position.level & 0x3)
+                        packet.putBits(10, room.position.x / 8)
+                        packet.putBits(11, room.position.y / 8)
+                        packet.putBits(2, room.rotation)
+                        packet.putBits(1, 0) //unused
                     }
                 }
             }

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

@@ -4,6 +4,7 @@
  * chunk: 8x8 tile chunk within a map.
  */
 import { Position } from '@engine/world/position';
+import { Room } from '@plugins/skills/construction/con-house';
 
 export type RegionType = 'map' | 'chunk';
 
@@ -25,8 +26,7 @@ export const regionSizes: RegionSizeMap = {
 
 export interface ConstructedMap {
     position: Position;
-    emptySpace?: number;
-    tileData: number[][][];
+    rooms: Room[][][];
     centerOffsetX?: number;
     centerOffsetY?: number;
 }

src/plugins/skills/construction/con-house.ts

@@ -16,21 +16,6 @@ export class House {
         }
     }
 
-    public getRoomData(): number[][][] {
-        const roomData = new Array(4);
-        for(let level = 0; level < 4; level++) {
-            roomData[level] = new Array(MAP_SIZE);
-            for(let x = 0; x < MAP_SIZE; x++) {
-                roomData[level][x] = new Array(MAP_SIZE);
-                for(let y = 0; y < MAP_SIZE; y++) {
-                    roomData[level][x][y] = this.rooms[level][x][y]?.roomData || null;
-                }
-            }
-        }
-
-        return roomData;
-    }
-
     public getRoom(position: Position): Room {
         return this.rooms[position.level][position.x][position.y];
     }
@@ -42,16 +27,15 @@ export class Room {
 
     public readonly type: RoomType;
 
-    public orientation: number;
+    public rotation: number;
 
     public constructor(type: RoomType, orientation: number = 0) {
         this.type = type;
-        this.orientation = orientation;
+        this.rotation = orientation;
     }
 
-    public get roomData(): number {
-        const { x, y, level } = roomTemplates[this.type];
-        return x / 8 << 14 | y / 8 << 3 | level % 4 << 24 | this.orientation % 4 << 1;
+    public get position(): Position {
+        return roomTemplates[this.type];
     }
 
 }

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

@@ -30,6 +30,8 @@ const openHouse = (player: Player): void => {
                 house.rooms[0][x][y] = thirdParlor;
             } else if(x === 6 && y === 7) {
                 house.rooms[0][x][y] = fourthParlor;
+            } else {
+                house.rooms[0][x][y] = emptySpace;
             }
         }
     }
@@ -48,8 +50,7 @@ const openHouse = (player: Player): void => {
 
     player.metadata.customMap = {
         position: pohPosition,
-        emptySpace: emptySpace.roomData,
-        tileData: house.getRoomData()
+        rooms: house.rooms
     } as ConstructedMap;
 
     player.sendMessage(`Welcome home.`);