Stream progress!

Author: Tynarus

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

@@ -126,7 +126,7 @@ export class OutboundPackets {
 
         chunkUpdates.forEach(update => {
             if(update.type === 'ADD') {
-                if(update.object) {
+                if(update.object && !update.object.reference) {
                     const offset = this.getChunkPositionOffset(update.object.x, update.object.y, chunk);
                     packet.put(241, 'BYTE');
                     packet.put((update.object.type << 2) + (update.object.orientation & 3));

src/game-engine/world/action/index.ts

@@ -166,7 +166,8 @@ export class ActionPipeline {
                     await this.actor.waitForPathing(
                         !gameObject ? runnableHooks.actionPosition : (gameObject as LandscapeObject));
                 } catch(error) {
-                    logger.error(`Error pathing to hook target`, error);
+                    logger.error(`Error pathing to hook target`);
+                    logger.error(error);
                     return;
                 }
             }

src/game-engine/world/action/object-interaction.action.ts

@@ -27,7 +27,7 @@ export type objectInteractionActionHandler = (objectInteractionAction: ObjectInt
 
 
 /**
- * Details about an npc action being performed.
+ * Details about an object action being performed.
  */
 export interface ObjectInteractionAction {
     // The player performing the action.

src/game-engine/world/actor/actor.ts

@@ -93,6 +93,7 @@ export abstract class Actor {
      */
     public async waitForPathing(target: Position | LandscapeObject): Promise<void>;
     public async waitForPathing(target: Position | LandscapeObject): Promise<void> {
+        console.log(target);
         if(this.position.withinInteractionDistance(target)) {
             return;
         }

src/game-engine/world/index.ts

@@ -19,7 +19,7 @@ import { loadActionFiles } from '@engine/world/action';
 import { LandscapeObject } from '@runejs/filestore';
 import { lastValueFrom, Subject } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { ConstructedRegion, getRotatedLocalX, getRotatedLocalY } from '@engine/world/map/region';
+import { ConstructedRegion, getTemplateLocalX, getTemplateLocalY } from '@engine/world/map/region';
 import { Chunk } from '@engine/world/map/chunk';
 
 
@@ -174,10 +174,23 @@ export class World {
         const mapTemplateWorldY = tileY;
         const mapTemplateChunk = world.chunkManager.getChunkForWorldPosition(new Position(mapTemplateWorldX, mapTemplateWorldY, objectPosition.level));
 
-        const templateObjectPosition = new Position(mapTemplateWorldX + getRotatedLocalX(tileOrientation, objectLocalX, objectLocalY),
-            mapTemplateWorldY + getRotatedLocalY(tileOrientation, objectLocalX, objectLocalY), objectPosition.level);
+        const templateObjectPosition = new Position(mapTemplateWorldX + getTemplateLocalX(tileOrientation, objectLocalX, objectLocalY),
+            mapTemplateWorldY + getTemplateLocalY(tileOrientation, objectLocalX, objectLocalY), objectPosition.level);
         const realObject = mapTemplateChunk.getFilestoreLandscapeObject(objectId, templateObjectPosition);
 
+        realObject.x = objectPosition.x;
+        realObject.y = objectPosition.y;
+        realObject.level = objectPosition.level;
+
+        let rotation = realObject.orientation + objectTile.rotation;
+        if(rotation > 3) {
+            rotation -= 4;
+        }
+
+        console.log(realObject.orientation, rotation);
+
+        realObject.orientation = rotation;
+
         return realObject || null;
     }
 

src/game-engine/world/instances.ts

@@ -324,12 +324,18 @@ export class WorldInstance {
     /**
      * Spawn a new game object into the instance.
      * @param object The game object to spawn.
+     * @param reference Whether or not the object being spawned is a reference to an existing object or if it should
+     * be sent to the game client for forced rendering. Defaults to false for forced rendering.
      */
-    public spawnGameObject(object: LandscapeObject): void {
+    public spawnGameObject(object: LandscapeObject, reference: boolean = false): void {
         const position = new Position(object.x, object.y, object.level);
 
         const { chunk: instancedChunk, mods } = this.getTileModifications(position);
 
+        if(mods.spawnedObjects.find(o => o.x === object.x && o.y === object.y && o.level === object.level && o.type === object.type)) {
+            return;
+        }
+
         mods.spawnedObjects.push(object);
         instancedChunk.mods.set(position.key, mods);
 

src/game-engine/world/map/chunk-manager.ts

@@ -164,7 +164,6 @@ export class ChunkManager {
         }
 
         const pos = (position as Position);
-
         if(this.chunkMap.has(pos.key)) {
             return this.chunkMap.get(pos.key);
         } else {

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

@@ -7,8 +7,12 @@ import { WorldItem } from '@engine/world/items/world-item';
 import { LandscapeObject } from '@runejs/filestore';
 
 
+interface CustomLandscapeObject {
+    reference?: boolean;
+}
+
 export interface ChunkUpdateItem {
-    object?: LandscapeObject;
+    object?: LandscapeObject & CustomLandscapeObject;
     worldItem?: WorldItem;
     type: 'ADD' | 'REMOVE';
 }

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

@@ -50,7 +50,43 @@ export interface ConstructedRegion {
 }
 
 
-export const getRotatedLocalX = (orientation: number, localX: number, localY: number): number => {
+
+export const getTemplateRotatedX = (orientation: number, localX: number, localY: number): number => {
+    if(orientation === 0) {
+        return localX;
+    }
+    if(orientation === 1) {
+        if(localX === 7) {
+            return localY;
+        } else {
+            return 7 - localY;
+        }
+    }
+    if(orientation === 2) {
+        if(localY === 0) {
+            return localX;
+        } else {
+            return 7 - localX;
+        }
+    }
+    return localY;
+};
+
+export const getTemplateRotatedY = (orientation: number, localX: number, localY: number): number => {
+    if(orientation === 0) {
+        return localY;
+    }
+    if(orientation === 1) {
+        return localX;
+    }
+    if(orientation === 2) {
+        return 7 - localY;
+    }
+    return 7 - localX;
+};
+
+
+export const getTemplateLocalX = (orientation: number, localX: number, localY: number): number => {
     if(orientation === 0) {
         return localX;
     }
@@ -71,7 +107,7 @@ export const getRotatedLocalX = (orientation: number, localX: number, localY: nu
     return localY;
 };
 
-export const getRotatedLocalY = (orientation: number, localX: number, localY: number): number => {
+export const getTemplateLocalY = (orientation: number, localX: number, localY: number): number => {
     if(orientation === 0) {
         return localY;
     }

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

@@ -17,10 +17,6 @@ export class House {
         }
     }
 
-    public getRoom(position: Position): Room {
-        return this.rooms[position.level][position.x][position.y];
-    }
-
 }