From fb3d719f2c4f94f845ed0d1489cb3f012e853f8f Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Wed, 8 Jun 2016 19:37:45 +0300 Subject: [PATCH] Added config options for count of upgrades for Draconic Tools --- .../common/handler/BalanceConfigHandler.java | 30 +++++++++++++++++ .../common/items/tools/DraconicAxe.java | 32 +++++++++++++----- .../common/items/tools/DraconicHoe.java | 18 ++++++---- .../common/items/tools/DraconicPickaxe.java | 31 ++++++++++++----- .../common/items/tools/DraconicShovel.java | 33 +++++++++++++------ 5 files changed, 110 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java index 7be13159..903ac607 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java @@ -15,6 +15,12 @@ public class BalanceConfigHandler public static final int wyvernToolsMaxDigAOEUpgradePoints = 2; public static final int wyvernToolsMinDigSpeedUpgradePoints = 4; public static final int wyvernToolsMaxDigSpeedUpgradePoints = 16; + public static final int draconicToolsMinDigAOEUpgradePoints = 2; + public static final int draconicToolsMaxDigAOEUpgradePoints = 4; + public static final int draconicToolsMinDigSpeedUpgradePoints = 5; + public static final int draconicToolsMaxDigSpeedUpgradePoints = 32; + public static final int draconicToolsMinDigDepthUpgradePoints = 1; + public static final int draconicToolsMaxDigDepthUpgradePoints = 5; public static int wyvernArmorBaseStorage = 1000000; public static int wyvernArmorStoragePerUpgrade = 500000; public static int wyvernArmorMaxTransfer = 50000; @@ -69,6 +75,9 @@ public class BalanceConfigHandler public static int wyvernToolsMaxCapacityUpgradePoints = 50; public static int wyvernToolsMaxUpgrades = 3; public static int wyvernToolsMaxUpgradePoints = 50; + public static int draconicToolsMaxCapacityUpgradePoints = 50; + public static int draconicToolsMaxUpgrades = 6; + public static int draconicToolsMaxUpgradePoints = 50; public static int wyvernCapacitorMaxUpgrades = 3; public static int draconicCapacitorMaxUpgrades = 6; public static int fluxCapacitorMaxUpgradePoints = 50; @@ -237,6 +246,27 @@ public class BalanceConfigHandler wyvernToolsMaxUpgradePoints - (wyvernToolsMaxDigAOEUpgradePoints - wyvernToolsMinDigAOEUpgradePoints) - (wyvernToolsMaxDigSpeedUpgradePoints - wyvernToolsMinDigSpeedUpgradePoints), wyvernToolsMaxCapacityUpgradePoints), 0); + draconicToolsMaxCapacityUpgradePoints = (int) Math.floor( + (double) (Integer.MAX_VALUE - draconicToolsBaseStorage) / + (double) Math.max(draconicToolsStoragePerUpgrade, 1)); + draconicToolsMaxUpgrades = + getInteger("tweaks.tools", "Draconic Tools: Maximum amount of upgrades", draconicToolsMaxUpgrades, 0, + (int) Math.ceil( + (double) ((draconicToolsMaxDigAOEUpgradePoints - draconicToolsMinDigAOEUpgradePoints) + + (draconicToolsMaxDigSpeedUpgradePoints - draconicToolsMinDigSpeedUpgradePoints) + + (draconicToolsMaxDigDepthUpgradePoints - draconicToolsMinDigDepthUpgradePoints) + + draconicToolsMaxCapacityUpgradePoints) / 4D)); + draconicToolsMaxUpgradePoints = getInteger("tweaks.tools", "Draconic Tools: Maximum amount of upgrade points", + draconicToolsMaxUpgradePoints, draconicToolsMaxUpgrades * 4, + Integer.MAX_VALUE); + draconicToolsMaxCapacityUpgradePoints = Math.max(Math.min(draconicToolsMaxUpgradePoints - + (draconicToolsMaxDigAOEUpgradePoints - + draconicToolsMinDigAOEUpgradePoints) - + (draconicToolsMaxDigSpeedUpgradePoints - + draconicToolsMinDigSpeedUpgradePoints) - + (draconicToolsMaxDigDepthUpgradePoints - + draconicToolsMinDigDepthUpgradePoints), + draconicToolsMaxCapacityUpgradePoints), 0); int wyvernCapacitorUpgradesLimit = (int) Math.floor((double) (Integer.MAX_VALUE - wyvernCapacitorBaseStorage) / (double) Math.max(wyvernCapacitorStoragePerUpgrade, 1) / 2D); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java index 38828565..625d09a9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java @@ -75,7 +75,7 @@ public class DraconicAxe extends MiningTool implements IInventoryTool, IRenderTw @Override public int getUpgradeCap(ItemStack itemstack) { - return References.MAX_DRACONIC_UPGRADES; + return BalanceConfigHandler.draconicToolsMaxUpgrades; } @Override @@ -96,18 +96,32 @@ public class DraconicAxe extends MiningTool implements IInventoryTool, IRenderTw @Override public int getMaxUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 4; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 7; - return 50; + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return BalanceConfigHandler.draconicToolsMaxCapacityUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMaxDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicToolsMaxDigDepthUpgradePoints + 2; + } + if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) { + return BalanceConfigHandler.draconicToolsMaxDigSpeedUpgradePoints; + } + return BalanceConfigHandler.draconicToolsMaxUpgradePoints; } @Override public int getBaseUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 0; - else if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 2; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 1; - else if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) return 5; - + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMinDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicToolsMinDigDepthUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) { + return BalanceConfigHandler.draconicToolsMinDigSpeedUpgradePoints; + } return 0; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java index 0d244edd..8d5ad58a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java @@ -288,7 +288,7 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende @Override public int getUpgradeCap(ItemStack itemstack) { - return References.MAX_DRACONIC_UPGRADES; + return BalanceConfigHandler.draconicToolsMaxUpgrades; } @Override @@ -298,16 +298,20 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende @Override public int getMaxUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 5; - - return 50; + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return BalanceConfigHandler.draconicToolsMaxCapacityUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMaxDigAOEUpgradePoints + 1; + } + return BalanceConfigHandler.draconicToolsMaxUpgradePoints; } @Override public int getBaseUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 0; - else if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 3; - + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMinDigAOEUpgradePoints + 1; + } return 0; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java index 3469fcdf..fbc64e99 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java @@ -78,7 +78,7 @@ public class DraconicPickaxe extends MiningTool implements IInventoryTool, IRend @Override public int getUpgradeCap(ItemStack itemstack) { - return References.MAX_DRACONIC_UPGRADES; + return BalanceConfigHandler.draconicToolsMaxUpgrades; } @Override @@ -99,17 +99,32 @@ public class DraconicPickaxe extends MiningTool implements IInventoryTool, IRend @Override public int getMaxUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 4; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 5; - return 50; + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return BalanceConfigHandler.draconicToolsMaxCapacityUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMaxDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicToolsMaxDigDepthUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) { + return BalanceConfigHandler.draconicToolsMaxDigSpeedUpgradePoints; + } + return BalanceConfigHandler.draconicToolsMaxUpgradePoints; } @Override public int getBaseUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 0; - else if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 2; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 1; - else if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) return 5; + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMinDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicToolsMinDigDepthUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) { + return BalanceConfigHandler.draconicToolsMinDigSpeedUpgradePoints; + } return 0; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java index c70d410e..2d8d6374 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java @@ -82,7 +82,7 @@ public class DraconicShovel extends MiningTool implements IInventoryTool, IRende @Override public int getUpgradeCap(ItemStack itemstack) { - return References.MAX_DRACONIC_UPGRADES; + return BalanceConfigHandler.draconicToolsMaxUpgrades; } @Override @@ -103,19 +103,32 @@ public class DraconicShovel extends MiningTool implements IInventoryTool, IRende @Override public int getMaxUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 4; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 5; - - return 50; + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return BalanceConfigHandler.draconicToolsMaxCapacityUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMaxDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicToolsMaxDigDepthUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) { + return BalanceConfigHandler.draconicToolsMaxDigSpeedUpgradePoints; + } + return BalanceConfigHandler.draconicToolsMaxUpgradePoints; } @Override public int getBaseUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 0; - else if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 2; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 1; - else if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) return 5; - + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicToolsMinDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicToolsMinDigDepthUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_SPEED.index) { + return BalanceConfigHandler.draconicToolsMinDigSpeedUpgradePoints; + } return 0; } // @Override