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 20d13155..9d458a14 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java @@ -26,10 +26,22 @@ public class BalanceConfigHandler public static final int wyvernWeaponsMaxAttackAOEUpgradePoints = 3; public static final int wyvernWeaponsMinAttackDamageUpgradePoints = 0; public static final int wyvernWeaponsMaxAttackDamageUpgradePoints = 8; + public static final int wyvernBowMinDrawSpeedUpgradePoints = 3; + public static final int wyvernBowMaxDrawSpeedUpgradePoints = 5; + public static final int wyvernBowMinArrowSpeedUpgradePoints = 1; + public static final int wyvernBowMaxArrowSpeedUpgradePoints = 10; + public static final int wyvernBowMinArrowDamageUpgradePoints = 2; + public static final int wyvernBowMaxArrowDamageUpgradePoints = 10; public static final int draconicWeaponsMinAttackAOEUpgradePoints = 2; public static final int draconicWeaponsMaxAttackAOEUpgradePoints = 5; public static final int draconicWeaponsMinAttackDamageUpgradePoints = 0; public static final int draconicWeaponsMaxAttackDamageUpgradePoints = 16; + public static final int draconicBowMinDrawSpeedUpgradePoints = 4; + public static final int draconicBowMaxDrawSpeedUpgradePoints = 6; + public static final int draconicBowMinArrowSpeedUpgradePoints = 3; + public static final int draconicBowMaxArrowSpeedUpgradePoints = 10; + public static final int draconicBowMinArrowDamageUpgradePoints = 3; + public static final int draconicBowMaxArrowDamageUpgradePoints = 20; public static int wyvernArmorBaseStorage = 1000000; public static int wyvernArmorStoragePerUpgrade = 500000; public static int wyvernArmorMaxTransfer = 50000; @@ -93,6 +105,12 @@ public class BalanceConfigHandler public static int draconicWeaponsMaxCapacityUpgradePoints = 50; public static int draconicWeaponsMaxUpgrades = 6; public static int draconicWeaponsMaxUpgradePoints = 50; + public static int wyvernBowMaxCapacityUpgradePoints = 50; + public static int wyvernBowMaxUpgrades = 3; + public static int wyvernBowMaxUpgradePoints = 50; + public static int draconicBowMaxCapacityUpgradePoints = 50; + public static int draconicBowMaxUpgrades = 6; + public static int draconicBowMaxUpgradePoints = 50; public static int wyvernCapacitorMaxUpgrades = 3; public static int draconicCapacitorMaxUpgrades = 6; public static int fluxCapacitorMaxUpgradePoints = 50; @@ -333,6 +351,56 @@ public class BalanceConfigHandler draconicWeaponsMinAttackDamageUpgradePoints) * EnumUpgrade.ARROW_DAMAGE.pointConversion, draconicWeaponsMaxCapacityUpgradePoints), 0); + wyvernBowMaxCapacityUpgradePoints = (int) Math.floor((double) (Integer.MAX_VALUE - wyvernWeaponsBaseStorage) / + (double) Math.max(wyvernWeaponsStoragePerUpgrade, 1)) * + EnumUpgrade.RF_CAPACITY.pointConversion; + wyvernBowMaxUpgrades = + getInteger("tweaks.weapons", "Wyvern Bow: Maximum amount of upgrades", wyvernBowMaxUpgrades, 0, + (wyvernBowMaxDrawSpeedUpgradePoints - wyvernBowMinDrawSpeedUpgradePoints) * + EnumUpgrade.DRAW_SPEED.pointConversion + + (wyvernBowMaxArrowSpeedUpgradePoints - wyvernBowMinArrowSpeedUpgradePoints) * + EnumUpgrade.ARROW_SPEED.pointConversion + + (wyvernBowMaxArrowDamageUpgradePoints - wyvernBowMinArrowDamageUpgradePoints) * + EnumUpgrade.ARROW_DAMAGE.pointConversion + wyvernBowMaxCapacityUpgradePoints); + wyvernBowMaxUpgradePoints = + getInteger("tweaks.weapons", "Wyvern Bow: Maximum amount of upgrade points", wyvernBowMaxUpgradePoints, + wyvernBowMaxUpgrades, Integer.MAX_VALUE); + wyvernBowMaxCapacityUpgradePoints = Math.max(Math.min(wyvernBowMaxUpgradePoints - + (wyvernBowMaxDrawSpeedUpgradePoints - + wyvernBowMinDrawSpeedUpgradePoints) * + EnumUpgrade.DRAW_SPEED.pointConversion - + (wyvernBowMaxArrowSpeedUpgradePoints - + wyvernBowMinArrowSpeedUpgradePoints) * + EnumUpgrade.ARROW_SPEED.pointConversion - + (wyvernBowMaxArrowDamageUpgradePoints - + wyvernBowMinArrowDamageUpgradePoints) * + EnumUpgrade.ARROW_DAMAGE.pointConversion, + wyvernBowMaxCapacityUpgradePoints), 0); + draconicBowMaxCapacityUpgradePoints = (int) Math.floor( + (double) (Integer.MAX_VALUE - draconicWeaponsBaseStorage) / + (double) Math.max(draconicWeaponsStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; + draconicBowMaxUpgrades = + getInteger("tweaks.weapons", "Draconic Bow: Maximum amount of upgrades", draconicBowMaxUpgrades, 0, + (draconicBowMaxDrawSpeedUpgradePoints - draconicBowMinDrawSpeedUpgradePoints) * + EnumUpgrade.DIG_SPEED.pointConversion + + (draconicBowMaxArrowSpeedUpgradePoints - draconicBowMinArrowSpeedUpgradePoints) * + EnumUpgrade.ARROW_SPEED.pointConversion + + (draconicBowMaxArrowDamageUpgradePoints - draconicBowMinArrowDamageUpgradePoints) * + EnumUpgrade.ARROW_DAMAGE.pointConversion + draconicBowMaxCapacityUpgradePoints); + draconicBowMaxUpgradePoints = + getInteger("tweaks.weapons", "Draconic Bow: Maximum amount of upgrade points", draconicBowMaxUpgradePoints, + draconicBowMaxUpgrades, Integer.MAX_VALUE); + draconicBowMaxCapacityUpgradePoints = Math.max(Math.min(draconicBowMaxUpgradePoints - + (draconicBowMaxDrawSpeedUpgradePoints - + draconicBowMinDrawSpeedUpgradePoints) * + EnumUpgrade.DIG_SPEED.pointConversion - + (draconicBowMaxArrowSpeedUpgradePoints - + draconicBowMinArrowSpeedUpgradePoints) * + EnumUpgrade.ARROW_SPEED.pointConversion - + (draconicBowMaxArrowDamageUpgradePoints - + draconicBowMinArrowDamageUpgradePoints) * + EnumUpgrade.ARROW_DAMAGE.pointConversion, + draconicBowMaxCapacityUpgradePoints), 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/weapons/DraconicBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java index 1f50e2a0..f5ac10f7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java @@ -229,7 +229,7 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public int getUpgradeCap(ItemStack itemstack) { - return References.MAX_DRACONIC_UPGRADES; + return BalanceConfigHandler.draconicBowMaxUpgrades; } @Override @@ -239,17 +239,32 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public int getMaxUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 6; - else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 10; - return 50; + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return BalanceConfigHandler.draconicBowMaxCapacityUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) { + return BalanceConfigHandler.draconicBowMaxDrawSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) { + return BalanceConfigHandler.draconicBowMaxArrowSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) { + return BalanceConfigHandler.draconicBowMaxArrowDamageUpgradePoints; + } + return BalanceConfigHandler.draconicBowMaxUpgradePoints; } @Override public int getBaseUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 0; - else if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 4; - else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 3; - else if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) return 3; + if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) { + return BalanceConfigHandler.draconicBowMinDrawSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) { + return BalanceConfigHandler.draconicBowMinArrowSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) { + return BalanceConfigHandler.draconicBowMinArrowDamageUpgradePoints; + } return 0; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java index 83b03cce..98293600 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java @@ -230,7 +230,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public int getUpgradeCap(ItemStack itemstack) { - return References.MAX_WYVERN_UPGRADES; + return BalanceConfigHandler.wyvernBowMaxUpgrades; } @Override @@ -240,17 +240,32 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public int getMaxUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 5; - else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 10; - return 50; + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return BalanceConfigHandler.wyvernBowMaxCapacityUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) { + return BalanceConfigHandler.wyvernBowMaxDrawSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) { + return BalanceConfigHandler.wyvernBowMaxArrowSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) { + return BalanceConfigHandler.wyvernBowMaxArrowDamageUpgradePoints; + } + return BalanceConfigHandler.wyvernBowMaxUpgradePoints; } @Override public int getBaseUpgradePoints(int upgradeIndex) { - if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 0; - else if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 3; - else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 1; - else if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) return 2; + if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) { + return BalanceConfigHandler.wyvernBowMinDrawSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) { + return BalanceConfigHandler.wyvernBowMinArrowSpeedUpgradePoints; + } + if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) { + return BalanceConfigHandler.wyvernBowMinArrowDamageUpgradePoints; + } return 0; }