Compare commits

..

No commits in common. "8fa06b9ca1394ff3d61b93f9ad22178ce195d409ec56cc893bc40467a587ed42" and "e2385f56cd195ce0f35aa2f843e50a926dc13983849a5828ca775b24a53fedff" have entirely different histories.

2 changed files with 10 additions and 5 deletions

View file

@ -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);

View file

@ -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"],