From f565df0ba4bad158f5e174365e94648fec2c9b80d2d76d0ec9dad9722c277142 Mon Sep 17 00:00:00 2001 From: aslan Date: Fri, 23 Jan 2026 11:06:15 -0500 Subject: [PATCH] Add fights --- src/services/game/game.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/services/game/game.ts b/src/services/game/game.ts index 00e7a90..9d13bef 100644 --- a/src/services/game/game.ts +++ b/src/services/game/game.ts @@ -19,6 +19,9 @@ const fightEntity = async ( let attackerAttacks: Attack[] = []; let attackerDamage = 0; let attackerDefense = 0; + attacker.attacks.forEach((attack) => { + attackerAttacks.push(attack); + }); attacker.inventory.items.forEach((item) => { item.attacks.forEach((attack) => { attackerAttacks.push(attack); @@ -28,12 +31,16 @@ const fightEntity = async ( attackerDefense += stat.defense; }); }); + attackerDamage *= 10 + attacker.strength / 5; attackerDefense *= 10 + attacker.strength / 5; let defenderAttacks: Attack[] = []; let defenderDamage = 0; let defenderDefense = 0; + defender.attacks.forEach((attack) => { + defenderAttacks.push(attack); + }); defender.inventory.items.forEach((item) => { item.attacks.forEach((attack) => { defenderAttacks.push(attack); @@ -43,6 +50,7 @@ const fightEntity = async ( defenderDefense += stat.defense; }); }); + defenderDamage *= 1 + defender.strength / 10; defenderDefense *= 1 + defender.strength / 10; @@ -78,6 +86,8 @@ const fightEntity = async ( break; } + await sleep(3000); + const defenderWon = fightRound( client, roomId, @@ -119,8 +129,6 @@ const fightRound = ( ): boolean => { const attackerAttack = attackerAttacks[Math.floor(Math.random() * attackerAttacks.length)]; - console.log(attackerAttacks); - console.log(attackerAttack); if (!attackerAttack) { return false;