EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 10:14:43 +02:00
Code Issues Projects Releases Wiki Activity

Removed PVP requirement on Stab, added info about Stab to /swords

Browse Source
This commit is contained in:
nossr50
2019-03-27 12:33:04 -07:00
parent e0341f7ae7
commit c4a383c4fb
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
View File

@ -94,6 +94,12 @@ public class SwordsCommand extends SkillCommand {
+ (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : ""));
}
if(canUseSubskill(player, SubSkillType.SWORDS_STAB))
{
messages.add(getStatMessage(SubSkillType.SWORDS_STAB,
String.valueOf(UserManager.getPlayer(player).getSwordsManager().getStabDamage())));
}
return messages;
}

5
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@ -84,11 +84,8 @@ public class SwordsManager extends SkillManager {
}
}
public double stabCheck(LivingEntity target)
public double getStabDamage()
{
if(!(target instanceof Player))
return 0;
int rank = RankUtils.getRank(getPlayer(), SubSkillType.SWORDS_STAB);
if(rank > 0)

3
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -21,7 +21,6 @@ import com.gmail.nossr50.util.*;
import com.gmail.nossr50.util.player.NotificationManager;
import com.gmail.nossr50.util.player.UserManager;
import com.google.common.collect.ImmutableMap;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.*;
@ -64,7 +63,7 @@ public final class CombatUtils {
//Add Stab Damage
if(swordsManager.canUseStab())
{
event.setDamage(swordsManager.stabCheck(target) + initialDamage);
event.setDamage(swordsManager.getStabDamage(target) + initialDamage);
}
if (swordsManager.canUseSerratedStrike()) {

3
src/main/resources/locale/locale_en_US.properties
View File

@ -405,7 +405,8 @@ Swords.SubSkill.SerratedStrikes.Stat=Serrated Strikes Length
Swords.SubSkill.Rupture.Name=Rupture
Swords.SubSkill.Rupture.Description=Apply a powerful bleed DoT
Swords.SubSkill.Stab.Name=Stab
Swords.SubSkill.Stab.Description=Adds {0} extra damage when attacking players.
Swords.SubSkill.Stab.Description=Adds bonus damage to your attacks.
Swords.SubSkill.Stab.Stat=Stab Damage
Swords.SubSkill.Rupture.Stat=Rupture Chance
Swords.SubSkill.Rupture.Stat.Extra=Rupture: [[GREEN]]{0} ticks [{1} DMG vs Player] [{2} DMG vs Mobs]
Swords.Effect.4=Serrated Strikes Rupture+