gotchi-battler-game-logic 4.0.5 → 4.0.7

package/game-logic/v2.0/index.js

@@ -75,7 +75,7 @@ const gameLoop = (team1, team2, seed, options = { debug: false, type: 'training'
         while (getAlive(team1).length && getAlive(team2).length) {
             // Check if turnCounter is ready for environment effects (99,149,199, etc)
             let isEnvironmentTurn = [
-                99, 149, 199, 249, 299, 349, 399, 449, 499, 
+                99, 149, 199, 249, 299, 349, 399, 449, 499,
                 549, 599, 649, 699, 749, 799, 849, 899, 949, 999].includes(turnCounter)
             if (isEnvironmentTurn) {
                 allAliveGotchis.forEach(x => {
@@ -119,7 +119,7 @@ const gameLoop = (team1, team2, seed, options = { debug: false, type: 'training'
         team1: getTeamStats(team1),
         team2: getTeamStats(team2)
     }
-    
+
     logs.result.winner = getAlive(team1).length ? 1 : 2
     logs.result.winningTeam = logs.result.winner === 1 ? getTeamGotchis(team1) : getTeamGotchis(team2)
     logs.result.winningTeam = logs.result.winningTeam.map((gotchi) => {
@@ -191,7 +191,7 @@ const executeTurn = (team1, team2, rng) => {
         // Execute special attack
         actionName = attackingGotchi.specialExpanded.code
         const specialResults = attack(attackingGotchi, attackingTeam, defendingTeam, rng, true)
-        
+
         actionEffects = specialResults.actionEffects
         additionalEffects = specialResults.additionalEffects
         statusesExpired = specialResults.statusesExpired
@@ -201,7 +201,7 @@ const executeTurn = (team1, team2, rng) => {
             repeatAttack = true
         } else {
             // Reset specialBar
-            attackingGotchi.specialBar = Math.round((100/6) * (6 - attackingGotchi.specialExpanded.cooldown))
+            attackingGotchi.specialBar = Math.round((100 / 6) * (6 - attackingGotchi.specialExpanded.cooldown))
         }
     } else {
         // Do an auto attack
@@ -212,7 +212,7 @@ const executeTurn = (team1, team2, rng) => {
         statusesExpired = attackResults.statusesExpired
 
         // Increase specialBar by 1/6th
-        attackingGotchi.specialBar = Math.round(attackingGotchi.specialBar + (100/6))
+        attackingGotchi.specialBar = Math.round(attackingGotchi.specialBar + (100 / 6))
         if (attackingGotchi.specialBar > 100) attackingGotchi.specialBar = 100
     }
 
@@ -377,13 +377,23 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
     const targetCode = isSpecial ? attackingGotchi.specialExpanded.target : 'enemy_random'
     const targets = getTargetsFromCode(targetCode, attackingGotchi, attackingTeam, defendingTeam, rng)
 
-    let actionMultipler = isSpecial ? attackingGotchi.specialExpanded.actionMultiplier : 1
+    const actionMultipler = isSpecial ? attackingGotchi.specialExpanded.actionMultiplier : 1
+
+    const specialEffects = isSpecial ? (attackingGotchi.specialExpanded.effects || []) : []
 
     const actionEffects = []
     const additionalEffects = []
     const statusesExpired = []
+
+    // repeat_attack is a meta-effect: roll once per special use (not once per target)
+    const repeatAttackEffect = isSpecial ? specialEffects.find(e => e.effectType === 'repeat_attack') : null
+    const nonRepeatSpecialEffects = isSpecial ? specialEffects.filter(e => e.effectType !== 'repeat_attack') : []
+
     let repeatAttack = false
-    
+    if (isSpecial && repeatAttackEffect) {
+        repeatAttack = rng() <= repeatAttackEffect.chance
+    }
+
     targets.forEach((target) => {
         // The effect for the main action of the attack
         let targetActionEffect
@@ -391,13 +401,14 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
         // For an additional effects that come for the special attack e.g. heals
         const targetAdditionalEffects = []
 
+        // Roll for crit multiplier
+        const critMultiplier = getCritMultiplier(attackingGotchi, rng)
+        const isCrit = critMultiplier > 1
+        const totalMultiplier = actionMultipler * critMultiplier
+
         // Handle action first
         if (action === 'attack') {
-            const critMultiplier = getCritMultiplier(attackingGotchi, rng)
-            const isCrit = critMultiplier > 1
-            actionMultipler *= critMultiplier
-            
-            const damage = getDamage(attackingGotchi, target, actionMultipler)
+            const damage = getDamage(attackingGotchi, target, totalMultiplier)
 
             targetActionEffect = {
                 target: target.id,
@@ -416,7 +427,7 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
             target.stats.dmgReceived += damage
 
         } else if (action === 'heal') {
-            const amountToHeal = getHealFromMultiplier(attackingGotchi, target, actionMultipler)
+            const amountToHeal = getHealFromMultiplier(attackingGotchi, target, totalMultiplier)
 
             targetActionEffect = {
                 target: target.id,
@@ -437,7 +448,7 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
 
         // If it's a special attack then handle the special effects with target 'same_as_attack'
         if (isSpecial) {
-            attackingGotchi.specialExpanded.effects.forEach((specialEffect) => {
+            nonRepeatSpecialEffects.forEach((specialEffect) => {
                 // Only handle special effects here that have a target code of 'same_as_attack'
                 // Handle the rest after the action is done
                 // This is to ensure that these effects are not applied multiple times
@@ -463,10 +474,6 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
                     targetAdditionalEffects.push(...specialEffectResults.additionalEffects)
 
                     statusesExpired.push(...specialEffectResults.statusesExpired)
-
-                    if (specialEffectResults.repeatAttack) {
-                        repeatAttack = true
-                    }
                 }
             })
         } else {
@@ -584,11 +591,11 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
 
     // Handle specialEffects that are not 'same_as_attack'
     if (isSpecial) {
-        attackingGotchi.specialExpanded.effects.forEach((specialEffect) => {
+        nonRepeatSpecialEffects.forEach((specialEffect) => {
             if (specialEffect.target !== 'same_as_attack') {
                 const targets = getTargetsFromCode(specialEffect.target, attackingGotchi, attackingTeam, defendingTeam, rng)
 
-                targets.forEach((target) => {   
+                targets.forEach((target) => {
                     const specialEffectResults = handleSpecialEffects(attackingTeam, attackingGotchi, target, specialEffect, rng)
 
                     additionalEffects.push(specialEffectResults.actionEffect)
@@ -596,10 +603,6 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
                     additionalEffects.push(...specialEffectResults.additionalEffects)
 
                     statusesExpired.push(...specialEffectResults.statusesExpired)
-
-                    if (specialEffectResults.repeatAttack) {
-                        repeatAttack = true
-                    }
                 })
             }
         })
@@ -622,15 +625,13 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
 
     const additionalEffects = []
     const statusesExpired = []
-    let repeatAttack = false
 
     // Check for chance of the special effect
     if (specialEffect.chance && specialEffect.chance < 1 && rng() > specialEffect.chance) {
         return {
             actionEffect,
             additionalEffects,
-            statusesExpired,
-            repeatAttack
+            statusesExpired
         }
     }
 
@@ -652,7 +653,7 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
         }
         case 'heal': {
             const amountToHeal = getHealFromMultiplier(attackingGotchi, target, specialEffect.actionMultiplier)
-            
+
             // Add another effect for the healing
             additionalEffects.push({
                 target: target.id,
@@ -662,7 +663,7 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
             })
 
             target.health += amountToHeal
-            
+
             break
         }
         case 'remove_buff': {
@@ -756,10 +757,6 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
 
             break
         }
-        case 'repeat_attack': {
-            repeatAttack = true
-            break
-        }
         default:
             throw new Error(`Invalid special effect type: ${specialEffect.effectType}`)
     }
@@ -767,8 +764,7 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
     return {
         actionEffect,
         additionalEffects,
-        statusesExpired,
-        repeatAttack
+        statusesExpired
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gotchi-battler-game-logic",
-    "version": "4.0.5",
+    "version": "4.0.7",
     "main": "index.js",
     "scripts": {
         "test": "mocha \"tests/**/*.test.js\"",