diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java
index 4aeb6de16..ef72c5a48 100644
--- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java
+++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java
@@ -115,6 +115,7 @@ public final class ModCrafingRecipes {
public static IRecipe recipeWaterRing;
public static IRecipe recipeMiningRing;
public static IRecipe recipeMagnetRing;
+ public static IRecipe recipeTerraPick;
public static void init() {
// Lexicon Recipe
@@ -626,6 +627,14 @@ public final class ModCrafingRecipes {
'M', LibOreDict.MANA_STEEL);
recipeMagnetRing = BotaniaAPI.getLatestAddedRecipe();
+ // Terra Shatterer Recipe
+ addOreDictRecipe(new ItemStack(ModItems.terraPick),
+ "ITI", "ILI", " L ",
+ 'T', new ItemStack(ModItems.manaTablet, 1, -1),
+ 'I', LibOreDict.TERRA_STEEL,
+ 'L', LibOreDict.LIVINGWOOD_TWIG);
+ recipeTerraPick = BotaniaAPI.getLatestAddedRecipe();
+
// Mana and Terrasteel Block Recipes
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
"III", "III", "III",
diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java
index 3b24c0ace..1c31842ed 100644
--- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java
+++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java
@@ -45,13 +45,17 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem {
private static final String TAG_ENABLED = "enabled";
private static final String TAG_MANA = "mana";
- private static final int MAX_MANA = 1000000000;
+ private static final int MAX_MANA = 2000000000;
private static final Material[] MATERIALS = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay };
private static final int[] LEVELS = new int[] {
0, 10000, 1000000, 10000000, 100000000, 1000000000
};
+
+ private static final int[] CREATIVE_MANA = new int[] {
+ 10000 - 1, 1000000 - 1, 10000000 - 1, 100000000 - 1, 1000000000 - 1, MAX_MANA
+ };
IIcon iconTool, iconOverlay;
@@ -61,9 +65,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem {
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
- for(int level : LEVELS) {
+ for(int mana : CREATIVE_MANA) {
ItemStack stack = new ItemStack(item);
- setMana(stack, level);
+ setMana(stack, mana);
list.add(stack);
}
}
@@ -80,8 +84,11 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem {
int mana = getMana(par1ItemStack);
int level = getLevel(par1ItemStack);
- if(level != 0)
+ if(level != 0) {
setEnabled(par1ItemStack, !isEnabled(par1ItemStack));
+ if(!par2World.isRemote)
+ par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.5F, 0.4F);
+ }
return par1ItemStack;
}
diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
index efd03448d..64cb1ce00 100644
--- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
+++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
@@ -116,6 +116,7 @@ public final class LexiconData {
public static LexiconEntry terrasteelArmor;
public static LexiconEntry grassHorn;
public static LexiconEntry terraBlade;
+ public static LexiconEntry terraPick;
public static LexiconEntry baublesIntro;
public static LexiconEntry tinyPlanet;
@@ -369,6 +370,9 @@ public final class LexiconData {
terraBlade = new BLexiconEntry(LibLexicon.TOOL_TERRA_SWORD, categoryTools);
terraBlade.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTerraSword));
+ terraPick = new BLexiconEntry(LibLexicon.TOOL_TERRA_PICK, categoryTools);
+ terraPick.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCrafingRecipes.recipeTerraPick));
+
// BAUBLES ENTRIES
baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles);
baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2"));
diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java
index 7955ca881..cd51aa1e5 100644
--- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java
+++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java
@@ -97,6 +97,7 @@ public final class LibLexicon {
public static final String TOOL_TERRASTEEL_ARMOR = "terrasteelArmor";
public static final String TOOL_GRASS_HORN = "grassHorn";
public static final String TOOL_TERRA_SWORD = "terraSword";
+ public static final String TOOL_TERRA_PICK = "terraPick";
public static final String BAUBLE_INTRO = "bIntro";
public static final String BAUBLE_TINY_PLANET = "tinyPlanet";
diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang
index 25ab05366..18930d15f 100644
--- a/resources/assets/botania/lang/en_US.lang
+++ b/resources/assets/botania/lang/en_US.lang
@@ -802,6 +802,15 @@ botania.entry.terraSword=Terra Blade
botania.page.terraSword0=The &1Terra Blade&0, crafted from &1Terrasteel Ingots&0, is a sword infused with natural strength. Not only does it par with a &1Diamond Sword&0 in terms of strength and it uses &4Mana&0 from the inventory like &1Manasteel Tools&0, but when it's swinged, there's a chance for it to create a beam that will deal as much damage as a melee hit.
botania.page.terraSword1=No Broken Hero Sword
+# -- TERRA SHATTERER
+botania.entry.terraPick=Terra Shatterer
+botania.page.terraPick0=The &1Terra Shatterer&0 is a tool that can amass insane quantities of mana on itself, due to the amount of &1Terrasteel&0 required for it's creation.
The tool functions very much like a &1Mana Tablet&0 by which it can amass &4Mana&0 by being tossed on a &1Mana Pool&0, it can't give the &4Mana&0 back, though, so it doesn't function as a storage method.
+botania.page.terraPick1=The amount of &4Mana&0 stored on the tool defines it's &4Rank&0. Ranks go as follows: &4D&0, &4C&0, &4B&0, &4A&0, &4S&0, &4SS&0. &4D&0 being the default rank.
The amount of &4Mana&0 required to advance from rank to rank increases as the rank does. To advance from &4D&0 to &4C&0, for example, it requires just a few seconds of exposition to a &1Mana Pool&0.
+botania.page.terraPick2=To advance from rank &4C&0 to rank &4B&0, a full &1Mana Pool&0 is required, and the cost increases by a tenfold per rank from there on in, all the way to &4SS&0.
The rank of the tool does not change it's speed, but instead, it increases the power of it's &4Active Ability&0.
Toggling the tool's ability can be done via right click.
+botania.page.terraPick3=While the tool is active, it enables it to break blocks in an extended area. At rank &4C&0 it's a small column, which increases to a square at rank &4B&0, that gets larger trough the ranks. It's to note that the rank &4D&0 tool does not have the active ability.
Having the tool active consumes &4Mana&0 from it's storage passively, even if not being used to mine.
+botania.page.terraPick4=Lastly, the tool takes damage for every single block broken, so a good supply of &4Mana&0 in the wielder's inventory is a must for the higher ranks, as the tool does function like normal &1Manasteel Tools&0, in which it'll use &4Mana&0 instead of actually taking damage, given it's made of &1Terrasteel&0.
+botania.page.terraPick5=Stronger than a Gastrea
+
# - BAUBLES
# -- AN INTRODUCTION TO BAUBLES
botania.entry.bIntro=An Introduction to Baubles