From 4bf8e94d26378243b331a10d08652120e0310ff0 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 02:13:24 +0100 Subject: [PATCH] Changed required Activation Crystal levels for Ritual Activation (#1456) These Rituals will require an Awakened Activation Crystal: From 1.7.10: - RitualMeteor (Mark of the falling Tower) New: - all Living Armor related Rituals (because it is the most end-game/powerful stuff right now). I changed the Activation Crystal level for the Living Armor related rituals based on the (old) Bound Armor related rituals. Remaining (non-ported) Rituals (from 1.7.10) that require an Awakened Activation Crystal: NOTE: Some of those Rituals represent an outdated concept, don't assume that they will be ported. - DrillOfTheDead (Sanguimancy - More powerful version of Well of Suffering) - AW016FeatheredEarth (no fall damage?); "Ritual of the Feathered Earth" - AW017Gaia (no idea); "Ritual of Gaia's Transformation" - AW018Condor (localized creative flight); "Ritual of the Condor" - AW025Conduit (transferring LP from network to Altar); "Cry of the Eternal Soul" - AW031Convocation (how do I get Tier6?); "Convocation of the Damned" - AW032Symmetry (Omega upgrade for Bound Armor); "Symmetry of the Omega" - AW033Stalling (permanent Omega upgrade?); "Duet of the Fused Souls" - AW036SphereIsland (Shard of Laputa alike); "Blood of the New Moon" --- .../bloodmagic/ritual/types/RitualArmourEvolve.java | 2 +- .../ritual/types/RitualLivingArmourDowngrade.java | 6 +++--- .../WayofTime/bloodmagic/ritual/types/RitualMeteor.java | 3 ++- .../bloodmagic/ritual/types/RitualUpgradeRemove.java | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java index 77251191..8f2ed0a5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java @@ -19,7 +19,7 @@ public class RitualArmourEvolve extends Ritual { public static final String CHECK_RANGE = "fillRange"; public RitualArmourEvolve() { - super("ritualArmourEvolve", 0, 50000, "ritual." + BloodMagic.MODID + ".armourEvolveRitual"); + super("ritualArmourEvolve", 2, 50000, "ritual." + BloodMagic.MODID + ".armourEvolveRitual"); addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index ea2da47c..0d633b79 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; @@ -33,7 +33,7 @@ public class RitualLivingArmourDowngrade extends Ritual { private int internalTimer = 0; public RitualLivingArmourDowngrade() { - super("ritualDowngrade", 0, 10000, "ritual." + BloodMagic.MODID + ".downgradeRitual"); + super("ritualDowngrade", 2, 10000, "ritual." + BloodMagic.MODID + ".downgradeRitual"); addBlockRange(DOWNGRADE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 0, -3), 7)); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index 9cffa010..9579495f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -22,7 +22,8 @@ public class RitualMeteor extends Ritual { public static final double destructiveWillDrain = 50; public RitualMeteor() { - super("ritualMeteor", 0, 0, "ritual." + BloodMagic.MODID + ".meteorRitual"); + super("ritualMeteor", 2, 0, "ritual." + BloodMagic.MODID + ".meteorRitual"); + addBlockRange(ITEM_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); setMaximumVolumeAndDistanceOfRange(ITEM_RANGE, 0, 10, 10); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java index c8e210ef..1addb3c6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; @@ -26,7 +26,7 @@ public class RitualUpgradeRemove extends Ritual { public static final String CHECK_RANGE = "fillRange"; public RitualUpgradeRemove() { - super("ritualUpgradeRemove", 0, 25000, "ritual." + BloodMagic.MODID + ".upgradeRemoveRitual"); + super("ritualUpgradeRemove", 2, 25000, "ritual." + BloodMagic.MODID + ".upgradeRemoveRitual"); addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); }