From 336adf9530e1cd4fb585c07687d035e899899fb7 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 23 Feb 2012 10:23:04 -0800 Subject: [PATCH] Changed Unarmed to start with a damage bonus --- Changelog.txt | 4 +++- .../com/gmail/nossr50/commands/skills/UnarmedCommand.java | 6 +++--- src/main/java/com/gmail/nossr50/skills/Unarmed.java | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 4190c0907..253797539 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -25,7 +25,9 @@ Version 1.3.00-dev = Prettied up new config files ! Changed mcMMO user information to be stored for 2 minutes after log out to reduce lag on rejoins ! Changed the name of Unarmed Apprentice/Mastery to Iron Arm Style - ! Changed Unarmed to gain bonus damage every 50 skill levels, capping out at what Unarmed Mastery was before + ! Changed Unarmed to start with a +3 DMG bonus from Iron Arm Style to make leveling it more viable + ! Changed Unarmed to gain bonus damage every 50 skill levels + ! Changed Unarmed to gain more bonus damage total than before ! Changed Tree Feller to take down entire trees ! Changed mob spawn tracking to use Unique Entity ID instead of Entity Object ! Changed stats command name to mcstats for better plugin compatibility 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 19ecf4b83..54a7a84d9 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -42,10 +42,10 @@ public class UnarmedCommand implements CommandExecutor { ticks++; } - int bonus = PP.getSkillLevel(SkillType.UNARMED)/50; + int bonus = 3 + (PP.getSkillLevel(SkillType.UNARMED)/50); - if(bonus > 6) - bonus = 6; + if(bonus > 8) + bonus = 8; player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillUnarmed") })); player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainUnarmed") })); diff --git a/src/main/java/com/gmail/nossr50/skills/Unarmed.java b/src/main/java/com/gmail/nossr50/skills/Unarmed.java index cffaaaf21..7e86c62cc 100644 --- a/src/main/java/com/gmail/nossr50/skills/Unarmed.java +++ b/src/main/java/com/gmail/nossr50/skills/Unarmed.java @@ -65,13 +65,13 @@ public class Unarmed { public static void unarmedBonus(Player attacker, EntityDamageByEntityEvent event) { PlayerProfile PPa = Users.getProfile(attacker); - int bonus = 0; + int bonus = 3; //Add 1 DMG for every 50 skill levels - bonus = PPa.getSkillLevel(SkillType.UNARMED)/50; + bonus += PPa.getSkillLevel(SkillType.UNARMED)/50; - if(bonus > 6) - bonus = 6; + if(bonus > 8) + bonus = 8; event.setDamage(event.getDamage()+bonus); }