feat: add sweepingBlow passive (#556)

kyvg · web-flow · commit 1d59fe7a8133 · 2026-05-13T12:09:58.000+03:00
diff --git a/server/arena/Constuructors/BaseAction.ts b/server/arena/Constuructors/BaseAction.ts
@@ -67,19 +67,19 @@ export abstract class BaseAction {
     };
   }
 
-  getSuccessResult({ initiator, target } = this.params): SuccessArgs {
+  getSuccessResult({ initiator, target, status } = this.context): SuccessArgs {
     return {
-      exp: this.status.exp,
+      exp: status.exp,
       action: this.displayName,
       actionType: this.actionType,
       target,
       initiator,
-      effect: floatNumber(this.status.effect),
+      effect: floatNumber(status.effect),
       hp: target.stats.val('hp'),
       effectType: this.effectType,
       orderType: this.orderType,
-      expArr: this.status.expArr,
-      affects: this.status.affects,
+      expArr: status.expArr,
+      affects: status.affects,
       // @ts-expect-error todo вынести кастомные сообщения в отдельный сервис
       msg: this.customMessage?.bind(this),
     };
@@ -110,12 +110,12 @@ export abstract class BaseAction {
     }
   }
 
-  next({ initiator, target, game } = this.params): void {
-    const result = this.getSuccessResult({ initiator, target, game });
+  next(context = this.context): void {
+    const result = this.getSuccessResult(context);
     this.giveExp(result);
 
     if (!this.isAffect) {
-      game.recordOrderResult(result);
+      context.game.recordOrderResult(result);
     }
   }
 
diff --git a/server/arena/Constuructors/BaseActionContext.ts b/server/arena/Constuructors/BaseActionContext.ts
@@ -36,8 +36,8 @@ export class BaseActionContext {
     this.params.target = target;
   }
 
-  addAffect(action: BaseAction, params = this.params) {
-    const result = action.getSuccessResult(params);
+  addAffect(action: BaseAction, ctx = this) {
+    const result = action.getSuccessResult(ctx);
     this.rootCtx.status.affects.push(result);
 
     return result;
diff --git a/server/arena/Constuructors/LongDmgMagicConstructor.ts b/server/arena/Constuructors/LongDmgMagicConstructor.ts
@@ -1,4 +1,4 @@
-import type { BaseActionParams } from '@/arena/Constuructors/BaseAction';
+import type { BaseActionContext } from '@/arena/Constuructors/BaseAction';
 import type Game from '../GameService';
 import type { Player } from '../PlayersService';
 import { DmgMagic } from './DmgMagicConstructor';
@@ -25,7 +25,7 @@ export abstract class LongDmgMagic extends DmgMagic {
       this.checkChance();
       this.run(initiator, target, game); // вызов кастомного обработчика
       this.calculateExp();
-      this.next({ initiator, target, game });
+      this.next(this.context);
     } catch (failMsg) {
       if (this.isAffect) {
         throw failMsg;
@@ -36,9 +36,9 @@ export abstract class LongDmgMagic extends DmgMagic {
     }
   }
 
-  override getSuccessResult(params?: BaseActionParams): SuccessArgs {
+  override getSuccessResult(ctx?: BaseActionContext): SuccessArgs {
     return {
-      ...super.getSuccessResult(params),
+      ...super.getSuccessResult(ctx),
       duration: this.duration,
     };
   }
diff --git a/server/arena/Constuructors/LongMagicConstructor.ts b/server/arena/Constuructors/LongMagicConstructor.ts
@@ -1,5 +1,5 @@
 import type { ActionType } from '@fwo/shared';
-import type { BaseActionParams } from '@/arena/Constuructors/BaseAction';
+import type { BaseActionContext } from '@/arena/Constuructors/BaseAction';
 import type { SuccessArgs } from '@/arena/Constuructors/types';
 import type Game from '../GameService';
 import type { Player } from '../PlayersService';
@@ -37,7 +37,7 @@ export abstract class LongMagic extends CommonMagic {
       this.onBeforeRun();
       this.run(initiator, target, game); // вызов кастомного обработчика
       this.calculateExp();
-      this.next({ initiator, target, game });
+      this.next(this.context);
     } catch (e) {
       if (this.isAffect) {
         throw e;
@@ -49,9 +49,9 @@ export abstract class LongMagic extends CommonMagic {
     }
   }
 
-  override getSuccessResult(params?: BaseActionParams): SuccessArgs {
+  override getSuccessResult(context?: BaseActionContext): SuccessArgs {
     return {
-      ...super.getSuccessResult(params),
+      ...super.getSuccessResult(context),
       duration: this.duration,
     };
   }
diff --git a/server/arena/Constuructors/PhysConstructor.ts b/server/arena/Constuructors/PhysConstructor.ts
@@ -73,15 +73,19 @@ export default abstract class PhysConstructor extends BaseAction {
     this.status.effect = floatNumber(hit * initiator.proc);
   }
 
-  /**
-   * Рассчитываем полученный exp
-   */
-  calculateExp({ initiator, target } = this.params) {
+  getEffectExp({ initiator, target } = this.params, effect: number) {
     const effects = initiator.affects.getEffectsByAction('glitch');
     if (initiator.isAlly(target) && !effects.length) {
-      this.status.exp = 0;
+      return 0;
     } else {
-      this.status.exp = Math.round(this.status.effect * 8);
+      return Math.round(effect * 8);
     }
   }
+
+  /**
+   * Рассчитываем полученный exp
+   */
+  calculateExp(params = this.params) {
+    this.status.exp = this.getEffectExp(params, this.status.effect);
+  }
 }
diff --git a/server/arena/Constuructors/ProtectConstructor.ts b/server/arena/Constuructors/ProtectConstructor.ts
@@ -81,24 +81,24 @@ export abstract class ProtectConstructor extends BaseAction {
     }
 
     this.reset();
-    const { initiator, target, game } = ctx.params;
+    const { initiator, target, game } = ctx;
     this.createContext(initiator, target, game);
 
-    const protectors = this.getTargetProtectors(ctx.params);
+    const protectors = this.getTargetProtectors(ctx);
     if (!protectors.length) {
       return;
     }
 
     const protect = protectors.reduce((acc, { value = 0 }) => acc + value, 0);
-    const chance = this.getProtectChance(ctx.params, protect);
+    const chance = this.getProtectChance(ctx, protect);
 
     const ratio = Math.min(chance / 100, 0.5);
 
     if (MiscService.chance(chance)) {
       this.calculateExp({ initiator, target, game }, ctx.status.effect);
       this.reduceProtection(ratio);
 
-      throw new CastError(this.getSuccessResult({ initiator, target, game }));
+      throw new CastError(this.getSuccessResult(this.context));
     } else {
       this.reduceProtection(ratio);
     }
diff --git a/server/arena/LogService/utils/format-cause.ts b/server/arena/LogService/utils/format-cause.ts
@@ -4,6 +4,7 @@ import { formatAction } from './format-action';
 import { formatExp } from './format-exp';
 
 export function formatCause(cause: SuccessArgs) {
+  console.log(cause.actionType, cause.action, cause.msg);
   switch (cause.actionType) {
     case 'dodge':
     case 'skill':
diff --git a/server/arena/LogService/utils/format-exp.ts b/server/arena/LogService/utils/format-exp.ts
@@ -3,6 +3,7 @@ import { brackets } from '@/utils/formatString';
 import { getDamageTypeIcon } from '@/utils/icons';
 
 export function formatExp(args: SuccessArgs): string {
+  console.log(args.action);
   const exp = args.initiator.isBot ? '' : `📖${args.exp}`;
   switch (args.actionType) {
     case 'phys':
diff --git a/server/arena/LogService/utils/format-message.ts b/server/arena/LogService/utils/format-message.ts
@@ -14,6 +14,7 @@ export function formatMessage(msgObj: SuccessArgs | FailArgs, depth = 0): string
       return `${indent}${formatLong(msgObj)}${formatAction(msgObj)}\n${indent}${formatExp(msgObj)}`;
     }
 
+    console.log(msgObj.affects.length);
     const affects = msgObj.affects.map((msgObj) => formatCause(msgObj));
 
     return `${indent}${formatLong(msgObj)}${formatAction(msgObj)}\n${indent}${formatExp(msgObj)}\n${affects.join('\n')}`;
diff --git a/server/arena/actions/attack.ts b/server/arena/actions/attack.ts
@@ -46,9 +46,9 @@ class Attack extends PhysConstructor {
     }
 
     const { initiator, game } = ctx.params;
-    throw new CastError(
-      this.getSuccessResult({ initiator: affect.initiator, target: initiator, game }),
-    );
+    this.createContext(affect.initiator, initiator, game);
+
+    throw new CastError(this.getSuccessResult(this.context));
   }
 }
 
diff --git a/server/arena/effects/asleep.ts b/server/arena/effects/asleep.ts
@@ -46,7 +46,9 @@ class Asleep extends LongMagic {
     }
 
     throw new CastError(
-      effects.map(({ initiator }) => this.getSuccessResult({ initiator, target, game })),
+      effects.map(({ initiator }) =>
+        this.getSuccessResult(this.createContext(initiator, target, game)),
+      ),
     );
   }
 
diff --git a/server/arena/effects/stun.ts b/server/arena/effects/stun.ts
@@ -39,7 +39,9 @@ class Stun extends LongMagic {
     }
 
     throw new CastError(
-      effects.map(({ initiator }) => this.getSuccessResult({ initiator, target: initiator, game })),
+      effects.map(({ initiator }) =>
+        this.getSuccessResult(this.createContext(initiator, initiator, game)),
+      ),
     );
   }
 
diff --git a/server/arena/magics/eclipse.ts b/server/arena/magics/eclipse.ts
@@ -50,7 +50,7 @@ class Eclipse extends CommonMagic {
 
     throw new CastError(
       effects.map(({ initiator }) =>
-        this.getSuccessResult({ initiator, target: ctx.initiator, game }),
+        this.getSuccessResult(this.createContext(initiator, ctx.initiator, game)),
       ),
     );
   }
diff --git a/server/arena/magics/glitch.ts b/server/arena/magics/glitch.ts
@@ -52,11 +52,7 @@ class Glitch extends CommonMagic {
       `glitch debug:: new target: ${ctx.params.target.nick}, old target:: ${target.nick}`,
     );
 
-    ctx.addAffect(this, {
-      initiator: affect.initiator,
-      target: initiator,
-      game,
-    });
+    ctx.addAffect(this, this.createContext(affect.initiator, initiator, game));
   }
 }
 
diff --git a/server/arena/magics/lightShield.ts b/server/arena/magics/lightShield.ts
@@ -53,16 +53,12 @@ class LightShieldEffect extends LongDmgMagic {
 
     affect.initiator.setProc(ctx.status.effect * (affect.proc ?? 1) * 0.01);
 
-    this.createContext(affect.initiator, ctx.params.initiator, ctx.params.game);
+    const context = this.createContext(affect.initiator, ctx.params.initiator, ctx.params.game);
     this.run();
     this.calculateExp();
     this.next();
 
-    ctx.addAffect(this, {
-      initiator: affect.initiator,
-      target: ctx.params.initiator,
-      game: ctx.params.game,
-    });
+    ctx.addAffect(this, context);
   }
 
   run() {
diff --git a/server/arena/magics/madness.ts b/server/arena/magics/madness.ts
@@ -49,11 +49,7 @@ class Madness extends CommonMagic {
 
     ctx.params.target = initiator;
 
-    ctx.addAffect(this, {
-      initiator: affect.initiator,
-      target: initiator,
-      game,
-    });
+    ctx.addAffect(this, this.createContext(affect.initiator, initiator, game));
   }
 }
 
diff --git a/server/arena/magics/magicWall.ts b/server/arena/magics/magicWall.ts
@@ -58,7 +58,7 @@ class MagicWall extends LongMagic {
 
     throw new CastError(
       effects.map(({ initiator: wallCaster }) =>
-        this.getSuccessResult({ initiator: wallCaster, target: initiator, game }),
+        this.getSuccessResult(this.createContext(wallCaster, initiator, game)),
       ),
     );
   }
diff --git a/server/arena/magics/paralysis.ts b/server/arena/magics/paralysis.ts
@@ -44,7 +44,9 @@ class Paralysis extends CommonMagic {
     const effects = target.affects.getEffectsByAction(this.name);
 
     throw new CastError(
-      effects.map(({ initiator }) => this.getSuccessResult({ initiator, target, game })),
+      effects.map(({ initiator }) =>
+        this.getSuccessResult(this.createContext(initiator, target, game)),
+      ),
     );
   }
 }
diff --git a/server/arena/passiveSkills/__snapshots__/sweepingBlow.test.ts.snap b/server/arena/passiveSkills/__snapshots__/sweepingBlow.test.ts.snap
@@ -0,0 +1,9 @@
+// Bun Snapshot v1, https://bun.sh/docs/test/snapshots
+
+exports[`sweepingBlow should passively hit random enemy 1`] = `
+"*Игрок 1* пустил кровь *Игрок 2* _Оружием_ и нанёс *6.1* урона
+\\[ Игрок 2 💥 💔-6.1/1.9 📖49 ]
+_💥 Размашистый удар_ \\[ Игрок 3  💔-4.57/3.43 📖37 ]"
+`;
+
+exports[`sweepingBlow should passively hit random enemy 2`] = `86`;
diff --git a/server/arena/passiveSkills/consussion.ts b/server/arena/passiveSkills/consussion.ts
@@ -53,7 +53,7 @@ class Consussion extends PassiveSkillConstructor {
       },
     });
 
-    ctx.status.affects.push(this.getSuccessResult({ initiator, target, game }));
+    ctx.addAffect(this, ctx);
   }
 }
 
