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.

This commit is contained in:
WayofTime 2016-10-05 16:38:58 -04:00
parent f9b1b91c6d
commit b5f7344ca6
6 changed files with 19 additions and 7 deletions

View file

@ -7,6 +7,7 @@ Version 2.1.0-66
- Modified the Grim Reaper's Sprint so it is better at later levels. - 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) - 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. - 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 Version 2.1.0-65

View file

@ -19,7 +19,7 @@ public class StatTrackerDigging extends StatTracker
public int totalBlocksDug = 0; public int totalBlocksDug = 0;
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>(); public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
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) public static void incrementCounter(LivingArmour armour)
{ {
@ -85,7 +85,7 @@ public class StatTrackerDigging extends StatTracker
{ {
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>(); List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
for (int i = 0; i < 5; i++) for (int i = 0; i < 10; i++)
{ {
if (totalBlocksDug >= blocksRequired[i]) if (totalBlocksDug >= blocksRequired[i])
{ {

View file

@ -16,9 +16,9 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade
{ {
public static HashMap<ILivingArmour, Boolean> changeMap = new HashMap<ILivingArmour, Boolean>(); public static HashMap<ILivingArmour, Boolean> changeMap = new HashMap<ILivingArmour, Boolean>();
public static final int[] costs = new int[] { 5, 10, 18, 35, 65, 100, 160 }; 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, 60, 60, 100, 100, 100, 100 }; 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 }; 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 }; 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 @Override
public int getMaxTier() public int getMaxTier()
{ {
return 5; // Set to here until I can add more upgrades to it. return 10;
} }
@Override @Override

View file

@ -3,6 +3,7 @@ package WayofTime.bloodmagic.registry;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDigSlowdown;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDisoriented; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDisoriented;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; 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.StatTrackerSprintAttack;
import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerStepAssist; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerStepAssist;
import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerBattleHungry; 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.StatTrackerMeleeDecrease;
import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerQuenched; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerQuenched;
import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerSlowness; import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerSlowness;
@ -86,6 +88,7 @@ public class ModArmourTrackers
LivingArmourHandler.registerStatTracker(StatTrackerSlowness.class); LivingArmourHandler.registerStatTracker(StatTrackerSlowness.class);
LivingArmourHandler.registerStatTracker(StatTrackerBattleHungry.class); LivingArmourHandler.registerStatTracker(StatTrackerBattleHungry.class);
LivingArmourHandler.registerStatTracker(StatTrackerQuenched.class); LivingArmourHandler.registerStatTracker(StatTrackerQuenched.class);
LivingArmourHandler.registerStatTracker(StatTrackerDigSlowdown.class);
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSpeed(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSpeed(0));
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigging(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigging(0));
@ -117,5 +120,6 @@ public class ModArmourTrackers
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeQuenched(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeQuenched(0));
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeMeleeDecrease(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeMeleeDecrease(0));
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDisoriented(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDisoriented(0));
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigSlowdown(0));
} }
} }

View file

@ -35,6 +35,7 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect;
import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered;
import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSprintAttack; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSprintAttack;
import WayofTime.bloodmagic.livingArmour.tracker.downgrade.StatTrackerBattleHungry; 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.StatTrackerMeleeDecrease;
import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging;
import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience;
@ -46,7 +47,7 @@ public class StatTrackerHandler
private static float lastPlayerSwingStrength = 0; private static float lastPlayerSwingStrength = 0;
// Tracks: Digging // Tracks: Digging, DigSlowdown
@SubscribeEvent @SubscribeEvent
public void blockBreakEvent(BlockEvent.BreakEvent event) public void blockBreakEvent(BlockEvent.BreakEvent event)
{ {
@ -64,6 +65,11 @@ public class StatTrackerHandler
{ {
StatTrackerDigging.incrementCounter(armour); StatTrackerDigging.incrementCounter(armour);
LivingArmourUpgradeDigging.hasDug(armour); LivingArmourUpgradeDigging.hasDug(armour);
if (player.isPotionActive(MobEffects.MINING_FATIGUE))
{
StatTrackerDigSlowdown.incrementCounter(armour);
}
} }
} }
} }

View file

@ -495,6 +495,7 @@ tooltip.BloodMagic.livingArmour.upgrade.slippery=Loose Traction
tooltip.BloodMagic.livingArmour.upgrade.battleHunger=Battle Hungry tooltip.BloodMagic.livingArmour.upgrade.battleHunger=Battle Hungry
tooltip.BloodMagic.livingArmour.upgrade.quenched=Quenched tooltip.BloodMagic.livingArmour.upgrade.quenched=Quenched
tooltip.BloodMagic.livingArmour.upgrade.meleeDecrease=Dulled Blade 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.level=%s (Level %d)
tooltip.BloodMagic.livingArmour.upgrade.progress=%s (%d/100) tooltip.BloodMagic.livingArmour.upgrade.progress=%s (%d/100)
tooltip.BloodMagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s tooltip.BloodMagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s