From c51be84b503da46ba560e34db6a8fc7f31248338 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 23 Jan 2019 15:29:31 -0800 Subject: [PATCH] Serrated now uses Rupture rank to calculate its bleed effect's properties Gore now actually uses Rupture rank 1 in its calculations --- Changelog.txt | 3 ++- src/main/java/com/gmail/nossr50/config/AdvancedConfig.java | 6 +++--- .../java/com/gmail/nossr50/skills/swords/SwordsManager.java | 4 ++-- src/main/java/com/gmail/nossr50/skills/taming/Taming.java | 2 +- .../java/com/gmail/nossr50/skills/taming/TamingManager.java | 2 +- .../java/com/gmail/nossr50/util/skills/CombatUtils.java | 2 +- src/main/resources/advanced.yml | 1 - 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index a917ee831..10bb069b5 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -35,8 +35,9 @@ Version 2.1.0 + (Events) Starting an XP event will now use the title API (toggle this in advanced.yml) + (Sound) Volume and Pitch of sounds can now be configured in the new sounds.yml file + (MySQL) Added support for SSL for MySQL/MariaDB (On by default) - ! (Skills) Taming's Gore now uses Rupture Rank 1 for its DoT + ! (Skills) Taming's Gore now uses Rupture Rank 1 for its DoT calculations ! (Skills) Sword's Bleed has been renamed to Rupture + ! (Skills) Sword's Serrated Strikes now uses your Rupture rank to determine the damage/ticks for its bleed effect. ! (Skills) Sword's Rupture now ticks four times as fast = (Skills) Fixed a bug where Rupture would apply an incorrect amount of bleed ticks ! (Skills) Sword's Rupture now reaches its max proc chance at level 20 (200 in Retro) diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index cf499ab27..ad6a14c31 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -533,9 +533,9 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { reason.add("Skills.Taming.Gore.MaxBonusLevel should be at least 1!"); } - if (getGoreRuptureTicks() < 1) { + /*if (getGoreRuptureTicks() < 1) { reason.add("Skills.Taming.Gore.RuptureTicks should be at least 1!"); - } + }*/ if (getGoreModifier() < 1) { reason.add("Skills.Taming.Gore.Modifier should be at least 1!"); @@ -967,7 +967,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes.RuptureTicks", 5); } /* TAMING */ - public int getGoreRuptureTicks() { return config.getInt("Skills.Taming.Gore.RuptureTicks", 2); } + //public int getGoreRuptureTicks() { return config.getInt("Skills.Taming.Gore.RuptureTicks", 2); } public double getGoreModifier() { return config.getDouble("Skills.Taming.Gore.Modifier", 2.0D); } /*public int getFastFoodUnlock() { return config.getInt("Skills.Taming.FastFood.UnlockLevel", 50); }*/ 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 7f822c8d3..8e8f0c641 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -61,7 +61,7 @@ public class SwordsManager extends SkillManager { } } - BleedTimerTask.add(target, getRuptureBleedTicks(), RankUtils.getRank(getPlayer(), SubSkillType.SWORDS_RUPTURE)); + BleedTimerTask.add(target, getPlayer(), getRuptureBleedTicks(), RankUtils.getRank(getPlayer(), SubSkillType.SWORDS_RUPTURE)); if (mcMMOPlayer.useChatNotifications()) { NotificationManager.sendPlayerInformation(getPlayer(), NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.Bleeding"); @@ -105,6 +105,6 @@ public class SwordsManager extends SkillManager { */ public void serratedStrikes(LivingEntity target, double damage, Map modifiers) { CombatUtils.applyAbilityAoE(getPlayer(), target, damage / Swords.serratedStrikesModifier, modifiers, skill); - BleedTimerTask.add(target, Swords.serratedStrikesBleedTicks, RankUtils.getRank(getPlayer(), SubSkillType.SWORDS_RUPTURE)); + BleedTimerTask.add(target, getPlayer(), getRuptureBleedTicks(), RankUtils.getRank(getPlayer(), SubSkillType.SWORDS_RUPTURE)); } } 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 092048eab..9ceb69c71 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/Taming.java @@ -13,7 +13,7 @@ public class Taming { public static int fastFoodServiceUnlockLevel = RankUtils.getUnlockLevel(SubSkillType.TAMING_FAST_FOOD_SERVICE); public static double fastFoodServiceActivationChance = AdvancedConfig.getInstance().getFastFoodChance(); - public static int goreBleedTicks = AdvancedConfig.getInstance().getGoreRuptureTicks(); + public static int goreBleedTicks = 2; //Equivalent to rank 1 in Rupture public static double goreModifier = AdvancedConfig.getInstance().getGoreModifier(); public static int sharpenedClawsUnlockLevel = RankUtils.getUnlockLevel(SubSkillType.TAMING_SHARPENED_CLAWS); 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 762efcd41..84fbb6bb3 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -111,7 +111,7 @@ public class TamingManager extends SkillManager { return 0; } - BleedTimerTask.add(target, Taming.goreBleedTicks, 1); + BleedTimerTask.add(target, getPlayer(), Taming.goreBleedTicks, 1); if (target instanceof Player) { NotificationManager.sendPlayerInformation((Player)target, NotificationType.SUBSKILL_MESSAGE, "Combat.StruckByGore"); diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index e594ab40f..7cbb6ffdb 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -418,7 +418,7 @@ public final class CombatUtils { NotificationManager.sendPlayerInformation((Player)entity, NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.SS.Struck"); } - BleedTimerTask.add(livingEntity, Swords.serratedStrikesBleedTicks, RankUtils.getRank(attacker, SubSkillType.SWORDS_RUPTURE)); + BleedTimerTask.add(livingEntity, attacker, UserManager.getPlayer(attacker).getSwordsManager().getRuptureBleedTicks(), RankUtils.getRank(attacker, SubSkillType.SWORDS_RUPTURE)); break; case AXES: diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index 26c4d9642..39908c88a 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -483,7 +483,6 @@ Skills: MaxBonusLevel: 100 # BleedTicks: Determines the length of the bleeding effect # Modifier: Damage will get multiplied by this modifier - BleedTicks: 2 Modifier: 2.0 FastFood: # UnlockLevel: Level when FastFood unlocks