From ee50d9d622f1da5ab2a5ead2e7c47eba09fc87c7e0f1b2638775e701406dc00c Mon Sep 17 00:00:00 2001 From: aslan Date: Fri, 23 Jan 2026 11:14:10 -0500 Subject: [PATCH 1/2] Add fights --- src/services/game/game.ts | 7 +------ src/services/game/structures/attacks.ts | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/services/game/game.ts b/src/services/game/game.ts index 593c042..832a5d4 100644 --- a/src/services/game/game.ts +++ b/src/services/game/game.ts @@ -1,10 +1,5 @@ import type { MatrixClient } from "matrix-js-sdk"; -import type { - IEntity, - INPC, - IPlayer, - TFullNPC, -} from "./structures/entities.js"; +import type { INPC, IPlayer, TFullNPC } from "./structures/entities.js"; import { locationFarlands } from "./structures/locations.js"; import { getAttack, getMaxHealth, getNpcData, isPlayer } from "./entity.js"; import { sleep } from "matrix-js-sdk/lib/utils.js"; diff --git a/src/services/game/structures/attacks.ts b/src/services/game/structures/attacks.ts index 50b6cef..a7a6861 100644 --- a/src/services/game/structures/attacks.ts +++ b/src/services/game/structures/attacks.ts @@ -61,8 +61,8 @@ export const attackKick: IAttack = { damageType: DamageType.PHYSICAL, damageMultiplier: 0.75, messages: [ - "ATTACKER kick DEFENDER", - "ATTACKER kick DEFENDER in their face", + "ATTACKER kicks DEFENDER", + "ATTACKER kicks DEFENDER in their face", ], messagesDead: ["ATTACKER kicks DEFENDER to death"], messagesOverpower: ["ATTACKER kicks DEFENDER into mush"], From 8fa06b9ca1394ff3d61b93f9ad22178ce195d409ec56cc893bc40467a587ed42 Mon Sep 17 00:00:00 2001 From: aslan Date: Fri, 23 Jan 2026 11:15:33 -0500 Subject: [PATCH 2/2] Add fights --- src/services/game/game.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/game/game.ts b/src/services/game/game.ts index 832a5d4..c3050bc 100644 --- a/src/services/game/game.ts +++ b/src/services/game/game.ts @@ -144,7 +144,7 @@ const fightRound = ( defender.health <= -getMaxHealth(defender) ? attackerAttackInfo.messagesOverpower : attackerAttackInfo.messagesDead, - ) + `; Dealing ${attackerAttackDamage.toFixed(0)} damage`; + ) + ` - Dealing ${attackerAttackDamage.toFixed(0)} damage`; msg = msg.replaceAll("ATTACKER", attacker.name); msg = msg.replaceAll("DEFENDER", defender.name); @@ -155,7 +155,7 @@ const fightRound = ( let msg = getRandomAttackMessage(attackerAttackInfo.messages) + - `; Dealing ${attackerAttackDamage.toFixed(0)} damage`; + ` - Dealing ${attackerAttackDamage.toFixed(0)} damage`; msg = msg.replaceAll("ATTACKER", attacker.name); msg = msg.replaceAll("DEFENDER", defender.name);