diff --git a/server/arena/passiveSkills/divineWill.ts b/server/arena/passiveSkills/divineWill.ts
@@ -55,11 +55,11 @@ class DivineWill extends PassiveSkillConstructor {
       return;
     }
 
-    const { initiator, target, game } = ctx.params;
+    const { initiator, target, game } = ctx;
     this.createContext(initiator, target, game);
 
     if (this.checkChance()) {
-      return ctx.addAffect(this, this.context.params);
+      return ctx.addAffect(this, this.context);
     }
   }
 
@@ -72,7 +72,7 @@ class DivineWill extends PassiveSkillConstructor {
     this.createContext(initiator, target, game);
 
     if (this.checkChance()) {
-      throw new CastError(this.getSuccessResult({ initiator, target, game }));
+      throw new CastError(this.getSuccessResult(this.context));
     }
   }
 }
diff --git a/server/arena/passiveSkills/fatesMiss.ts b/server/arena/passiveSkills/fatesMiss.ts
@@ -1,8 +1,11 @@
 import type { BaseAction, BaseActionContext } from '@/arena/Constuructors/BaseAction';
 import { PassiveSkillConstructor } from '@/arena/Constuructors/PassiveSkillConstructor';
+import type { ActionType } from '@/arena/Constuructors/types';
 import CastError from '@/arena/errors/CastError';
 
 class FatesMiss extends PassiveSkillConstructor {
+  actionType: ActionType = 'miss';
+
   constructor() {
     super({
       name: 'fatesMiss',
@@ -44,10 +47,7 @@ class FatesMiss extends PassiveSkillConstructor {
     this.createContext(initiator, target, game);
 
     if (this.checkChance()) {
-      throw new CastError({
-        ...this.getSuccessResult({ initiator, target, game }),
-        actionType: 'miss',
-      });
+      throw new CastError(this.getSuccessResult(this.context));
     }
   }
 }
diff --git a/server/arena/passiveSkills/huntersMark.ts b/server/arena/passiveSkills/huntersMark.ts
@@ -61,7 +61,7 @@ class HuntersMark extends PassiveSkillConstructor {
       },
     });
 
-    ctx.addAffect(this, { initiator, target, game });
+    ctx.addAffect(this, this.context);
   }
 }
 
