diff --git a/src/main/java/electroblob/wizardry/item/ItemArtefact.java b/src/main/java/electroblob/wizardry/item/ItemArtefact.java index 21377347..630a10c1 100644 --- a/src/main/java/electroblob/wizardry/item/ItemArtefact.java +++ b/src/main/java/electroblob/wizardry/item/ItemArtefact.java @@ -349,9 +349,14 @@ public class ItemArtefact extends Item { }); }else if(artefact == WizardryItems.charm_feeding){ - // Every 5 seconds, feed the player if they are near starving - if(player.ticksExisted % 100 == 0 && player.getFoodStats().getFoodLevel() < 2){ - findMatchingWandAndCast(player, Spells.replenish_hunger); + // Every 5 seconds, feed the player if they are hungry enough + if(player.ticksExisted % 100 == 0){ + if(player.getFoodStats().getFoodLevel() < 20 - Spells.satiety.getProperty(Satiety.HUNGER_POINTS).intValue()){ + if(findMatchingWandAndCast(player, Spells.satiety)) continue; + } + if(player.getFoodStats().getFoodLevel() < 20 - Spells.replenish_hunger.getProperty(ReplenishHunger.HUNGER_POINTS).intValue()){ + findMatchingWandAndCast(player, Spells.replenish_hunger); + } } } } diff --git a/src/main/resources/assets/ebwizardry/lang/en_gb.lang b/src/main/resources/assets/ebwizardry/lang/en_gb.lang index 709769a5..c2c9a5ac 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_gb.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_gb.lang @@ -359,7 +359,7 @@ item.ebwizardry\:charm_light.desc=Conjured light sources last forever and may be item.ebwizardry\:charm_transportation.name=Ancient Compass item.ebwizardry\:charm_transportation.desc=Up to four stone circles may be remembered and selected from when using transportation item.ebwizardry\:charm_feeding.name=Bottomless Provisions -item.ebwizardry\:charm_feeding.desc=Replenish hunger triggers automatically when bound to a wand on your hotbar +item.ebwizardry\:charm_feeding.desc=Replenish hunger and satiety trigger automatically when bound to a wand on your hotbar item.charge_status.full=Full item.charge_status.almost_full=Almost full diff --git a/src/main/resources/assets/ebwizardry/lang/en_us.lang b/src/main/resources/assets/ebwizardry/lang/en_us.lang index a136fbb7..06a2ef56 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_us.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_us.lang @@ -359,7 +359,7 @@ item.ebwizardry\:charm_light.desc=Conjured light sources last forever and may be item.ebwizardry\:charm_transportation.name=Ancient Compass item.ebwizardry\:charm_transportation.desc=Up to four stone circles may be remembered and selected from when using transportation item.ebwizardry\:charm_feeding.name=Bottomless Provisions -item.ebwizardry\:charm_feeding.desc=Replenish hunger triggers automatically when bound to a wand on your hotbar +item.ebwizardry\:charm_feeding.desc=Replenish hunger and satiety trigger automatically when bound to a wand on your hotbar item.charge_status.full=Full item.charge_status.almost_full=Almost full