#147 Exorcism, Anathema, Dispel (#323)

src/arena/Constuructors/MagicConstructor.ts

@@ -89,7 +89,6 @@ export abstract class Magic extends AffectableAction {
    */
   getCost(initiator: Player): void {
     const costValue = +initiator.stats.val(this.costType) - this.cost;
-    console.log(initiator.id, 'MP:', costValue);
     if (costValue >= 0) {
       initiator.stats.set(this.costType, costValue);
     } else {
@@ -197,7 +196,6 @@ export abstract class Magic extends AffectableAction {
       const x = (initiator.stats.val('mga') / target.stats.val('mgp')) * 3;
       result += x;
     }
-    console.log('chance is :', result, 'total', result * initiator.proc);
     return result * initiator.proc;
   }
 

src/arena/Constuructors/utils/index.ts

@@ -23,7 +23,7 @@ export const isPhysicalDamageResult = (result: Result): result is SuccessArgs =>
 };
 
 export const findByTarget = (target: string) => {
-  return (result: Result) => {
+  return (result: { target: string }) => {
     return result.target === target;
   };
 };

src/arena/LogService/LogService.ts

@@ -34,9 +34,7 @@ export class LogService {
     });
 
     try {
-      const x = this.format();
-      console.log(x);
-      await this.writer(x);
+      await this.writer(this.format());
     } catch (e) {
       console.log('sendBattleLog: ', e);
     } finally {

src/arena/magics/anathema.ts

@@ -1,10 +1,8 @@
+import arena from '@/arena';
 import { bold, italic } from '../../utils/formatString';
 import { CommonMagic } from '../Constuructors/CommonMagicConstructor';
-import type { LongItem } from '../Constuructors/LongMagicConstructor';
 import type { SuccessArgs } from '../Constuructors/types';
-import arena from '../index';
 
-type LongActionsEntry = [magic: string, item?: LongItem[]]
 /**
  * Экзорцизм
  * Основное описание магии общее требовани есть в конструкторе
@@ -23,25 +21,21 @@ class Anathema extends CommonMagic {
       aoeType: 'target',
       magType: 'bad',
       chance: ['1d60', '1d70', '1d85'],
-      profList: ['m'],
+      profList: ['p'],
       effect: [],
     });
   }
 
   run() {
-    // Очищаем все "bad" магии в которых target является target данной магии
     const { game, target } = this.params;
-    const { longActions } = game;
-    const entries = Object.entries(longActions) as LongActionsEntry[];
-    entries.reduce((sum, [key, items]) => {
-      if (!items) return sum;
+    const entries = Object.entries(game.longActions);
+
+    entries.forEach(([key, items]) => {
       const magic = arena.magics[key];
       if (magic.magType === 'good') {
-        const newItem = items.filter((item) => item.target !== target.id);
-        sum[key] = newItem;
+        game.longActions[key] = items.filter((item) => item.target !== target.id);
       }
-      return sum;
-    }, {} as typeof longActions);
+    });
   }
 
   customMessage(args: SuccessArgs) {

src/arena/magics/dispel.ts

@@ -1,16 +1,12 @@
-import _ from 'lodash';
-import { bold } from '../../utils/formatString';
+import { bold, italic } from '../../utils/formatString';
 import { CommonMagic } from '../Constuructors/CommonMagicConstructor';
-import type { LongItem } from '../Constuructors/LongMagicConstructor';
 import type { SuccessArgs } from '../Constuructors/types';
 
 /**
  * Снятие магии
  * Основное описание магии общее требовани есть в конструкторе
  */
 class Dispel extends CommonMagic {
-  dispelled!: Record<string, LongItem[]>; // закладка для customMessage
-
   constructor() {
     super({
       name: 'dispel',
@@ -30,23 +26,17 @@ class Dispel extends CommonMagic {
   }
 
   run() {
-    const { target, game } = this.params;
+    const { game, target } = this.params;
     const entries = Object.entries(game.longActions);
-    entries.forEach(([name, items]) => {
-      const [dispelled, rest] = _.partition(items, (item) => item.target === target.id);
-      this.dispelled[name] = dispelled;
-      game.longActions[name] = rest;
-    });
-  }
 
-  next() {
-    super.next();
-    this.dispelled = {};
+    entries.forEach(([key, items]) => {
+      game.longActions[key] = items.filter((item) => item.target !== target.id);
+    });
   }
 
   customMessage(args: SuccessArgs) {
     const { initiator, target } = args;
-    return `${bold(initiator)} снимает все длительные магии с ${target}, используя заклинание ${this.displayName}`;
+    return `${bold(initiator)} снимает все длительные магии с ${bold(target)}, используя заклинание ${italic(this.displayName)}`;
   }
 }
 

src/arena/magics/exorcism.ts

@@ -10,7 +10,6 @@ import arena from '../index';
 class Exorcism extends CommonMagic {
   constructor() {
     super({
-      // @ts-expect-error не используется
       name: 'exorcism',
       displayName: 'Экзорцизм',
       desc: 'Экзорцизм снимает все отрицательные эффекты с цели',
@@ -22,20 +21,20 @@ class Exorcism extends CommonMagic {
       aoeType: 'target',
       magType: 'good',
       chance: ['1d60', '1d70', '1d80'],
-      profList: ['m'],
+      profList: ['p'],
       effect: [],
     });
   }
 
   run() {
-    // Очищаем все "bad" магии в которых target является target данной магии
     const { game, target } = this.params;
-    const { ordersList } = game.orders;
-    game.orders.ordersList = ordersList.filter((order) => {
-      if (order.target === target.id) {
-        return arena.magics[order.action]?.magType !== 'bad';
+    const entries = Object.entries(game.longActions);
+
+    entries.forEach(([key, items]) => {
+      const magic = arena.magics[key];
+      if (magic.magType === 'bad') {
+        game.longActions[key] = items.filter((item) => item.target !== target.id);
       }
-      return true;
     });
   }
 

src/arena/magics/index.ts

@@ -33,3 +33,4 @@ export { default as lightShield } from './lightShield';
 export { default as secondLife } from './secondLife';
 export { default as sleep } from './sleep';
 export { default as magicWall } from './magicWall';
+export { default as exorcism } from './exorcism';

src/arena/magics/lightShield.ts

@@ -19,7 +19,7 @@ const params = {
   cost: 3,
   baseExp: 6,
   costType: 'mp',
-  lvl: 1,
+  lvl: 4,
   orderType: 'team',
   aoeType: 'target',
   magType: 'good',