From 25e4700ef9cd36154622db0d09acb8c781ffbacc Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 12 Sep 2013 14:18:13 -0400 Subject: [PATCH] Changed various values to double in advanced.yml for the sake of consistency. --- .../nossr50/commands/skills/AxesCommand.java | 4 +- .../commands/skills/UnarmedCommand.java | 2 +- .../gmail/nossr50/config/AdvancedConfig.java | 70 ++++++++++--------- .../nossr50/skills/acrobatics/Acrobatics.java | 18 ++--- .../gmail/nossr50/skills/archery/Archery.java | 4 +- .../com/gmail/nossr50/skills/axes/Axes.java | 8 +-- .../gmail/nossr50/skills/fishing/Fishing.java | 12 ++-- .../skills/fishing/FishingManager.java | 4 +- .../nossr50/skills/repair/ArcaneForging.java | 20 +++--- .../nossr50/skills/repair/RepairManager.java | 4 +- .../gmail/nossr50/skills/swords/Swords.java | 6 +- .../gmail/nossr50/skills/taming/Taming.java | 14 ++-- .../gmail/nossr50/skills/unarmed/Unarmed.java | 6 +- .../skills/unarmed/UnarmedManager.java | 2 +- src/main/resources/advanced.yml | 66 ++++++++--------- 15 files changed, 121 insertions(+), 119 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index 75005c7b7..e00d48cab 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -8,8 +8,8 @@ import com.gmail.nossr50.util.Permissions; public class AxesCommand extends SkillCommand { private String critChance; private String critChanceLucky; - private float bonusDamage; - private float impactDamage; + private double bonusDamage; + private double impactDamage; private String skullSplitterLength; private String skullSplitterLengthEndurance; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index c0ec2e441..e9c31bbb8 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -14,7 +14,7 @@ public class UnarmedCommand extends SkillCommand { private String disarmChanceLucky; private String ironGripChance; private String ironGripChanceLucky; - private int ironArmBonus; + private double ironArmBonus; private boolean canBerserk; private boolean canDisarm; diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 23b60d9f0..58ec348ca 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -789,15 +789,15 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { /* ACROBATICS */ public double getDodgeChanceMax() { return config.getDouble("Skills.Acrobatics.Dodge_ChanceMax", 20.0D); } public int getDodgeMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Dodge_MaxBonusLevel", 800); } - public int getDodgeDamageModifier() { return config.getInt("Skills.Acrobatics.Dodge_DamageModifier", 2); } + public double getDodgeDamageModifier() { return config.getDouble("Skills.Acrobatics.Dodge_DamageModifier", 2.0D); } public double getRollChanceMax() { return config.getDouble("Skills.Acrobatics.Roll_ChanceMax", 100.0D); } public int getRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Roll_MaxBonusLevel", 1000); } - public int getRollDamageThreshold() { return config.getInt("Skills.Acrobatics.Roll_DamageThreshold", 7); } + public double getRollDamageThreshold() { return config.getDouble("Skills.Acrobatics.Roll_DamageThreshold", 7.0D); } public double getGracefulRollChanceMax() { return config.getDouble("Skills.Acrobatics.GracefulRoll_ChanceMax", 100.0D); } public int getGracefulRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.GracefulRoll_MaxBonusLevel", 500); } - public int getGracefulRollDamageThreshold() { return config.getInt("Skills.Acrobatics.GracefulRoll_DamageThreshold", 14); } + public double getGracefulRollDamageThreshold() { return config.getDouble("Skills.Acrobatics.GracefulRoll_DamageThreshold", 14.0D); } public int getDodgeXPModifier() { return config.getInt("Skills.Acrobatics.Dodge_XP_Modifier", 120); } public int getRollXPModifier() { return config.getInt("Skills.Acrobatics.Roll_XP_Modifier", 80); } @@ -811,7 +811,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public double getDazeBonusMax() { return config.getDouble("Skills.Archery.Daze_MaxChance", 50.0D); } public int getDazeMaxBonusLevel() { return config.getInt("Skills.Archery.Daze_MaxBonusLevel", 1000); } - public int getDazeModifier() { return config.getInt("Skills.Archery.Daze_BonusDamage", 4); } + public double getDazeModifier() { return config.getDouble("Skills.Archery.Daze_BonusDamage", 4.0D); } public double getRetrieveChanceMax() { return config.getDouble("Skills.Archery.Retrieve_MaxBonus", 100.0D); } public int getRetrieveMaxBonusLevel() { return config.getInt("Skills.Archery.Retrieve_MaxBonusLevel", 1000); } @@ -819,7 +819,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public double getForceMultiplier() { return config.getDouble("Skills.Archery.Force_Multiplier", 2.0D); } /* AXES */ - public int getBonusDamageAxesBonusMax() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonus", 4); } + public double getBonusDamageAxesBonusMax() { return config.getDouble("Skills.Axes.DamageIncrease_MaxBonus", 4.0D); } public int getBonusDamageAxesMaxBonusLevel() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonusLevel", 200); } public double getAxesCriticalChance() { return config.getDouble("Skills.Axes.AxesCritical_MaxChance", 37.50D); } @@ -828,14 +828,14 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public double getAxesCriticalPVEModifier() { return config.getDouble("Skills.Axes.AxesCritical_PVE_Modifier", 2.0D); } public double getGreaterImpactChance() { return config.getDouble("Skills.Axes.GreaterImpact_Chance", 25.0D); } - public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); } - public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); } + public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5D); } + public double getGreaterImpactBonusDamage() { return config.getDouble("Skills.Axes.GreaterImpact_BonusDamage", 2.0D); } public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); } public double getImpactChance() { return config.getDouble("Skills.Axes.ArmorImpact_Chance", 25.0D); } public double getArmorImpactMaxDurabilityDamage() { return config.getDouble("Skills.Axes.ArmorImpact_MaxPercentageDurabilityDamage", 20.0D); } - public int getSkullSplitterModifier() { return config.getInt("Skills.Axes.SkullSplitter_DamagerModifier", 2); } + public double getSkullSplitterModifier() { return config.getDouble("Skills.Axes.SkullSplitter_DamagerModifier", 2.0D); } /* EXCAVATION */ //Nothing to configure, everything is already configurable in config.yml @@ -847,7 +847,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public int getFishingTierLevelsTier4() { return config.getInt("Skills.Fishing.Tier_Levels.Tier4", 600); } public int getFishingTierLevelsTier5() { return config.getInt("Skills.Fishing.Tier_Levels.Tier5", 800); } - public int getFishingMagicMultiplier() { return config.getInt("Skills.Fishing.MagicHunter_Multiplier", 5); } + public double getFishingMagicMultiplier() { return config.getDouble("Skills.Fishing.MagicHunter_Multiplier", 5.0D); } public int getFishermanDietRankChange() { return config.getInt("Skills.Fishing.Fisherman_Diet_RankChange", 200); } @@ -855,11 +855,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { /* Shake */ public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); } - public int getShakeChanceRank1() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_1", 25); } - public int getShakeChanceRank2() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_2", 40); } - public int getShakeChanceRank3() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_3", 55); } - public int getShakeChanceRank4() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_4", 60); } - public int getShakeChanceRank5() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_5", 75); } + public double getShakeChanceRank1() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_1", 25.0D); } + public double getShakeChanceRank2() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_2", 40.0D); } + public double getShakeChanceRank3() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_3", 55.0D); } + public double getShakeChanceRank4() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_4", 60.0D); } + public double getShakeChanceRank5() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_5", 75.0D); } /* Vanilla XP Boost */ public int getFishingVanillaXPModifierRank1() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_1", 1); } @@ -951,15 +951,17 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { /* Arcane Forging */ public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.Downgrades.Enabled", true); } - public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75); } - public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50); } - public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25); } - public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15); } + public double getArcaneForgingDowngradeChanceRank1() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75.0D); } + public double getArcaneForgingDowngradeChanceRank2() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50.0D); } + public double getArcaneForgingDowngradeChanceRank3() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25.0D); } + public double getArcaneForgingDowngradeChanceRank4() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15.0D); } + public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.May_Lose_Enchants", true); } - public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); } - public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); } - public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); } - public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); } + public double getArcaneForgingKeepEnchantsChanceRank1() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10.0D); } + public double getArcaneForgingKeepEnchantsChanceRank2() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20.0D); } + public double getArcaneForgingKeepEnchantsChanceRank3() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30.0D); } + public double getArcaneForgingKeepEnchantsChanceRank4() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40.0D); } + public int getArcaneForgingRankLevels1() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_1", 100); } public int getArcaneForgingRankLevels2() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_2", 250); } public int getArcaneForgingRankLevels3() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_3", 500); } @@ -996,32 +998,32 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.Counter_RequiresBlock"); } public double getCounterChanceMax() { return config.getDouble("Skills.Swords.Counter_ChanceMax", 30.0D); } public int getCounterMaxBonusLevel() { return config.getInt("Skills.Swords.Counter_MaxBonusLevel", 600); } - public int getCounterModifier() { return config.getInt("Skills.Swords.Counter_DamageModifier", 2); } + public double getCounterModifier() { return config.getDouble("Skills.Swords.Counter_DamageModifier", 2.0D); } - public int getSerratedStrikesModifier() { return config.getInt("Skills.Swords.SerratedStrikes_DamageModifier", 4); } + public double getSerratedStrikesModifier() { return config.getDouble("Skills.Swords.SerratedStrikes_DamageModifier", 4.0D); } public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes_BleedTicks", 5); } /* TAMING */ - public double getGoreChanceMax() { return config.getInt("Skills.Taming.Gore_ChanceMax", 100); } + public double getGoreChanceMax() { return config.getDouble("Skills.Taming.Gore_ChanceMax", 100.0D); } public int getGoreMaxBonusLevel() { return config.getInt("Skills.Taming.Gore_MaxBonusLevel", 1000); } public int getGoreBleedTicks() { return config.getInt("Skills.Taming.Gore_BleedTicks", 2); } - public int getGoreModifier() { return config.getInt("Skills.Taming.Gore_Modifier", 2); } + public double getGoreModifier() { return config.getDouble("Skills.Taming.Gore_Modifier", 2.0D); } public int getFastFoodUnlock() { return config.getInt("Skills.Taming.FastFood_UnlockLevel", 50); } - public double getFastFoodChance() { return config.getInt("Skills.Taming.FastFood_Chance", 50); } + public double getFastFoodChance() { return config.getDouble("Skills.Taming.FastFood_Chance", 50.0D); } public int getEnviromentallyAwareUnlock() { return config.getInt("Skills.Taming.EnvironmentallyAware_UnlockLevel", 100); } public int getThickFurUnlock() { return config.getInt("Skills.Taming.ThickFur_UnlockLevel", 250); } - public int getThickFurModifier() { return config.getInt("Skills.Taming.ThickFur_Modifier", 2); } + public double getThickFurModifier() { return config.getDouble("Skills.Taming.ThickFur_Modifier", 2.0D); } public int getHolyHoundUnlock() {return config.getInt("Skills.Taming.HolyHound_UnlockLevel", 375); } public int getShockProofUnlock() { return config.getInt("Skills.Taming.ShockProof_UnlockLevel", 500); } - public int getShockProofModifier() { return config.getInt("Skills.Taming.ShockProof_Modifier", 6); } + public double getShockProofModifier() { return config.getDouble("Skills.Taming.ShockProof_Modifier", 6.0D); } public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws_UnlockLevel", 750); } - public int getSharpenedClawsBonus() { return config.getInt("Skills.Taming.SharpenedClaws_Bonus", 2); } + public double getSharpenedClawsBonus() { return config.getDouble("Skills.Taming.SharpenedClaws_Bonus", 2.0D); } /* UNARMED */ public double getDisarmChanceMax() { return config.getDouble("Skills.Unarmed.Disarm_ChanceMax", 33.0D); } @@ -1033,8 +1035,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public double getIronGripChanceMax() { return config.getDouble("Skills.Unarmed.IronGrip_ChanceMax", 100.0D); } public int getIronGripMaxBonusLevel() { return config.getInt("Skills.Unarmed.IronGrip_MaxBonusLevel", 1000); } - public int getIronArmMinBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMin", 3); } - public int getIronArmMaxBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMax", 8); } + public double getIronArmMinBonus() { return config.getDouble("Skills.Unarmed.IronArm_BonusMin", 3.0D); } + public double getIronArmMaxBonus() { return config.getDouble("Skills.Unarmed.IronArm_BonusMax", 8.0D); } public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm_IncreaseLevel", 50); } /* WOODCUTTING */ @@ -1048,12 +1050,12 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public boolean getKrakenGlobalSoundsEnabled() { return config.getBoolean("Kraken.Global_Sounds", true); } public boolean getKrakenEscapeAllowed() { return config.getBoolean("Kraken.Allow_Escaping", false); } public int getKrakenTriesBeforeRelease() { return config.getInt("Kraken.Tries_Before_Release", 50); } - public int getKrakenHealth() { return config.getInt("Kraken.Health", 50); } + public double getKrakenHealth() { return config.getDouble("Kraken.Health", 50.0D); } public String getKrakenName() { return config.getString("Kraken.Name", "The Kraken"); } public String getServerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Server", "(PLAYER) has unleashed the kraken!"); } public String getPlayerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Player", "THE KRAKEN HAS BEEN UNLEASHED!"); } public String getPlayerDefeatMessage() { return config.getString("Kraken.Defeated_Message.Killed", "You have slain the kraken!"); } public String getPlayerEscapeMessage() { return config.getString("Kraken.Defeated_Message.Escape", "You have escaped from the kraken!"); } public int getKrakenAttackInterval() { return config.getInt("Kraken.Attack_Interval_Seconds", 1); } - public int getKrakenAttackDamage() { return config.getInt("Kraken.Attack_Damage", 1); } + public double getKrakenAttackDamage() { return config.getDouble("Kraken.Attack_Damage", 1.0D); } } diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java index e703a3d83..48f3b4465 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java @@ -5,16 +5,16 @@ import com.gmail.nossr50.config.Config; public final class Acrobatics { public static int dodgeMaxBonusLevel = AdvancedConfig.getInstance().getDodgeMaxBonusLevel(); - public static int dodgeDamageModifier = AdvancedConfig.getInstance().getDodgeDamageModifier(); + public static double dodgeDamageModifier = AdvancedConfig.getInstance().getDodgeDamageModifier(); public static double dodgeMaxChance = AdvancedConfig.getInstance().getDodgeChanceMax(); public static int rollMaxBonusLevel = AdvancedConfig.getInstance().getRollMaxBonusLevel(); - public static int rollThreshold = AdvancedConfig.getInstance().getRollDamageThreshold(); + public static double rollThreshold = AdvancedConfig.getInstance().getRollDamageThreshold(); public static double rollMaxChance = AdvancedConfig.getInstance().getRollChanceMax(); - public static int gracefulRollMaxBonusLevel = AdvancedConfig.getInstance().getGracefulRollMaxBonusLevel(); - public static int gracefulRollThreshold = AdvancedConfig.getInstance().getGracefulRollDamageThreshold(); - public static double gracefulRollMaxChance = AdvancedConfig.getInstance().getGracefulRollChanceMax(); + public static int gracefulRollMaxBonusLevel = AdvancedConfig.getInstance().getGracefulRollMaxBonusLevel(); + public static double gracefulRollThreshold = AdvancedConfig.getInstance().getGracefulRollDamageThreshold(); + public static double gracefulRollMaxChance = AdvancedConfig.getInstance().getGracefulRollChanceMax(); public static int dodgeXpModifier = AdvancedConfig.getInstance().getDodgeXPModifier(); public static int rollXpModifier = AdvancedConfig.getInstance().getRollXPModifier(); @@ -25,11 +25,11 @@ public final class Acrobatics { private Acrobatics() {}; - protected static double calculateModifiedDodgeDamage(double damage, int damageModifier) { - return Math.max(damage / damageModifier, 1); + protected static double calculateModifiedDodgeDamage(double damage, double damageModifier) { + return Math.max(damage / damageModifier, 1.0); } - protected static double calculateModifiedRollDamage(double damage, int damageThreshold) { - return Math.max(damage - damageThreshold, 0); + protected static double calculateModifiedRollDamage(double damage, double damageThreshold) { + return Math.max(damage - damageThreshold, 0.0); } } diff --git a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java index e335cd80c..9c8e1de2a 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java @@ -22,10 +22,10 @@ public class Archery { public static int skillShotIncreaseLevel = AdvancedConfig.getInstance().getSkillShotIncreaseLevel(); public static double skillShotIncreasePercentage = AdvancedConfig.getInstance().getSkillShotIncreasePercentage(); public static double skillShotMaxBonusPercentage = AdvancedConfig.getInstance().getSkillShotBonusMax(); - public static double skillShotMaxBonusDamage = AdvancedConfig.getInstance().getSkillShotDamageMax(); + public static double skillShotMaxBonusDamage = AdvancedConfig.getInstance().getSkillShotDamageMax(); public static int dazeMaxBonusLevel = AdvancedConfig.getInstance().getDazeMaxBonusLevel(); - public static int dazeModifier = AdvancedConfig.getInstance().getDazeModifier(); + public static double dazeModifier = AdvancedConfig.getInstance().getDazeModifier(); public static double dazeMaxBonus = AdvancedConfig.getInstance().getDazeBonusMax(); public static final double DISTANCE_XP_MULTIPLIER = 0.025; diff --git a/src/main/java/com/gmail/nossr50/skills/axes/Axes.java b/src/main/java/com/gmail/nossr50/skills/axes/Axes.java index 5b9173627..73c86d13d 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/Axes.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/Axes.java @@ -7,8 +7,8 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.util.ItemUtils; public class Axes { - public static int bonusDamageMaxBonus = AdvancedConfig.getInstance().getBonusDamageAxesBonusMax(); - public static int bonusDamageMaxBonusLevel = AdvancedConfig.getInstance().getBonusDamageAxesMaxBonusLevel(); + public static double bonusDamageMaxBonus = AdvancedConfig.getInstance().getBonusDamageAxesBonusMax(); + public static int bonusDamageMaxBonusLevel = AdvancedConfig.getInstance().getBonusDamageAxesMaxBonusLevel(); public static int criticalHitMaxBonusLevel = AdvancedConfig.getInstance().getAxesCriticalMaxBonusLevel(); public static double criticalHitMaxChance = AdvancedConfig.getInstance().getAxesCriticalChance(); @@ -19,11 +19,11 @@ public class Axes { public static double impactChance = AdvancedConfig.getInstance().getImpactChance(); public static double impactMaxDurabilityModifier = AdvancedConfig.getInstance().getArmorImpactMaxDurabilityDamage() / 100D; - public static int greaterImpactBonusDamage = AdvancedConfig.getInstance().getGreaterImpactBonusDamage(); + public static double greaterImpactBonusDamage = AdvancedConfig.getInstance().getGreaterImpactBonusDamage(); public static double greaterImpactChance = AdvancedConfig.getInstance().getGreaterImpactChance(); public static double greaterImpactKnockbackMultiplier = AdvancedConfig.getInstance().getGreaterImpactModifier(); - public static int skullSplitterModifier = AdvancedConfig.getInstance().getSkullSplitterModifier(); + public static double skullSplitterModifier = AdvancedConfig.getInstance().getSkullSplitterModifier(); protected static boolean hasArmor(LivingEntity target) { for (ItemStack itemStack : target.getEquipment().getArmorContents()) { diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java index 8a2a89dfd..71361abc1 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java @@ -18,23 +18,23 @@ public final class Fishing { protected enum Tier { FIVE(5) { @Override public int getLevel() { return AdvancedConfig.getInstance().getFishingTierLevelsTier5(); } - @Override public int getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank5(); } + @Override public double getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank5(); } @Override public int getVanillaXPBoostModifier() { return AdvancedConfig.getInstance().getFishingVanillaXPModifierRank5(); }}, FOUR(4) { @Override public int getLevel() { return AdvancedConfig.getInstance().getFishingTierLevelsTier4(); } - @Override public int getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank4(); } + @Override public double getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank4(); } @Override public int getVanillaXPBoostModifier() { return AdvancedConfig.getInstance().getFishingVanillaXPModifierRank4(); }}, THREE(3) { @Override public int getLevel() { return AdvancedConfig.getInstance().getFishingTierLevelsTier3(); } - @Override public int getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank3(); } + @Override public double getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank3(); } @Override public int getVanillaXPBoostModifier() { return AdvancedConfig.getInstance().getFishingVanillaXPModifierRank3(); }}, TWO(2) { @Override public int getLevel() { return AdvancedConfig.getInstance().getFishingTierLevelsTier2(); } - @Override public int getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank2(); } + @Override public double getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank2(); } @Override public int getVanillaXPBoostModifier() { return AdvancedConfig.getInstance().getFishingVanillaXPModifierRank2(); }}, ONE(1) { @Override public int getLevel() { return AdvancedConfig.getInstance().getFishingTierLevelsTier1(); } - @Override public int getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank1(); } + @Override public double getShakeChance() { return AdvancedConfig.getInstance().getShakeChanceRank1(); } @Override public int getVanillaXPBoostModifier() { return AdvancedConfig.getInstance().getFishingVanillaXPModifierRank1(); }}; int numerical; @@ -48,7 +48,7 @@ public final class Fishing { } abstract protected int getLevel(); - abstract protected int getShakeChance(); + abstract protected double getShakeChance(); abstract protected int getVanillaXPBoostModifier(); } diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index eb8b729d9..4348bbcd3 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -226,7 +226,7 @@ public class FishingManager extends SkillManager { * * @return Shake Mob probability */ - public int getShakeProbability() { + public double getShakeProbability() { int skillLevel = getSkillLevel(); for (Tier tier : Tier.values()) { @@ -235,7 +235,7 @@ public class FishingManager extends SkillManager { } } - return 0; + return 0.0; } /** diff --git a/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java b/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java index 262f981c6..376e17de8 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java @@ -7,20 +7,20 @@ public class ArcaneForging { protected enum Tier { FOUR(4) { @Override public int getLevel() { return AdvancedConfig.getInstance().getArcaneForgingRankLevels4(); } - @Override public int getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank4(); } - @Override public int getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank4(); }}, + @Override public double getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank4(); } + @Override public double getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank4(); }}, THREE(3) { @Override public int getLevel() { return AdvancedConfig.getInstance().getArcaneForgingRankLevels3(); } - @Override public int getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank3(); } - @Override public int getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank3(); }}, + @Override public double getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank3(); } + @Override public double getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank3(); }}, TWO(2) { @Override public int getLevel() { return AdvancedConfig.getInstance().getArcaneForgingRankLevels2(); } - @Override public int getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank2(); } - @Override public int getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank2(); }}, + @Override public double getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank2(); } + @Override public double getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank2(); }}, ONE(1) { @Override public int getLevel() { return AdvancedConfig.getInstance().getArcaneForgingRankLevels1(); } - @Override public int getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank1(); } - @Override public int getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank1(); }}; + @Override public double getKeepEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingKeepEnchantsChanceRank1(); } + @Override public double getDowngradeEnchantChance() { return AdvancedConfig.getInstance().getArcaneForgingDowngradeChanceRank1(); }}; int numerical; @@ -33,8 +33,8 @@ public class ArcaneForging { } abstract protected int getLevel(); - abstract protected int getKeepEnchantChance(); - abstract protected int getDowngradeEnchantChance(); + abstract protected double getKeepEnchantChance(); + abstract protected double getDowngradeEnchantChance(); } public static boolean arcaneForgingDowngrades = AdvancedConfig.getInstance().getArcaneForgingDowngradeEnabled(); diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java index c4f5bf0f4..904d0f65d 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -244,7 +244,7 @@ public class RepairManager extends SkillManager { * * @return The chance of keeping the enchantment */ - public int getKeepEnchantChance() { + public double getKeepEnchantChance() { int skillLevel = getSkillLevel(); for (Tier tier : Tier.values()) { @@ -261,7 +261,7 @@ public class RepairManager extends SkillManager { * * @return The chance of the enchantment being downgraded */ - public int getDowngradeEnchantChance() { + public double getDowngradeEnchantChance() { int skillLevel = getSkillLevel(); for (Tier tier : Tier.values()) { diff --git a/src/main/java/com/gmail/nossr50/skills/swords/Swords.java b/src/main/java/com/gmail/nossr50/skills/swords/Swords.java index 55ff6dc1f..4110f095a 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/Swords.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/Swords.java @@ -10,9 +10,9 @@ public class Swords { public static boolean counterAttackRequiresBlock = AdvancedConfig.getInstance().getCounterRequiresBlock(); public static int counterAttackMaxBonusLevel = AdvancedConfig.getInstance().getCounterMaxBonusLevel(); - public static int counterAttackModifier = AdvancedConfig.getInstance().getCounterModifier(); + public static double counterAttackModifier = AdvancedConfig.getInstance().getCounterModifier(); public static double counterAttackMaxChance = AdvancedConfig.getInstance().getCounterChanceMax(); - public static int serratedStrikesModifier = AdvancedConfig.getInstance().getSerratedStrikesModifier(); - public static int serratedStrikesBleedTicks = AdvancedConfig.getInstance().getSerratedStrikesTicks(); + public static double serratedStrikesModifier = AdvancedConfig.getInstance().getSerratedStrikesModifier(); + public static int serratedStrikesBleedTicks = AdvancedConfig.getInstance().getSerratedStrikesTicks(); } diff --git a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java b/src/main/java/com/gmail/nossr50/skills/taming/Taming.java index 3b3e55251..947c01d86 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/Taming.java @@ -20,17 +20,17 @@ public class Taming { public static int goreBleedTicks = AdvancedConfig.getInstance().getGoreBleedTicks(); public static int goreMaxBonusLevel = AdvancedConfig.getInstance().getGoreMaxBonusLevel(); - public static int goreModifier = AdvancedConfig.getInstance().getGoreModifier(); + public static double goreModifier = AdvancedConfig.getInstance().getGoreModifier(); public static double goreMaxChance = AdvancedConfig.getInstance().getGoreChanceMax(); - public static int sharpenedClawsUnlockLevel = AdvancedConfig.getInstance().getSharpenedClawsUnlock(); - public static int sharpenedClawsBonusDamage = AdvancedConfig.getInstance().getSharpenedClawsBonus(); + public static int sharpenedClawsUnlockLevel = AdvancedConfig.getInstance().getSharpenedClawsUnlock(); + public static double sharpenedClawsBonusDamage = AdvancedConfig.getInstance().getSharpenedClawsBonus(); - public static int shockProofUnlockLevel = AdvancedConfig.getInstance().getShockProofUnlock(); - public static int shockProofModifier = AdvancedConfig.getInstance().getShockProofModifier(); + public static int shockProofUnlockLevel = AdvancedConfig.getInstance().getShockProofUnlock(); + public static double shockProofModifier = AdvancedConfig.getInstance().getShockProofModifier(); - public static int thickFurUnlockLevel = AdvancedConfig.getInstance().getThickFurUnlock(); - public static int thickFurModifier = AdvancedConfig.getInstance().getThickFurModifier(); + public static int thickFurUnlockLevel = AdvancedConfig.getInstance().getThickFurUnlock(); + public static double thickFurModifier = AdvancedConfig.getInstance().getThickFurModifier(); public static int wolfXp = ExperienceConfig.getInstance().getTamingXPWolf(); public static int ocelotXp = ExperienceConfig.getInstance().getTamingXPOcelot(); diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java b/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java index 8e2022487..34b10a07a 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java @@ -10,9 +10,9 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; public class Unarmed { - public static int ironArmMinBonusDamage = AdvancedConfig.getInstance().getIronArmMinBonus(); - public static int ironArmMaxBonusDamage = AdvancedConfig.getInstance().getIronArmMaxBonus(); - public static int ironArmIncreaseLevel = AdvancedConfig.getInstance().getIronArmIncreaseLevel(); + public static double ironArmMinBonusDamage = AdvancedConfig.getInstance().getIronArmMinBonus(); + public static double ironArmMaxBonusDamage = AdvancedConfig.getInstance().getIronArmMaxBonus(); + public static int ironArmIncreaseLevel = AdvancedConfig.getInstance().getIronArmIncreaseLevel(); public static int disarmMaxBonusLevel = AdvancedConfig.getInstance().getDisarmMaxBonusLevel(); public static double disarmMaxChance = AdvancedConfig.getInstance().getDisarmChanceMax(); diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java index 7404d0af3..8b58780e5 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -125,7 +125,7 @@ public class UnarmedManager extends SkillManager { * @param target The {@link LivingEntity} being affected by the ability */ public double ironArm(LivingEntity target) { - int unarmedBonus = Math.min(Unarmed.ironArmMinBonusDamage + (getSkillLevel() / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage); + double unarmedBonus = Math.min(Unarmed.ironArmMinBonusDamage + (getSkillLevel() / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage); return CombatUtils.callFakeDamageEvent(getPlayer(), target, unarmedBonus); } diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index 0bf61eeb3..1eb7d5e5c 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -27,14 +27,14 @@ Skills: # Dodge_DamageModifer: Dodge damage will be divided by this modifier Dodge_ChanceMax: 20.0 Dodge_MaxBonusLevel: 800 - Dodge_DamageModifier: 2 + Dodge_DamageModifier: 2.0 # Roll_ChanceMax: Maximum chance of rolling when on Roll_MaxBonusLevel or higher # Roll_MaxBonusLevel: On this level or higher, the roll chance will not go higher than Roll_ChanceMax # Roll_DamageThreshold: The max damage a player can negate with a roll Roll_ChanceMax: 100.0 Roll_MaxBonusLevel: 1000 - Roll_DamageThreshold: 7 + Roll_DamageThreshold: 7.0 # GracefulRoll_ChanceMax: Maximum chance of graceful rolling when on GracefulRoll_MaxBonusLevel or higher # GracefulRoll_MaxBonusLevel: On this level or higher, the graceful roll chance will not go higher than GracefulRoll_ChanceMax @@ -42,7 +42,7 @@ Skills: # GracefulRoll_SuccessModifier: Graceful rolls will be this many times more likely to succeed than regular rolls GracefulRoll_ChanceMax: 100.0 GracefulRoll_MaxBonusLevel: 500 - GracefulRoll_DamageThreshold: 14 + GracefulRoll_DamageThreshold: 14.0 # Amount of experience for performing a dodge, roll or fall Dodge_XP_Modifier: 120 @@ -65,7 +65,7 @@ Skills: # Daze_Modifier: Extra damage for arrows that cause a daze (2 damage = 1 heart) Daze_MaxChance: 50.0 Daze_MaxBonusLevel: 1000 - Daze_Modifier: 4 + Daze_Modifier: 4.0 # Retrieve_MaxChance: Maximum chance or retrieving arrows # Retrieve_MaxBonusLevel: Maximum bonus level for Arrow retrieval, at this level the chance of retrieving arrows from mobs is Retrieve_MaxBonus @@ -80,7 +80,7 @@ Skills: Axes: # DamageIncrease_MaxBonus: Maximum bonus damage # DamageIncrease_MaxBonusLevel: Level where the maximum bonus is reached - DamageIncrease_MaxBonus: 4 + DamageIncrease_MaxBonus: 4.0 DamageIncrease_MaxBonusLevel: 200 # AxesCritical_MaxChance: Maximum chance of causing a critical hit @@ -97,7 +97,7 @@ Skills: # GreaterImpact_BonusDamage: Extra damage for GreaterImpact hits GreaterImpact_Chance: 25.0 GreaterImpact_KnockbackModifier: 1.5 - GreaterImpact_BonusDamage: 2 + GreaterImpact_BonusDamage: 2.0 # ArmorImpact_IncreaseLevel: Every "IncreaseLevel" the durability damage goes up with 1 # ArmorImpact_Chance: Chance of hitting with ArmorImpact @@ -107,7 +107,7 @@ Skills: ArmorImpact_MaxPercentageDurabilityDamage: 20.0 # SkullSplitter_DamageModifier: Damage will get divided by this modifier - SkullSplitter_DamageModifier: 2 + SkullSplitter_DamageModifier: 2.0 # # Settings for Fishing ### @@ -115,11 +115,11 @@ Skills: # Shake_UnlockLevel: Fishing level when the Shake ability unlocks Shake_UnlockLevel: 150 Shake_Chance: - Rank_1: 25 - Rank_2: 40 - Rank_3: 55 - Rank_4: 60 - Rank_5: 75 + Rank_1: 25.0 + Rank_2: 40.0 + Rank_3: 55.0 + Rank_4: 60.0 + Rank_5: 75.0 #VanillaXPBoost: Vanilla XP gained from fishing is mutliplied by these values. VanillaXPBoost: @@ -138,7 +138,7 @@ Skills: Tier5: 800 # MagicHunter_Multiplier: Determines the chance of fishing enchanted items. The chance is calculated by getting the fishing TreasureHunt tier and multiplying it with MagicHunter_Multiplier - MagicHunter_Multiplier: 5 + MagicHunter_Multiplier: 5.0 # This determines when Fisherman's Diet adds extra hunger recovery to food Fisherman_Diet_RankChange: 200 @@ -179,7 +179,7 @@ Skills: Mining: # DoubleDrops_ChanceMax: Maximum chance of receiving double drops # DoubleDrops_MaxBonusLevel: Level when the maximum chance of receiving double drops is reached - DoubleDrops_ChanceMax: 100 + DoubleDrops_ChanceMax: 100.0 DoubleDrops_MaxBonusLevel: 1000 # BlastMining_Rank: BlastMining rank unlocks @@ -267,17 +267,17 @@ Skills: Rank_4: 750 Keep_Enchants: Chance: - Rank_4: 40 - Rank_3: 30 - Rank_2: 20 - Rank_1: 10 + Rank_4: 40.0 + Rank_3: 30.0 + Rank_2: 20.0 + Rank_1: 10.0 Downgrades: Enabled: true Chance: - Rank_4: 15 - Rank_3: 25 - Rank_2: 50 - Rank_1: 75 + Rank_4: 15.0 + Rank_3: 25.0 + Rank_2: 50.0 + Rank_1: 75.0 # # Settings for Smelting ### @@ -289,7 +289,7 @@ Skills: # SecondSmelt_MaxBonusChance: Maximum chance of triggering Second Smelt # SecondSmelt_MaxBonusLevel: On this level, the chance to cause Second Smelt will be SecondSmelt_MaxBonusChance - SecondSmelt_MaxBonusChance: 100 + SecondSmelt_MaxBonusChance: 100.0 SecondSmelt_MaxBonusLevel: 1000 # FluxMining_UnlockLevel: Level when Flux Mining becomes available @@ -330,11 +330,11 @@ Skills: Counter_MaxBonusLevel: 600 # Counter_DamageModifier: Damaged caused by the damager will get divided by this modifier and dealt back to the damager - Counter_DamageModifier: 2 + Counter_DamageModifier: 2.0 # SerratedStrikes_DamageModifier: Damage will get divided by this modifier # SerratedStrikes_BleedTicks: This determines how long the bleeding effect of SerratedStrikes lasts - SerratedStrikes_DamageModifier: 4 + SerratedStrikes_DamageModifier: 4.0 SerratedStrikes_BleedTicks: 5 # # Settings for Taming @@ -348,7 +348,7 @@ Skills: # Gore_BleedTicks: Determines the length of the bleeding effect # Gore_Modifier: Damage will get multiplied by this modifier Gore_BleedTicks: 2 - Gore_Modifier: 2 + Gore_Modifier: 2.0 # FastFood_UnlockLevel: Level when FastFood unlocks # FastFood_Chance: The chance for wolves to heal hp when inflicting damage @@ -361,7 +361,7 @@ Skills: # ThickFur_UnlockLevel: Level when ThickFur unlocks # ThickFur_Modifier: Damage will get divided by this modifier ThickFur_UnlockLevel: 250 - ThickFur_Modifier: 2 + ThickFur_Modifier: 2.0 # HolyHound_UnlockLevel: Level when HolyHound unlocks HolyHound_UnlockLevel: 375 @@ -369,12 +369,12 @@ Skills: # ShockProof_UnlockLevel: Level when ShockProof unlocks # ShockProof_Modifier: Damage will get divided by this modifier ShockProof_UnlockLevel: 500 - ShockProof_Modifier: 6 + ShockProof_Modifier: 6.0 # SharpenedClaws_UnlockLevel: Level when SharpenedClaws unlocks # SharpenedClaws_Bonus: This bonus will get added to the damage caused SharpenedClaws_UnlockLevel: 750 - SharpenedClaws_Bonus: 2 + SharpenedClaws_Bonus: 2.0 # # Settings for Unarmed ### @@ -397,8 +397,8 @@ Skills: # IronArm_BonusMin: Minimum bonus damage for unarmed # IronArm_BonusMax: Maximum bonus damage for unarmed # IronArm_IncreaseLevel: Bonus damage increases every increase level - IronArm_BonusMin: 3 - IronArm_BonusMax: 8 + IronArm_BonusMin: 3.0 + IronArm_BonusMax: 8.0 IronArm_IncreaseLevel: 50 # # Settings for Woodcutting @@ -417,10 +417,10 @@ Skills: Kraken: Enabled: true Tries_Before_Release: 50 - Health: 50 + Health: 50.0 Name: The Kraken Attack_Interval_Seconds: 1 - Attack_Damage: 1 + Attack_Damage: 1.0 Global_Sounds: true Allow_Escaping: false Unleashed_Message: