gotchi-battler-game-logic 4.0.1 → 4.0.3

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

@@ -264,11 +264,18 @@ const getDamage = (attackingGotchi, defendingGotchi, multiplier) => {
     return damage
 }
 
-const getHealFromMultiplier = (healingGotchi, multiplier) => {
+const getHealFromMultiplier = (healingGotchi, target, multiplier) => {
+    // % of original target health
+    let amountToHeal = Math.round(target.fullHealth * multiplier)
 
-    const modifiedHealingGotchi = getModifiedStats(healingGotchi)
+    // Don't allow amountToHeal to be more than the difference between current health and max health
+    if (amountToHeal > target.fullHealth - target.health) {
+        amountToHeal = target.fullHealth - target.health
+    }
 
-    const amountToHeal = Math.round(modifiedHealingGotchi.resist * multiplier)
+    // Handle stats
+    healingGotchi.stats.healGiven += amountToHeal
+    target.stats.healReceived += amountToHeal
 
     return amountToHeal
 }

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

@@ -414,7 +414,7 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
             target.stats.dmgReceived += damage
 
         } else if (action === 'heal') {
-            const amountToHeal = getHealFromMultiplier(attackingGotchi, actionMultipler)
+            const amountToHeal = getHealFromMultiplier(attackingGotchi, target, actionMultipler)
 
             targetActionEffect = {
                 target: target.id,
@@ -426,10 +426,6 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
             // Handle healing
             target.health += amountToHeal
 
-            // Handle stats
-            attackingGotchi.stats.healGiven += amountToHeal
-            target.stats.healReceived += amountToHeal
-
         } else if (action === 'none') {
             // Do nothing
         } else {
@@ -449,32 +445,25 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
                     // Handle the effect
                     const specialEffectResults = handleSpecialEffects(attackingTeam, attackingGotchi, target, specialEffect, rng)
 
-                    if (specialEffectResults) {
-                        if (specialEffectResults.actionEffect) {
-                            if (targetActionEffect) {
-                                // If target is same as the actionEffect then just add statuses to the actionEffect
-                                if (targetActionEffect.target && targetActionEffect.target === specialEffectResults.actionEffect.target) {
-                                    targetActionEffect.statuses.push(...specialEffectResults.actionEffect.statuses)
-                                } else {
-                                    // If not then add to additionalEffects
-                                    targetAdditionalEffects.push(specialEffectResults.actionEffect)
-                                }
-                            } else {
-                                targetActionEffect = specialEffectResults.actionEffect
-                            }
+                    // Do we already have an action effect with attack damage or healing?
+                    if (targetActionEffect) {
+                        // If target is same as the actionEffect then just add statuses to the actionEffect
+                        if (targetActionEffect.target && targetActionEffect.target === specialEffectResults.actionEffect.target) {
+                            targetActionEffect.statuses.push(...specialEffectResults.actionEffect.statuses)
+                        } else {
+                            // If not then add to additionalEffects
+                            targetAdditionalEffects.push(specialEffectResults.actionEffect)
                         }
+                    } else {
+                        targetActionEffect = specialEffectResults.actionEffect
+                    }
 
-                        if (specialEffectResults.additionalEffects) {   
-                            targetAdditionalEffects.push(...specialEffectResults.additionalEffects)
-                        }
+                    targetAdditionalEffects.push(...specialEffectResults.additionalEffects)
 
-                        if (specialEffectResults.statusesExpired) {
-                            statusesExpired.push(...specialEffectResults.statusesExpired)
-                        }
+                    statusesExpired.push(...specialEffectResults.statusesExpired)
 
-                        if (specialEffectResults.repeatAttack) {
-                            repeatAttack = true
-                        }
+                    if (specialEffectResults.repeatAttack) {
+                        repeatAttack = true
                     }
                 }
             })
@@ -598,22 +587,14 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
                 targets.forEach((target) => {   
                     const specialEffectResults = handleSpecialEffects(attackingTeam, attackingGotchi, target, specialEffect, rng)
 
-                    if (specialEffectResults) {
-                        if (specialEffectResults.actionEffect) {
-                            additionalEffects.push(specialEffectResults.actionEffect)
-                        }
+                    additionalEffects.push(specialEffectResults.actionEffect)
 
-                        if (specialEffectResults.additionalEffects) {
-                            additionalEffects.push(...specialEffectResults.additionalEffects)
-                        }
+                    additionalEffects.push(...specialEffectResults.additionalEffects)
 
-                        if (specialEffectResults.statusesExpired) {
-                            statusesExpired.push(...specialEffectResults.statusesExpired)
-                        }
+                    statusesExpired.push(...specialEffectResults.statusesExpired)
 
-                        if (specialEffectResults.repeatAttack) {
-                            repeatAttack = true
-                        }
+                    if (specialEffectResults.repeatAttack) {
+                        repeatAttack = true
                     }
                 })
             }
@@ -629,33 +610,41 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
 }
 
 const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEffect, rng) => {
-    if (specialEffect.chance && specialEffect.chance < 1 && rng() > specialEffect.chance) {
-        return false
-    }
-
     const actionEffect = {
         target: target.id,
         statuses: [],
-        outcome: 'success'
+        outcome: 'failed'
     }
-    
+
     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
+        }
+    }
+
     switch (specialEffect.effectType) {
         case 'status': {
             // Focus/resistance check if target is not on the same team as the attacking gotchi
             if (focusCheck(attackingTeam, attackingGotchi, target, rng)) {
                 addStatusToGotchi(target, specialEffect.status)
                 actionEffect.statuses.push(specialEffect.status)
+                actionEffect.outcome = 'success'
+            } else {
+                actionEffect.outcome = 'resisted'
             }
             break
         }
         case 'heal': {
-            const amountToHeal = getHealFromMultiplier(target, specialEffect.actionMultiplier)
-            target.health += amountToHeal
-
+            const amountToHeal = getHealFromMultiplier(attackingGotchi, target, specialEffect.actionMultiplier)
+            
             // Add another effect for the healing
             additionalEffects.push({
                 target: target.id,
@@ -664,9 +653,8 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
                 outcome: 'success'
             })
 
-            // Handle stats
-            attackingGotchi.stats.healGiven += amountToHeal
-            target.stats.healReceived += amountToHeal
+            target.health += amountToHeal
+            
             break
         }
         case 'remove_buff': {

package/package.json

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