Merge branch 'develop' into development

Author: src

package-lock.json

@@ -68,7 +68,26 @@ export class OutboundPackets {
         packet.putBytes(Buffer.from(message));
         this.queue(packet);
     }
-
+    //packet - 129 - freezes client?
+    //packet - 202 - directly to login screen
+
+    public sendProjectile(position: Position, offsetX: number, offsetY: number, id: number, startHeight: number, endHeight: number, speed: number, lockon: number, delay: number) {
+        this.updateReferencePosition(position);
+        
+        const packet = new Packet(1);
+        packet.put(0);
+        packet.put(offsetY, 'byte');
+        packet.put(offsetX, 'byte');
+        packet.put(lockon, 'SHORT', 'BIG_ENDIAN');
+        packet.put(id, 'SHORT', 'BIG_ENDIAN');
+        packet.put(startHeight);
+        packet.put(endHeight);
+        packet.put(delay, 'SHORT', 'BIG_ENDIAN');
+        packet.put(speed, 'SHORT', 'BIG_ENDIAN');
+        packet.put(16);
+        packet.put(64);
+        this.queue(packet);
+    } 
     public updateFriendStatus(friendName: string, worldId: number): void {
         const packet = new Packet(156);
         packet.put(stringToLong(friendName.toLowerCase()), 'LONG');

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

@@ -53,7 +53,6 @@ const magicOnNpcActionPipe = (npc:Npc, player: Player, widgetId: number, buttonI
 
     // Find all object action plugins that reference this location object
     const matchingHooks = getActionHooks<MagicOnNPCActionHook>('magic_on_npc');
-      
 
     return {
         hooks: matchingHooks,

src/game-engine/world/action/magic-on-npc.action.ts

@@ -53,6 +53,8 @@ const npcInteractionActionPipe = (player: Player, npc: Npc, position: Position,
         return;
     }
 
+
+
     const morphedNpc = player.getMorphedNpcDetails(npc);
 
     // Find all NPC action plugins that reference this NPC
@@ -61,6 +63,7 @@ const npcInteractionActionPipe = (player: Player, npc: Npc, position: Position,
             (!plugin.npcs || stringHookFilter(plugin.npcs, morphedNpc?.key || npc.key)) &&
             (!plugin.options || stringHookFilter(plugin.options, option)));
     const questActions = matchingHooks.filter(plugin => plugin.questRequirement !== undefined);
+    
 
     if(questActions.length !== 0) {
         matchingHooks = questActions;
@@ -74,6 +77,7 @@ const npcInteractionActionPipe = (player: Player, npc: Npc, position: Position,
         return null;
     }
 
+    console.log(`WE ARE INTERACTING WITH NPC quests: ${questActions.length} ${matchingHooks.length}`);
     return {
         hooks: matchingHooks,
         actionPosition: position,

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

@@ -67,7 +67,7 @@ export class AutoAttackBehavior extends Behavior {
             console.log(`you attack ${(this.Them as Npc).name} for ${_damage} damage! (after the CD)`);
             this.Them.damage(_damage);
             if (this.Them.hitPoints <= 0) {
-                (this.Them as Npc).npcEvents.emit('death', this.Me);
+                (this.Them as Npc).npcEvents.emit('death', this.Me, this.Them);
             }
 
         });

src/game-engine/world/actor/behaviors/auto-attack.behavior.ts

@@ -126,25 +126,18 @@ export class Npc extends Actor {
 
     //This is useful so that we can tie into things like "spell casts" or events, or traps, etc to finish quests or whatever
 
-    public async processDeath(assailant: Actor): Promise<void> {
+    public async processDeath(assailant: Actor, defender:Actor): Promise<void> {
+        
         return new Promise<void>(resolve => {
-            const deathPosition = this.position;
+            const deathPosition = defender.position;
 
             let deathAnim: number = animationIds.death;
-            deathAnim = findNpc(this.id)?.combatAnimations?.death || animationIds.death
-
+            deathAnim = findNpc((defender as Npc).id)?.combatAnimations?.death || animationIds.death
 
-            //ToDo: all this is broken
-            try {
+            defender.playAnimation(deathAnim);
+            world.playLocationSound(deathPosition, soundIds.npc.human.maleDeath, 5);
+            world.globalInstance.spawnWorldItem(itemIds.bones, deathPosition, { owner: assailant instanceof Player ? assailant : undefined, expires: 300 });
 
-                this.playAnimation(deathAnim);
-                world.playLocationSound(deathPosition, soundIds.npc.human.maleDeath, 5);
-                world.globalInstance.spawnWorldItem(itemIds.bones, deathPosition,
-                    { owner: assailant instanceof Player ? assailant : undefined, expires: 300 });
-            }
-            catch (err) {
-                logger.debug(err);
-            }
         });
 
     }

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

@@ -28,6 +28,19 @@ export const activate = (task: TaskExecutor<MagicOnNPCAction>, elapsedTicks: num
         buttonId
     } = task.actionData;
 
+    const attackerX = player.position.x;
+    const attackerY = player.position.y
+    const victimX = npc.position.x
+    const victimY = npc.position.y;
+    const offsetX = ((victimY - attackerY));
+    const offsetY = ((victimX - attackerX));
+
+    //https://oldschool.runescape.wiki/w/Attack_range#:~:text=All%20combat%20magic%20spells%20have,also%20allow%20longrange%20attack%20style
+    // range should be within 10 tiles for magic
+    // range should be within 7 for magic staff
+
+    //npc world index would be -1 for players
+    player.outgoingPackets.sendProjectile(player.position, offsetX, offsetY, 250, 40, 36, 100, npc.worldIndex + 1, 1); 
     console.info(`${player.username} smites ${npc.name} with ${spells[buttonId]}`);
 };
 

src/plugins/buttons/magic-attack.plugin.ts

@@ -42,7 +42,7 @@ export default {
         {
             type: 'npc_interaction',
             options: 'attack',
-            walkTo: true,
+            walkTo: false,
             task: {
                 activate,
             }