fix: Prevent infinite fights with high deflect

Author: Zenoo

client/src/components/Brute/PetTooltip.tsx

@@ -61,9 +61,9 @@ const PetTooltip = ({
       return (
         <Text bold sx={{ color }} {...textProps}>
           {(tieredPet[stat][tieredPet.tier - 1] ?? 0) > 0 ? '+' : '-'}
-          {uniqueValue ? Math.round(
+          {uniqueValue ? Math.abs(Math.round(
             getPetScaledStat(chaos, brute, tieredPet, stat, precision) * 100,
-          ) : (
+          )) : (
             <>
               [
               {tieredPet[stat].map((_, index) => (

client/src/utils/Fetch.ts

@@ -84,7 +84,9 @@ const Fetch = <ReturnType>(url: string, data = {}, method = 'GET', additionalURL
         } else {
           response.text().then((text) => {
             if (response.status === 999) {
-              window.location.href = '/generating-tournaments';
+              if (window.location.pathname !== '/generating-tournaments') {
+                window.location.href = '/generating-tournaments';
+              }
             }
 
             reject({

core/src/brute/skills.ts

@@ -523,12 +523,12 @@ export const SkillModifiers: Record<
     [FightStat.COMBO]: { percent: [0.2, 0.3, 0.4] },
   },
   [SkillName.shield]: {
-    [FightStat.BLOCK]: { percent: [0.45, 0.55, 0.65] },
-    [FightStat.DAMAGE]: { percent: [-0.25, -0.30, -0.35] },
+    [FightStat.BLOCK]: { percent: [0.45, 0.50, 0.55] },
+    [FightStat.DAMAGE]: { percent: [-0.25, -0.25, -0.25] },
   },
   [SkillName.armor]: {
-    [FightStat.ARMOR]: { percent: [0.25, 0.35, 0.45] },
-    [FightStat.SPEED]: { percent: [-0.15, -0.20, -0.25] },
+    [FightStat.ARMOR]: { percent: [0.25, 0.30, 0.35] },
+    [FightStat.SPEED]: { percent: [-0.15, -0.15, -0.15] },
   },
   [SkillName.toughenedSkin]: {
     [FightStat.ARMOR]: { percent: [0.1, 0.15, 0.2] },
@@ -558,7 +558,7 @@ export const SkillModifiers: Record<
       weaponType: WeaponType.BLUNT,
       opponent: true,
     },
-    [FightStat.EVASION]: { percent: [-0.15, -0.2, -0.25] },
+    [FightStat.EVASION]: { percent: [-0.15, -0.15, -0.15] },
   },
   [SkillName.balletShoes]: {
     [FightStat.EVASION]: { percent: [0.1, 0.15, 0.2] },
@@ -569,7 +569,7 @@ export const SkillModifiers: Record<
   },
   [SkillName.resistant]: {},
   [SkillName.reconnaissance]: {
-    [FightStat.INITIATIVE]: { flat: [-200, -250, -300] },
+    [FightStat.INITIATIVE]: { flat: [-200, -200, -200] },
     [FightStat.SPEED]: { flat: [5, 10, 15], percent: [1.5, 2, 2.5] },
     [FightStat.CRITICAL_DAMAGE]: { percent: [0.5, 0.6, 0.7] },
   },
@@ -600,8 +600,8 @@ export const SkillModifiers: Record<
   },
   [SkillName.monk]: {
     [FightStat.COUNTER]: { percent: [0.4, 0.45, 0.5] },
-    [FightStat.INITIATIVE]: { flat: [-200, -250, -300] },
-    [FightStat.HIT_SPEED]: { percent: [-1, -1.1, -1.2] },
+    [FightStat.INITIATIVE]: { flat: [-200, -200, -200] },
+    [FightStat.HIT_SPEED]: { percent: [-1, -1, -1] },
   },
   [SkillName.vampirism]: {},
   [SkillName.chaining]: {},

core/src/brute/weapons.ts

@@ -208,11 +208,11 @@ export const weapons: Record<WeaponName, Weapon> = {
     tempo: [2, 2, 2],
     reversal: [-0.3, -0.3, -0.3],
     evasion: [-0.3, -0.3, -0.3],
-    dexterity: [-0.65, -0.65, -0.65],
+    dexterity: [-0.65, -0.60, -0.55],
     block: [-0.3, -0.3, -0.3],
     accuracy: [0.3, 0.4, 0.5],
     disarm: [0.1, 0.15, 0.2],
-    combo: [-0.6, -0.6, -0.6],
+    combo: [-0.6, -0.55, -0.5],
     deflect: [0, 0, 0],
     criticalChance: [0.2, 0.3, 0.4],
     criticalDamage: [0, 0, 0],

server/src/utils/fight/fightMethods.ts

@@ -1681,7 +1681,13 @@ const deflectProjectile = (chaos: boolean, fighter: DetailedFighter, timesDeflec
 
   const random = Math.random();
 
-  return random < getFighterStat(chaos, fighter, 'deflect', deflectWithWeapon ? undefined : 'fighter');
+  // Max 90% chance to deflect
+  const stat = Math.min(
+    getFighterStat(chaos, fighter, 'deflect', deflectWithWeapon ? undefined : 'fighter'),
+    0.9,
+  );
+
+  return random < stat;
 };
 
 const attack = (

server/src/utils/fight/getDamage.ts

@@ -181,8 +181,9 @@ export const getDamage = (
   }
 
   // Reduce damage with opponent's armor if not thrown
+  // Max 90% armor reduction
   if (!thrown) {
-    damage = Math.ceil(damage * (1 - opponent.armor));
+    damage = Math.ceil(damage * (1 - Math.min(opponent.armor, 0.9)));
   }
 
   // Set minimum damage to 1