From c27d79cf25b028658faf2b638a85e0759d210b9d Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sat, 18 Jan 2014 23:08:40 +0100 Subject: [PATCH] Added new XP perk - 10% boost Adds #1698 --- Changelog.txt | 1 + .../com/gmail/nossr50/util/Permissions.java | 1 + .../gmail/nossr50/util/skills/PerksUtils.java | 3 + src/main/resources/plugin.yml | 73 ++++++++++++++++++- 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 9e107112a..987e14a31 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -17,6 +17,7 @@ Version 1.4.08-dev + Added bypass permission for finding Fishing traps + Added level threshold settings to hardcore modes. When a players skill level is below this threshold, they will not lose any stats + Added party alliances, two parties can now team up. Allies share party chat and cannot harm each other. + + Added new experience bonus perk 'mcmmo.perks.xp.10percentboost.', gives +10% experience = Fixed bug where LeafBlower permissions were ignored = Fixed bug with toggle commands not properly displaying the success message. = Fixed IllegalArgumentException caused by an empty Fishing treasure category diff --git a/src/main/java/com/gmail/nossr50/util/Permissions.java b/src/main/java/com/gmail/nossr50/util/Permissions.java index af07341b6..c4a820e00 100644 --- a/src/main/java/com/gmail/nossr50/util/Permissions.java +++ b/src/main/java/com/gmail/nossr50/util/Permissions.java @@ -108,6 +108,7 @@ public final class Permissions { public static boolean doubleAndOneHalfXp(Permissible permissible, SkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.150percentboost." + skill.toString().toLowerCase()); } public static boolean doubleXp(Permissible permissible, SkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.double." + skill.toString().toLowerCase()); } public static boolean oneAndOneHalfXp(Permissible permissible, SkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.50percentboost." + skill.toString().toLowerCase()); } + public static boolean oneAndOneTenthXp(Permissible permissible, SkillType skill) { return permissible.hasPermission("mcmmo.perks.xp.10percentboost." + skill.toString().toLowerCase()); } /* ACTIVATION PERKS */ public static boolean twelveSecondActivationBoost(Permissible permissible) { return permissible.hasPermission("mcmmo.perks.activationtime.twelveseconds"); } diff --git a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java index 78e0bae69..a6007943a 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java @@ -59,6 +59,9 @@ public final class PerksUtils { else if (Permissions.oneAndOneHalfXp(player, skill)) { xp *= 1.5; } + else if (Permissions.oneAndOneTenthXp(player, skill)) { + xp *= 1.1; + } return xp; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8fce9c725..b9eb4c1a8 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1344,6 +1344,7 @@ permissions: children: mcmmo.perks.xp.150percentboost.all: true mcmmo.perks.xp.50percentboost.all: true + mcmmo.perks.xp.10percentboost.all: true mcmmo.perks.xp.double.all: true mcmmo.perks.xp.quadruple.all: true mcmmo.perks.xp.triple.all: true @@ -1426,7 +1427,7 @@ permissions: default: false description: Mulitplies incoming XP by 1.5 children: - mcmmo.perks.xp.150percentboost.all: true + mcmmo.perks.xp.50percentboost.all: true mcmmo.perks.xp.50percentboost.all: default: false description: Mulitplies incoming XP by 1.5 @@ -1487,6 +1488,76 @@ permissions: mcmmo.perks.xp.50percentboost.woodcutting: default: false description: Multiplies incoming Woodcutting XP by 1.5 + mcmmo.perks.xp.10percentboost.*: + default: false + description: Mulitplies incoming XP by 1.1 + children: + mcmmo.perks.xp.10percentboost.all: true + mcmmo.perks.xp.10percentboost: + default: false + description: Mulitplies incoming XP by 1.1 + children: + mcmmo.perks.xp.10percentboost.all: true + mcmmo.perks.xp.10percentboost.all: + default: false + description: Mulitplies incoming XP by 1.1 + children: + mcmmo.perks.xp.10percentboost.acrobatics: true + mcmmo.perks.xp.10percentboost.alchemy: true + mcmmo.perks.xp.10percentboost.archery: true + mcmmo.perks.xp.10percentboost.axes: true + mcmmo.perks.xp.10percentboost.excavation: true + mcmmo.perks.xp.10percentboost.fishing: true + mcmmo.perks.xp.10percentboost.herbalism: true + mcmmo.perks.xp.10percentboost.mining: true + mcmmo.perks.xp.10percentboost.repair: true + mcmmo.perks.xp.10percentboost.smelting: true + mcmmo.perks.xp.10percentboost.swords: true + mcmmo.perks.xp.10percentboost.taming: true + mcmmo.perks.xp.10percentboost.unarmed: true + mcmmo.perks.xp.10percentboost.woodcutting: true + mcmmo.perks.xp.10percentboost.acrobatics: + default: false + description: Multiplies incoming Acrobatics XP by 1.1 + mcmmo.perks.xp.10percentboost.alchemy: + default: false + description: Multiplies incoming Acrobatics XP by 1.1 + mcmmo.perks.xp.10percentboost.archery: + default: false + description: Multiplies incoming Archery XP by 1.1 + mcmmo.perks.xp.10percentboost.axes: + default: false + description: Multiplies incoming Axes XP by 1.1 + mcmmo.perks.xp.10percentboost.excavation: + default: false + description: Multiplies incoming Excavation XP by 1.1 + mcmmo.perks.xp.10percentboost.fishing: + default: false + description: Multiplies incoming Fishing XP by 1.1 + mcmmo.perks.xp.10percentboost.herbalism: + default: false + description: Multiplies incoming Herbalism XP by 1.1 + mcmmo.perks.xp.10percentboost.mining: + default: false + description: Multiplies incoming Mining XP by 1.1 + mcmmo.perks.xp.10percentboost.repair: + default: false + description: Multiplies incoming Repair XP by 1.1 + mcmmo.perks.xp.10percentboost.smelting: + default: false + description: Multiplies incoming Smelting XP by 1.1 + mcmmo.perks.xp.10percentboost.swords: + default: false + description: Multiplies incoming Swords XP by 1.1 + mcmmo.perks.xp.10percentboost.taming: + default: false + description: Multiplies incoming Taming XP by 1.1 + mcmmo.perks.xp.10percentboost.unarmed: + default: false + description: Multiplies incoming Unarmed XP by 1.1 + mcmmo.perks.xp.10percentboost.woodcutting: + default: false + description: Multiplies incoming Woodcutting XP by 1.1 mcmmo.perks.xp.double.*: default: false description: Doubles incoming XP