diff --git a/Changelog.txt b/Changelog.txt index 2065bbb11..211719163 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -34,7 +34,7 @@ Version 1.3.00-dev ! Changed default values of Woodcutting XP tables ! Changed 'Pine' to be renamed 'Oak' in Woodcutting XP tables ! Changed the name of Unarmed Apprentice/Mastery to Iron Arm Style - ! Changed Unarmed to start with a +3 DMG bonus from Iron Arm Style to make leveling it more viable + ! Changed Unarmed to start with a +3 DMG (1 Heart = 2 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 diff --git a/src/main/java/com/gmail/nossr50/m.java b/src/main/java/com/gmail/nossr50/m.java index 1310817f0..9d4c1fa8d 100644 --- a/src/main/java/com/gmail/nossr50/m.java +++ b/src/main/java/com/gmail/nossr50/m.java @@ -184,16 +184,19 @@ public class m for(int i = 0; i < quantity; i++) mcDropItem(location, is); } + public static void mcRandomDropItem(Location location, ItemStack is, int chance) { if(Math.random() * 100 < chance) mcDropItem(location, is); } + public static void mcRandomDropItems(Location location, ItemStack is, int chance, int quantity) { for(int i = 0; i < quantity; i++) mcRandomDropItem(location, is, chance); } + public static void mcDropItem(Location location, ItemStack itemStack) { // We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event. McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack); diff --git a/src/main/java/com/gmail/nossr50/skills/Acrobatics.java b/src/main/java/com/gmail/nossr50/skills/Acrobatics.java index 5a5d61e27..6200e4ba1 100644 --- a/src/main/java/com/gmail/nossr50/skills/Acrobatics.java +++ b/src/main/java/com/gmail/nossr50/skills/Acrobatics.java @@ -39,12 +39,15 @@ public class Acrobatics { if(Math.random() * 1000 <= acrovar && !event.isCancelled()) { int threshold = 7; + if(player.isSneaking()) threshold = 14; int newDamage = event.getDamage() - threshold; + if(newDamage < 0) newDamage = 0; + /* * Check for death */