diff --git a/server/arena/passiveSkills/index.ts b/server/arena/passiveSkills/index.ts
@@ -9,3 +9,4 @@ export { markedShot } from './markedShot';
 export { nightcall } from './nightcall';
 export { nineLives } from './nineLives';
 export { staticProtect } from './staticProtect';
+export { sweepingBlow } from './sweepingBlow';
diff --git a/server/arena/passiveSkills/lacerate.ts b/server/arena/passiveSkills/lacerate.ts
diff --git a/server/arena/passiveSkills/markedShot.ts b/server/arena/passiveSkills/markedShot.ts
diff --git a/server/arena/passiveSkills/sweepingBlow.test.ts b/server/arena/passiveSkills/sweepingBlow.test.ts
diff --git a/server/arena/passiveSkills/sweepingBlow.ts b/server/arena/passiveSkills/sweepingBlow.ts
diff --git a/server/arena/skills/disarm.ts b/server/arena/skills/disarm.ts
diff --git a/server/arena/skills/dodge.ts b/server/arena/skills/dodge.ts
diff --git a/server/arena/skills/parry.ts b/server/arena/skills/parry.ts
diff --git a/server/arena/skills/shieldBlock.ts b/server/arena/skills/shieldBlock.ts
diff --git a/server/arena/weaponMastery/constructors/counterEvasionSkill.ts b/server/arena/weaponMastery/constructors/counterEvasionSkill.ts
diff --git a/server/arena/weaponMastery/constructors/increaseEffectSkill.ts b/server/arena/weaponMastery/constructors/increaseEffectSkill.ts

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ export class BaseActionContext {`
`36`	`36`	`this.params.target = target;`
`37`	`37`	`}`
`38`	`38`
`39`		`- addAffect(action: BaseAction, params = this.params) {`
`40`		`- const result = action.getSuccessResult(params);`
	`39`	`+ addAffect(action: BaseAction, ctx = this) {`
	`40`	`+ const result = action.getSuccessResult(ctx);`
`41`	`41`	`this.rootCtx.status.affects.push(result);`
`42`	`42`
`43`	`43`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export function formatMessage(msgObj: SuccessArgs \| FailArgs, depth = 0): string`
`14`	`14`	return `${indent}${formatLong(msgObj)}${formatAction(msgObj)}\n${indent}${formatExp(msgObj)}`;
`15`	`15`	`}`
`16`	`16`
	`17`	`+ console.log(msgObj.affects.length);`
`17`	`18`	`const affects = msgObj.affects.map((msgObj) => formatCause(msgObj));`
`18`	`19`
`19`	`20`	return `${indent}${formatLong(msgObj)}${formatAction(msgObj)}\n${indent}${formatExp(msgObj)}\n${affects.join('\n')}`;
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ class Attack extends PhysConstructor {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`const { initiator, game } = ctx.params;`
`49`		`- throw new CastError(`
`50`		`- this.getSuccessResult({ initiator: affect.initiator, target: initiator, game }),`
`51`		`- );`
	`49`	`+ this.createContext(affect.initiator, initiator, game);`
	`50`	`+`
	`51`	`+ throw new CastError(this.getSuccessResult(this.context));`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`