box of spores fix

Trimps · Aug 13, 2022 · 75eb298 · 75eb298
1 parent 1be60a7
commit 75eb298
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/main.js b/main.js
@@ -13815,7 +13815,7 @@ function getDailyHeliumValue(weight, portalUni){
 	    var scruffXP = game.global.fluffyExp2 / 1000;
 	    var scruffLvl = Math.log(scruffXP) / Math.log(4);
 	    if(game.talents.fluffyAbility.purchased){scruffLvl++}
-	    if(scruffLvl >= 9){hasPetBonus = true;}
+	    if(scruffLvl >= 8){hasPetBonus = true;}
 	}
 	else if (portalUni == 1)
 	{

diff --git a/objects.js b/objects.js
@@ -678,6 +678,7 @@ var autoBattle = {
             bleedChance: 0,
             bleedMod: 0,
             bleedTime: 0,
+            hadBleed: false,
             poisonChance: 0,
             poisonTime: 0,
             poisonMod: 0,
@@ -2157,7 +2158,7 @@ var autoBattle = {
             level: 1,
             zone: 220,
             description: function(){
-            return "If the Enemy dies while Poisoned and not Bleeding, it drops " + this.dustMult() + "x more Dust.";
+            return "If the Enemy dies while Poisoned after never Bleeding, it drops " + this.dustMult() + "x more Dust.";
             },
             upgrade: "+1x Dust",
             dustMult: function(){
@@ -3009,6 +3010,7 @@ var autoBattle = {
                 if (this.items.Bag_of_Nails.equipped) this.enemy.noSlow = true;
                 if (defender.bleed.mod < attacker.bleedMod) defender.bleed.mod = (1 + attacker.bleedMod);
                 if (defender.bleed.time < attacker.bleedTime) defender.bleed.time = attacker.bleedTime;
+                if (defender.bleed.time > 0) defender.hadBleed = true;
             }
         }
         var poisonChance = attacker.poisonChance - defender.poisonResist;
@@ -3296,7 +3298,8 @@ var autoBattle = {
             }
             amt *= mutMult;
         }
-        if (this.items.Box_of_Spores.equipped && this.enemy.bleed.time <= 0 && this.enemy.poison.time >= 0){
+        if (this.items.Box_of_Spores.equipped && !this.enemy.hadBleed && this.enemy.poison.time > 0){
+
             amt *= this.items.Box_of_Spores.dustMult();
         }
         if (game.global.fluffyExp2 >= 1466015503701000) amt *= 5; //don't even look at this line, just move on