From 15650bac8be1f47759c2aaba8ae51a5dace3a2eb Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 16 Feb 2016 11:46:47 -0500 Subject: [PATCH] Amended range of Zephyr ritual Fixed Green Grove ritual Fixed Crusher ritual so it didn't break everything at once. --- changelog.txt | 3 +++ src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 4 ++-- src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java | 4 +++- .../java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java | 4 ++-- src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changelog.txt b/changelog.txt index 8e7b31d3..87af07fc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,9 @@ Version 2.0.0-18 - Added Ritual: Ritual of Living Evolution, which is used to set the living armour's max upgrade points to 300. - Added tooltip to living armour to show the current upgrade points of the armour. - Added recipe for the training bracelet. Combine in an anvil with an upgrade tome to set it as the upgrade to train. +- Ammended range of Zephyr ritual +- Fixed Green Grove ritual +- Fixed Crusher ritual so it didn't break everything at once. ------------------------------------------------------ Version 2.0.0-17 diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index e840da2f..e9598e26 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -71,7 +71,7 @@ public class BloodAltar implements IFluidHandler private int chargingFrequency = 0; private int maxCharge = 0; - private int cooldownAfterCrafting = 500; + private int cooldownAfterCrafting = 60; private ItemStack result; @@ -457,7 +457,7 @@ public class BloodAltar implements IFluidHandler server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0, new int[0]); } - this.cooldownAfterCrafting = 100; + this.cooldownAfterCrafting = 30; this.isActive = false; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index 5925556c..8ddc6e66 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -29,7 +29,7 @@ public class RitualCrushing extends Ritual public RitualCrushing() { - super("ritualCrushing", 0, 2500, "ritual." + Constants.Mod.MODID + ".crushingRitual"); + super("ritualCrushing", 0, 5000, "ritual." + Constants.Mod.MODID + ".crushingRitual"); addBlockRange(CRUSHING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, -3, -1), 3)); } @@ -113,6 +113,8 @@ public class RitualCrushing extends Ritual } world.setBlockToAir(newPos); + + break; } network.syphon(getRefreshCost()); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 8d738dc4..92f1f989 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -52,7 +52,7 @@ public class RitualGreenGrove extends Ritual IBlockState state = world.getBlockState(newPos); Block block = state.getBlock(); - if (BloodMagicAPI.getGreenGroveBlacklist().contains(block)) + if (!BloodMagicAPI.getGreenGroveBlacklist().contains(block)) { if (block instanceof IPlantable || block instanceof IGrowable) { @@ -79,7 +79,7 @@ public class RitualGreenGrove extends Ritual @Override public int getRefreshCost() { - return 20; + return 5; //TODO: Need to find a way to balance this } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index 8997b2e2..0ff738a7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -23,7 +23,7 @@ public class RitualZephyr extends Ritual public RitualZephyr() { super("ritualZephyr", 0, 1000, "ritual." + Constants.Mod.MODID + ".zephyrRitual"); - addBlockRange(ZEPHYR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-4, 1, -4), 10)); + addBlockRange(ZEPHYR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11)); } @Override