From 64fcc1f2adb3cba4ac65ffbe15b7e093918df606 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Thu, 9 Jun 2016 10:42:28 +0300 Subject: [PATCH] Added config options for count of upgrades for Draconic Staff --- .../common/handler/BalanceConfigHandler.java | 31 ++++++++++++++ .../items/tools/DraconicDistructionStaff.java | 40 ++++++++++++++----- .../common/lib/References.java | 1 - 3 files changed, 60 insertions(+), 12 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 9d458a14..58900738 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java @@ -42,6 +42,14 @@ public class BalanceConfigHandler public static final int draconicBowMaxArrowSpeedUpgradePoints = 10; public static final int draconicBowMinArrowDamageUpgradePoints = 3; public static final int draconicBowMaxArrowDamageUpgradePoints = 20; + public static final int draconicStaffMinDigAOEUpgradePoints = 3; + public static final int draconicStaffMaxDigAOEUpgradePoints = 5; + public static final int draconicStaffMinDigDepthUpgradePoints = 7; + public static final int draconicStaffMaxDigDepthUpgradePoints = 11; + public static final int draconicStaffMinAttackAOEUpgradePoints = 3; + public static final int draconicStaffMaxAttackAOEUpgradePoints = 13; + public static final int draconicStaffMinAttackDamageUpgradePoints = 0; + public static final int draconicStaffMaxAttackDamageUpgradePoints = 64; public static int wyvernArmorBaseStorage = 1000000; public static int wyvernArmorStoragePerUpgrade = 500000; public static int wyvernArmorMaxTransfer = 50000; @@ -111,6 +119,9 @@ public class BalanceConfigHandler public static int draconicBowMaxCapacityUpgradePoints = 50; public static int draconicBowMaxUpgrades = 6; public static int draconicBowMaxUpgradePoints = 50; + public static int draconicStaffMaxCapacityUpgradePoints = 50; + public static int draconicStaffMaxUpgrades = 12; + public static int draconicStaffMaxUpgradePoints = 50; public static int wyvernCapacitorMaxUpgrades = 3; public static int draconicCapacitorMaxUpgrades = 6; public static int fluxCapacitorMaxUpgradePoints = 50; @@ -401,6 +412,26 @@ public class BalanceConfigHandler draconicBowMinArrowDamageUpgradePoints) * EnumUpgrade.ARROW_DAMAGE.pointConversion, draconicBowMaxCapacityUpgradePoints), 0); + draconicStaffMaxCapacityUpgradePoints = (int) Math.floor( + (double) (Integer.MAX_VALUE - draconicToolsBaseStorage * 2 - draconicWeaponsBaseStorage) / + (double) Math.max(draconicToolsStoragePerUpgrade + draconicWeaponsStoragePerUpgrade, 1)) * + EnumUpgrade.RF_CAPACITY.pointConversion; + draconicStaffMaxUpgrades = draconicToolsMaxUpgrades + draconicWeaponsMaxUpgrades; + draconicStaffMaxUpgradePoints = draconicToolsMaxUpgradePoints + draconicWeaponsMaxUpgradePoints; + draconicStaffMaxCapacityUpgradePoints = Math.max(Math.min(draconicStaffMaxUpgradePoints - + (draconicStaffMaxDigAOEUpgradePoints - + draconicStaffMinDigAOEUpgradePoints) * + EnumUpgrade.DIG_AOE.pointConversion - + (draconicStaffMaxDigDepthUpgradePoints - + draconicStaffMinDigDepthUpgradePoints) * + EnumUpgrade.DIG_DEPTH.pointConversion - + (draconicStaffMaxAttackAOEUpgradePoints - + draconicStaffMinAttackAOEUpgradePoints) * + EnumUpgrade.ATTACK_AOE.pointConversion - + (draconicStaffMaxAttackDamageUpgradePoints - + draconicStaffMinAttackDamageUpgradePoints) * + EnumUpgrade.ATTACK_DAMAGE.pointConversion, + draconicStaffMaxCapacityUpgradePoints), 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/DraconicDistructionStaff.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java index 07af72b6..0a65a8ea 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java @@ -122,7 +122,7 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo @Override public int getUpgradeCap(ItemStack itemstack) { - return References.MAX_STAFF_UPGRADES; + return BalanceConfigHandler.draconicStaffMaxUpgrades; } @Override @@ -132,20 +132,38 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo @Override public int getMaxUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 5; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 11; - else if (upgradeIndex == EnumUpgrade.ATTACK_AOE.index) return 13; - - return 50; + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return BalanceConfigHandler.draconicStaffMaxCapacityUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicStaffMaxDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicStaffMaxDigDepthUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ATTACK_AOE.index) { + return BalanceConfigHandler.draconicStaffMaxAttackAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ATTACK_DAMAGE.index) { + return BalanceConfigHandler.draconicStaffMaxAttackDamageUpgradePoints; + } + return BalanceConfigHandler.draconicStaffMaxUpgradePoints; } @Override public int getBaseUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DIG_AOE.index) return 3; - else if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) return 7; - else if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 0; - else if (upgradeIndex == EnumUpgrade.ATTACK_AOE.index) return 3; - + if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { + return BalanceConfigHandler.draconicStaffMinDigAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DIG_DEPTH.index) { + return BalanceConfigHandler.draconicStaffMinDigDepthUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ATTACK_AOE.index) { + return BalanceConfigHandler.draconicStaffMinAttackAOEUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ATTACK_DAMAGE.index) { + return BalanceConfigHandler.draconicStaffMinAttackDamageUpgradePoints; + } return 0; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java index 89774011..6543120b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java @@ -15,7 +15,6 @@ public final class References { public static final int MAX_WYVERN_UPGRADES = 3; public static final int MAX_DRACONIC_UPGRADES = 6; - public static final int MAX_STAFF_UPGRADES = 12; //======================Render IDs========================// public static int idTeleporterStand = -1;