From 73a12c7a84f471e2d11afa15a002d249f3f869cd Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Thu, 1 Jan 2015 13:55:53 -0800 Subject: [PATCH] Fixing the Eldritch Blood Orb --- .../spiteful/forbidden/compat/BloodMagic.java | 18 +++++++++++------- .../forbidden/items/ForbiddenItems.java | 4 ++-- .../forbidden/items/ItemDivineOrb.java | 13 ++++++++++--- .../resources/assets/forbidden/lang/en_US.lang | 8 ++++---- .../resources/assets/forbidden/lang/fr_FR.lang | 8 ++++---- .../resources/assets/forbidden/lang/ru_RU.lang | 8 ++++---- .../resources/assets/forbidden/lang/zh_CN.lang | 8 ++++---- 7 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java index 9d8c17e..9cd4352 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java +++ b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java @@ -29,17 +29,16 @@ import fox.spiteful.forbidden.items.ForbiddenItems; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; -import thaumcraft.common.lib.potions.PotionWarpWard; +import thaumcraft.common.config.ConfigItems; public class BloodMagic { public static void stab() { try { - AlchemicalPotionCreationHandler.addPotion(ItemApi.getItem("itemResource", 11), PotionFluxTaint.instance.getId(), 450); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(ConfigItems.itemResource, 1, 11), PotionFluxTaint.instance.getId(), 450); AlchemicalPotionCreationHandler.addPotion(new ItemStack(ForbiddenItems.resource, 1, 3), DarkPotions.bloodSeal.getId(), 1200); AspectList list; Item masterOrb = GameRegistry.findItem("AWWayofTime", "masterBloodOrb"); - Item archmasterOrb = GameRegistry.findItem("AWWayofTime", "archmageBloodOrb"); Item imbuedSlate = GameRegistry.findItem("AWWayofTime", "imbuedSlate"); Item magicales = GameRegistry.findItem("AWWayofTime", "magicales"); Item aether = GameRegistry.findItem("AWWayofTime", "aether"); @@ -51,6 +50,7 @@ public class BloodMagic { Item crapOrb = GameRegistry.findItem("AWWayofTime", "weakBloodOrb"); Item demonShard = GameRegistry.findItem("AWWayofTime", "demonBloodShard"); Item bloodBucket = GameRegistry.findItem("AWWayofTime", "bucketLife"); + Item kamiOrb = GameRegistry.findItem("AWWayofTime", "transcendentBloodOrb"); if(Config.crossWand) { @@ -72,12 +72,13 @@ public class BloodMagic { (new DarkResearchItem("BLOODWELL", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.MIND, 4).add(Aspect.SENSES, 3), -10, 4, 1, new ItemStack(ForbiddenItems.bloodwell, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODWELL.1"), new ResearchPage(bloodwell_recipe) }).setParents(new String[] { "RESEARCH" }).setAspectTriggers(new Aspect[] { Aspect.LIFE }).setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("BLOODWELL", 1); - InfusionRecipe blood_rapier = ThaumcraftApi.addInfusionCraftingRecipe("BLOODRAPIER", new ItemStack(ForbiddenItems.bloodRapier, 1, 0), 8, (new AspectList()).add(Aspect.LIFE, 18).add(Aspect.HUNGER, 32).add(Aspect.WEAPON, 8), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[] { ItemApi.getItem("itemResource", 12), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.gluttonyShard, 1, 0), new ItemStack(Items.feather), ItemApi.getItem("itemResource", 6) }); + InfusionRecipe blood_rapier = ThaumcraftApi.addInfusionCraftingRecipe("BLOODRAPIER", new ItemStack(ForbiddenItems.bloodRapier, 1, 0), 8, (new AspectList()).add(Aspect.LIFE, 18).add(Aspect.HUNGER, 32).add(Aspect.WEAPON, 8), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 12), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.gluttonyShard, 1, 0), new ItemStack(Items.feather), new ItemStack(ConfigItems.itemResource, 1, 6) }); (new DarkResearchItem("BLOODRAPIER", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.HUNGER, 12).add(Aspect.WEAPON, 12).add(Aspect.MAGIC, 12), -9, 8, 4, new ItemStack(ForbiddenItems.bloodRapier, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODRAPIER.1"), new ResearchPage(blood_rapier) }).setParents(new String[] { "INFAUXSION", "VOIDMETAL" }).setConcealed().registerResearchItem(); - InfusionRecipe divine_orb = ThaumcraftApi.addInfusionCraftingRecipe("DIVINEORB", new ItemStack(ForbiddenItems.bloodOrb, 1, 0), 12, (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.ELDRITCH, 48).add(Aspect.DARKNESS, 32).add(Aspect.VOID, 64), new ItemStack(archmasterOrb), new ItemStack[] { ItemApi.getItem("itemEldritchObject", 0), new ItemStack(Items.ender_eye), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(Items.nether_star), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(Items.ender_eye) }); - (new DarkResearchItem("DIVINEORB", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 24).add(Aspect.VOID, 32).add(Aspect.CRYSTAL, 24).add(Aspect.ELDRITCH, 12), -9, 6, 6, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.DIVINEORB.1"), new ResearchPage(divine_orb) }).setParents(new String[] { "INFAUXSION", "ELDRITCHMAJOR", "VOIDMETAL" }).setConcealed().setSpecial().registerResearchItem(); - ThaumcraftApi.addWarpToResearch("DIVINEORB", 4); + InfusionRecipe eldritch_orb = ThaumcraftApi.addInfusionCraftingRecipe("ELDRITCHORB", new ItemStack(ForbiddenItems.bloodOrb, 1, 0), 12, (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.ELDRITCH, 48).add(Aspect.DARKNESS, 32).add(Aspect.VOID, 64), new ItemStack(kamiOrb), new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(ConfigItems.itemEldritchObject, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Items.nether_star), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemEldritchObject, 1, 0) }); + (new DarkResearchItem("ELDRITCHORB", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 24).add(Aspect.VOID, 32).add(Aspect.CRYSTAL, 24).add(Aspect.ELDRITCH, 12), -9, 6, 6, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ELDRITCHORB.1"), new ResearchPage(eldritch_orb) }).setParents(new String[] { "INFAUXSION", "PRIMPEARL", "VOIDMETAL" }).setConcealed().setSpecial().registerResearchItem(); + ThaumcraftApi.addWarpToResearch("ELDRITCHORB", 3); + ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenItems.bloodOrb), 5); BindingRegistry.registerRecipe(new ItemStack(ForbiddenItems.boundwell, 1, 0), new ItemStack(ForbiddenItems.crystalwell, 1, 0)); @@ -101,6 +102,9 @@ public class BloodMagic { list = (new AspectList()).add(Aspect.LIFE, 32).add(DarkAspects.NETHER, 4).add(Aspect.MAGIC, 8).add(Aspect.CRYSTAL, 4); aspectBloodItem("archmageBloodOrb", -1, list); + list = (new AspectList()).add(Aspect.LIFE, 32).add(DarkAspects.NETHER, 16).add(Aspect.MAGIC, 16).add(Aspect.CRYSTAL, 16); + ThaumcraftApi.registerObjectTag(new ItemStack(kamiOrb, 1, OreDictionary.WILDCARD_VALUE), list); + list = (new AspectList()).add(Aspect.ELDRITCH, 5).add(Aspect.WEAPON, 5).add(DarkAspects.WRATH, 5).add(Aspect.POISON, 1); aspectBloodItem("energySword", -1, list); diff --git a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java index f865273..ffbca69 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java +++ b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java @@ -157,8 +157,8 @@ public class ForbiddenItems { bloodwell = new ItemBloodwell().setUnlocalizedName("Bloodwell"); GameRegistry.registerItem(bloodwell, "Bloodwell"); - bloodOrb = new ItemDivineOrb().setUnlocalizedName("DivineOrb"); - GameRegistry.registerItem(bloodOrb, "DivineOrb"); + bloodOrb = new ItemDivineOrb().setUnlocalizedName("EldritchOrb"); + GameRegistry.registerItem(bloodOrb, "EldritchOrb"); boundwell = new ItemBoundwell().setUnlocalizedName("Boundwell"); GameRegistry.registerItem(boundwell, "Boundwell"); diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java index 155c2b1..574036a 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java @@ -22,8 +22,9 @@ import thaumcraft.api.IWarpingGear; public class ItemDivineOrb extends Item implements IBloodOrb, IBindable, IWarpingGear { public ItemDivineOrb() { - setCreativeTab(Forbidden.tab); - AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(this), 5, 140); + setMaxStackSize(1); + setCreativeTab(Forbidden.tab); + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(this), 6, 140); } @Override @@ -77,7 +78,7 @@ public class ItemDivineOrb extends Item implements IBloodOrb, IBindable, IWarpin @Override public int getOrbLevel() { - return 5; + return 6; } @Override @@ -90,6 +91,12 @@ public class ItemDivineOrb extends Item implements IBloodOrb, IBindable, IWarpin return EnumRarity.epic; } + @Override + public boolean hasContainerItem() + { + return true; + } + @Override public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) { diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang index ddca2cf..68ae803 100644 --- a/src/main/resources/assets/forbidden/lang/en_US.lang +++ b/src/main/resources/assets/forbidden/lang/en_US.lang @@ -37,7 +37,7 @@ item.DiabolistFork.name=Diabolist Fork item.DiabolistSpork.name=Spork of Doom item.GluttonyShard.name=Gluttony Shard item.Bloodwell.name=Bloody Scrivener's Tools -item.DivineOrb.name=Eldritch Blood Orb +item.EldritchOrb.name=Eldritch Blood Orb item.Crystalwell.name=Crystal Scribing Tools item.RidingCrop.name=Riding Crop item.BoundShears.name=Bound Shears @@ -260,9 +260,9 @@ forbidden.research_name.BLOODWELL=Bloody Scrivener's Tools forbidden.research_text.BLOODWELL="I'll complete this research if it kills me!" forbidden.research_page.BLOODWELL.1=There's nothing more frustrating than having to pause your research to refill your inkwell. Sometimes, you're just so desperate to complete a research you'd rather use your own blood as ink than stop to go find a refill.

The Bloody Scrivener's Tools will refill using Life Points from their owner's network, at a rate of 25 LP per point. This ability requires human warmth to activate, requiring you to remove the tools from the research table, but without having to actually leave the research area. # -forbidden.research_name.DIVINEORB=Eldritch Blood Orb -forbidden.research_text.DIVINEORB=Orb of Bel-Shamharoth -forbidden.research_page.DIVINEORB.1=Strange whispers speak of power and dark energy in the spaces between the stars where even gods dare not gaze. Whether or not the whispers are telling the truth, it turns out that you can fit a lot of things in those spaces.

By infusing a blood orb with the essence of the void and arcane geometries, you create an orb capable of storing vast amounts of life energy. 80,000,000 LP, to be exact. Storing life energy in a space not bound by Euclidean geometry can't possibly go wrong! +forbidden.research_name.ELDRITCHORB=Eldritch Blood Orb +forbidden.research_text.ELDRITCHORB=Orb of Bel-Shamharoth +forbidden.research_page.ELDRITCHORB.1=Strange whispers speak of power and dark energy in the spaces between the stars where even gods dare not gaze. Whether or not the whispers are telling the truth, it turns out that you can fit a lot of things in those spaces.

By infusing a blood orb with the essence of the void and arcane geometries, you create an orb capable of storing vast amounts of life energy. 80,000,000 LP, to be exact. Storing life energy in a space not bound by Euclidean geometry can't possibly go wrong! # forbidden.research_name.BLOODRAPIER=Rapier of the Strix forbidden.research_text.BLOODRAPIER=Destroyer of Blood Magic diff --git a/src/main/resources/assets/forbidden/lang/fr_FR.lang b/src/main/resources/assets/forbidden/lang/fr_FR.lang index 313fe3f..b99eb12 100644 --- a/src/main/resources/assets/forbidden/lang/fr_FR.lang +++ b/src/main/resources/assets/forbidden/lang/fr_FR.lang @@ -36,7 +36,7 @@ item.DiabolistFork.name=Fouche du diaboliste item.DiabolistSpork.name=Cuillère-fourchette de la perte item.GluttonyShard.name=Tesson de gloutonnerie item.Bloodwell.name=Outils du scribe sanglant -item.DivineOrb.name=orbe sanglante d'Eldritch +item.EldritchOrb.name=orbe sanglante d'Eldritch item.Crystalwell.name=outils d'écriture en cristal item.RidingCrop.name=Cravache item.BoundShears.name=Ciselles attachées @@ -244,9 +244,9 @@ forbidden.research_name.BLOODWELL=Bloody Scrivener's Tools forbidden.research_text.BLOODWELL="I'll complete this research if it kills me!" forbidden.research_page.BLOODWELL.1=There's nothing more frustrating than having to pause your research to refill your inkwell. Sometimes, you're just so desperate to complete a research you'd rather use your own blood as ink than stop to go find a refill.

The Bloody Scrivener's Tools will refill using Life Points from their owner's network, at a rate of 25 LP per point. This ability requires human warmth to activate, requiring you to remove the tools from the research table, but without having to actually leave the research area. # -forbidden.research_name.DIVINEORB=Eldritch Blood Orb -forbidden.research_text.DIVINEORB=Orb of Bel-Shamharoth -forbidden.research_page.DIVINEORB.1=Strange whispers speak of power and dark energy in the spaces between the stars where even gods dare not gaze. Whether or not the whispers are telling the truth, it turns out that you can fit a lot of things in those spaces.

By infusing a blood orb with the essence of the void and arcane geometries, you create an orb capable of storing vast amounts of life energy. 80,000,000 LP, to be exact. Storing life energy in a space not bound by Euclidean geometry can't possibly go wrong! +forbidden.research_name.ELDRITCHORB=Eldritch Blood Orb +forbidden.research_text.ELDRITCHORB=Orb of Bel-Shamharoth +forbidden.research_page.ELDRITCHORB.1=Strange whispers speak of power and dark energy in the spaces between the stars where even gods dare not gaze. Whether or not the whispers are telling the truth, it turns out that you can fit a lot of things in those spaces.

By infusing a blood orb with the essence of the void and arcane geometries, you create an orb capable of storing vast amounts of life energy. 80,000,000 LP, to be exact. Storing life energy in a space not bound by Euclidean geometry can't possibly go wrong! # forbidden.research_name.BLOODRAPIER=Rapier of the Strix forbidden.research_text.BLOODRAPIER=Destroyer of Blood Magic diff --git a/src/main/resources/assets/forbidden/lang/ru_RU.lang b/src/main/resources/assets/forbidden/lang/ru_RU.lang index b4b56cf..0b9dd89 100644 --- a/src/main/resources/assets/forbidden/lang/ru_RU.lang +++ b/src/main/resources/assets/forbidden/lang/ru_RU.lang @@ -37,7 +37,7 @@ item.DiabolistFork.name=Адские вилы item.DiabolistSpork.name=Ложка-вилка смерти item.GluttonyShard.name=Осколок прожорливости item.Bloodwell.name=Инструменты кровавого писца -item.DivineOrb.name=Древний шар крови +item.EldritchOrb.name=Древний шар крови item.Crystalwell.name=Кристальная чернильница с пером item.RidingCrop.name=Хлыст item.BoundShears.name=Связанные ножницы @@ -260,9 +260,9 @@ forbidden.research_name.BLOODWELL=Кровавые инструменты пис forbidden.research_text.BLOODWELL="Я завершу это исследование, если оно убьёт меня!" forbidden.research_page.BLOODWELL.1=Нет ничего более ужасного, чем приостановка исследования для пополнения своей чернильницы. Иногда, Вы так отчаянно хотите завершить своё исследование, что Вы предпочли бы использовать свою кровь вместо чернил, а не идти перезаправлять чернильницу.

Кровавые инструменты писаря будут заправляться, используя LP их владельца, со скоростью 25 LP за очко. Эта способность требует человеческого тепла, для этого Вам нужно убрать инструменты из стола исследований, но Вам не нужно покидать зону исследования. # -forbidden.research_name.DIVINEORB=Древний кровавый шар -forbidden.research_text.DIVINEORB=Шар пожирателя душ -forbidden.research_page.DIVINEORB.1=Прошёл шёпот в ряду кругов тауматургов, что Ихор на самом деле кровь Бога. Вы не знаете правда это или нет, но Ихор, кажется, имеет родство с более продвинутыми алхимическими устройствами.

Древний кровавый шар - вот что получается, когда Вы соединяете продвинутую тауматургию и алхимическое колдовство. Наполнение значительно увеличивает ёмкость шара, позволяя ему хранить колоссальные 70,000,000 LP. Для чего Вам нужно столько LP? +forbidden.research_name.ELDRITCHORB=Древний кровавый шар +forbidden.research_text.ELDRITCHORB=Шар пожирателя душ +forbidden.research_page.ELDRITCHORB.1=Прошёл шёпот в ряду кругов тауматургов, что Ихор на самом деле кровь Бога. Вы не знаете правда это или нет, но Ихор, кажется, имеет родство с более продвинутыми алхимическими устройствами.

Древний кровавый шар - вот что получается, когда Вы соединяете продвинутую тауматургию и алхимическое колдовство. Наполнение значительно увеличивает ёмкость шара, позволяя ему хранить колоссальные 70,000,000 LP. Для чего Вам нужно столько LP? # forbidden.research_name.BLOODRAPIER=Рапира неясыти forbidden.research_text.BLOODRAPIER=Уничтожитель Blood Magic diff --git a/src/main/resources/assets/forbidden/lang/zh_CN.lang b/src/main/resources/assets/forbidden/lang/zh_CN.lang index 7794e48..ee26c34 100644 --- a/src/main/resources/assets/forbidden/lang/zh_CN.lang +++ b/src/main/resources/assets/forbidden/lang/zh_CN.lang @@ -36,7 +36,7 @@ item.DiabolistFork.name=妖魔之叉 item.DiabolistSpork.name=劫难叉勺 item.GluttonyShard.name=饕餮碎片 item.Bloodwell.name=血腥之笔与墨 -item.DivineOrb.name=邪术气血宝珠 +item.EldritchOrb.name=邪术气血宝珠 item.Crystalwell.name=水晶笔与墨 item.RidingCrop.name=马鞭 item.Divinewell.name=图特之笔 @@ -245,9 +245,9 @@ forbidden.research_name.BLOODWELL=血腥之笔与墨 forbidden.research_text.BLOODWELL="如若它杀了我,我便能完成这项研究!" forbidden.research_page.BLOODWELL.1=没有比研究到一半却需要补充墨水更令人沮丧的事情了.有时候,你宁可使用自己的血来代替墨水也不愿意中断研究去找墨水.

血腥之笔与墨将能够使用生命点来补充墨水，每25个生命点补充一点墨水.但这项能力需要用体温激活,因此填充墨水时需要你从研究台中取出这个工具,但却实际上不会因此中断研究. # -forbidden.research_name.DIVINEORB=邪术气血宝珠 -forbidden.research_text.DIVINEORB=噬灵者的宝珠 -forbidden.research_page.DIVINEORB.1=即便是神也不敢遥望的星隙之间,奇怪的低语吐诉着黑暗之力.不管其所说是否属实,它让你清楚这些空间能被注入许多东西.

通过给一个气血宝珠注入虚空之力,塑以奥术之形,你创造出了一个能储存巨量生命能量的宝珠.足足有80,000,000 LP的储量.将生命能量存于不受欧几里得几何所局限的空间之内是不可能出错的! +forbidden.research_name.ELDRITCHORB=邪术气血宝珠 +forbidden.research_text.ELDRITCHORB=噬灵者的宝珠 +forbidden.research_page.ELDRITCHORB.1=即便是神也不敢遥望的星隙之间,奇怪的低语吐诉着黑暗之力.不管其所说是否属实,它让你清楚这些空间能被注入许多东西.

通过给一个气血宝珠注入虚空之力,塑以奥术之形,你创造出了一个能储存巨量生命能量的宝珠.足足有80,000,000 LP的储量.将生命能量存于不受欧几里得几何所局限的空间之内是不可能出错的! # forbidden.research_name.BLOODRAPIER=血鸮西洋剑 forbidden.research_text.BLOODRAPIER=血魔法的克星