Make penguin spying infallible

This commit is contained in:
ceikry
2021-08-04 22:55:57 -05:00
parent 15ee9b01cc
commit c12cbc0f91
@@ -16,7 +16,7 @@ import org.rs09.consts.Items
@Initializable @Initializable
class CropHarvester : OptionHandler() { class CropHarvester : OptionHandler() {
val nonLives = arrayOf(PatchType.HERB, PatchType.CACTUS, PatchType.BELLADONNA, PatchType.HOPS, PatchType.ALLOTMENT,PatchType.EVIL_TURNIP) val livesBased = arrayOf(PatchType.HERB, PatchType.CACTUS, PatchType.BELLADONNA, PatchType.HOPS, PatchType.ALLOTMENT,PatchType.EVIL_TURNIP)
val spadeAnim = Animation(830) val spadeAnim = Animation(830)
@@ -69,13 +69,13 @@ class CropHarvester : OptionHandler() {
delay = 2 delay = 2
player.inventory.add(Item(plantable.harvestItem,1)) player.inventory.add(Item(plantable.harvestItem,1))
player.skills.addExperience(Skills.FARMING,plantable.harvestXP) player.skills.addExperience(Skills.FARMING,plantable.harvestXP)
if(patch.patch.type in nonLives){ if(patch.patch.type in livesBased){
patch.harvestAmt--
} else {
patch.rollLivesDecrement( patch.rollLivesDecrement(
ContentAPI.getDynLevel(player, Skills.FARMING), ContentAPI.getDynLevel(player, Skills.FARMING),
requiredItem == Items.MAGIC_SECATEURS_7409 requiredItem == Items.MAGIC_SECATEURS_7409
) )
} else {
patch.harvestAmt--
} }
return patch.cropLives <= 0 || patch.harvestAmt <= 0 return patch.cropLives <= 0 || patch.harvestAmt <= 0
} }