EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 06:06:45 +01:00
Code Issues Projects Releases Wiki Activity

More work on Xbows/Tridents

Browse Source
This commit is contained in:
nossr50 2023-04-11 03:16:24 -07:00
parent 0db1d846bc
commit 534b22233d
10 changed files with 210 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
View File

@ -34,6 +34,7 @@ public class CrossbowsCommand extends SkillCommand {
List<String> messages = new ArrayList<>();
if (canSSG) {
messages.add("Super Shotgun");
//TODO: Implement SSG
}

53
src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java Normal file
View File

@ -0,0 +1,53 @@
package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.skills.RankUtils;
import com.gmail.nossr50.util.text.TextComponentFactory;
import net.kyori.adventure.text.Component;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
public class TridentsCommand extends SkillCommand {
private boolean canTridentsSuper;
public TridentsCommand() {
super(PrimarySkillType.TRIDENTS);
}
@Override
protected void dataCalculations(Player player, float skillValue) {
// TODO: Implement data calculations
}
@Override
protected void permissionsCheck(Player player) {
canTridentsSuper = RankUtils.hasUnlockedSubskill(player, SubSkillType.TRIDENTS_TRIDENTS_SUPER_ABILITY)
&& Permissions.superShotgun(player);
}
@Override
protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
List<String> messages = new ArrayList<>();
if (canTridentsSuper) {
messages.add("Tridents Super Ability");
//TODO: Implement SSG
}
return messages;
}
@Override
protected List<Component> getTextComponents(Player player) {
List<Component> textComponents = new ArrayList<>();
TextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkillType.TRIDENTS);
return textComponents;
}
}

2
src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
View File

