diff --git a/src/main/java/com/hbm/config/VersatileConfig.java b/src/main/java/com/hbm/config/VersatileConfig.java index 851211b76..eae8519d9 100644 --- a/src/main/java/com/hbm/config/VersatileConfig.java +++ b/src/main/java/com/hbm/config/VersatileConfig.java @@ -1,5 +1,7 @@ package com.hbm.config; +import java.util.ArrayList; + import com.hbm.items.ModItems; import com.hbm.potion.HbmPotion; @@ -33,7 +35,9 @@ public class VersatileConfig { if(PotionConfig.potionSickness == 2) duration *= 12; - entity.addPotionEffect(new PotionEffect(HbmPotion.potionsickness.id, duration * 20)); + PotionEffect eff = new PotionEffect(HbmPotion.potionsickness.id, duration * 20); + eff.setCurativeItems(new ArrayList()); + entity.addPotionEffect(eff); } public static boolean hasPotionSickness(EntityLivingBase entity) { diff --git a/src/main/java/com/hbm/items/food/ItemLemon.java b/src/main/java/com/hbm/items/food/ItemLemon.java index e66f898c0..661661140 100644 --- a/src/main/java/com/hbm/items/food/ItemLemon.java +++ b/src/main/java/com/hbm/items/food/ItemLemon.java @@ -45,7 +45,7 @@ public class ItemLemon extends ItemFood { if(this == ModItems.med_ipecac) { list.add("Bitter juice that will cause your stomach"); - list.add("to forcefully eject it's contents."); + list.add("to forcefully eject its contents."); } if(this == ModItems.med_ptsd) { diff --git a/src/main/java/com/hbm/items/food/ItemPill.java b/src/main/java/com/hbm/items/food/ItemPill.java index 6e1144e57..f531ddb55 100644 --- a/src/main/java/com/hbm/items/food/ItemPill.java +++ b/src/main/java/com/hbm/items/food/ItemPill.java @@ -1,5 +1,6 @@ package com.hbm.items.food; +import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -58,12 +59,20 @@ public class ItemPill extends ItemFood { } if(this == ModItems.pill_herbal) { + float fibrosis = HbmLivingProps.getFibrosis(player); + HbmLivingProps.setFibrosis(player, (int) Math.min(fibrosis, 37800)); HbmLivingProps.setAsbestos(player, 0); HbmLivingProps.setBlackLung(player, Math.min(HbmLivingProps.getBlackLung(player), HbmLivingProps.maxBlacklung / 5)); + HbmLivingProps.incrementRadiation(player, -100F); + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 10 * 20, 0)); player.addPotionEffect(new PotionEffect(Potion.weakness.id, 10 * 60 * 20, 2)); player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 10 * 60 * 20, 2)); player.addPotionEffect(new PotionEffect(Potion.poison.id, 5 * 20, 2)); + + PotionEffect eff = new PotionEffect(HbmPotion.potionsickness.id, 10 * 60 * 20); + eff.setCurativeItems(new ArrayList()); + player.addPotionEffect(eff); } if(this == ModItems.xanax) { @@ -112,6 +121,10 @@ public class ItemPill extends ItemFood { if(this == ModItems.siox) { list.add("Reverses mesothelioma with the power of Asbestos!"); } + if(this == ModItems.pill_herbal) { + list.add("Effective treatment against lung disease and mild radiation poisoning"); + list.add("Comes with side effects"); + } if(this == ModItems.xanax) { list.add("Removes 500mDRX"); } diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 09117cd8e..2f30e19ee 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -216,6 +216,7 @@ public class CraftingManager { addShapelessAuto(new ItemStack(ModItems.powder_poison), new Object[] { DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.NIGHTSHADE) }); addShapelessAuto(new ItemStack(ModItems.syringe_metal_stimpak), new Object[] { ModItems.syringe_metal_empty, Items.carrot, DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.FOXGLOVE) }); //xander root and broc flower + addShapelessAuto(new ItemStack(ModItems.pill_herbal), new Object[] { COAL.dust(), Items.poisonous_potato, Items.nether_wart, DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.FOXGLOVE) }); addShapelessAuto(DictFrame.fromOne(ModItems.plant_item, EnumPlantType.ROPE, 1), new Object[] { Items.string, Items.string, Items.string }); addRecipeAuto(DictFrame.fromOne(ModItems.plant_item, EnumPlantType.ROPE, 4), new Object[] { "W", "W", "W", 'W', DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.WEED) }); addRecipeAuto(new ItemStack(ModItems.rag, 16), new Object[] { "WW", "WW", 'W', DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.WEED) }); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 5cca52ac0..e24b1c8c4 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -2215,6 +2215,7 @@ item.pile_rod_plutonium.name=Chicago Pile Plutoniumstab item.pile_rod_source.name=Chicago Pile Ra226Be-Neutronenquelle item.pile_rod_uranium.name=Chicago Pile Uranstab item.pill_iodine.name=Iodpille +item.pill_herbal.name=Kräuterpaste item.pin.name=Haarklammer item.pipes_steel.name=Stahlrohre item.pirfenidone.name=Pirfenidon diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index fb479e7c5..c9f511f43 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2553,6 +2553,7 @@ item.pile_rod_source.desc=§d[Neutron Source] item.pile_rod_uranium.name=Chicago Pile Uranium Rod item.pile_rod_uranium.desc=§a[Reactive Fuel]$§eUse hand drill to take core sample item.pill_iodine.name=Iodine Pill +item.pill_herbal.name=Herbal Paste item.pin.name=Bobby Pin item.pin.desc="*Unmodified* success rate of picking a standard lock is ~10%. item.pipes_steel.name=Steel Pipes diff --git a/src/main/resources/assets/hbm/textures/blocks/plant_flower.foxglove.png b/src/main/resources/assets/hbm/textures/blocks/plant_flower.foxglove.png index f1357aa19..bba918c74 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/plant_flower.foxglove.png and b/src/main/resources/assets/hbm/textures/blocks/plant_flower.foxglove.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/plant_flower.nightshade.png b/src/main/resources/assets/hbm/textures/blocks/plant_flower.nightshade.png index 77d18136a..01a3dcf59 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/plant_flower.nightshade.png and b/src/main/resources/assets/hbm/textures/blocks/plant_flower.nightshade.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/plant_flower.tobacco.png b/src/main/resources/assets/hbm/textures/blocks/plant_flower.tobacco.png index ea4d67d05..56f0815de 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/plant_flower.tobacco.png and b/src/main/resources/assets/hbm/textures/blocks/plant_flower.tobacco.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/plant_tall.weed.lower.png b/src/main/resources/assets/hbm/textures/blocks/plant_tall.weed.lower.png new file mode 100644 index 000000000..1e412f0cf Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/plant_tall.weed.lower.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/plant_tall.weed.upper.png b/src/main/resources/assets/hbm/textures/blocks/plant_tall.weed.upper.png new file mode 100644 index 000000000..e7a23bdbe Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/plant_tall.weed.upper.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/potions.png b/src/main/resources/assets/hbm/textures/gui/potions.png index 8eafece73..09759f2f9 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/potions.png and b/src/main/resources/assets/hbm/textures/gui/potions.png differ