fixed all the linting stuffmerged lint results

Author: Twistt

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

@@ -8,7 +8,7 @@ import { Npc } from '../actor/npc/npc';
 /**
  * Defines a button action hook.
  */
-export interface Magic_On_NPCActionHook extends ActionHook<Magic_On_NPCAction, magic_on_npcActionHandler> {
+export interface Magic_On_NPCActionHook extends ActionHook<Magic_On_NPCAction, magic_on_npcActionHandler> {
     // The npc world id that was clicked on after choosing the spell
     npcworldId?: number;
     // The IDs of the UI widgets that the buttons are on.
@@ -23,15 +23,15 @@ export interface Magic_On_NPCActionHook extends ActionHook<Magic_On_NPCAction, m
 /**
  * The button action hook handler function to be called when the hook's conditions are met.
  */
-export type magic_on_npcActionHandler = (buttonAction: Magic_On_NPCAction) => void | Promise<void>;
+export type magic_on_npcActionHandler = (buttonAction: Magic_On_NPCAction) => void | Promise<void>;
 
 
 /**
  * Details about a button action being performed.
  */
-export interface Magic_On_NPCAction {
+export interface Magic_On_NPCAction {
     // The npc world id that was clicked on after choosing the spell
-    npc: Npc;
+    npc: Npc;
     // The player performing the action.
     player: Player;
     // The ID of the UI widget that the button is on.
@@ -48,11 +48,11 @@ export interface Magic_On_NPCAction {
  * @param widgetId
  * @param buttonId
  */
-const buttonActionPipe = (npc:Npc, player: Player, widgetId: number, buttonId: number): RunnableHooks<Magic_On_NPCAction> => {
+const buttonActionPipe = (npc:Npc, player: Player, widgetId: number, buttonId: number): RunnableHooks<Magic_On_NPCAction> => {
     //console.info(`pew pew you use magic on ${npc.name}!`);
 
     // Find all object action plugins that reference this location object
-    const matchingHooks = getActionHooks<Magic_On_NPCActionHook>('magic_on_npc');
+    const matchingHooks = getActionHooks<Magic_On_NPCActionHook>('magic_on_npc');
 
 
     return {

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

@@ -41,6 +41,25 @@ export abstract class Actor {
 
     public pathfinding: Pathfinding = new Pathfinding(this);
     public lastMovementPosition: Position;
+    // #region Behaviors and Combat flags/checks
+    public inCombat: boolean = false;
+    public meleeDistance: number = 1;
+    public Behaviors: Behavior[] = [];
+    public isDead: boolean = false;
+    public combatTargets: Actor[] = [];
+    public hitPoints = this.skills.hitpoints.level * 4;
+    public maxHitPoints = this.skills.hitpoints.level * 4;
+    public get highestCombatSkill(): Skill {
+        const attack = this.skills.getLevel('attack');
+        const magic = this.skills.getLevel('magic');
+        const ranged = this.skills.getLevel('ranged');
+
+        if (ranged > magic && ranged > ranged) return ranged;
+        else if (magic > attack && magic > ranged) return magic;
+        else return attack;
+    }
+
+    // #endregion  
 
     protected randomMovementInterval;
 
@@ -65,9 +84,9 @@ export abstract class Actor {
     }
 
     public damage(amount: number, damageType: DamageType = DamageType.DAMAGE) {
-        let armorReduction = 0;
-        let spellDamageReduction = 0;
-        let poisonReistance = 0;
+        const armorReduction = 0;
+        const spellDamageReduction = 0;
+        const poisonReistance = 0;
         amount -= armorReduction;
         this.hitPoints -= amount;
         this.skills.setHitpoints(this.hitPoints);
@@ -78,6 +97,8 @@ export abstract class Actor {
         this.playAnimation(this.getBlockAnimation());
     }
 
+
+
     //public damage(amount: number, damageType: DamageType = DamageType.DAMAGE): 'alive' | 'dead' {
     //    let remainingHitpoints: number = this.skills.hitpoints.level - amount;
     //    const maximumHitpoints: number = this.skills.hitpoints.levelForExp;
@@ -567,23 +588,5 @@ export abstract class Actor {
         };
     }
 
-    // #region Behaviors and Combat flags/checks
-    public inCombat: boolean = false;
-    public meleeDistance: number = 1;
-    public Behaviors: Behavior[] = new Array();
-    public isDead: boolean = false;
-    public combatTargets: Actor[] = new Array();
-    public hitPoints = this.skills.hitpoints.level * 4;
-    public maxHitPoints = this.skills.hitpoints.level * 4;
-    public get highestCombatSkill(): Skill {
-        let attack = this.skills.getLevel('attack');
-        let magic = this.skills.getLevel('magic');
-        let ranged = this.skills.getLevel('ranged');
-
-        if (ranged > magic && ranged > ranged) return ranged;
-        else if (magic > attack && magic > ranged) return magic;
-        else return attack;
-    }
 
-    // #endregion  
 }

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

@@ -9,21 +9,23 @@ import { Npc } from '../npc/npc';
 import { Player } from '../player/player';
 
 export class AutoAttackBehavior extends Behavior {
-    private _combatPulse;
+    
     Type = BehaviorType.Combat;
-    Name = "auto-attack-combat";
-    //seconds
+    Name = 'auto-attack-combat';
+
+    private _combatPulse;
     private _CoolDown: number = 3;
     private _lastAttack = new Date();
     private _player: Player;
+
     //this should be called when combat starts
     public async init(me: Actor, them: Actor): Promise<void> {
         this.Me = me;
         this.Them = them;
         this._player = (me as Player);
         console.log('all set to auto attack!');
         (this.Them as Npc).npcEvents.on('death', (npc) => this._player.onNpcKill);
-        super.init(me, them);
+        await super.init(me, them);
     }
 
     public async tick() {
@@ -61,7 +63,7 @@ export class AutoAttackBehavior extends Behavior {
     public async doAttack(): Promise<void> {
         return new Promise<void>(resolve => {
             //do attack stuff
-            let _damage = this.Me.skills.strength.level;
+            const _damage = this.Me.skills.strength.level;
             console.log(`you attack ${(this.Them as Npc).name} for ${_damage} damage! (after the CD)`);
             this.Them.damage(_damage);
             if (this.Them.hitPoints <= 0) {

src/game-engine/world/actor/behaviors/melee-combat.behavior.ts

@@ -9,9 +9,9 @@ import { Player } from '../player/player';
 import { Npc } from '../npc/npc';
 
 export class MeleeCombatBehavior extends Behavior {
-    private _combatPulse;
+
     Type = BehaviorType.Combat;
-    Name = "basic-melee-combat";
+    Name = 'basic-melee-combat';
     //seconds
     private _CoolDown: number = 4;
     private _lastAttack = new Date();
@@ -20,7 +20,7 @@ export class MeleeCombatBehavior extends Behavior {
     public async init(me: Actor, them: Actor): Promise<void> {
         this.Me = me;
         this.Them = them;
-        super.init(me, them);
+        await super.init(me, them);
     }
 
     public async tick() {
@@ -54,7 +54,7 @@ export class MeleeCombatBehavior extends Behavior {
                 if (!this.Me.isDead) super.tick();
                 resolve();
             }
-
+            
 
         });
     }
@@ -63,7 +63,7 @@ export class MeleeCombatBehavior extends Behavior {
             //do attack stuff
             this.Me.playAnimation(this.Me.getAttackAnimation());
 
-            let _damage = this.Me.skills.strength.level;
+            const _damage = this.Me.skills.strength.level;
             console.log(`${(this.Me as Npc).name} attacks ${(this.Them as Player).username} for ${_damage} damage! (after the CD)`);
             (this.Me as Npc).npcEvents.emit('damage', _damage);
             this.Them.damage(_damage);

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

@@ -40,6 +40,10 @@ export class Npc extends Actor {
         stand?: number;
     };
     public instanceId: string = null;
+    //ToDo: this should either be calculated by the level or from a config
+    public experienceValue: number = 10;
+    public npcEvents: EventEmitter = new EventEmitter();
+
 
     private _name: string;
     private _combatLevel: number;
@@ -49,8 +53,7 @@ export class Npc extends Actor {
     private npcSpawn: NpcSpawn;
     private _initialized: boolean = false;
 
-    //ToDo: this should either be calcualted by teh level or from a config
-    public experienceValue: number = 10;
+
 
     public constructor(npcDetails: NpcDetails | number, npcSpawn: NpcSpawn, instanceId: string = null) {
         super();
@@ -122,27 +125,27 @@ 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 npcEvents: EventEmitter = new EventEmitter();
+
     public async processDeath(assailant: Actor): Promise<void> {
-        const deathPosition = this.position;
+        return new Promise<void>(resolve => {
+            const deathPosition = this.position;
 
-        let deathAnim: number = animationIds.death;
-        deathAnim = findNpc(this.id)?.combatAnimations?.death || animationIds.death
-        
+            let deathAnim: number = animationIds.death;
+            deathAnim = findNpc(this.id)?.combatAnimations?.death || animationIds.death
 
-        //ToDo: all this is broken
-        try {
-            
-            this.playAnimation(deathAnim);
-            world.playLocationSound(deathPosition, soundIds.npc.human.maleDeath, 5);
-            let instance = world.globalInstance;
-            instance.spawnWorldItem(itemIds.bones, deathPosition,
-                { owner: assailant instanceof Player ? assailant : undefined, expires: 300 });
-        }
-        catch (err) {
-            logger.debug(err);
-        }
 
+            //ToDo: all this is broken
+            try {
+
+                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);
+            }
+        });
 
     }
     public getAttackAnimation(): number {
@@ -172,7 +175,7 @@ export class Npc extends Actor {
     }
 
     public async tick(): Promise<void> {
-        for (var i = 0; i < this.Behaviors.length; i++) {
+        for (let i = 0; i < this.Behaviors.length; i++) {
             this.Behaviors[i].tick();
         }
         return new Promise<void>(resolve => {

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

@@ -127,6 +127,8 @@ export class Player extends Actor {
     public friendsList: string[] = [];
     public ignoreList: string[] = [];
     public cutscene: Cutscene = null;
+    public playerEvents: EventEmitter = new EventEmitter();
+
 
     private readonly _socket: Socket;
     private readonly _inCipher: Isaac;
@@ -400,7 +402,7 @@ export class Player extends Actor {
     }
 
     public async tick(): Promise<void> {
-        for (var i = 0; i < this.Behaviors.length; i++) {
+        for (let i = 0; i < this.Behaviors.length; i++) {
             this.Behaviors[i].tick();
         }
         return new Promise<void>(resolve => {
@@ -991,7 +993,6 @@ export class Player extends Actor {
         this.savedMetadata.npcTransformation = npc;
         this.updateFlags.appearanceUpdateRequired = true;
     }
-    public playerEvents: EventEmitter = new EventEmitter();
 
     /**
      * Returns the morphed NPC details for a specific player based on his client settings

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

@@ -15,12 +15,12 @@ const buttonIds: number[] = [
 ];
 
 function attack_target(player: Player, elapsedTicks: number): boolean {
-    logger.info('attacking?');
+    logger.info('attacking?');
     return true;
 }
 
-const spells = ['Wind Strike','Confuse', 'Water Strike','unknown?', 'Earth Strike'];
-export const activate = (task: TaskExecutor<Magic_On_NPCAction>, elapsedTicks: number = 0) => {
+const spells = ['Wind Strike','Confuse', 'Water Strike','unknown?', 'Earth Strike'];
+export const activate = (task: TaskExecutor<Magic_On_NPCAction>, elapsedTicks: number = 0) => {
     const {
         npc,
         player,
@@ -42,6 +42,6 @@ export default {
                 activate,
                 interval: 0
             }
-        } as Magic_On_NPCActionHook
+        } as Magic_On_NPCActionHook
 
 };

src/plugins/combat/combat.plugin.ts

@@ -32,7 +32,7 @@ export const activate = async (task: TaskExecutor<NpcInteractionAction>, elapsed
         await combatBehavior.init(player, npc);
         player.inCombat = true;
     });
-    task.stop();
+    await task.stop();
 };