diff --git a/src/services/game/game.ts b/src/services/game/game.ts index c3050bc..593c042 100644 --- a/src/services/game/game.ts +++ b/src/services/game/game.ts @@ -1,5 +1,10 @@ import type { MatrixClient } from "matrix-js-sdk"; -import type { INPC, IPlayer, TFullNPC } from "./structures/entities.js"; +import type { + IEntity, + 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"; @@ -144,7 +149,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 +160,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); diff --git a/src/services/game/structures/attacks.ts b/src/services/game/structures/attacks.ts index a7a6861..50b6cef 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 kicks DEFENDER", - "ATTACKER kicks DEFENDER in their face", + "ATTACKER kick DEFENDER", + "ATTACKER kick DEFENDER in their face", ], messagesDead: ["ATTACKER kicks DEFENDER to death"], messagesOverpower: ["ATTACKER kicks DEFENDER into mush"],