gotchi-battler-game-logic 4.0.2 → 4.0.4

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
 }
@@ -441,6 +448,9 @@ const addLeaderToTeam = (team, addStatuses) => {
 const addStatusToGotchi = (gotchi, status, count) => {
     if (!count) count = 1
 
+    // Only allow a maximum of 3 of the same status
+    if (gotchi.statuses.filter(x => x === status).length >= 3) return false
+
     for (let i = 0; i < count; i++) {
         gotchi.statuses.push(status)
     }

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

@@ -74,7 +74,9 @@ const gameLoop = (team1, team2, seed, options = { debug: false, type: 'training'
     try {
         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].includes(turnCounter)
+            let isEnvironmentTurn = [
+                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 => {
                     x.environmentEffects.push('damage_up')
@@ -119,7 +121,7 @@ const gameLoop = (team1, team2, seed, options = { debug: false, type: 'training'
     }
     
     logs.result.winner = getAlive(team1).length ? 1 : 2
-    logs.result.winningTeam = getTeamGotchis(team1).length ? getTeamGotchis(team1) : getTeamGotchis(team2)
+    logs.result.winningTeam = logs.result.winner === 1 ? getTeamGotchis(team1) : getTeamGotchis(team2)
     logs.result.winningTeam = logs.result.winningTeam.map((gotchi) => {
         return {
             id: gotchi.id,
@@ -414,7 +416,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 +428,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 {
@@ -487,18 +485,20 @@ const attack = (attackingGotchi, attackingTeam, defendingTeam, rng, isSpecial =
                 switch (attackEffect.type) {
                     case 'apply_status': {
                         if (focusCheck(attackingTeam, attackingGotchi, target, rng)) {
-                            addStatusToGotchi(target, attackEffect.status)
-                            targetActionEffect.statuses.push(attackEffect.status)
+                            if (addStatusToGotchi(target, attackEffect.status)) {
+                                targetActionEffect.statuses.push(attackEffect.status)
+                            }
                         }
                         break
                     }
                     case 'gain_status': {
-                        addStatusToGotchi(attackingGotchi, attackEffect.status)
-                        targetAdditionalEffects.push({
-                            target: attackingGotchi.id,
-                            status: attackEffect.status,
-                            outcome: 'success'
-                        })
+                        if (addStatusToGotchi(attackingGotchi, attackEffect.status)) {
+                            targetAdditionalEffects.push({
+                                target: attackingGotchi.id,
+                                status: attackEffect.status,
+                                outcome: 'success'
+                            })
+                        }
                         break
                     }
                     case 'remove_buff': {
@@ -638,18 +638,21 @@ const handleSpecialEffects = (attackingTeam, attackingGotchi, target, specialEff
         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'
+                if (addStatusToGotchi(target, specialEffect.status)) {
+                    actionEffect.statuses.push(specialEffect.status)
+                    actionEffect.outcome = 'success'
+                } else {
+                    // There's already a maximum of 3 of the same status
+                    actionEffect.outcome = 'failed'
+                }
             } 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,
@@ -658,9 +661,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.4",
   "main": "index.js",
   "scripts": {
     "test": "mocha \"tests/**/*.test.js\"",