diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 782a8dbdd..28d8a189f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -209,6 +209,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeRedStringFertilizer; public static IRecipe recipeRedStringComparator; public static IRecipe recipeRedStringRelay; + public static IRecipe recipeMissileRod; public static void init() { // Lexicon Recipe @@ -1340,6 +1341,14 @@ public final class ModCraftingRecipes { 'M', new ItemStack(ModBlocks.spreader)); recipeRedStringRelay = BotaniaAPI.getLatestAddedRecipe(); + // Rod of the Arcane Barrage + addOreDictRecipe(new ItemStack(ModItems.missileRod), + "GDD", " TD", "T G", + 'G', LibOreDict.LIFE_ESSENCE, + 'D', LibOreDict.DRAGONSTONE, + 'T', LibOreDict.LIVINGWOOD_TWIG); + recipeMissileRod = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index e6861afbe..f3672f856 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -60,6 +60,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem { EntityMagicMissile missile = new EntityMagicMissile(player.worldObj); missile.setPosition(player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1)); if(missile.getTarget()) { + player.worldObj.playSoundAtEntity(player, "botania:missile", 0.6F, 0.8F + (float) Math.random() * 0.2F); player.worldObj.spawnEntityInWorld(missile); ManaItemHandler.requestManaExact(stack, player, COST_PER, true); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index b3e737e5e..80f00d305 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -148,6 +148,7 @@ public final class LexiconData { public static LexiconEntry diviningRod; public static LexiconEntry gravityRod; public static LexiconEntry regenIvy; + public static LexiconEntry missileRod; public static LexiconEntry baublesIntro; public static LexiconEntry tinyPlanet; @@ -562,6 +563,9 @@ public final class LexiconData { regenIvy = new ALexiconEntry(LibLexicon.TOOL_REGEN_IVY, categoryTools); regenIvy.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRegenIvy)); + missileRod = new ALexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); + missileRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMissileRod)); + // 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/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 845b6a89e..43e7c6a23 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -129,7 +129,8 @@ public final class LibLexicon { public static final String TOOL_DIVINING_ROD = "diviningRod"; public static final String TOOL_GRAVITY_ROD = "gravityRod"; public static final String TOOL_REGEN_IVY = "regenIvy"; - + public static final String TOOL_MISSILE_ROD = "missileRod"; + public static final String BAUBLE_INTRO = "bIntro"; public static final String BAUBLE_TINY_PLANET = "tinyPlanet"; public static final String BAUBLE_MANA_RING = "manaRing"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index ab426e057..e0dd2d33c 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -786,7 +786,7 @@ item.botania:brewVial.name=Vial of %s (%s) item.botania:brewFlask.name=Flask of %s (%s) item.botania:bloodPendant.name=Tainted Blood Pendant item.botania:redString.name=Red String -item.botania:missileRod.name=Missile Rod Thingymajig (WIP) +item.botania:missileRod.name=Rod of the Arcane Barrage # BREW NAMES botania.brew.fallback=Fallback @@ -1600,6 +1600,11 @@ botania.page.regenIvy0=While &1Manasteel&0 or &1Elementium&0 tools have the abil botania.page.regenIvy1=To apply it, one'd simply craft the tool in question alongside the ivy and 3 of an item that can be used to repair the tool in an anvil (eg. &1Diamonds&0 for a &1Diamond Pickaxe&0).
Due to not being in direct contact with the material, the amount of &4Mana&0 used by the ivy in comparison to &1Manasteel&0 is rather high. botania.page.regenIvy2=Bring your Inferno Adze +# -- ROD OF THE ARCANE BARRAGE +botania.entry.missileRod=Rod of the Arcane Barrage +botania.page.missileRod0=The &1Rod of the Arcane Barrage&0 is a rather powerful weapon against a large crowd of foes. Channeling its power will materialize countless arcane missiles that home in on targets at random, at a pretty hefty cost of &4Mana&0. +botania.page.missileRod1=Zapzapzapzap + # - BAUBLES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=An Introduction to Baubles @@ -1703,7 +1708,6 @@ botania.entry.superLavaPendant=Crimson Pendant botania.page.superLavaPendant0=The &1Crimson Pendant&0 is, in simple terms, an upgraded counterpart to the &1Pyroclast Pendant&0, wearing it provides the wearer immunity to all fire and lava damage, instead of just extinguishing them. botania.page.superLavaPendant1=Runner-up on Monolith Code - # -- TAINED BLOOD PENDANT botania.entry.bloodPendant=Tained Blood Pendant botania.page.bloodPendant0=Messing around with the original source of the &4Potion&0 design, the Nether, seems to work fairly well at harnessing that very power.
The &1Tainted Blood Pendant&0 allows one to store a &4Brew&0 in a condensed, wearable state. Infusing this pendant with one and wearing it will apply the effect while it's worn, for the cost of &4Mana&0 depending on the power of the &4Brew&0. diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 458ad5cf1..c59f75555 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -17,6 +17,7 @@ "lexiconPage": { "category": "neutral", "sounds":["lexiconPage"] }, "manaBlaster": { "category": "neutral", "sounds":["manaBlaster"] }, "manaPoolCraft": { "category": "neutral", "sounds":["manaPoolCraft"] }, + "missile": { "category": "neutral", "sounds":["missile"] }, "orechid": { "category": "neutral", "sounds":["orechid"] }, "potionCreate": { "category": "neutral", "sounds":["potionCreate"] }, "runeAltarCraft": { "category": "neutral", "sounds":["runeAltarCraft"] }, diff --git a/src/main/resources/assets/botania/sounds/missile.ogg b/src/main/resources/assets/botania/sounds/missile.ogg new file mode 100644 index 000000000..36bb1b5b0 Binary files /dev/null and b/src/main/resources/assets/botania/sounds/missile.ogg differ