From 9a4f159942b50ba0e6f440efda53c40e6a8251ae Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 3 Dec 2014 16:35:32 +0000 Subject: [PATCH] Finishing the missiles up /o/ --- .../common/crafting/ModCraftingRecipes.java | 9 +++++++++ .../botania/common/item/rod/ItemMissileRod.java | 1 + .../botania/common/lexicon/LexiconData.java | 4 ++++ .../vazkii/botania/common/lib/LibLexicon.java | 3 ++- .../resources/assets/botania/lang/en_US.lang | 8 ++++++-- src/main/resources/assets/botania/sounds.json | 1 + .../resources/assets/botania/sounds/missile.ogg | Bin 0 -> 7794 bytes 7 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/botania/sounds/missile.ogg 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 0000000000000000000000000000000000000000..36bb1b5b06830d02581f286f7bd02f82c8ebee4c GIT binary patch literal 7794 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