@ -1255,7 +1255,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
// Acrobatics - Unused
tryLoadSkillCooldownFromRawData(skillsDATS, character, SuperAbilityType.BLAST_MINING, COOLDOWN_BLAST_MINING, username);
tryLoadSkillCooldownFromRawData(skillsDATS, character, SuperAbilityType.SUPER_SHOTGUN, COOLDOWN_SUPER_SHOTGUN, username);
tryLoadSkillCooldownFromRawData(skillsDATS, character, SuperAbilityType.TRIDENT_ABILITY, COOLDOWN_TRIDENTS, username);
tryLoadSkillCooldownFromRawData(skillsDATS, character, SuperAbilityType.TRIDENTS_SUPER_ABILITY, COOLDOWN_TRIDENTS, username);
UUID uuid;
try {

3
src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
View File

@ -96,6 +96,9 @@ public enum SubSkillType {
TAMING_SHOCK_PROOF(1),
TAMING_THICK_FUR(1),
/* Tridents */
TRIDENTS_TRIDENTS_SUPER_ABILITY(1),
/* Unarmed */
UNARMED_ARROW_DEFLECT(1),
UNARMED_BERSERK(1),

44
src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java
View File

@ -72,7 +72,7 @@ public enum SuperAbilityType {
"Crossbows.Skills.SSG.Refresh",
null,
"Crossbows.SubSkill.SuperShotgun.Name"),
TRIDENT_ABILITY(
TRIDENTS_SUPER_ABILITY(
"Tridents.Skills.TA.On",
"Tridents.Skills.TA.Off",
"Tridents.Skills.TA.Other.On",
@ -188,34 +188,20 @@ public enum SuperAbilityType {
* @return true if the player has permissions, false otherwise
*/
public boolean getPermissions(Player player) {
switch (this) {
case BERSERK:
return Permissions.berserk(player);
case BLAST_MINING:
return Permissions.remoteDetonation(player);
case GIGA_DRILL_BREAKER:
return Permissions.gigaDrillBreaker(player);
case GREEN_TERRA:
return Permissions.greenTerra(player);
case SERRATED_STRIKES:
return Permissions.serratedStrikes(player);
case SKULL_SPLITTER:
return Permissions.skullSplitter(player);
case SUPER_BREAKER:
return Permissions.superBreaker(player);
case TREE_FELLER:
return Permissions.treeFeller(player);
default:
return false;
}
return switch (this) {
case BERSERK -> Permissions.berserk(player);
case BLAST_MINING -> Permissions.remoteDetonation(player);
case GIGA_DRILL_BREAKER -> Permissions.gigaDrillBreaker(player);
case GREEN_TERRA -> Permissions.greenTerra(player);
case SERRATED_STRIKES -> Permissions.serratedStrikes(player);
case SKULL_SPLITTER -> Permissions.skullSplitter(player);
case SUPER_BREAKER -> Permissions.superBreaker(player);
case SUPER_SHOTGUN -> Permissions.superShotgun(player);
case TREE_FELLER -> Permissions.treeFeller(player);
case TRIDENTS_SUPER_ABILITY -> Permissions.tridentsSuper(player);
default ->
throw new RuntimeException("Unhandled SuperAbilityType in getPermissions(), devs need to add definition for " + this + "!");
};
}
/**

1
src/main/java/com/gmail/nossr50/util/Permissions.java
View File

@ -227,6 +227,7 @@ public final class Permissions {
public static boolean treeFeller(Permissible permissible) { return permissible.hasPermission("mcmmo.ability.woodcutting.treefeller"); }
/* CROSSBOWS */
public static boolean superShotgun(Permissible permissible) { return permissible.hasPermission("mcmmo.ability.crossbows.supershotgun"); }
public static boolean tridentsSuper(Permissible permissible) { return permissible.hasPermission("mcmmo.ability.tridents.superability"); }
/*
* PARTY

2
src/main/java/com/gmail/nossr50/util/skills/SkillTools.java
View File

@ -180,7 +180,7 @@ public class SkillTools {
case SERRATED_STRIKES -> PrimarySkillType.SWORDS;
case GIGA_DRILL_BREAKER -> PrimarySkillType.EXCAVATION;
case SUPER_SHOTGUN -> PrimarySkillType.CROSSBOWS;
case TRIDENT_ABILITY -> PrimarySkillType.TRIDENTS;
case TRIDENTS_SUPER_ABILITY -> PrimarySkillType.TRIDENTS;
default ->
throw new InvalidSkillException("No parent defined for super ability! " + superAbilityType.toString());
};

176
src/main/resources/plugin.yml
View File

@ -19,9 +19,6 @@ load: POSTWORLD
api-version: 1.13
commands:
# mmodroptreasures:
# description: An admin command used to spawn treasure drops
# permission: mcmmo.commands.droptreasures
mmoxpbar:
aliases: xpbarsettings
description: Change XP bar settings
@ -237,6 +234,7 @@ permissions:
mcmmo.ability.alchemy.all: true
mcmmo.ability.archery.all: true
mcmmo.ability.axes.all: true
mcmmo.ability.crossbows.all: true
mcmmo.ability.excavation.all: true
mcmmo.ability.fishing.all: true
mcmmo.ability.herbalism.all: true
@ -246,6 +244,7 @@ permissions:
mcmmo.ability.smelting.all: true
mcmmo.ability.swords.all: true
mcmmo.ability.taming.all: true
mcmmo.ability.tridents.all: true
mcmmo.ability.unarmed.all: true
mcmmo.ability.woodcutting.all: true
mcmmo.ability.acrobatics.*:
@ -289,7 +288,7 @@ permissions:
mcmmo.ability.archery.arrowretrieval: true
mcmmo.ability.archery.archerylimitbreak: true
mcmmo.ability.archery.archerylimitbreak:
description: Adds damage to bows and crossbows
description: Adds damage to bows
mcmmo.ability.archery.skillshot:
description: Allows bonus damage from the Archery SkillShot ability
mcmmo.ability.archery.daze:
@ -322,6 +321,16 @@ permissions:
description: Allows access to the Impact ability
mcmmo.ability.axes.skullsplitter:
description: Allows access to the Skull Splitter ability
mcmmo.ability.crossbows.*:
description: Allows access to all Crossbows abilities
children:
mcmmo.ability.crossbows.all: true
mcmmo.ability.crossbows.all:
description: Allows access to all Crossbows abilities
children:
mcmmo.ability.crossbows.supershotgun: true
mcmmo.ability.crossbows.supershotgun:
description: Allows access to the Super Shotgun ability
mcmmo.ability.excavation.*:
default: false
description: Allows access to all Excavation abilities
@ -686,6 +695,17 @@ permissions:
description: Allows access to the Thick Fur ability
mcmmo.ability.taming.pummel:
description: Allows access to the Pummel ability
mcmmo.ability.tridents.*:
default: false
description: Allows access to all Trident abilities
children:
mcmmo.ability.tridents.all: true
mcmmo.ability.tridents.all:
description: Allows access to all Trident abilities
children:
mcmmo.ability.tridents.superability: true
mcmmo.ability.tridents.superability:
description: Allows access to tridents super ability
mcmmo.ability.unarmed.*:
default: false
description: Allows access to all Unarmed abilities
@ -884,29 +904,16 @@ permissions:
description: Allows access to the archery command
mcmmo.commands.axes:
description: Allows access to the axes command
mcmmo.commands.crossbows:
description: Allows access to the crossbows command
mcmmo.commands.excavation:
description: Allows access to the excavation command
mcmmo.commands.fishing:
description: Allows access to the fishing command
# mcmmo.commands.hardcore.*:
# default: false
# description: Implies access to all mcmmo.commands.hardcore permissions
# children:
# mcmmo.commands.hardcore.all: true
# mcmmo.commands.hardcore.all:
# description: Implies access to all mcmmo.commands.hardcore permissions
# children:
# mcmmo.commands.hardcore: true
# mcmmo.commands.hardcore.modify: true
# mcmmo.commands.hardcore.toggle: true
# mcmmo.commands.hardcore:
# description: Allows access to the hardcore command
# mcmmo.commands.hardcore.modify:
# description: Allows access to the hardcore command to modify the hardcore rate
# mcmmo.commands.hardcore.toggle:
# description: Allows access to the hardcore command to toggle hardcore on/off
mcmmo.commands.herbalism:
description: Allows access to the herbalism command
mcmmo.commands.tridents:
description: Allows access to the tridents command
mcmmo.commands.inspect.*:
default: false
description: Implies access to all mcmmo.commands.inspect permissions
@ -1012,6 +1019,7 @@ permissions:
mcmmo.commands.mctop.alchemy: true
mcmmo.commands.mctop.archery: true
mcmmo.commands.mctop.axes: true
mcmmo.commands.mctop.crossbows: true
mcmmo.commands.mctop.excavation: true
mcmmo.commands.mctop.fishing: true
mcmmo.commands.mctop.herbalism: true
@ -1021,6 +1029,7 @@ permissions:
mcmmo.commands.mctop.smelting: true
mcmmo.commands.mctop.swords: true
mcmmo.commands.mctop.taming: true
mcmmo.commands.mctop.tridents: true
mcmmo.commands.mctop.unarmed: true
mcmmo.commands.mctop.woodcutting: true
mcmmo.commands.mctop:
@ -1033,6 +1042,8 @@ permissions:
description: Allows access to the mctop command for archery
mcmmo.commands.mctop.axes:
description: Allows access to the mctop command for axes
mcmmo.commands.mctop.crossbows:
description: Allows access to the mctop command for crossbows
mcmmo.commands.mctop.excavation:
description: Allows access to the mctop command for excavation
mcmmo.commands.mctop.fishing:
@ -1051,6 +1062,8 @@ permissions:
description: Allows access to the mctop command for swords
mcmmo.commands.mctop.taming:
description: Allows access to the mctop command for taming
mcmmo.commands.mctop.tridents:
description: Allows access to the mctop command for tridents
mcmmo.commands.mctop.unarmed:
description: Allows access to the mctop command for unarmed
mcmmo.commands.mctop.woodcutting:
@ -1465,6 +1478,9 @@ permissions:
mcmmo.perks.lucky.axes:
default: false
description: Gives Axes abilities & skills a 33.3% better chance to activate.
mcmmo.perks.lucky.crossbows:
default: false
description: Gives Crossbows abilities & skills a 33.3% better chance to activate.
mcmmo.perks.lucky.excavation:
default: false
description: Gives Excavation abilities & skills a 33.3% better chance to activate.
@ -1492,6 +1508,9 @@ permissions:
mcmmo.perks.lucky.taming:
default: false
description: Gives Taming abilities & skills a 33.3% better chance to activate.
mcmmo.perks.lucky.tridents:
default: false
description: Gives Tridents abilities & skills a 33.3% better chance to activate.
mcmmo.perks.lucky.unarmed:
default: false
description: Gives Unarmed abilities & skills a 33.3% better chance to activate.
@ -1533,6 +1552,7 @@ permissions:
mcmmo.perks.xp.150percentboost.alchemy: true
mcmmo.perks.xp.150percentboost.archery: true
mcmmo.perks.xp.150percentboost.axes: true
mcmmo.perks.xp.150percentboost.crossbows: true
mcmmo.perks.xp.150percentboost.excavation: true
mcmmo.perks.xp.150percentboost.fishing: true
mcmmo.perks.xp.150percentboost.herbalism: true
@ -1541,6 +1561,7 @@ permissions:
mcmmo.perks.xp.150percentboost.smelting: true
mcmmo.perks.xp.150percentboost.swords: true
mcmmo.perks.xp.150percentboost.taming: true
mcmmo.perks.xp.150percentboost.tridents: true
mcmmo.perks.xp.150percentboost.unarmed: true
mcmmo.perks.xp.150percentboost.woodcutting: true
mcmmo.perks.xp.150percentboost.acrobatics:
@ -1555,6 +1576,9 @@ permissions:
mcmmo.perks.xp.150percentboost.axes:
default: false
description: Multiplies incoming Axes XP by 2.5
mcmmo.perks.xp.150percentboost.crossbows:
default: false
description: Multiplies incoming Crossbows XP by 2.5
mcmmo.perks.xp.150percentboost.excavation:
default: false
description: Multiplies incoming Excavation XP by 2.5
@ -1579,6 +1603,9 @@ permissions:
mcmmo.perks.xp.150percentboost.taming:
default: false
description: Multiplies incoming Taming XP by 2.5
mcmmo.perks.xp.150percentboost.tridents:
default: false
description: Multiplies incoming Tridents XP by 2.5
mcmmo.perks.xp.150percentboost.unarmed:
default: false
description: Multiplies incoming Unarmed XP by 2.5
@ -1603,6 +1630,7 @@ permissions:
mcmmo.perks.xp.50percentboost.alchemy: true
mcmmo.perks.xp.50percentboost.archery: true
mcmmo.perks.xp.50percentboost.axes: true
mcmmo.perks.xp.50percentboost.crossbows: true
mcmmo.perks.xp.50percentboost.excavation: true
mcmmo.perks.xp.50percentboost.fishing: true
mcmmo.perks.xp.50percentboost.herbalism: true
@ -1611,6 +1639,7 @@ permissions:
mcmmo.perks.xp.50percentboost.smelting: true
mcmmo.perks.xp.50percentboost.swords: true
mcmmo.perks.xp.50percentboost.taming: true
mcmmo.perks.xp.50percentboost.tridents: true
mcmmo.perks.xp.50percentboost.unarmed: true
mcmmo.perks.xp.50percentboost.woodcutting: true
mcmmo.perks.xp.50percentboost.acrobatics:
@ -1625,6 +1654,9 @@ permissions:
mcmmo.perks.xp.50percentboost.axes:
default: false
description: Multiplies incoming Axes XP by 1.5
mcmmo.perks.xp.50percentboost.crossbows:
default: false
description: Multiplies incoming Crossbows XP by 1.5
mcmmo.perks.xp.50percentboost.excavation:
default: false
description: Multiplies incoming Excavation XP by 1.5
@ -1649,6 +1681,9 @@ permissions:
mcmmo.perks.xp.50percentboost.taming:
default: false
description: Multiplies incoming Taming XP by 1.5
mcmmo.perks.xp.50percentboost.tridents:
default: false
description: Multiplies incoming Tridents XP by 1.5
mcmmo.perks.xp.50percentboost.unarmed:
default: false
description: Multiplies incoming Unarmed XP by 1.5
@ -1669,20 +1704,22 @@ permissions:
default: false
description: Multiplies incoming XP by 1.25
children:
mcmmo.perks.xp.25percentboost.acrobatics: true
mcmmo.perks.xp.25percentboost.alchemy: true
mcmmo.perks.xp.25percentboost.archery: true
mcmmo.perks.xp.25percentboost.axes: true
mcmmo.perks.xp.25percentboost.excavation: true
mcmmo.perks.xp.25percentboost.fishing: true
mcmmo.perks.xp.25percentboost.herbalism: true
mcmmo.perks.xp.25percentboost.mining: true
mcmmo.perks.xp.25percentboost.repair: true
mcmmo.perks.xp.25percentboost.smelting: true
mcmmo.perks.xp.25percentboost.swords: true
mcmmo.perks.xp.25percentboost.taming: true
mcmmo.perks.xp.25percentboost.unarmed: true
mcmmo.perks.xp.25percentboost.woodcutting: true
mcmmo.perks.xp.25percentboost.acrobatics: true
mcmmo.perks.xp.25percentboost.alchemy: true
mcmmo.perks.xp.25percentboost.archery: true
mcmmo.perks.xp.25percentboost.axes: true
mcmmo.perks.xp.25percentboost.crossbows: true
mcmmo.perks.xp.25percentboost.excavation: true
mcmmo.perks.xp.25percentboost.fishing: true
mcmmo.perks.xp.25percentboost.herbalism: true
mcmmo.perks.xp.25percentboost.mining: true
mcmmo.perks.xp.25percentboost.repair: true
mcmmo.perks.xp.25percentboost.smelting: true
mcmmo.perks.xp.25percentboost.swords: true
mcmmo.perks.xp.25percentboost.taming: true
mcmmo.perks.xp.25percentboost.tridents: true
mcmmo.perks.xp.25percentboost.unarmed: true
mcmmo.perks.xp.25percentboost.woodcutting: true
mcmmo.perks.xp.25percentboost.acrobatics:
default: false
description: Multiplies incoming Acrobatics XP by 1.25
@ -1695,6 +1732,9 @@ permissions:
mcmmo.perks.xp.25percentboost.axes:
default: false
description: Multiplies incoming Axes XP by 1.25
mcmmo.perks.xp.25percentboost.crossbows:
default: false
description: Multiplies incoming Crossbows XP by 1.25
mcmmo.perks.xp.25percentboost.excavation:
default: false
description: Multiplies incoming Excavation XP by 1.25
@ -1719,6 +1759,9 @@ permissions:
mcmmo.perks.xp.25percentboost.taming:
default: false
description: Multiplies incoming Taming XP by 1.25
mcmmo.perks.xp.25percentboost.tridents:
default: false
description: Multiplies incoming Tridents XP by 1.25
mcmmo.perks.xp.25percentboost.unarmed:
default: false
description: Multiplies incoming Unarmed XP by 1.5
@ -1743,6 +1786,7 @@ permissions:
mcmmo.perks.xp.10percentboost.alchemy: true
mcmmo.perks.xp.10percentboost.archery: true
mcmmo.perks.xp.10percentboost.axes: true
mcmmo.perks.xp.10percentboost.crossbows: true
mcmmo.perks.xp.10percentboost.excavation: true
mcmmo.perks.xp.10percentboost.fishing: true
mcmmo.perks.xp.10percentboost.herbalism: true
@ -1751,6 +1795,7 @@ permissions:
mcmmo.perks.xp.10percentboost.smelting: true
mcmmo.perks.xp.10percentboost.swords: true
mcmmo.perks.xp.10percentboost.taming: true
mcmmo.perks.xp.10percentboost.tridents: true
mcmmo.perks.xp.10percentboost.unarmed: true
mcmmo.perks.xp.10percentboost.woodcutting: true
mcmmo.perks.xp.10percentboost.acrobatics:
@ -1765,6 +1810,9 @@ permissions:
mcmmo.perks.xp.10percentboost.axes:
default: false
description: Multiplies incoming Axes XP by 1.1
mcmmo.perks.xp.10percentboost.crossbows:
default: false
description: Multiplies incoming Crossbows XP by 1.1
mcmmo.perks.xp.10percentboost.excavation:
default: false
description: Multiplies incoming Excavation XP by 1.1
@ -1789,6 +1837,9 @@ permissions:
mcmmo.perks.xp.10percentboost.taming:
default: false
description: Multiplies incoming Taming XP by 1.1
mcmmo.perks.xp.10percentboost.tridents:
default: false
description: Multiplies incoming Tridents XP by 1.1
mcmmo.perks.xp.10percentboost.unarmed:
default: false
description: Multiplies incoming Unarmed XP by 1.1
@ -1813,6 +1864,7 @@ permissions:
mcmmo.perks.xp.customboost.alchemy: true
mcmmo.perks.xp.customboost.archery: true
mcmmo.perks.xp.customboost.axes: true
mcmmo.perks.xp.customboost.crossbows: true
mcmmo.perks.xp.customboost.excavation: true
mcmmo.perks.xp.customboost.fishing: true
mcmmo.perks.xp.customboost.herbalism: true
@ -1821,6 +1873,7 @@ permissions:
mcmmo.perks.xp.customboost.smelting: true
mcmmo.perks.xp.customboost.swords: true
mcmmo.perks.xp.customboost.taming: true
mcmmo.perks.xp.customboost.tridents: true
mcmmo.perks.xp.customboost.unarmed: true
mcmmo.perks.xp.customboost.woodcutting: true
mcmmo.perks.xp.customboost.acrobatics:
@ -1835,6 +1888,9 @@ permissions:
mcmmo.perks.xp.customboost.axes:
default: false
description: Multiplies incoming Axes XP by the boost amount defined in the experience config
mcmmo.perks.xp.customboost.crossbows:
default: false
description: Multiplies incoming Crossbows XP by the boost amount defined in the experience config
mcmmo.perks.xp.customboost.excavation:
default: false
description: Multiplies incoming Excavation XP by the boost amount defined in the experience config
@ -1859,6 +1915,9 @@ permissions:
mcmmo.perks.xp.customboost.taming:
default: false
description: Multiplies incoming Taming XP by the boost amount defined in the experience config
mcmmo.perks.xp.customboost.tridents:
default: false
description: Multiplies incoming Tridents XP by the boost amount defined in the experience config
mcmmo.perks.xp.customboost.unarmed:
default: false
description: Multiplies incoming Unarmed XP by the boost amount defined in the experience config
@ -1883,6 +1942,7 @@ permissions:
mcmmo.perks.xp.double.alchemy: true
mcmmo.perks.xp.double.archery: true
mcmmo.perks.xp.double.axes: true
mcmmo.perks.xp.double.crossbows: true
mcmmo.perks.xp.double.excavation: true
mcmmo.perks.xp.double.fishing: true
mcmmo.perks.xp.double.herbalism: true
@ -1891,6 +1951,7 @@ permissions:
mcmmo.perks.xp.double.smelting: true
mcmmo.perks.xp.double.swords: true
mcmmo.perks.xp.double.taming: true
mcmmo.perks.xp.double.tridents: true
mcmmo.perks.xp.double.unarmed: true
mcmmo.perks.xp.double.woodcutting: true
mcmmo.perks.xp.double.acrobatics:
@ -1905,6 +1966,9 @@ permissions:
mcmmo.perks.xp.double.axes:
default: false
description: Doubles incoming Axes XP
mcmmo.perks.xp.double.crossbows:
default: false
description: Doubles incoming Crossbows XP
mcmmo.perks.xp.double.excavation:
default: false
description: Doubles incoming Excavation XP
@ -1929,6 +1993,9 @@ permissions:
mcmmo.perks.xp.double.taming:
default: false
description: Doubles incoming Taming XP
mcmmo.perks.xp.double.tridents:
default: false
description: Doubles incoming Tridents XP
mcmmo.perks.xp.double.unarmed:
default: false
description: Doubles incoming Unarmed XP
@ -1953,6 +2020,7 @@ permissions:
mcmmo.perks.xp.quadruple.alchemy: true
mcmmo.perks.xp.quadruple.archery: true
mcmmo.perks.xp.quadruple.axes: true
mcmmo.perks.xp.quadruple.crossbows: true
mcmmo.perks.xp.quadruple.excavation: true
mcmmo.perks.xp.quadruple.fishing: true
mcmmo.perks.xp.quadruple.herbalism: true
@ -1961,6 +2029,7 @@ permissions:
mcmmo.perks.xp.quadruple.smelting: true
mcmmo.perks.xp.quadruple.swords: true
mcmmo.perks.xp.quadruple.taming: true
mcmmo.perks.xp.quadruple.tridents: true
mcmmo.perks.xp.quadruple.unarmed: true
mcmmo.perks.xp.quadruple.woodcutting: true
mcmmo.perks.xp.quadruple.acrobatics:
@ -1975,6 +2044,9 @@ permissions:
mcmmo.perks.xp.quadruple.axes:
default: false
description: Quadruples incoming Axes XP
mcmmo.perks.xp.quadruple.crossbows:
default: false
description: Quadruples incoming Crossbows XP
mcmmo.perks.xp.quadruple.excavation:
default: false
description: Quadruples incoming Excavation XP
@ -1999,6 +2071,9 @@ permissions:
mcmmo.perks.xp.quadruple.taming:
default: false
description: Quadruples incoming Taming XP
mcmmo.perks.xp.quadruple.tridents:
default: false
description: Quadruples incoming Tridents XP
mcmmo.perks.xp.quadruple.unarmed:
default: false
description: Quadruples incoming Unarmed XP
@ -2023,6 +2098,7 @@ permissions:
mcmmo.perks.xp.triple.alchemy: true
mcmmo.perks.xp.triple.archery: true
mcmmo.perks.xp.triple.axes: true
mcmmo.perks.xp.triple.crossbows: true
mcmmo.perks.xp.triple.excavation: true
mcmmo.perks.xp.triple.fishing: true
mcmmo.perks.xp.triple.herbalism: true
@ -2031,6 +2107,7 @@ permissions:
mcmmo.perks.xp.triple.smelting: true
mcmmo.perks.xp.triple.swords: true
mcmmo.perks.xp.triple.taming: true
mcmmo.perks.xp.triple.tridents: true
mcmmo.perks.xp.triple.unarmed: true
mcmmo.perks.xp.triple.woodcutting: true
mcmmo.perks.xp.triple.acrobatics:
@ -2045,6 +2122,9 @@ permissions:
mcmmo.perks.xp.triple.axes:
default: false
description: Triples incoming Axes XP
mcmmo.perks.xp.triple.crossbows:
default: false
description: Triples incoming Crossbows XP
mcmmo.perks.xp.triple.excavation:
default: false
description: Triples incoming Excavation XP
@ -2069,6 +2149,9 @@ permissions:
mcmmo.perks.xp.triple.taming:
default: false
description: Triples incoming Taming XP
mcmmo.perks.xp.triple.tridents:
default: false
description: Triples incoming Tridents XP
mcmmo.perks.xp.triple.unarmed:
default: false
description: Triples incoming Unarmed XP
@ -2124,6 +2207,11 @@ permissions:
children:
mcmmo.ability.axes.all: true
mcmmo.commands.axes: true
mcmmo.skills.crossbows:
description: Allows access to the Crossbows skill
children:
mcmmo.ability.crossbows.all: true
mcmmo.commands.crossbows: true
mcmmo.skills.excavation:
description: Allows access to the Excavation skill
children:
@ -2169,6 +2257,11 @@ permissions:
children:
mcmmo.ability.taming.all: true
mcmmo.commands.taming: true
mcmmo.skills.tridents:
description: Allows access to the Tridents skill
children:
mcmmo.ability.tridents.all: true
mcmmo.commands.tridents: true
mcmmo.skills.unarmed:
description: Allows access to the Unarmed skill
children:
@ -2182,16 +2275,3 @@ permissions:
mcmmo.showversion:
default: true
description: Show mcMMO version number in /mcmmo and motd
mcmmo.tools.*:
default: false
description: Implies all mcmmo.tools permissions.
children:
mcmmo.tools.all: true
mcmmo.tools.all:
default: false
description: Implies all mcmmo.tools permissions.
children:
mcmmo.tools.updatecheck: true
mcmmo.tools.updatecheck:
default: false
description: Notifies admins if there is a new version of mcMMO available

6
src/main/resources/skillranks.yml
View File

@ -207,6 +207,12 @@ Crossbows:
Rank_1: 5
RetroMode:
Rank_1: 50
Tridents:
TridentsSuperAbility:
Standard:
Rank_1: 5
RetroMode:
Rank_1: 50
Taming:
BeastLore:
Standard:

2
src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java
View File

@ -492,7 +492,7 @@ class FlatFileDatabaseManagerTest {
return expectedSerratedStrikesCd;
case BLAST_MINING:
return expectedBlastMiningCd;
case TRIDENT_ABILITY:
case TRIDENTS_SUPER_ABILITY:
return expectedTridentSuperCd;
}