gotchi-battler-game-logic 4.0.2 → 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 {
@@ -647,9 +643,8 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
             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,
@@ -658,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.2",
+  "version": "4.0.3",
   "main": "index.js",
   "scripts": {
     "test": "mocha \"tests/**/*.test.js\"",