From ef180ad5b7bae5c1aad24325c10b9583a084dab5 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 18 Jul 2015 20:07:53 +0100 Subject: [PATCH] The big thorn chakram buffage. --- .../java/vazkii/botania/common/crafting/ModCraftingRecipes.java | 2 +- .../java/vazkii/botania/common/entity/EntityThornChakram.java | 2 +- src/main/java/vazkii/botania/common/item/ItemThornChakram.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c15627d1a..6d5877c42 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1524,7 +1524,7 @@ public final class ModCraftingRecipes { recipeSpellCloth = BotaniaAPI.getLatestAddedRecipe(); // Thorn Chakram Recipe - addOreDictRecipe(new ItemStack(ModItems.thornChakram), + addOreDictRecipe(new ItemStack(ModItems.thornChakram, 2), "VVV", "VTV", "VVV", 'V', new ItemStack(Blocks.vine), 'T', LibOreDict.TERRA_STEEL); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 1712c115b..178215545 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -94,7 +94,7 @@ public class EntityThornChakram extends EntityThrowable { EntityLivingBase thrower = getThrower(); if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) { - ((EntityLivingBase) pos.entityHit).attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 6); + ((EntityLivingBase) pos.entityHit).attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); if(worldObj.rand.nextInt(3) == 0) ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); } else { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 55fb74e1d..1f6ad9294 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -23,7 +23,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { public ItemThornChakram() { setUnlocalizedName(LibItemNames.THORN_CHAKRAM); - setMaxStackSize(1); + setMaxStackSize(6); } @Override diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 38ac43cf5..f8596c864 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2405,7 +2405,7 @@ botania.page.spellCloth1=Oldest item in the book # -- THORN CHAKRAM botania.entry.thornChakram=Thorn Chakram -botania.page.thornChakram0=The &1Thorn Chakram&0 is a thrown weapon made of &1Terrasteel&0 and plant matter. After thrown it'll pierce through enemies, damaging them and sometimes poisoning them, and bounce on blocks a few times before returning to the thrower, similarly to a boomerang. +botania.page.thornChakram0=The &1Thorn Chakram&0 is a thrown weapon made of &1Terrasteel&0 and plant matter. After thrown it'll pierce through enemies, damaging them and sometimes poisoning them, and bounce on blocks a few times before returning to the thrower, similarly to a boomerang.
Up to 6 &1Thorn Chakrams&0 can be stacked together, making them a versatile weapon for closed environments. botania.page.thornChakram1=Spores and stingers # -- OVERGROWTH SEED