From b331fa353b014505ce161bfcbfe7225e247f275a Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 21 Jun 2012 23:01:02 -0400 Subject: [PATCH] Added increased activate time donor perks --- Changelog.txt | 1 + .../java/com/gmail/nossr50/util/Skills.java | 11 +++++++++++ src/main/resources/plugin.yml | 18 +++++++++++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index f4858c9b7..299b6bbfc 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -11,6 +11,7 @@ Version 1.3.09 + Added compatibility with AntiCheat (Which I highly recommend to prevent cheating) + Added several permission nodes to give individual users special perks (Double/Triple/Quadruple XP) + Added reduced cooldown permission nodes as donor perks (1/4, 1/3, 1/2 cooldown) + + Added increased activation time permissions nodes as donor perks (+2, +4, and +6 seconds) + Added API for plugins to add custom tools directly via Spout - repair / abilities do not work ATM + Added offline party members to the list displayed by /party + Added possibility to kick offline members from parties diff --git a/src/main/java/com/gmail/nossr50/util/Skills.java b/src/main/java/com/gmail/nossr50/util/Skills.java index e144072fc..cb72b83b2 100644 --- a/src/main/java/com/gmail/nossr50/util/Skills.java +++ b/src/main/java/com/gmail/nossr50/util/Skills.java @@ -403,6 +403,17 @@ public class Skills { } int ticks = 2 + (PP.getSkillLevel(type) / 50); + + if (player.hasPermission("mcmmo.perks.activationtime.sixseconds")) { + ticks = ticks + 6; + } + else if (player.hasPermission("mcmmo.perks.activationtime.fourseconds")) { + ticks = ticks + 4; + } + else if (player.hasPermission("mcmmo.perks.activationtime.twoseconds")) { + ticks = ticks + 2; + } + int maxTicks = ability.getMaxTicks(); if (maxTicks != 0 && ticks > maxTicks) { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index a92ada659..58ba618b1 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -137,7 +137,23 @@ permissions: mcmmo.admin: true mcmmo.tools.*: true mcmmo.admin: - description: Allows access to mmoupdate and other sensitive commands + description: Allows access to mmoupdate and other sensitive commands + mcmmo.perks.activationtime: + default: false + description: Increased activation time perks typically given to donors or VIPs + children: + mcmmo.perks.activationtime.sixseconds: true + mcmmo.perks.activationtime.fourseconds: true + mcmmo.perks.activationtime.twoseconds: true + mcmmo.perks.activationtime.sixseconds: + default: false + description: Increases activation time by 6 seconds + mcmmo.perks.activationtime.fourseconds: + default: false + description: Increases activation time by 4 seconds + mcmmo.perks.activationtime.twoseconds: + default: false + description: Increases activation time by 2 seconds mcmmo.perks.cooldowns: default: false description: Reduced cooldown perks typically given to donors or VIPs