From b5f7344ca6dcabc0f38376901bf6a4a7c37738b2 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 5 Oct 2016 16:38:58 -0400 Subject: [PATCH] Added a Dig Slowdown armour downgrade called "Weakened Pick", trained by having weakness on while mining. Also expanded Dwarven Might so that it can get to level 10. --- changelog.txt | 1 + .../livingArmour/tracker/StatTrackerDigging.java | 4 ++-- .../livingArmour/upgrade/LivingArmourUpgradeDigging.java | 8 ++++---- .../WayofTime/bloodmagic/registry/ModArmourTrackers.java | 4 ++++ .../bloodmagic/util/handler/event/StatTrackerHandler.java | 8 +++++++- src/main/resources/assets/bloodmagic/lang/en_US.lang | 1 + 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/changelog.txt b/changelog.txt index a975b7ce..cd7b2039 100644 --- a/changelog.txt +++ b/changelog.txt @@ -7,6 +7,7 @@ Version 2.1.0-66 - Modified the Grim Reaper's Sprint so it is better at later levels. - Added a Repairing Living Armour Upgrade (trained by damaging the chestplate of the Living Armour while you have a full set on - it repairs all of your armour pieces over time) - Modified the Dwarven Might skill to better change the mining speed when mining. +- Added a Dig Slowdown armour downgrade called "Weakened Pick", trained by having weakness on while mining. ------------------------------------------------------ Version 2.1.0-65 diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index 0d2904c5..8241ce84 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -19,7 +19,7 @@ public class StatTrackerDigging extends StatTracker public int totalBlocksDug = 0; public static HashMap changeMap = new HashMap(); - public static int[] blocksRequired = new int[] { 128, 512, 1024, 2048, 8192, 16000, 32000 }; + public static int[] blocksRequired = new int[] { 128, 512, 1024, 2048, 8192, 16000, 32000, 50000, 80000, 150000 }; public static void incrementCounter(LivingArmour armour) { @@ -85,7 +85,7 @@ public class StatTrackerDigging extends StatTracker { List upgradeList = new ArrayList(); - for (int i = 0; i < 5; i++) + for (int i = 0; i < 10; i++) { if (totalBlocksDug >= blocksRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index 0f66d0fa..7f545d90 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -16,9 +16,9 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { public static HashMap changeMap = new HashMap(); - public static final int[] costs = new int[] { 5, 10, 18, 35, 65, 100, 160 }; - public static final int[] digSpeedTime = new int[] { 0, 60, 60, 100, 100, 100, 100 }; - public static final int[] digSpeedLevel = new int[] { 0, 0, 0, 1, 1, 1, 1 }; + public static final int[] costs = new int[] { 5, 10, 18, 32, 60, 90, 140, 180, 240, 300 }; + public static final int[] digSpeedTime = new int[] { 0, 50, 60, 100, 100, 100, 100, 150, 150, 150 }; + public static final int[] digSpeedLevel = new int[] { 0, 0, 0, 1, 1, 1, 1, 1, 2, 2 }; public static final double[] digSpeedModifier = new double[] { 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 2, 2.2, 2.5 }; @@ -61,7 +61,7 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade @Override public int getMaxTier() { - return 5; // Set to here until I can add more upgrades to it. + return 10; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index 26a02b80..b555fc0d 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDigSlowdown; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDisoriented; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; @@ -30,6 +31,7 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSprintAttack; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerStepAssist; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerBattleHungry; +import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerDigSlowdown; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerMeleeDecrease; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerQuenched; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerSlowness; @@ -86,6 +88,7 @@ public class ModArmourTrackers LivingArmourHandler.registerStatTracker(StatTrackerSlowness.class); LivingArmourHandler.registerStatTracker(StatTrackerBattleHungry.class); LivingArmourHandler.registerStatTracker(StatTrackerQuenched.class); + LivingArmourHandler.registerStatTracker(StatTrackerDigSlowdown.class); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSpeed(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigging(0)); @@ -117,5 +120,6 @@ public class ModArmourTrackers LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeQuenched(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeMeleeDecrease(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDisoriented(0)); + LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigSlowdown(0)); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index 1921727d..1cd5c15d 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -35,6 +35,7 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSprintAttack; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerBattleHungry; +import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerDigSlowdown; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerMeleeDecrease; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; @@ -46,7 +47,7 @@ public class StatTrackerHandler private static float lastPlayerSwingStrength = 0; - // Tracks: Digging + // Tracks: Digging, DigSlowdown @SubscribeEvent public void blockBreakEvent(BlockEvent.BreakEvent event) { @@ -64,6 +65,11 @@ public class StatTrackerHandler { StatTrackerDigging.incrementCounter(armour); LivingArmourUpgradeDigging.hasDug(armour); + + if (player.isPotionActive(MobEffects.MINING_FATIGUE)) + { + StatTrackerDigSlowdown.incrementCounter(armour); + } } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index f9bc5146..c4658e6d 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -495,6 +495,7 @@ tooltip.BloodMagic.livingArmour.upgrade.slippery=Loose Traction tooltip.BloodMagic.livingArmour.upgrade.battleHunger=Battle Hungry tooltip.BloodMagic.livingArmour.upgrade.quenched=Quenched tooltip.BloodMagic.livingArmour.upgrade.meleeDecrease=Dulled Blade +tooltip.BloodMagic.livingArmour.upgrade.digSlowdown=Weakened Pick tooltip.BloodMagic.livingArmour.upgrade.level=%s (Level %d) tooltip.BloodMagic.livingArmour.upgrade.progress=%s (%d/100) tooltip.BloodMagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s