diff --git a/Changelog.txt b/Changelog.txt index 578abaf87..9eb7bc3a7 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -27,6 +27,8 @@ Version 1.3.13-dev = Fixed a bug where a infinite loop of errors caused by mySQL database could cause the server to crash = Fixed a bug where PartyChangeEvent was fired even when a player isn't able to change parties = Fixed a bug which caused advanced.yml not to work for Swords + = Fixed a bug which caused advanced.yml not to respect every MaxChance node + = Fixed a bug where GreenThumb_StageChange wasn't read from advanced.yml = Fixed a bug where Repair would remove enchantments but the glow effect remained = Fixed a bug where dropped items did not retain custom NBT data = Fixed a bug which caused a potentially infinite recursion in a btree structure diff --git a/README.creole b/README.creole index 952bcef16..2342a9bf2 100644 --- a/README.creole +++ b/README.creole @@ -1,8 +1,8 @@ == mcMMO **The RPG lovers mod** -=== Forums -http://forums.mcmmo.info Talk with developers and the community about mcMMO here +=== Dev builds +http://nuclearw.com:8080/job/mcMMO/ Download the latest dev build of mcMMO here. === Brief Description mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience. @@ -20,6 +20,7 @@ Hearing that people enjoy mcMMO and seeing the daily youtube videos about my mod Required Libraries: * Spout API +* JUnit Required to Run: * Bukkit diff --git a/src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java b/src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java index 57f04bd3d..568f7c98f 100644 --- a/src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java +++ b/src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java @@ -4,11 +4,13 @@ import org.bukkit.CropState; import org.bukkit.Material; import org.bukkit.block.Block; +import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; public class GreenThumbTimer implements Runnable { + AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private Block block; private PlayerProfile profile; private Material type; @@ -24,19 +26,26 @@ public class GreenThumbTimer implements Runnable { if(this.block.getType() != this.type) this.block.setType(this.type); + int skillLevel = this.profile.getSkillLevel(SkillType.HERBALISM); + + final int STAGE_CHANGE = advancedConfig.getGreenThumbStageChange(); + + int greenThumbStage = (int) ((double) skillLevel / (double) STAGE_CHANGE); + if (greenThumbStage > 4) greenThumbStage = 4; + switch(this.type) { case CROPS: case CARROT: case POTATO: //This replants the wheat at a certain stage in development based on Herbalism Skill if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) { - if (this.profile.getSkillLevel(SkillType.HERBALISM) >= 600) { + if (greenThumbStage == 3) { this.block.setData(CropState.MEDIUM.getData()); } - else if (this.profile.getSkillLevel(SkillType.HERBALISM) >= 400) { + else if (greenThumbStage == 2) { this.block.setData(CropState.SMALL.getData()); } - else if (this.profile.getSkillLevel(SkillType.HERBALISM) >= 200) { + else if (greenThumbStage == 1) { this.block.setData(CropState.VERY_SMALL.getData()); } else { @@ -49,10 +58,10 @@ public class GreenThumbTimer implements Runnable { break; case NETHER_WARTS: if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) { - if (this.profile.getSkillLevel(SkillType.HERBALISM) >= 600) { + if (greenThumbStage == 3) { this.block.setData((byte) 2); } - else if (this.profile.getSkillLevel(SkillType.HERBALISM) >= 400) { + else if (greenThumbStage == 2) { this.block.setData((byte) 1); } else { @@ -65,10 +74,10 @@ public class GreenThumbTimer implements Runnable { break; case COCOA: if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) { - if (this.profile.getSkillLevel(SkillType.HERBALISM) >= 600) { + if (greenThumbStage == 3) { this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4))); } - else if (this.profile.getSkillLevel(SkillType.HERBALISM) >= 400) { + else if (greenThumbStage == 2) { this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4))); } else { 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 1af3cc8c5..c9883433d 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java @@ -6,12 +6,17 @@ import com.gmail.nossr50.config.AdvancedConfig; public class Acrobatics { static AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); + public static final int DODGE_MAX_CHANCE = advancedConfig.getDodgeChanceMax(); public static final int DODGE_MAX_BONUS_LEVEL = advancedConfig.getDodgeMaxBonusLevel(); public static final int DODGE_XP_MODIFIER = advancedConfig.getDodgeXPModifier(); - public static final int FALL_XP_MODIFIER = advancedConfig.getFallXPModifier(); + public static final int ROLL_MAX_CHANCE = advancedConfig.getRollChanceMax(); public static final int ROLL_MAX_BONUS_LEVEL = advancedConfig.getRollMaxBonusLevel(); + public static final int GRACEFUL_MAX_CHANCE = advancedConfig.getGracefulRollChanceMax(); + public static final int GRACEFUL_MAX_BONUS_LEVEL = advancedConfig.getGracefulRollMaxBonusLevel(); + public static final int ROLL_XP_MODIFIER = advancedConfig.getRollXPModifier(); + public static final int FALL_XP_MODIFIER = advancedConfig.getFallXPModifier(); private static Random random = new Random(); diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java index cfe6fe8fb..2b417369f 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -40,13 +40,20 @@ public class AcrobaticsManager { RollEventHandler eventHandler = new RollEventHandler(this, event); - int randomChance = 1000; + int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) { randomChance = (int) (randomChance * 0.75); } - if (Acrobatics.getRandom().nextInt(randomChance) <= eventHandler.skillModifier && !eventHandler.isFatal(eventHandler.modifiedDamage)) { + float chance = (float) (((double) Acrobatics.ROLL_MAX_CHANCE / (double) Acrobatics.ROLL_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Acrobatics.ROLL_MAX_CHANCE) chance = Acrobatics.ROLL_MAX_CHANCE; + if (eventHandler.isGraceful) { + chance = (float) (((double) Acrobatics.GRACEFUL_MAX_CHANCE / (double) Acrobatics.GRACEFUL_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Acrobatics.GRACEFUL_MAX_CHANCE) chance = Acrobatics.GRACEFUL_MAX_CHANCE; + } + + if (chance > Acrobatics.getRandom().nextInt(randomChance) && !eventHandler.isFatal(eventHandler.modifiedDamage)) { eventHandler.modifyEventDamage(); eventHandler.sendAbilityMessage(); eventHandler.processXPGain(eventHandler.damage * Acrobatics.ROLL_XP_MODIFIER); @@ -71,13 +78,16 @@ public class AcrobaticsManager { DodgeEventHandler eventHandler = new DodgeEventHandler(this, event); - int randomChance = 4000; + int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) { randomChance = (int) (randomChance * 0.75); } - if (Acrobatics.getRandom().nextInt(randomChance) <= eventHandler.skillModifier && !eventHandler.isFatal(eventHandler.modifiedDamage)) { + float chance = (float) (((double) Acrobatics.DODGE_MAX_CHANCE / (double) Acrobatics.DODGE_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Acrobatics.DODGE_MAX_CHANCE) chance = Acrobatics.DODGE_MAX_CHANCE; + + if (chance > Acrobatics.getRandom().nextInt(randomChance) && !eventHandler.isFatal(eventHandler.modifiedDamage)) { eventHandler.modifyEventDamage(); eventHandler.sendAbilityMessage(); eventHandler.processXPGain(eventHandler.damage * Acrobatics.DODGE_XP_MODIFIER); diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java index 4ef6f39d4..1ca82153f 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java @@ -9,7 +9,7 @@ import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Skills; public class RollEventHandler extends AcrobaticsEventHandler { - private boolean isGraceful; + public boolean isGraceful; private int damageThreshold; protected RollEventHandler(AcrobaticsManager manager, EntityDamageEvent event) { diff --git a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java index 3f26b5e87..1f56eb3a4 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java @@ -49,7 +49,10 @@ public class ArcheryManager { if (player.hasPermission("mcmmo.perks.lucky.archery")) { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) Archery.ARROW_TRACKING_MAX_BONUS / (double) Archery.ARROW_TRACKING_MAX_BONUS_LEVEL) * skillLevel); + + float chance = (float) (((double) Archery.ARROW_TRACKING_MAX_BONUS / (double) Archery.ARROW_TRACKING_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Archery.ARROW_TRACKING_MAX_BONUS) chance = Archery.ARROW_TRACKING_MAX_BONUS; + if (chance > Archery.getRandom().nextInt(randomChance)) { eventHandler.addToTracker(); } @@ -80,7 +83,9 @@ public class ArcheryManager { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) Archery.DAZE_MAX_BONUS / (double) Archery.DAZE_MAX_BONUS_LEVEL) * skillLevel); + float chance = (float) (((double) Archery.DAZE_MAX_BONUS / (double) Archery.DAZE_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Archery.DAZE_MAX_BONUS) chance = Archery.DAZE_MAX_BONUS; + if (chance > Archery.getRandom().nextInt(randomChance)) { eventHandler.handleDazeEffect(); eventHandler.sendAbilityMessages(); diff --git a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java index 22ac29c55..230e285b3 100644 --- a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java +++ b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java @@ -89,6 +89,7 @@ public class Axes { int randomChance = 100; double chance = (MAX_CHANCE / MAX_BONUS_LEVEL) * skillCheck; + if (chance > MAX_CHANCE) chance = MAX_CHANCE; if (attacker.hasPermission("mcmmo.perks.lucky.axes")) { randomChance = (int) (randomChance * 0.75); diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java index 7cddc3d41..6a14c1a44 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java @@ -13,6 +13,7 @@ import org.bukkit.inventory.PlayerInventory; import org.bukkit.material.MaterialData; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.mods.CustomBlocksConfig; import com.gmail.nossr50.datatypes.AbilityType; @@ -30,6 +31,7 @@ import com.gmail.nossr50.util.Users; public class Herbalism { private static Random random = new Random(); + static AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); /** * Activate the Green Terra ability. @@ -85,7 +87,8 @@ public class Herbalism { return; final PlayerProfile profile = Users.getProfile(player); - final int MAX_BONUS_LEVEL = 1000; + final double MAX_CHANCE = advancedConfig.getHerbalismDoubleDropsChanceMax(); + final int MAX_BONUS_LEVEL = advancedConfig.getHerbalismDoubleDropsMaxLevel(); int herbLevel = profile.getSkillLevel(SkillType.HERBALISM); int id = block.getTypeId(); @@ -101,12 +104,15 @@ public class Herbalism { boolean customPlant = false; - int randomChance = 1000; + int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.herbalism")) { randomChance = (int) (randomChance * 0.75); } + float chance = (float) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * herbLevel); + if (chance > MAX_CHANCE) chance = (float) MAX_CHANCE; + switch (type) { case BROWN_MUSHROOM: case RED_MUSHROOM: @@ -122,7 +128,7 @@ public class Herbalism { if (b.getType().equals(Material.CACTUS)) { mat = Material.CACTUS; if (!mcMMO.placeStore.isTrue(b)) { - if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= herbLevel) { + if (chance > random.nextInt(randomChance)) { catciDrops++; } xp += Config.getInstance().getHerbalismXPCactus(); @@ -182,7 +188,7 @@ public class Herbalism { if (b.getType().equals(Material.SUGAR_CANE_BLOCK)) { mat = Material.SUGAR_CANE; if (!mcMMO.placeStore.isTrue(b)) { - if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= herbLevel) { + if (chance > random.nextInt(randomChance)) { caneDrops++; } xp += Config.getInstance().getHerbalismXPSugarCane(); @@ -275,7 +281,7 @@ public class Herbalism { } } - if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= herbLevel) { + if (chance > random.nextInt(randomChance)) { Config configInstance = Config.getInstance(); switch (type) { @@ -399,7 +405,8 @@ public class Herbalism { * @param plugin mcMMO plugin instance */ private static void greenThumbWheat(Block block, Player player, BlockBreakEvent event, mcMMO plugin) { - final int MAX_BONUS_LEVEL = 1500; + final int MAX_CHANCE = advancedConfig.getGreenThumbChanceMax(); + final int MAX_BONUS_LEVEL = advancedConfig.getGreenThumbMaxLevel(); PlayerProfile profile = Users.getProfile(player); int herbLevel = profile.getSkillLevel(SkillType.HERBALISM); @@ -429,13 +436,16 @@ public class Herbalism { break; } - int randomChance = 1500; + int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.herbalism")) { randomChance = (int) (randomChance * 0.75); } - if (hasSeeds && profile.getAbilityMode(AbilityType.GREEN_TERRA) || hasSeeds && (herbLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= herbLevel)) { + float chance = (float) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * herbLevel); + if (chance > MAX_CHANCE) chance = (float) MAX_CHANCE; + + if (hasSeeds && profile.getAbilityMode(AbilityType.GREEN_TERRA) || hasSeeds && (chance > random.nextInt(randomChance))) { event.setCancelled(true); switch(type) { @@ -481,7 +491,8 @@ public class Herbalism { * @param block The block being used in the ability */ public static void greenThumbBlocks(ItemStack is, Player player, Block block) { - final int MAX_BONUS_LEVEL = 1500; + final int MAX_CHANCE = advancedConfig.getGreenThumbChanceMax(); + final int MAX_BONUS_LEVEL = advancedConfig.getGreenThumbMaxLevel(); PlayerProfile profile = Users.getProfile(player); int skillLevel = profile.getSkillLevel(SkillType.HERBALISM); @@ -489,13 +500,16 @@ public class Herbalism { player.setItemInHand(new ItemStack(Material.SEEDS, seeds - 1)); - int randomChance = 1500; + int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.herbalism")) { randomChance = (int) (randomChance * 0.75); } - if (skillLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= skillLevel) { + float chance = (float) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * skillLevel); + if (chance > MAX_CHANCE) chance = (float) MAX_CHANCE; + + if (chance > random.nextInt(randomChance)) { greenTerraConvert(player, block); } else { diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java index 5a11558d2..ac5231252 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java @@ -356,6 +356,7 @@ public class WoodCutting { int randomChance = 100; int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * skillLevel); + if (chance > MAX_CHANCE) chance = MAX_CHANCE; if (player.hasPermission("mcmmo.perks.lucky.woodcutting")) { randomChance = (int) (randomChance * 0.75); diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java index 019ac2cf3..47580266c 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java @@ -31,10 +31,10 @@ public class Repair { static AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); - private static int repairMasteryChanceMax = advancedConfig.getRepairMasteryChanceMax(); - private static int repairMasteryMaxBonusLevel = advancedConfig.getRepairMasteryMaxLevel(); - private static int superRepairChanceMax = advancedConfig.getSuperRepairChanceMax(); - private static int superRepairMaxBonusLevel = advancedConfig.getSuperRepairMaxLevel(); + public static final int REPAIR_MASTERY_CHANCE_MAX = advancedConfig.getRepairMasteryChanceMax(); + public static final int REPAIR_MASTERY_MAX_BONUS_LEVEL = advancedConfig.getRepairMasteryMaxLevel(); + public static final int SUPER_REPAIR_CHANCE_MAX = advancedConfig.getSuperRepairChanceMax(); + public static final int SUPER_REPAIR_MAX_BONUS_LEVEL = advancedConfig.getSuperRepairMaxLevel(); /** * Handle the XP gain for repair events. @@ -241,8 +241,8 @@ public class Repair { */ protected static short repairCalculate(Player player, int skillLevel, short durability, int repairAmount) { float bonus; - if(skillLevel >= repairMasteryMaxBonusLevel) bonus = ((float) repairMasteryChanceMax / 100F); - else bonus = (((float) skillLevel) / ((float) repairMasteryMaxBonusLevel)) * (((float) repairMasteryChanceMax) / 100F); + if(skillLevel >= REPAIR_MASTERY_MAX_BONUS_LEVEL) bonus = ((float) REPAIR_MASTERY_CHANCE_MAX / 100F); + else bonus = (((float) skillLevel) / ((float) REPAIR_MASTERY_MAX_BONUS_LEVEL)) * (((float) REPAIR_MASTERY_CHANCE_MAX) / 100F); if (permInstance.repairMastery(player)) { bonus = (((float) repairAmount) * bonus); @@ -272,14 +272,11 @@ public class Repair { * @return true if bonus granted, false otherwise */ public static boolean checkPlayerProcRepair(Player player) { - final int MAX_CHANCE = superRepairChanceMax; - final int MAX_BONUS_LEVEL = superRepairMaxBonusLevel; - int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR); int randomChance = 100; - int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * skillLevel); - if (skillLevel >= MAX_BONUS_LEVEL) chance = MAX_CHANCE; + int chance = (int) (((double) SUPER_REPAIR_CHANCE_MAX / (double) SUPER_REPAIR_MAX_BONUS_LEVEL) * skillLevel); + if (skillLevel >= SUPER_REPAIR_MAX_BONUS_LEVEL) chance = SUPER_REPAIR_CHANCE_MAX; if (player.hasPermission("mcmmo.perks.lucky.repair")) randomChance = (int) (randomChance * 0.75); 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 c72c739c8..16afa0d57 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/Swords.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/Swords.java @@ -7,10 +7,12 @@ import com.gmail.nossr50.config.AdvancedConfig; public class Swords { static AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); + public static final int BLEED_CHANCE_MAX = AdvancedConfig.getInstance().getBleedChanceMax(); public static final int BLEED_MAX_BONUS_LEVEL = advancedConfig.getBleedMaxBonusLevel(); public static final int MAX_BLEED_TICKS = advancedConfig.getBleedMaxTicks(); public static final int BASE_BLEED_TICKS = advancedConfig.getBleedBaseTicks(); + public static final int COUNTER_ATTACK_CHANCE_MAX = advancedConfig.getCounterChanceMax(); public static final int COUNTER_ATTACK_MAX_BONUS_LEVEL = advancedConfig.getCounterMaxBonusLevel(); public static final int COUNTER_ATTACK_MODIFIER = advancedConfig.getCounterModifier(); diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java index f3dec39e6..c9c43e9ee 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -3,7 +3,6 @@ package com.gmail.nossr50.skills.swords; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.util.Combat; @@ -42,15 +41,15 @@ public class SwordsManager { if (Combat.shouldBeAffected(player, defender)) { BleedEventHandler eventHandler = new BleedEventHandler(this, defender); - int bleedChanceMax = AdvancedConfig.getInstance().getBleedChanceMax(); - int bleedMaxLevel = AdvancedConfig.getInstance().getBleedMaxBonusLevel(); int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.swords")) { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) bleedChanceMax / (double) bleedMaxLevel) * skillLevel); + float chance = (float) (((double) Swords.BLEED_CHANCE_MAX / (double) Swords.BLEED_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Swords.BLEED_CHANCE_MAX) chance = Swords.BLEED_CHANCE_MAX; + if (chance > Swords.getRandom().nextInt(randomChance)) { eventHandler.addBleedTicks(); eventHandler.sendAbilityMessages(); @@ -73,15 +72,16 @@ public class SwordsManager { if (eventHandler.isHoldingSword()) { eventHandler.calculateSkillModifier(); - int counterChanceMax = AdvancedConfig.getInstance().getCounterChanceMax(); - int counterMaxLevel = AdvancedConfig.getInstance().getCounterMaxBonusLevel(); + int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.swords")) { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) counterChanceMax / (double) counterMaxLevel) * skillLevel); + float chance = (float) (((double) Swords.COUNTER_ATTACK_CHANCE_MAX / (double) Swords.COUNTER_ATTACK_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Swords.COUNTER_ATTACK_CHANCE_MAX) chance = Swords.COUNTER_ATTACK_CHANCE_MAX; + if (chance > Swords.getRandom().nextInt(randomChance)) { eventHandler.dealDamage(); eventHandler.sendAbilityMessages(); 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 903a970d5..13cb89529 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/Taming.java @@ -12,6 +12,7 @@ public class Taming { public static final int FAST_FOOD_SERVICE_ACTIVATION_CHANCE = advancedConfig.getFastFoodChance(); public static final int FAST_FOOD_SERVICE_ACTIVATION_LEVEL = advancedConfig.getFastFoodUnlock(); + public static final int GORE_CHANCE_MAX = AdvancedConfig.getInstance().getGoreChanceMax(); public static final int GORE_BLEED_TICKS = advancedConfig.getGoreBleedTicks(); public static final int GORE_MAX_BONUS_LEVEL = advancedConfig.getGoreMaxBonusLevel(); public static final int GORE_MULTIPLIER = advancedConfig.getGoreModifier(); diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java index aa93d7bd5..9a9394f00 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -8,7 +8,6 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; @@ -103,15 +102,15 @@ public class TamingManager { GoreEventHandler eventHandler = new GoreEventHandler(this, event); - int goreChanceMax = AdvancedConfig.getInstance().getGoreChanceMax(); - int goreMaxLevel = AdvancedConfig.getInstance().getGoreMaxBonusLevel(); int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.taming")) { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) goreChanceMax / (double) goreMaxLevel) * skillLevel); + float chance = (float) (((double) Taming.GORE_CHANCE_MAX / (double) Taming.GORE_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Taming.GORE_CHANCE_MAX) chance = Taming.GORE_CHANCE_MAX; + if (chance > Taming.getRandom().nextInt(randomChance)) { eventHandler.modifyEventDamage(); eventHandler.applyBleed(); 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 203af802a..69ae2d9ba 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java @@ -9,10 +9,13 @@ public class Unarmed { public static final int BONUS_DAMAGE_MAX_BONUS_MODIFIER = advancedConfig.getIronArmBonus(); public static final int BONUS_DAMAGE_INCREASE_LEVEL = advancedConfig.getIronArmIncreaseLevel(); + public static final int DEFLECT_MAX_CHANCE = advancedConfig.getDisarmChanceMax() ; public static final int DEFLECT_MAX_BONUS_LEVEL = advancedConfig.getDisarmMaxBonusLevel(); + public static final int DISARM_MAX_CHANCE = advancedConfig.getDeflectChanceMax(); public static final int DISARM_MAX_BONUS_LEVEL = advancedConfig.getDeflectMaxBonusLevel(); + public static final int IRON_GRIP_MAX_CHANCE = advancedConfig.getIronGripChanceMax(); public static final int IRON_GRIP_MAX_BONUS_LEVEL = advancedConfig.getIronGripMaxBonusLevel(); 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 7cbaa3c07..47b3d007a 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -3,7 +3,6 @@ package com.gmail.nossr50.skills.unarmed; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; -import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.util.Permissions; @@ -43,15 +42,15 @@ public class UnarmedManager { if (eventHandler.isHoldingItem()) { eventHandler.calculateSkillModifier(); - int disarmChanceMax = AdvancedConfig.getInstance().getDisarmChanceMax(); - int disarmMaxLevel = AdvancedConfig.getInstance().getDisarmMaxBonusLevel(); int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.unarmed")) { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) disarmChanceMax / (double) disarmMaxLevel) * skillLevel); + float chance = (float) (((double) Unarmed.DISARM_MAX_CHANCE / (double) Unarmed.DISARM_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Unarmed.DISARM_MAX_CHANCE) chance = Unarmed.DISARM_MAX_CHANCE; + if (chance > Unarmed.getRandom().nextInt(randomChance)) { if (!hasIronGrip(defender)) { eventHandler.sendAbilityMessage(); @@ -80,15 +79,15 @@ public class UnarmedManager { DeflectEventHandler eventHandler = new DeflectEventHandler(this, event); - int deflectChanceMax = AdvancedConfig.getInstance().getDeflectChanceMax(); - int deflectMaxLevel = AdvancedConfig.getInstance().getDeflectMaxBonusLevel(); int randomChance = 100; if (player.hasPermission("mcmmo.perks.lucky.unarmed")) { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) deflectChanceMax / (double) deflectMaxLevel) * skillLevel); + float chance = (float) (((double) Unarmed.DEFLECT_MAX_CHANCE / (double) Unarmed.DEFLECT_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Unarmed.DEFLECT_MAX_CHANCE) chance = Unarmed.DEFLECT_MAX_CHANCE; + if (chance > Unarmed.getRandom().nextInt(randomChance)) { eventHandler.cancelEvent(); eventHandler.sendAbilityMessage(); @@ -136,15 +135,15 @@ public class UnarmedManager { IronGripEventHandler eventHandler = new IronGripEventHandler(this, defender); - int ironGripChanceMax = AdvancedConfig.getInstance().getIronGripChanceMax(); - int ironGripMaxLevel = AdvancedConfig.getInstance().getIronGripMaxBonusLevel(); int randomChance = 100; if (defender.hasPermission("mcmmo.perks.lucky.unarmed")) { randomChance = (int) (randomChance * 0.75); } - final float chance = (float) (((double) ironGripChanceMax / (double) ironGripMaxLevel) * skillLevel); + float chance = (float) (((double) Unarmed.IRON_GRIP_MAX_CHANCE / (double) Unarmed.IRON_GRIP_MAX_BONUS_LEVEL) * skillLevel); + if (chance > Unarmed.IRON_GRIP_MAX_CHANCE) chance = Unarmed.IRON_GRIP_MAX_CHANCE; + if (chance > Unarmed.getRandom().nextInt(randomChance)) { eventHandler.sendAbilityMessages(); return true;