mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-30 00:56:47 +01:00
Changed secondary abilities to use constants instead of enum
This commit is contained in:
ile123ile
parent
0700e4354c
commit
edd764d5e6
@ -1,51 +0,0 @@
|
|||||||
# This is the main configuration file for Bukkit.
|
|
||||||
# As you can see, there's actually not that much to configure without any plugins.
|
|
||||||
# For a reference for any variable inside this file, check out the bukkit wiki at
|
|
||||||
# http://wiki.bukkit.org/Bukkit.yml
|
|
||||||
#
|
|
||||||
# If you need help on this file, feel free to join us on irc or leave a message
|
|
||||||
# on the forums asking for advice.
|
|
||||||
#
|
|
||||||
# IRC: #bukkit @ esper.net
|
|
||||||
# (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit )
|
|
||||||
# Forums: http://forums.bukkit.org/forums/bukkit-help.6/
|
|
||||||
# Twitter: http://twitter.com/Craftbukkit
|
|
||||||
# Bug tracker: http://leaky.bukkit.org/
|
|
||||||
|
|
||||||
|
|
||||||
settings:
|
|
||||||
allow-end: true
|
|
||||||
warn-on-overload: true
|
|
||||||
spawn-radius: 16
|
|
||||||
permissions-file: permissions.yml
|
|
||||||
update-folder: update
|
|
||||||
ping-packet-limit: 100
|
|
||||||
use-exact-login-location: false
|
|
||||||
plugin-profiling: false
|
|
||||||
connection-throttle: 4000
|
|
||||||
query-plugins: true
|
|
||||||
deprecated-verbose: default
|
|
||||||
spawn-limits:
|
|
||||||
monsters: 70
|
|
||||||
animals: 15
|
|
||||||
water-animals: 5
|
|
||||||
ticks-per:
|
|
||||||
animal-spawns: 400
|
|
||||||
monster-spawns: 1
|
|
||||||
auto-updater:
|
|
||||||
enabled: true
|
|
||||||
on-broken:
|
|
||||||
- warn-console
|
|
||||||
- warn-ops
|
|
||||||
on-update:
|
|
||||||
- warn-console
|
|
||||||
- warn-ops
|
|
||||||
preferred-channel: rb
|
|
||||||
host: dl.bukkit.org
|
|
||||||
suggest-channels: true
|
|
||||||
database:
|
|
||||||
username: bukkit
|
|
||||||
isolation: SERIALIZABLE
|
|
||||||
driver: org.sqlite.JDBC
|
|
||||||
password: walrus
|
|
||||||
url: jdbc:sqlite:{DIR}{NAME}.db
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
# This is the help configuration file for Bukkit.
|
|
||||||
#
|
|
||||||
# By default you do not need to modify this file. Help topics for all plugin commands are automatically provided by
|
|
||||||
# or extracted from your installed plugins. You only need to modify this file if you wish to add new help pages to
|
|
||||||
# your server or override the help pages of existing plugin commands.
|
|
||||||
#
|
|
||||||
# This file is divided up into the following parts:
|
|
||||||
# -- general-topics: lists admin defined help topics
|
|
||||||
# -- index-topics: lists admin defined index topics
|
|
||||||
# -- amend-topics: lists topic amendments to apply to existing help topics
|
|
||||||
# -- ignore-plugins: lists any plugins that should be excluded from help
|
|
||||||
#
|
|
||||||
# Examples are given below. When amending command topic, the string <text> will be replaced with the existing value
|
|
||||||
# in the help topic. Color codes can be used in topic text. The color code character is & followed by 0-F.
|
|
||||||
# ================================================================
|
|
||||||
#
|
|
||||||
# Set this to true to list the individual command help topics in the master help.
|
|
||||||
# command-topics-in-master-index: true
|
|
||||||
#
|
|
||||||
# Each general topic will show up as a separate topic in the help index along with all the plugin command topics.
|
|
||||||
# general-topics:
|
|
||||||
# Rules:
|
|
||||||
# shortText: Rules of the server
|
|
||||||
# fullText: |
|
|
||||||
# &61. Be kind to your fellow players.
|
|
||||||
# &B2. No griefing.
|
|
||||||
# &D3. No swearing.
|
|
||||||
# permission: topics.rules
|
|
||||||
#
|
|
||||||
# Each index topic will show up as a separate sub-index in the help index along with all the plugin command topics.
|
|
||||||
# To override the default help index (displayed when the user executes /help), name the index topic "Default".
|
|
||||||
# index-topics:
|
|
||||||
# Ban Commands:
|
|
||||||
# shortText: Player banning commands
|
|
||||||
# preamble: Moderator - do not abuse these commands
|
|
||||||
# permission: op
|
|
||||||
# commands:
|
|
||||||
# - /ban
|
|
||||||
# - /ban-ip
|
|
||||||
# - /banlist
|
|
||||||
#
|
|
||||||
# Topic amendments are used to change the content of automatically generated plugin command topics.
|
|
||||||
# amended-topics:
|
|
||||||
# /stop:
|
|
||||||
# shortText: Stops the server cold....in its tracks!
|
|
||||||
# fullText: <text> - This kills the server.
|
|
||||||
# permission: you.dont.have
|
|
||||||
#
|
|
||||||
# Any plugin in the ignored plugins list will be excluded from help. The name must match the name displayed by
|
|
||||||
# the /plugins command. Ignore "Bukkit" to remove the standard bukkit commands from the index. Ignore "All"
|
|
||||||
# to completely disable automatic help topic generation.
|
|
||||||
# ignore-plugins:
|
|
||||||
# - PluginNameOne
|
|
||||||
# - PluginNameTwo
|
|
||||||
# - PluginNameThree
|
|
||||||
|
|
||||||
@ -1,584 +0,0 @@
|
|||||||
#
|
|
||||||
# Advanced configuration
|
|
||||||
# Last updated on 1.5.01-SNAPSHOT-b${BUILD_NUMBER}
|
|
||||||
#
|
|
||||||
# For advanced users only! There is no need to change anything here.
|
|
||||||
#
|
|
||||||
# You can customize almost every aspect of every skill here.
|
|
||||||
# Its mainly here if you've customized the experience formula.
|
|
||||||
# Configure at what level you get better with certain abilities.
|
|
||||||
#
|
|
||||||
#####
|
|
||||||
|
|
||||||
#
|
|
||||||
# Settings for the Skills
|
|
||||||
###
|
|
||||||
Skills:
|
|
||||||
General:
|
|
||||||
Ability:
|
|
||||||
# IncreaseLevel: This setting will determine when the length of every ability gets longer with 1 second
|
|
||||||
# EnchantBuff: This setting determines how many enchant levels to use when buffing Super Breaker & Giga Drill Breaker
|
|
||||||
IncreaseLevel: 50
|
|
||||||
EnchantBuff: 5
|
|
||||||
#
|
|
||||||
# Settings for Acrobatics
|
|
||||||
###
|
|
||||||
Acrobatics:
|
|
||||||
Dodge:
|
|
||||||
# ChanceMax: Maximum chance of dodging when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: On this level or higher, the dodge chance will not go higher than <ChanceMax>
|
|
||||||
# DamageModifier: Dodge damage will be divided by this modifier
|
|
||||||
ChanceMax: 20.0
|
|
||||||
MaxBonusLevel: 800
|
|
||||||
DamageModifier: 2.0
|
|
||||||
|
|
||||||
Roll:
|
|
||||||
# ChanceMax: Maximum chance of rolling when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: On this level or higher, the roll chance will not go higher than <ChanceMax>
|
|
||||||
# DamageThreshold: The max damage a player can negate with a roll
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
DamageThreshold: 7.0
|
|
||||||
|
|
||||||
GracefulRoll:
|
|
||||||
# ChanceMax: Maximum chance of graceful rolling when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: On this level or higher, the graceful roll chance will not go higher than <ChanceMax>
|
|
||||||
# DamageThreshold: The max damage a player can negate with a graceful roll
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 500
|
|
||||||
DamageThreshold: 14.0
|
|
||||||
#
|
|
||||||
# Settings for Alchemy
|
|
||||||
###
|
|
||||||
Alchemy:
|
|
||||||
Catalysis:
|
|
||||||
# UnlockLevel: Alchemy level when the Catalysis ability unlocks
|
|
||||||
# MaxBonusLevel: Maximum bonus level of Catalysis, when a player reaches this level his brewing speed will be <MaxSpeed>
|
|
||||||
# MinSpeed: Minimum brewing speed allowed when at <UnlockLevel> or lower
|
|
||||||
# MaxSpeed: Maximum brewing speed allowed when at <MaxBonusLevel> or higher
|
|
||||||
UnlockLevel: 100
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
MinSpeed: 1.0
|
|
||||||
MaxSpeed: 4.0
|
|
||||||
|
|
||||||
# Rank_Levels: Alchemy level where rank gets unlocked
|
|
||||||
Rank_Levels:
|
|
||||||
Rank_1: 0
|
|
||||||
Rank_2: 125
|
|
||||||
Rank_3: 250
|
|
||||||
Rank_4: 375
|
|
||||||
Rank_5: 500
|
|
||||||
Rank_6: 625
|
|
||||||
Rank_7: 750
|
|
||||||
Rank_8: 875
|
|
||||||
#
|
|
||||||
# Settings for Archery
|
|
||||||
###
|
|
||||||
Archery:
|
|
||||||
SkillShot:
|
|
||||||
# IncreaseLevel: Every <IncreaseLevel> the skillshot bonus will go up by <IncreasePercentage>
|
|
||||||
# IncreasePercentage: This is a percentage value, 0.1 = 10%
|
|
||||||
# MaxBonus: When the <MaxBonus> has been reached, the bonus percentage will not go up anymore. 2.0 = 200%
|
|
||||||
IncreaseLevel: 50
|
|
||||||
IncreasePercentage: 0.1
|
|
||||||
MaxBonus: 2.0
|
|
||||||
MaxDamage: 9.0
|
|
||||||
|
|
||||||
Daze:
|
|
||||||
# ChanceMax: Maximum chance of causing daze to opponents when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: Maximum bonus level of Daze, when a player reaches this level his chance of causing a daze will be <ChanceMax>
|
|
||||||
# Modifier: Extra damage for arrows that cause a daze (2 damage = 1 heart)
|
|
||||||
ChanceMax: 50.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
Modifier: 4.0
|
|
||||||
|
|
||||||
Retrieve:
|
|
||||||
# ChanceMax: Maximum chance of retrieving arrows when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: Maximum bonus level for Arrow retrieval, at this level the chance of retrieving arrows from mobs is <ChanceMax>
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
# ForceMultiplier: Multiply the force of the bow by this for an XP boost.
|
|
||||||
ForceMultiplier: 2.0
|
|
||||||
#
|
|
||||||
# Settings for Axes
|
|
||||||
###
|
|
||||||
Axes:
|
|
||||||
AxeMastery:
|
|
||||||
# MaxBonus: Maximum bonus damage when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: Level where <MaxBonus> is reached
|
|
||||||
MaxBonus: 4.0
|
|
||||||
MaxBonusLevel: 200
|
|
||||||
|
|
||||||
CriticalHit:
|
|
||||||
# ChanceMax: Maximum chance of causing a critical hit when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: Level where <ChanceMax> of causing critical hits is reached
|
|
||||||
ChanceMax: 37.50
|
|
||||||
MaxBonusLevel: 750
|
|
||||||
# Damage modifier of critical hits for PVP / PVE, when causing a critical hit the damage gets multiplied by the modifier
|
|
||||||
PVP_Modifier: 1.5
|
|
||||||
PVE_Modifier: 2.0
|
|
||||||
|
|
||||||
GreaterImpact:
|
|
||||||
# Chance: Chance of hitting with GreaterImpact, mobs are knocked backwards when successful
|
|
||||||
# KnockbackModifier: Velocity modifier of GreaterImpact hits, this determines how great the knockback is
|
|
||||||
# BonusDamage: Extra damage for GreaterImpact hits
|
|
||||||
Chance: 25.0
|
|
||||||
KnockbackModifier: 1.5
|
|
||||||
BonusDamage: 2.0
|
|
||||||
|
|
||||||
ArmorImpact:
|
|
||||||
# IncreaseLevel: Every <IncreaseLevel> the durability damage goes up with 1
|
|
||||||
# Chance: Chance of hitting with ArmorImpact
|
|
||||||
# MaxPercentageDurabilityDamage: Durability damage cap for ArmorImpact, 20% means that you can never destroy a piece of armor in less than 5 hits
|
|
||||||
IncreaseLevel: 50
|
|
||||||
Chance: 25.0
|
|
||||||
MaxPercentageDurabilityDamage: 20.0
|
|
||||||
|
|
||||||
SkullSplitter:
|
|
||||||
# DamageModifier: Damage will get divided by this modifier
|
|
||||||
DamageModifier: 2.0
|
|
||||||
#
|
|
||||||
# Settings for Fishing
|
|
||||||
###
|
|
||||||
Fishing:
|
|
||||||
# Rank_Levels: Fishing level where rank gets unlocked
|
|
||||||
Rank_Levels:
|
|
||||||
Rank_1: 0
|
|
||||||
Rank_2: 125
|
|
||||||
Rank_3: 250
|
|
||||||
Rank_4: 375
|
|
||||||
Rank_5: 500
|
|
||||||
Rank_6: 625
|
|
||||||
Rank_7: 700
|
|
||||||
Rank_8: 875
|
|
||||||
|
|
||||||
ShakeChance:
|
|
||||||
Rank_1: 15.0
|
|
||||||
Rank_2: 15.0
|
|
||||||
Rank_3: 25.0
|
|
||||||
Rank_4: 35.0
|
|
||||||
Rank_5: 45.0
|
|
||||||
Rank_6: 55.0
|
|
||||||
Rank_7: 65.0
|
|
||||||
Rank_8: 75.0
|
|
||||||
|
|
||||||
# VanillaXPMultiplier: Vanilla XP gained from fishing is multiplied by these values.
|
|
||||||
VanillaXPMultiplier:
|
|
||||||
Rank_1: 1
|
|
||||||
Rank_2: 2
|
|
||||||
Rank_3: 3
|
|
||||||
Rank_4: 3
|
|
||||||
Rank_5: 4
|
|
||||||
Rank_6: 4
|
|
||||||
Rank_7: 5
|
|
||||||
Rank_8: 5
|
|
||||||
|
|
||||||
FishermansDiet:
|
|
||||||
# This determines when Fisherman's Diet adds extra hunger recovery to food
|
|
||||||
RankChange: 200
|
|
||||||
|
|
||||||
IceFishing:
|
|
||||||
# UnlockLevel: Fishing level when the Ice Fishing ability unlocks
|
|
||||||
UnlockLevel: 50
|
|
||||||
|
|
||||||
MasterAngler:
|
|
||||||
# UnlockLevel: Fishing level when the Master Angler ability unlocks
|
|
||||||
# BoatMultiplier: Catch rate is multiplied by this modifier
|
|
||||||
# BiomeModifier: Catch rate is multiplied by this modifier
|
|
||||||
UnlockLevel: 125
|
|
||||||
BoatModifier: 2.0
|
|
||||||
BiomeModifier: 2.0
|
|
||||||
#
|
|
||||||
# Settings for Herbalism
|
|
||||||
###
|
|
||||||
Herbalism:
|
|
||||||
FarmersDiet:
|
|
||||||
# This determines when Farmers Diet adds extra hunger recovery to food
|
|
||||||
RankChange: 200
|
|
||||||
|
|
||||||
GreenThumb:
|
|
||||||
# StageChange: Level value when the GreenThumb stage rank goes up
|
|
||||||
# ChanceMax: Maximum chance of GreenThumb when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: On this level, GreenThumb chance will be <ChanceMax>
|
|
||||||
StageChange: 200
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1500
|
|
||||||
|
|
||||||
DoubleDrops:
|
|
||||||
# ChanceMax: Maximum chance of receiving double drops when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: Level when <ChanceMax> of receiving double drops is reached
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
HylianLuck:
|
|
||||||
# ChanceMax: Maximum chance of Hylian Luck when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: On this level, Hylian Luck chance will be <ChanceMax>
|
|
||||||
ChanceMax: 10.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
ShroomThumb:
|
|
||||||
# ChanceMax: Maximum chance of ShroomThumb when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: On this level, ShroomThumb chance will be <ChanceMax>
|
|
||||||
ChanceMax: 50.0
|
|
||||||
MaxBonusLevel: 1500
|
|
||||||
#
|
|
||||||
# Settings for Mining
|
|
||||||
###
|
|
||||||
Mining:
|
|
||||||
DoubleDrops:
|
|
||||||
# ChanceMax: Maximum chance of receiving double drops when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: Level when <ChanceMax> of receiving double drops is reached
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
# BlastMining_Rank: BlastMining rank unlocks
|
|
||||||
BlastMining:
|
|
||||||
Rank_Levels:
|
|
||||||
Rank_1: 125
|
|
||||||
Rank_2: 250
|
|
||||||
Rank_3: 375
|
|
||||||
Rank_4: 500
|
|
||||||
Rank_5: 625
|
|
||||||
Rank_6: 750
|
|
||||||
Rank_7: 875
|
|
||||||
Rank_8: 1000
|
|
||||||
|
|
||||||
# BlastDamageDecrease Ranks: % of damage reduced from TNT explosions
|
|
||||||
BlastDamageDecrease:
|
|
||||||
Rank_1: 0.0
|
|
||||||
Rank_2: 0.0
|
|
||||||
Rank_3: 0.0
|
|
||||||
Rank_4: 25.0
|
|
||||||
Rank_5: 25.0
|
|
||||||
Rank_6: 50.0
|
|
||||||
Rank_7: 50.0
|
|
||||||
Rank_8: 100.0
|
|
||||||
|
|
||||||
# OreBonus Ranks: % of extra ores received when Blast Mining
|
|
||||||
OreBonus:
|
|
||||||
Rank_1: 35.0
|
|
||||||
Rank_2: 40.0
|
|
||||||
Rank_3: 45.0
|
|
||||||
Rank_4: 50.0
|
|
||||||
Rank_5: 55.0
|
|
||||||
Rank_6: 60.0
|
|
||||||
Rank_7: 65.0
|
|
||||||
Rank_8: 70.0
|
|
||||||
|
|
||||||
# DebrisReduction_Rank: % of fewer non-ores received when Blast Mining
|
|
||||||
DebrisReduction:
|
|
||||||
Rank_1: 10.0
|
|
||||||
Rank_2: 20.0
|
|
||||||
Rank_3: 30.0
|
|
||||||
Rank_4: 30.0
|
|
||||||
Rank_5: 30.0
|
|
||||||
Rank_6: 30.0
|
|
||||||
Rank_7: 30.0
|
|
||||||
Rank_8: 30.0
|
|
||||||
|
|
||||||
# DropMultiplier Ranks: # of times each ore will drop
|
|
||||||
DropMultiplier:
|
|
||||||
Rank_1: 1
|
|
||||||
Rank_2: 1
|
|
||||||
Rank_3: 1
|
|
||||||
Rank_4: 1
|
|
||||||
Rank_5: 2
|
|
||||||
Rank_6: 2
|
|
||||||
Rank_7: 3
|
|
||||||
Rank_8: 3
|
|
||||||
|
|
||||||
# BlastRadiusModifier Ranks: Increases the blast radius by this amount
|
|
||||||
BlastRadiusModifier:
|
|
||||||
Rank_1: 1.0
|
|
||||||
Rank_2: 1.0
|
|
||||||
Rank_3: 2.0
|
|
||||||
Rank_4: 2.0
|
|
||||||
Rank_5: 3.0
|
|
||||||
Rank_6: 3.0
|
|
||||||
Rank_7: 4.0
|
|
||||||
Rank_8: 4.0
|
|
||||||
#
|
|
||||||
# Settings for Repair
|
|
||||||
###
|
|
||||||
Repair:
|
|
||||||
RepairMastery:
|
|
||||||
# MaxBonusPercentage: Maximum bonus percentage for Repair Mastery
|
|
||||||
# MaxBonusLevel: On this level, the maximum bonus is reached
|
|
||||||
MaxBonusPercentage: 200.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
SuperRepair:
|
|
||||||
# ChanceMax: Maximum chance of Super Repair when on <MaxBonusLevel> or higher
|
|
||||||
# MaxBonusLevel: On this level, Super Repair chance will be <ChanceMax>
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
ArcaneForging:
|
|
||||||
May_Lose_Enchants: true
|
|
||||||
Rank_Levels:
|
|
||||||
Rank_1: 125
|
|
||||||
Rank_2: 250
|
|
||||||
Rank_3: 375
|
|
||||||
Rank_4: 500
|
|
||||||
Rank_5: 625
|
|
||||||
Rank_6: 750
|
|
||||||
Rank_7: 875
|
|
||||||
Rank_8: 1000
|
|
||||||
Keep_Enchants_Chance:
|
|
||||||
Rank_1: 10.0
|
|
||||||
Rank_2: 20.0
|
|
||||||
Rank_3: 30.0
|
|
||||||
Rank_4: 40.0
|
|
||||||
Rank_5: 50.0
|
|
||||||
Rank_6: 50.0
|
|
||||||
Rank_7: 60.0
|
|
||||||
Rank_8: 60.0
|
|
||||||
Downgrades_Enabled: true
|
|
||||||
Downgrades_Chance:
|
|
||||||
Rank_1: 75.0
|
|
||||||
Rank_2: 50.0
|
|
||||||
Rank_3: 40.0
|
|
||||||
Rank_4: 30.0
|
|
||||||
Rank_5: 25.0
|
|
||||||
Rank_6: 20.0
|
|
||||||
Rank_7: 15.0
|
|
||||||
Rank_8: 10.0
|
|
||||||
#
|
|
||||||
# Settings for Salvage
|
|
||||||
###
|
|
||||||
Salvage:
|
|
||||||
# MaxPercentage: Maximum percentage of materials to be returned when Salvaging
|
|
||||||
# MaxPercentageLevel: On this level, the Salvage percentage will be <MaxPercentage>
|
|
||||||
MaxPercentage: 100.0
|
|
||||||
MaxPercentageLevel: 1000
|
|
||||||
|
|
||||||
# AdvancedSalvage_UnlockLevel: The level at which Advance Salvage become available
|
|
||||||
AdvancedSalvage:
|
|
||||||
UnlockLevel: 350
|
|
||||||
|
|
||||||
ArcaneSalvage:
|
|
||||||
# EnchantLossEnabled: When salvaging enchanted items, the enchants may be lost
|
|
||||||
# EnchantDowngradeEnabled: When salvaging enchanted items, the enchants may be downgraded
|
|
||||||
EnchantLossEnabled: true
|
|
||||||
EnchantDowngradeEnabled: true
|
|
||||||
Rank_Levels:
|
|
||||||
Rank_1: 125
|
|
||||||
Rank_2: 250
|
|
||||||
Rank_3: 375
|
|
||||||
Rank_4: 500
|
|
||||||
Rank_5: 625
|
|
||||||
Rank_6: 750
|
|
||||||
Rank_7: 875
|
|
||||||
Rank_8: 1000
|
|
||||||
|
|
||||||
# ExtractFullEnchant: Chance to extract the full enchant at each ArcaneSalvage rank
|
|
||||||
ExtractFullEnchant:
|
|
||||||
Rank_1: 2.5
|
|
||||||
Rank_2: 5.0
|
|
||||||
Rank_3: 7.5
|
|
||||||
Rank_4: 10.0
|
|
||||||
Rank_5: 12.5
|
|
||||||
Rank_6: 17.5
|
|
||||||
Rank_7: 25.0
|
|
||||||
Rank_8: 32.5
|
|
||||||
|
|
||||||
# ExtractPartialEnchant: Chance to extract the partial enchant at each ArcaneSalvage rank
|
|
||||||
ExtractPartialEnchant:
|
|
||||||
Rank_1: 2.0
|
|
||||||
Rank_2: 2.5
|
|
||||||
Rank_3: 5.0
|
|
||||||
Rank_4: 7.5
|
|
||||||
Rank_5: 10.0
|
|
||||||
Rank_6: 12.5
|
|
||||||
Rank_7: 15.0
|
|
||||||
Rank_8: 17.5
|
|
||||||
#
|
|
||||||
# Settings for Smelting
|
|
||||||
###
|
|
||||||
Smelting:
|
|
||||||
FuelEfficiency:
|
|
||||||
# Multiplier: The furnace burn time will be multiplied by this value.
|
|
||||||
# MaxBonusLevel: On this level, the efficiency multiplier will stop increasing
|
|
||||||
Multiplier: 3.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
SecondSmelt:
|
|
||||||
# ChanceMax: Maximum chance of triggering Second Smelt
|
|
||||||
# MaxBonusLevel: On this level, the chance to cause Second Smelt will be <ChanceMax>
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
FluxMining:
|
|
||||||
# UnlockLevel: Level when Flux Mining becomes available
|
|
||||||
# Chance: Chance for Flux Mining to activate
|
|
||||||
UnlockLevel: 250
|
|
||||||
Chance: 33.0
|
|
||||||
|
|
||||||
# Rank_Levels: Smelting level where rank gets unlocked
|
|
||||||
Rank_Levels:
|
|
||||||
Rank_1: 125
|
|
||||||
Rank_2: 250
|
|
||||||
Rank_3: 375
|
|
||||||
Rank_4: 500
|
|
||||||
Rank_5: 625
|
|
||||||
Rank_6: 750
|
|
||||||
Rank_7: 875
|
|
||||||
Rank_8: 1000
|
|
||||||
|
|
||||||
# VanillaXPMultiplier: Vanilla XP gained from smelting ores is multiplied by these values.
|
|
||||||
VanillaXPMultiplier:
|
|
||||||
Rank_1: 1
|
|
||||||
Rank_2: 2
|
|
||||||
Rank_3: 3
|
|
||||||
Rank_4: 3
|
|
||||||
Rank_5: 4
|
|
||||||
Rank_6: 4
|
|
||||||
Rank_7: 5
|
|
||||||
Rank_8: 5
|
|
||||||
|
|
||||||
#
|
|
||||||
# Settings for Swords
|
|
||||||
###
|
|
||||||
Swords:
|
|
||||||
Bleed:
|
|
||||||
# ChanceMax: Maximum chance of triggering bleeding
|
|
||||||
# MaxBonusLevel: On this level, the chance to cause Bleeding will be <ChanceMax>
|
|
||||||
ChanceMax: 75.0
|
|
||||||
MaxBonusLevel: 750
|
|
||||||
|
|
||||||
# These settings determine how long the Bleeding effect lasts
|
|
||||||
MaxTicks: 3
|
|
||||||
BaseTicks: 2
|
|
||||||
|
|
||||||
Counter:
|
|
||||||
# RequiresBlock: Determines if blocking is required to trigger counter attack
|
|
||||||
RequiresBlock: true
|
|
||||||
|
|
||||||
# ChanceMax: Maximum chance of triggering a counter attack
|
|
||||||
# MaxBonusLevel: On this level, the chance to Counter will be <ChanceMax>
|
|
||||||
ChanceMax: 30.0
|
|
||||||
MaxBonusLevel: 600
|
|
||||||
|
|
||||||
# DamageModifier: Damaged caused by the damager will get divided by this modifier and dealt back to the damager
|
|
||||||
DamageModifier: 2.0
|
|
||||||
|
|
||||||
SerratedStrikes:
|
|
||||||
# DamageModifier: Damage will get divided by this modifier
|
|
||||||
# BleedTicks: This determines how long the bleeding effect of SerratedStrikes lasts
|
|
||||||
DamageModifier: 4.0
|
|
||||||
BleedTicks: 5
|
|
||||||
#
|
|
||||||
# Settings for Taming
|
|
||||||
###
|
|
||||||
Taming:
|
|
||||||
Gore:
|
|
||||||
# ChanceMax: Maximum chance of triggering gore
|
|
||||||
# MaxBonusLevel: On this level, the chance to cause Gore will be <ChanceMax>
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
# BleedTicks: Determines the length of the bleeding effect
|
|
||||||
# Modifier: Damage will get multiplied by this modifier
|
|
||||||
BleedTicks: 2
|
|
||||||
Modifier: 2.0
|
|
||||||
|
|
||||||
FastFood:
|
|
||||||
# UnlockLevel: Level when FastFood unlocks
|
|
||||||
# Chance: The chance for wolves to heal hp when inflicting damage
|
|
||||||
UnlockLevel: 50
|
|
||||||
Chance: 50.0
|
|
||||||
|
|
||||||
EnvironmentallyAware:
|
|
||||||
# UnlockLevel: Level when EnvironmentallyAware unlocks
|
|
||||||
UnlockLevel: 100
|
|
||||||
|
|
||||||
ThickFur:
|
|
||||||
# UnlockLevel: Level when ThickFur unlocks
|
|
||||||
# Modifier: Damage will get divided by this modifier
|
|
||||||
UnlockLevel: 250
|
|
||||||
Modifier: 2.0
|
|
||||||
|
|
||||||
HolyHound:
|
|
||||||
# UnlockLevel: Level when HolyHound unlocks
|
|
||||||
UnlockLevel: 375
|
|
||||||
|
|
||||||
ShockProof:
|
|
||||||
# UnlockLevel: Level when ShockProof unlocks
|
|
||||||
# Modifier: Damage will get divided by this modifier
|
|
||||||
UnlockLevel: 500
|
|
||||||
Modifier: 6.0
|
|
||||||
|
|
||||||
SharpenedClaws:
|
|
||||||
# UnlockLevel: Level when SharpenedClaws unlocks
|
|
||||||
# Bonus: This bonus will get added to the damage caused
|
|
||||||
UnlockLevel: 750
|
|
||||||
Bonus: 2.0
|
|
||||||
|
|
||||||
CallOfTheWild:
|
|
||||||
# MinHorseJumpStrength: The minimum jump strength a summoned horse must have
|
|
||||||
# MaxHorseJumpStrength: The maximum jump strength a summoned horse can have
|
|
||||||
MinHorseJumpStrength: 0.7
|
|
||||||
MaxHorseJumpStrength: 2.0
|
|
||||||
#
|
|
||||||
# Settings for Unarmed
|
|
||||||
###
|
|
||||||
Unarmed:
|
|
||||||
Disarm:
|
|
||||||
# ChanceMax: Maximum chance of disarming other players
|
|
||||||
# MaxBonusLevel: Level when the maximum chance to disarm is reached
|
|
||||||
# AntiTheft: Determines if only the disarmed player can retrieve disarmed items
|
|
||||||
ChanceMax: 33.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
AntiTheft: false
|
|
||||||
|
|
||||||
Deflect:
|
|
||||||
# ChanceMax: Maximum chance of deflecting arrows
|
|
||||||
# MaxBonusLevel: Level when the maximum chance to deflect is reached
|
|
||||||
ChanceMax: 50.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
IronGrip:
|
|
||||||
# ChanceMax: Maximum chance of preventing being disarmed
|
|
||||||
# MaxBonusLevel: Level when the maximum chance to prevent being disarmed is reached
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
|
|
||||||
IronArm:
|
|
||||||
# BonusMin: Minimum bonus damage for unarmed
|
|
||||||
# BonusMax: Maximum bonus damage for unarmed
|
|
||||||
# IncreaseLevel: Bonus damage increases every increase level
|
|
||||||
BonusMin: 3.0
|
|
||||||
BonusMax: 8.0
|
|
||||||
IncreaseLevel: 50
|
|
||||||
#
|
|
||||||
# Settings for Woodcutting
|
|
||||||
###
|
|
||||||
Woodcutting:
|
|
||||||
LeafBlower:
|
|
||||||
# UnlockLevel: At this level, the passive ability LeafBlower unlocks
|
|
||||||
UnlockLevel: 100
|
|
||||||
|
|
||||||
DoubleDrops:
|
|
||||||
# ChanceMax: Maximum chance of receiving double drops
|
|
||||||
# MaxBonusLevel: Level when the maximum chance of receiving double drops is reached
|
|
||||||
ChanceMax: 100.0
|
|
||||||
MaxBonusLevel: 1000
|
|
||||||
#
|
|
||||||
# Customize the kraken!
|
|
||||||
###
|
|
||||||
Kraken:
|
|
||||||
Enabled: true
|
|
||||||
Tries_Before_Release: 50
|
|
||||||
Health: 50.0
|
|
||||||
Name: The Kraken
|
|
||||||
Attack_Interval_Seconds: 1
|
|
||||||
Attack_Damage: 1.0
|
|
||||||
Global_Effects: false
|
|
||||||
Allow_Escaping: false
|
|
||||||
Unleashed_Message:
|
|
||||||
Server: (PLAYER) has unleashed the kraken!
|
|
||||||
Player: THE KRAKEN HAS BEEN UNLEASHED!
|
|
||||||
Defeated_Message:
|
|
||||||
Escape: You have escaped from the kraken!
|
|
||||||
Killed: You have slain the kraken!
|
|
||||||
@ -30,21 +30,21 @@ public class AcrobaticsCommand extends SkillCommand {
|
|||||||
protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
|
protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
|
||||||
// DODGE
|
// DODGE
|
||||||
if (canDodge) {
|
if (canDodge) {
|
||||||
String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DODGE, isLucky);
|
String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.dodge, isLucky);
|
||||||
dodgeChance = dodgeStrings[0];
|
dodgeChance = dodgeStrings[0];
|
||||||
dodgeChanceLucky = dodgeStrings[1];
|
dodgeChanceLucky = dodgeStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// ROLL
|
// ROLL
|
||||||
if (canRoll) {
|
if (canRoll) {
|
||||||
String[] rollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.ROLL, isLucky);
|
String[] rollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.roll, isLucky);
|
||||||
rollChance = rollStrings[0];
|
rollChance = rollStrings[0];
|
||||||
rollChanceLucky = rollStrings[1];
|
rollChanceLucky = rollStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// GRACEFUL ROLL
|
// GRACEFUL ROLL
|
||||||
if (canGracefulRoll) {
|
if (canGracefulRoll) {
|
||||||
String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GRACEFUL_ROLL, isLucky);
|
String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.gracefullRoll, isLucky);
|
||||||
gracefulRollChance = gracefulRollStrings[0];
|
gracefulRollChance = gracefulRollStrings[0];
|
||||||
gracefulRollChanceLucky = gracefulRollStrings[1];
|
gracefulRollChanceLucky = gracefulRollStrings[1];
|
||||||
}
|
}
|
||||||
@ -52,9 +52,9 @@ public class AcrobaticsCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canDodge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DODGE);
|
canDodge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.dodge);
|
||||||
canRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ROLL);
|
canRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.roll);
|
||||||
canGracefulRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GRACEFUL_ROLL);
|
canGracefulRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.gracefullRoll);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -59,8 +59,8 @@ public class AlchemyCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canCatalysis = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CATALYSIS);
|
canCatalysis = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.catalysis);
|
||||||
canConcoctions = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS);
|
canConcoctions = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.concoctions);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -36,14 +36,14 @@ public class ArcheryCommand extends SkillCommand {
|
|||||||
|
|
||||||
// DAZE
|
// DAZE
|
||||||
if (canDaze) {
|
if (canDaze) {
|
||||||
String[] dazeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DAZE, isLucky);
|
String[] dazeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.daze, isLucky);
|
||||||
dazeChance = dazeStrings[0];
|
dazeChance = dazeStrings[0];
|
||||||
dazeChanceLucky = dazeStrings[1];
|
dazeChanceLucky = dazeStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// RETRIEVE
|
// RETRIEVE
|
||||||
if (canRetrieve) {
|
if (canRetrieve) {
|
||||||
String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.RETRIEVE, isLucky);
|
String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.retrieve, isLucky);
|
||||||
retrieveChance = retrieveStrings[0];
|
retrieveChance = retrieveStrings[0];
|
||||||
retrieveChanceLucky = retrieveStrings[1];
|
retrieveChanceLucky = retrieveStrings[1];
|
||||||
}
|
}
|
||||||
@ -51,9 +51,9 @@ public class ArcheryCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canSkillShot = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SKILL_SHOT);
|
canSkillShot = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.skillShot);
|
||||||
canDaze = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DAZE);
|
canDaze = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.daze);
|
||||||
canRetrieve = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.RETRIEVE);
|
canRetrieve = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.retrieve);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -45,7 +45,7 @@ public class AxesCommand extends SkillCommand {
|
|||||||
|
|
||||||
// CRITICAL HIT
|
// CRITICAL HIT
|
||||||
if (canCritical) {
|
if (canCritical) {
|
||||||
String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.CRITICAL_HIT, isLucky);
|
String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.criticalHit, isLucky);
|
||||||
critChance = criticalHitStrings[0];
|
critChance = criticalHitStrings[0];
|
||||||
critChanceLucky = criticalHitStrings[1];
|
critChanceLucky = criticalHitStrings[1];
|
||||||
}
|
}
|
||||||
@ -59,10 +59,10 @@ public class AxesCommand extends SkillCommand {
|
|||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canSkullSplitter = Permissions.skullSplitter(player);
|
canSkullSplitter = Permissions.skullSplitter(player);
|
||||||
canCritical = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CRITICAL_HIT);
|
canCritical = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.criticalHit);
|
||||||
canAxeMastery = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.AXE_MASTERY);
|
canAxeMastery = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.axeMastery);
|
||||||
canImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARMOR_IMPACT);
|
canImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.armorImpact);
|
||||||
canGreaterImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GREATER_IMPACT);
|
canGreaterImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.greaterImpact);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -34,7 +34,7 @@ public class ExcavationCommand extends SkillCommand {
|
|||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canGigaDrill = Permissions.gigaDrillBreaker(player);
|
canGigaDrill = Permissions.gigaDrillBreaker(player);
|
||||||
canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.EXCAVATION_TREASURE_HUNTER);
|
canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.excavationTreasureHunter);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -111,12 +111,12 @@ public class FishingCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHING_TREASURE_HUNTER);
|
canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fishingTreasureHunter);
|
||||||
canMagicHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MAGIC_HUNTER);
|
canMagicHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.magicHunter);
|
||||||
canShake = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHAKE);
|
canShake = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.shake);
|
||||||
canFishermansDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHERMANS_DIET);
|
canFishermansDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fishermansDiet);
|
||||||
canMasterAngler = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MASTER_ANGLER);
|
canMasterAngler = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.masterAngler);
|
||||||
canIceFish = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ICE_FISHING);
|
canIceFish = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.iceFishing);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -56,28 +56,28 @@ public class HerbalismCommand extends SkillCommand {
|
|||||||
if (canGreenThumbBlocks || canGreenThumbPlants) {
|
if (canGreenThumbBlocks || canGreenThumbPlants) {
|
||||||
greenThumbStage = calculateRank(skillValue, Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
|
greenThumbStage = calculateRank(skillValue, Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
|
||||||
|
|
||||||
String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GREEN_THUMB_PLANT, isLucky);
|
String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.greenThumbPlant, isLucky);
|
||||||
greenThumbChance = greenThumbStrings[0];
|
greenThumbChance = greenThumbStrings[0];
|
||||||
greenThumbChanceLucky = greenThumbStrings[1];
|
greenThumbChanceLucky = greenThumbStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// DOUBLE DROPS
|
// DOUBLE DROPS
|
||||||
if (canDoubleDrop) {
|
if (canDoubleDrop) {
|
||||||
String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.HERBALISM_DOUBLE_DROPS, isLucky);
|
String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.herbalismDoubleDrops, isLucky);
|
||||||
doubleDropChance = doubleDropStrings[0];
|
doubleDropChance = doubleDropStrings[0];
|
||||||
doubleDropChanceLucky = doubleDropStrings[1];
|
doubleDropChanceLucky = doubleDropStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// HYLIAN LUCK
|
// HYLIAN LUCK
|
||||||
if (hasHylianLuck) {
|
if (hasHylianLuck) {
|
||||||
String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.HYLIAN_LUCK, isLucky);
|
String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.hylianLuck, isLucky);
|
||||||
hylianLuckChance = hylianLuckStrings[0];
|
hylianLuckChance = hylianLuckStrings[0];
|
||||||
hylianLuckChanceLucky = hylianLuckStrings[1];
|
hylianLuckChanceLucky = hylianLuckStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// SHROOM THUMB
|
// SHROOM THUMB
|
||||||
if (canShroomThumb) {
|
if (canShroomThumb) {
|
||||||
String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.SHROOM_THUMB, isLucky);
|
String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.shroomThumb, isLucky);
|
||||||
shroomThumbChance = shroomThumbStrings[0];
|
shroomThumbChance = shroomThumbStrings[0];
|
||||||
shroomThumbChanceLucky = shroomThumbStrings[1];
|
shroomThumbChanceLucky = shroomThumbStrings[1];
|
||||||
}
|
}
|
||||||
@ -85,13 +85,13 @@ public class HerbalismCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
hasHylianLuck = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HYLIAN_LUCK);
|
hasHylianLuck = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.hylianLuck);
|
||||||
canGreenTerra = Permissions.greenTerra(player);
|
canGreenTerra = Permissions.greenTerra(player);
|
||||||
canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
|
canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
|
||||||
canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
|
canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
|
||||||
canFarmersDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FARMERS_DIET);
|
canFarmersDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.farmersDiet);
|
||||||
canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
|
canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.herbalismDoubleDrops) && !skill.getDoubleDropsDisabled();
|
||||||
canShroomThumb = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHROOM_THUMB);
|
canShroomThumb = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.shroomThumb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -49,7 +49,7 @@ public class MiningCommand extends SkillCommand {
|
|||||||
|
|
||||||
// DOUBLE DROPS
|
// DOUBLE DROPS
|
||||||
if (canDoubleDrop) {
|
if (canDoubleDrop) {
|
||||||
String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.MINING_DOUBLE_DROPS, isLucky);
|
String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.miningDoubleDrops, isLucky);
|
||||||
doubleDropChance = doubleDropStrings[0];
|
doubleDropChance = doubleDropStrings[0];
|
||||||
doubleDropChanceLucky = doubleDropStrings[1];
|
doubleDropChanceLucky = doubleDropStrings[1];
|
||||||
}
|
}
|
||||||
@ -72,7 +72,7 @@ public class MiningCommand extends SkillCommand {
|
|||||||
canBiggerBombs = Permissions.biggerBombs(player);
|
canBiggerBombs = Permissions.biggerBombs(player);
|
||||||
canBlast = Permissions.remoteDetonation(player);
|
canBlast = Permissions.remoteDetonation(player);
|
||||||
canDemoExpert = Permissions.demolitionsExpertise(player);
|
canDemoExpert = Permissions.demolitionsExpertise(player);
|
||||||
canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MINING_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
|
canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.miningDoubleDrops) && !skill.getDoubleDropsDisabled();
|
||||||
canSuperBreaker = Permissions.superBreaker(player);
|
canSuperBreaker = Permissions.superBreaker(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -66,7 +66,7 @@ public class RepairCommand extends SkillCommand {
|
|||||||
|
|
||||||
// SUPER REPAIR
|
// SUPER REPAIR
|
||||||
if (canSuperRepair) {
|
if (canSuperRepair) {
|
||||||
String[] superRepairStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.SUPER_REPAIR, isLucky);
|
String[] superRepairStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.superRepair, isLucky);
|
||||||
superRepairChance = superRepairStrings[0];
|
superRepairChance = superRepairStrings[0];
|
||||||
superRepairChanceLucky = superRepairStrings[1];
|
superRepairChanceLucky = superRepairStrings[1];
|
||||||
}
|
}
|
||||||
@ -74,9 +74,9 @@ public class RepairCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canSuperRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SUPER_REPAIR);
|
canSuperRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.superRepair);
|
||||||
canMasterRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.REPAIR_MASTERY);
|
canMasterRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.repairMastery);
|
||||||
canArcaneForge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_FORGING);
|
canArcaneForge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.arcaneForging);
|
||||||
canRepairDiamond = Permissions.repairMaterialType(player, MaterialType.DIAMOND);
|
canRepairDiamond = Permissions.repairMaterialType(player, MaterialType.DIAMOND);
|
||||||
canRepairGold = Permissions.repairMaterialType(player, MaterialType.GOLD);
|
canRepairGold = Permissions.repairMaterialType(player, MaterialType.GOLD);
|
||||||
canRepairIron = Permissions.repairMaterialType(player, MaterialType.IRON);
|
canRepairIron = Permissions.repairMaterialType(player, MaterialType.IRON);
|
||||||
|
|||||||
@ -29,8 +29,8 @@ public class SalvageCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canAdvancedSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ADVANCED_SALVAGE);
|
canAdvancedSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.advancedSalvage);
|
||||||
canArcaneSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_SALVAGE);
|
canArcaneSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.arcaneSalvage);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -39,7 +39,7 @@ public class SmeltingCommand extends SkillCommand {
|
|||||||
|
|
||||||
// SECOND SMELT
|
// SECOND SMELT
|
||||||
if (canSecondSmelt) {
|
if (canSecondSmelt) {
|
||||||
String[] secondSmeltStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.SECOND_SMELT, isLucky);
|
String[] secondSmeltStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.secondSmelt, isLucky);
|
||||||
secondSmeltChance = secondSmeltStrings[0];
|
secondSmeltChance = secondSmeltStrings[0];
|
||||||
secondSmeltChanceLucky = secondSmeltStrings[1];
|
secondSmeltChanceLucky = secondSmeltStrings[1];
|
||||||
}
|
}
|
||||||
@ -54,9 +54,9 @@ public class SmeltingCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canFuelEfficiency = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FUEL_EFFICIENCY);
|
canFuelEfficiency = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fuelEfficiency);
|
||||||
canSecondSmelt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SECOND_SMELT);
|
canSecondSmelt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.secondSmelt);
|
||||||
canFluxMine = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FLUX_MINING);
|
canFluxMine = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fluxMining);
|
||||||
canVanillaXPBoost = Permissions.vanillaXpBoost(player, skill);
|
canVanillaXPBoost = Permissions.vanillaXpBoost(player, skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -40,16 +40,16 @@ public class SwordsCommand extends SkillCommand {
|
|||||||
|
|
||||||
// BLEED
|
// BLEED
|
||||||
if (canBleed) {
|
if (canBleed) {
|
||||||
bleedLength = (skillValue >= AdvancedConfig.getInstance().getMaxBonusLevel(SecondaryAbility.BLEED)) ? Swords.bleedMaxTicks : Swords.bleedBaseTicks;
|
bleedLength = (skillValue >= AdvancedConfig.getInstance().getMaxBonusLevel(SecondaryAbility.bleed)) ? Swords.bleedMaxTicks : Swords.bleedBaseTicks;
|
||||||
|
|
||||||
String[] bleedStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.BLEED, isLucky);
|
String[] bleedStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.bleed, isLucky);
|
||||||
bleedChance = bleedStrings[0];
|
bleedChance = bleedStrings[0];
|
||||||
bleedChanceLucky = bleedStrings[1];
|
bleedChanceLucky = bleedStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// COUNTER
|
// COUNTER
|
||||||
if (canCounter) {
|
if (canCounter) {
|
||||||
String[] counterStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.COUNTER, isLucky);
|
String[] counterStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.counter, isLucky);
|
||||||
counterChance = counterStrings[0];
|
counterChance = counterStrings[0];
|
||||||
counterChanceLucky = counterStrings[1];
|
counterChanceLucky = counterStrings[1];
|
||||||
}
|
}
|
||||||
@ -57,8 +57,8 @@ public class SwordsCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canBleed = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.BLEED);
|
canBleed = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.bleed);
|
||||||
canCounter = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.COUNTER);
|
canCounter = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.counter);
|
||||||
canSerratedStrike = Permissions.serratedStrikes(player);
|
canSerratedStrike = Permissions.serratedStrikes(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@ public class TamingCommand extends SkillCommand {
|
|||||||
@Override
|
@Override
|
||||||
protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
|
protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
|
||||||
if (canGore) {
|
if (canGore) {
|
||||||
String[] goreStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GORE, isLucky);
|
String[] goreStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.gore, isLucky);
|
||||||
goreChance = goreStrings[0];
|
goreChance = goreStrings[0];
|
||||||
goreChanceLucky = goreStrings[1];
|
goreChanceLucky = goreStrings[1];
|
||||||
}
|
}
|
||||||
@ -42,15 +42,15 @@ public class TamingCommand extends SkillCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canBeastLore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.BEAST_LORE);
|
canBeastLore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.beastLore);
|
||||||
canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
|
canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
|
||||||
canEnvironmentallyAware = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ENVIROMENTALLY_AWARE);
|
canEnvironmentallyAware = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.enviromentallyAware);
|
||||||
canFastFood = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FAST_FOOD);
|
canFastFood = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fastFood);
|
||||||
canGore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GORE);
|
canGore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.gore);
|
||||||
canSharpenedClaws = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHARPENED_CLAWS);
|
canSharpenedClaws = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.sharpenedClaws);
|
||||||
canShockProof = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHOCK_PROOF);
|
canShockProof = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.shockProof);
|
||||||
canThickFur = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.THICK_FUR);
|
canThickFur = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.thickFur);
|
||||||
canHolyHound = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HOLY_HOUND);
|
canHolyHound = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.holyHound);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -43,14 +43,14 @@ public class UnarmedCommand extends SkillCommand {
|
|||||||
|
|
||||||
// DISARM
|
// DISARM
|
||||||
if (canDisarm) {
|
if (canDisarm) {
|
||||||
String[] disarmStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DISARM, isLucky);
|
String[] disarmStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.disarm, isLucky);
|
||||||
disarmChance = disarmStrings[0];
|
disarmChance = disarmStrings[0];
|
||||||
disarmChanceLucky = disarmStrings[1];
|
disarmChanceLucky = disarmStrings[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// DEFLECT
|
// DEFLECT
|
||||||
if (canDeflect) {
|
if (canDeflect) {
|
||||||
String[] deflectStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DEFLECT, isLucky);
|
String[] deflectStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.deflect, isLucky);
|
||||||
deflectChance = deflectStrings[0];
|
deflectChance = deflectStrings[0];
|
||||||
deflectChanceLucky = deflectStrings[1];
|
deflectChanceLucky = deflectStrings[1];
|
||||||
}
|
}
|
||||||
@ -62,7 +62,7 @@ public class UnarmedCommand extends SkillCommand {
|
|||||||
|
|
||||||
// IRON GRIP
|
// IRON GRIP
|
||||||
if (canIronGrip) {
|
if (canIronGrip) {
|
||||||
String[] ironGripStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.IRON_GRIP, isLucky);
|
String[] ironGripStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.ironGrip, isLucky);
|
||||||
ironGripChance = ironGripStrings[0];
|
ironGripChance = ironGripStrings[0];
|
||||||
ironGripChanceLucky = ironGripStrings[1];
|
ironGripChanceLucky = ironGripStrings[1];
|
||||||
}
|
}
|
||||||
@ -71,10 +71,10 @@ public class UnarmedCommand extends SkillCommand {
|
|||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canBerserk = Permissions.berserk(player);
|
canBerserk = Permissions.berserk(player);
|
||||||
canIronArm = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.IRON_ARM);
|
canIronArm = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ironArm);
|
||||||
canDeflect = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DEFLECT);
|
canDeflect = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.deflect);
|
||||||
canDisarm = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DISARM);
|
canDisarm = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.disarm);
|
||||||
canIronGrip = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.IRON_GRIP);
|
canIronGrip = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ironGrip);
|
||||||
// TODO: Apparently we forgot about block cracker?
|
// TODO: Apparently we forgot about block cracker?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -36,7 +36,7 @@ public class WoodcuttingCommand extends SkillCommand {
|
|||||||
|
|
||||||
// DOUBLE DROPS
|
// DOUBLE DROPS
|
||||||
if (canDoubleDrop) {
|
if (canDoubleDrop) {
|
||||||
String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.WOODCUTTING_DOUBLE_DROPS, isLucky);
|
String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.woodcuttingDoubleDrops, isLucky);
|
||||||
doubleDropChance = doubleDropStrings[0];
|
doubleDropChance = doubleDropStrings[0];
|
||||||
doubleDropChanceLucky = doubleDropStrings[1];
|
doubleDropChanceLucky = doubleDropStrings[1];
|
||||||
}
|
}
|
||||||
@ -45,8 +45,8 @@ public class WoodcuttingCommand extends SkillCommand {
|
|||||||
@Override
|
@Override
|
||||||
protected void permissionsCheck(Player player) {
|
protected void permissionsCheck(Player player) {
|
||||||
canTreeFell = Permissions.treeFeller(player);
|
canTreeFell = Permissions.treeFeller(player);
|
||||||
canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.WOODCUTTING_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
|
canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.woodcuttingDoubleDrops) && !skill.getDoubleDropsDisabled();
|
||||||
canLeafBlow = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.LEAF_BLOWER);
|
canLeafBlow = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.leafBlower);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -46,11 +46,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* ACROBATICS */
|
/* ACROBATICS */
|
||||||
if (getMaxChance(SecondaryAbility.DODGE) < 1) {
|
if (getMaxChance(SecondaryAbility.dodge) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Dodge.ChanceMax should be at least 1!");
|
reason.add("Skills.Acrobatics.Dodge.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.DODGE) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.dodge) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Dodge.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Acrobatics.Dodge.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,11 +58,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Acrobatics.Dodge.DamageModifier should be greater than 1!");
|
reason.add("Skills.Acrobatics.Dodge.DamageModifier should be greater than 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.ROLL) < 1) {
|
if (getMaxChance(SecondaryAbility.roll) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Roll.ChanceMax should be at least 1!");
|
reason.add("Skills.Acrobatics.Roll.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.ROLL) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.roll) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Roll.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Acrobatics.Roll.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,11 +70,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Acrobatics.Roll.DamageThreshold should be at least 0!");
|
reason.add("Skills.Acrobatics.Roll.DamageThreshold should be at least 0!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.GRACEFUL_ROLL) < 1) {
|
if (getMaxChance(SecondaryAbility.gracefullRoll) < 1) {
|
||||||
reason.add("Skills.Acrobatics.GracefulRoll.ChanceMax should be at least 1!");
|
reason.add("Skills.Acrobatics.GracefulRoll.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.GRACEFUL_ROLL) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.gracefullRoll) < 1) {
|
||||||
reason.add("Skills.Acrobatics.GracefulRoll.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Acrobatics.GracefulRoll.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -127,11 +127,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Archery.SkillShot.MaxBonus should be at least 0!");
|
reason.add("Skills.Archery.SkillShot.MaxBonus should be at least 0!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.DAZE) < 1) {
|
if (getMaxChance(SecondaryAbility.daze) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Daze.ChanceMax should be at least 1!");
|
reason.add("Skills.Acrobatics.Daze.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.DAZE) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.daze) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Daze.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Acrobatics.Daze.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,11 +139,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Acrobatics.Daze.BonusDamage should be at least 0!");
|
reason.add("Skills.Acrobatics.Daze.BonusDamage should be at least 0!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.RETRIEVE) < 1) {
|
if (getMaxChance(SecondaryAbility.retrieve) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Retrieve.ChanceMax should be at least 1!");
|
reason.add("Skills.Acrobatics.Retrieve.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.RETRIEVE) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.retrieve) < 1) {
|
||||||
reason.add("Skills.Acrobatics.Retrieve.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Acrobatics.Retrieve.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -160,11 +160,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Axes.AxeMastery.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Axes.AxeMastery.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.CRITICAL_HIT) < 1) {
|
if (getMaxChance(SecondaryAbility.criticalHit) < 1) {
|
||||||
reason.add("Skills.Axes.CriticalHit.ChanceMax should be at least 1!");
|
reason.add("Skills.Axes.CriticalHit.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.CRITICAL_HIT) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.criticalHit) < 1) {
|
||||||
reason.add("Skills.Axes.CriticalHit.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Axes.CriticalHit.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -266,44 +266,44 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Herbalism.GreenThumb.StageChange should be at least 1!");
|
reason.add("Skills.Herbalism.GreenThumb.StageChange should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.GREEN_THUMB_PLANT) < 1) {
|
if (getMaxChance(SecondaryAbility.greenThumbPlant) < 1) {
|
||||||
reason.add("Skills.Herbalism.GreenThumb.ChanceMax should be at least 1!");
|
reason.add("Skills.Herbalism.GreenThumb.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.GREEN_THUMB_PLANT) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.greenThumbPlant) < 1) {
|
||||||
reason.add("Skills.Herbalism.GreenThumb.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Herbalism.GreenThumb.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.HERBALISM_DOUBLE_DROPS) < 1) {
|
if (getMaxChance(SecondaryAbility.herbalismDoubleDrops) < 1) {
|
||||||
reason.add("Skills.Herbalism.DoubleDrops.ChanceMax should be at least 1!");
|
reason.add("Skills.Herbalism.DoubleDrops.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.HERBALISM_DOUBLE_DROPS) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.herbalismDoubleDrops) < 1) {
|
||||||
reason.add("Skills.Herbalism.DoubleDrops.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Herbalism.DoubleDrops.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.HYLIAN_LUCK) < 1) {
|
if (getMaxChance(SecondaryAbility.hylianLuck) < 1) {
|
||||||
reason.add("Skills.Herbalism.HylianLuck.ChanceMax should be at least 1!");
|
reason.add("Skills.Herbalism.HylianLuck.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.HYLIAN_LUCK) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.hylianLuck) < 1) {
|
||||||
reason.add("Skills.Herbalism.HylianLuck.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Herbalism.HylianLuck.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.SHROOM_THUMB) < 1) {
|
if (getMaxChance(SecondaryAbility.shroomThumb) < 1) {
|
||||||
reason.add("Skills.Herbalism.ShroomThumb.ChanceMax should be at least 1!");
|
reason.add("Skills.Herbalism.ShroomThumb.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.SHROOM_THUMB) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.shroomThumb) < 1) {
|
||||||
reason.add("Skills.Herbalism.ShroomThumb.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Herbalism.ShroomThumb.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* MINING */
|
/* MINING */
|
||||||
if (getMaxChance(SecondaryAbility.MINING_DOUBLE_DROPS) < 1) {
|
if (getMaxChance(SecondaryAbility.miningDoubleDrops) < 1) {
|
||||||
reason.add("Skills.Mining.DoubleDrops.ChanceMax should be at least 1!");
|
reason.add("Skills.Mining.DoubleDrops.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.MINING_DOUBLE_DROPS) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.miningDoubleDrops) < 1) {
|
||||||
reason.add("Skills.Mining.DoubleDrops.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Mining.DoubleDrops.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -372,11 +372,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Repair.RepairMastery.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Repair.RepairMastery.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.SUPER_REPAIR) < 1) {
|
if (getMaxChance(SecondaryAbility.superRepair) < 1) {
|
||||||
reason.add("Skills.Repair.SuperRepair.ChanceMax should be at least 1!");
|
reason.add("Skills.Repair.SuperRepair.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.SUPER_REPAIR) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.superRepair) < 1) {
|
||||||
reason.add("Skills.Repair.SuperRepair.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Repair.SuperRepair.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -466,11 +466,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Smelting.FuelEfficiency.Multiplier should be at least 1!");
|
reason.add("Skills.Smelting.FuelEfficiency.Multiplier should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.SECOND_SMELT) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.secondSmelt) < 1) {
|
||||||
reason.add("Skills.Smelting.SecondSmelt.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Smelting.SecondSmelt.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.SECOND_SMELT) < 1) {
|
if (getMaxChance(SecondaryAbility.secondSmelt) < 1) {
|
||||||
reason.add("Skills.Smelting.SecondSmelt.ChanceMax should be at least 1!");
|
reason.add("Skills.Smelting.SecondSmelt.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -507,11 +507,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* SWORDS */
|
/* SWORDS */
|
||||||
if (getMaxChance(SecondaryAbility.BLEED) < 1) {
|
if (getMaxChance(SecondaryAbility.bleed) < 1) {
|
||||||
reason.add("Skills.Swords.Bleed.ChanceMax should be at least 1!");
|
reason.add("Skills.Swords.Bleed.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.BLEED) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.bleed) < 1) {
|
||||||
reason.add("Skills.Swords.Bleed.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Swords.Bleed.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -527,11 +527,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Swords.Bleed.BaseTicks should be at least 1!");
|
reason.add("Skills.Swords.Bleed.BaseTicks should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.COUNTER) < 1) {
|
if (getMaxChance(SecondaryAbility.counter) < 1) {
|
||||||
reason.add("Skills.Swords.Counter.ChanceMax should be at least 1!");
|
reason.add("Skills.Swords.Counter.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.COUNTER) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.counter) < 1) {
|
||||||
reason.add("Skills.Swords.Counter.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Swords.Counter.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -549,11 +549,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
|
|
||||||
/* TAMING */
|
/* TAMING */
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.GORE) < 1) {
|
if (getMaxChance(SecondaryAbility.gore) < 1) {
|
||||||
reason.add("Skills.Taming.Gore.ChanceMax should be at least 1!");
|
reason.add("Skills.Taming.Gore.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.GORE) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.gore) < 1) {
|
||||||
reason.add("Skills.Taming.Gore.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Taming.Gore.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -610,27 +610,27 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* UNARMED */
|
/* UNARMED */
|
||||||
if (getMaxChance(SecondaryAbility.DISARM) < 1) {
|
if (getMaxChance(SecondaryAbility.disarm) < 1) {
|
||||||
reason.add("Skills.Unarmed.Disarm.ChanceMax should be at least 1!");
|
reason.add("Skills.Unarmed.Disarm.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.DISARM) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.disarm) < 1) {
|
||||||
reason.add("Skills.Unarmed.Disarm.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Unarmed.Disarm.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.DEFLECT) < 1) {
|
if (getMaxChance(SecondaryAbility.deflect) < 1) {
|
||||||
reason.add("Skills.Unarmed.Deflect.ChanceMax should be at least 1!");
|
reason.add("Skills.Unarmed.Deflect.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.DEFLECT) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.deflect) < 1) {
|
||||||
reason.add("Skills.Unarmed.Deflect.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Unarmed.Deflect.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.IRON_GRIP) < 1) {
|
if (getMaxChance(SecondaryAbility.ironGrip) < 1) {
|
||||||
reason.add("Skills.Unarmed.IronGrip.ChanceMax should be at least 1!");
|
reason.add("Skills.Unarmed.IronGrip.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.IRON_GRIP) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.ironGrip) < 1) {
|
||||||
reason.add("Skills.Unarmed.IronGrip.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Unarmed.IronGrip.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -655,11 +655,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
|
|||||||
reason.add("Skills.Woodcutting.LeafBlower.UnlockLevel should be at least 0!");
|
reason.add("Skills.Woodcutting.LeafBlower.UnlockLevel should be at least 0!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxChance(SecondaryAbility.WOODCUTTING_DOUBLE_DROPS) < 1) {
|
if (getMaxChance(SecondaryAbility.woodcuttingDoubleDrops) < 1) {
|
||||||
reason.add("Skills.Woodcutting.DoubleDrops.ChanceMax should be at least 1!");
|
reason.add("Skills.Woodcutting.DoubleDrops.ChanceMax should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMaxBonusLevel(SecondaryAbility.WOODCUTTING_DOUBLE_DROPS) < 1) {
|
if (getMaxBonusLevel(SecondaryAbility.woodcuttingDoubleDrops) < 1) {
|
||||||
reason.add("Skills.Woodcutting.DoubleDrops.MaxBonusLevel should be at least 1!");
|
reason.add("Skills.Woodcutting.DoubleDrops.MaxBonusLevel should be at least 1!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,85 +1,100 @@
|
|||||||
package com.gmail.nossr50.datatypes.skills;
|
package com.gmail.nossr50.datatypes.skills;
|
||||||
|
|
||||||
public enum SecondaryAbility {
|
public class SecondaryAbility {
|
||||||
/* ACROBATICS */
|
/* ACROBATICS */
|
||||||
DODGE,
|
public static final SecondaryAbility dodge = new SecondaryAbility("DODGE");
|
||||||
GRACEFUL_ROLL,
|
public static final SecondaryAbility gracefullRoll = new SecondaryAbility("GRACEFUL_ROLL");
|
||||||
ROLL,
|
public static final SecondaryAbility roll = new SecondaryAbility("ROLL");
|
||||||
|
|
||||||
/* ALCHEMY */
|
/* ALCHEMY */
|
||||||
CATALYSIS,
|
public static final SecondaryAbility catalysis = new SecondaryAbility("CATALYSIS");
|
||||||
CONCOCTIONS,
|
public static final SecondaryAbility concoctions = new SecondaryAbility("CONCOCTIONS");
|
||||||
|
|
||||||
/* ARCHERY */
|
/* ARCHERY */
|
||||||
DAZE,
|
public static final SecondaryAbility daze = new SecondaryAbility("DAZE");
|
||||||
RETRIEVE,
|
public static final SecondaryAbility retrieve = new SecondaryAbility("RETRIEVE");
|
||||||
SKILL_SHOT,
|
public static final SecondaryAbility skillShot = new SecondaryAbility("SKILL_SHOT");
|
||||||
|
|
||||||
/* Axes */
|
/* Axes */
|
||||||
ARMOR_IMPACT,
|
public static final SecondaryAbility armorImpact = new SecondaryAbility("ARMOR_IMPACT");
|
||||||
AXE_MASTERY,
|
public static final SecondaryAbility axeMastery = new SecondaryAbility("AXE_MASTERY");
|
||||||
CRITICAL_HIT,
|
public static final SecondaryAbility criticalHit = new SecondaryAbility("CRITICAL_HIT");
|
||||||
GREATER_IMPACT,
|
public static final SecondaryAbility greaterImpact = new SecondaryAbility("GREATER_IMPACT");
|
||||||
|
|
||||||
/* Excavation */
|
/* Excavation */
|
||||||
EXCAVATION_TREASURE_HUNTER,
|
public static final SecondaryAbility excavationTreasureHunter = new SecondaryAbility("TREASURE_HUNTER");
|
||||||
|
|
||||||
/* Fishing */
|
/* Fishing */
|
||||||
FISHERMANS_DIET,
|
public static final SecondaryAbility fishermansDiet = new SecondaryAbility("FISHERMANS_DIET");
|
||||||
FISHING_TREASURE_HUNTER,
|
public static final SecondaryAbility fishingTreasureHunter = new SecondaryAbility("TREASURE_HUNTER");
|
||||||
ICE_FISHING,
|
public static final SecondaryAbility iceFishing = new SecondaryAbility("ICE_FISHING");
|
||||||
MAGIC_HUNTER,
|
public static final SecondaryAbility magicHunter = new SecondaryAbility("MAGIC_HUNTER");
|
||||||
MASTER_ANGLER,
|
public static final SecondaryAbility masterAngler = new SecondaryAbility("MASTER_ANGLER");
|
||||||
SHAKE,
|
public static final SecondaryAbility shake = new SecondaryAbility("SHAKE");
|
||||||
|
|
||||||
/* Herbalism */
|
/* Herbalism */
|
||||||
FARMERS_DIET,
|
public static final SecondaryAbility farmersDiet = new SecondaryAbility("FARMERS_DIET");
|
||||||
GREEN_THUMB_PLANT,
|
public static final SecondaryAbility greenThumbPlant = new SecondaryAbility("GREEN_THUMB");
|
||||||
GREEN_THUMB_BLOCK,
|
public static final SecondaryAbility greenThumbBlock = new SecondaryAbility("GREEN_THUMB");
|
||||||
HERBALISM_DOUBLE_DROPS,
|
public static final SecondaryAbility herbalismDoubleDrops = new SecondaryAbility("DOUBLE_DROPS");
|
||||||
HYLIAN_LUCK,
|
public static final SecondaryAbility hylianLuck = new SecondaryAbility("HYLIAN_LUCK");
|
||||||
SHROOM_THUMB,
|
public static final SecondaryAbility shroomThumb = new SecondaryAbility("SHROOM_THUMB");
|
||||||
|
|
||||||
/* Mining */
|
/* Mining */
|
||||||
MINING_DOUBLE_DROPS,
|
public static final SecondaryAbility miningDoubleDrops = new SecondaryAbility("DOUBLE_DROPS");
|
||||||
|
|
||||||
/* Repair */
|
/* Repair */
|
||||||
ARCANE_FORGING,
|
public static final SecondaryAbility arcaneForging = new SecondaryAbility("ARCANE_FORGING");
|
||||||
REPAIR_MASTERY,
|
public static final SecondaryAbility repairMastery = new SecondaryAbility("REPAIR_MASTERY");
|
||||||
SUPER_REPAIR,
|
public static final SecondaryAbility superRepair = new SecondaryAbility("SUPER_REPAIR");
|
||||||
|
|
||||||
/* Salvage */
|
/* Salvage */
|
||||||
ADVANCED_SALVAGE,
|
public static final SecondaryAbility advancedSalvage = new SecondaryAbility("ADVANCED_SALVAGE");
|
||||||
ARCANE_SALVAGE,
|
public static final SecondaryAbility arcaneSalvage = new SecondaryAbility("ARCANE_SALVAGE");
|
||||||
|
|
||||||
/* Smelting */
|
/* Smelting */
|
||||||
FLUX_MINING,
|
public static final SecondaryAbility fluxMining = new SecondaryAbility("FLUX_MINING");
|
||||||
FUEL_EFFICIENCY,
|
public static final SecondaryAbility fuelEfficiency = new SecondaryAbility("FUEL_EFFICIENCY");
|
||||||
SECOND_SMELT,
|
public static final SecondaryAbility secondSmelt = new SecondaryAbility("SECOND_SMELT");
|
||||||
|
|
||||||
/* Swords */
|
/* Swords */
|
||||||
BLEED,
|
public static final SecondaryAbility bleed = new SecondaryAbility("BLEED");
|
||||||
COUNTER,
|
public static final SecondaryAbility counter = new SecondaryAbility("COUNTER");
|
||||||
|
|
||||||
/* Taming */
|
/* Taming */
|
||||||
BEAST_LORE,
|
public static final SecondaryAbility beastLore = new SecondaryAbility("BEAST_LORE");
|
||||||
CALL_OF_THE_WILD,
|
public static final SecondaryAbility callOfTheWild = new SecondaryAbility("CALL_OF_THE_WILD");
|
||||||
ENVIROMENTALLY_AWARE,
|
public static final SecondaryAbility enviromentallyAware = new SecondaryAbility("ENVIROMENTALLY_AWARE");
|
||||||
FAST_FOOD,
|
public static final SecondaryAbility fastFood = new SecondaryAbility("FAST_FOOD");
|
||||||
GORE,
|
public static final SecondaryAbility gore = new SecondaryAbility("GORE");
|
||||||
HOLY_HOUND,
|
public static final SecondaryAbility holyHound = new SecondaryAbility("HOLY_HOUND");
|
||||||
SHARPENED_CLAWS,
|
public static final SecondaryAbility sharpenedClaws = new SecondaryAbility("SHARPENED_CLAWS");
|
||||||
SHOCK_PROOF,
|
public static final SecondaryAbility shockProof = new SecondaryAbility("SHOCK_PROOF");
|
||||||
THICK_FUR,
|
public static final SecondaryAbility thickFur = new SecondaryAbility("THICK_FUR");
|
||||||
|
|
||||||
/* Unarmed */
|
/* Unarmed */
|
||||||
BLOCK_CRACKER,
|
public static final SecondaryAbility blockCracker = new SecondaryAbility("BLOCK_CRACKER");
|
||||||
DEFLECT,
|
public static final SecondaryAbility deflect = new SecondaryAbility("DEFLECT");
|
||||||
DISARM,
|
public static final SecondaryAbility disarm = new SecondaryAbility("DISARM");
|
||||||
IRON_ARM,
|
public static final SecondaryAbility ironArm = new SecondaryAbility("IRON_ARM");
|
||||||
IRON_GRIP,
|
public static final SecondaryAbility ironGrip = new SecondaryAbility("IRON_GRIP");
|
||||||
|
|
||||||
/* Woodcutting */
|
/* Woodcutting */
|
||||||
LEAF_BLOWER,
|
public static final SecondaryAbility leafBlower = new SecondaryAbility("LEAF_BLOWER");
|
||||||
WOODCUTTING_DOUBLE_DROPS;
|
public static final SecondaryAbility woodcuttingDoubleDrops = new SecondaryAbility("DOUBLE_DROPS");
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
private SecondaryAbility(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return getName();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -68,21 +68,21 @@ public class SkillType {
|
|||||||
private static List<SkillType> miscSkills = new ArrayList<SkillType>();
|
private static List<SkillType> miscSkills = new ArrayList<SkillType>();
|
||||||
|
|
||||||
|
|
||||||
public static final SkillType acrobatics = createSkill("ACROBATICS" , AcrobaticsManager.class , AcrobaticsCommand.class , false, Color.WHITE, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.DODGE, SecondaryAbility.GRACEFUL_ROLL, SecondaryAbility.ROLL));
|
public static final SkillType acrobatics = createSkill("ACROBATICS" , AcrobaticsManager.class , AcrobaticsCommand.class , false, Color.WHITE, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.dodge, SecondaryAbility.gracefullRoll, SecondaryAbility.roll));
|
||||||
public static final SkillType alchemy = createSkill("ALCHEMY" , AlchemyManager.class , AlchemyCommand.class , false, Color.FUCHSIA, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.CATALYSIS, SecondaryAbility.CONCOCTIONS));
|
public static final SkillType alchemy = createSkill("ALCHEMY" , AlchemyManager.class , AlchemyCommand.class , false, Color.FUCHSIA, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.catalysis, SecondaryAbility.concoctions));
|
||||||
public static final SkillType archery = createSkill("ARCHERY" , ArcheryManager.class , ArcheryCommand.class , false, Color.MAROON, SkillUseType.COMBAT, ImmutableList.of(SecondaryAbility.DAZE, SecondaryAbility.RETRIEVE, SecondaryAbility.SKILL_SHOT));
|
public static final SkillType archery = createSkill("ARCHERY" , ArcheryManager.class , ArcheryCommand.class , false, Color.MAROON, SkillUseType.COMBAT, ImmutableList.of(SecondaryAbility.daze, SecondaryAbility.retrieve, SecondaryAbility.skillShot));
|
||||||
public static final SkillType axes = createSkill("AXES" , AxesManager.class , AxesCommand.class , false, Color.AQUA, SkillUseType.COMBAT, AbilityType.skullSplitter, ToolType.AXE, ImmutableList.of(SecondaryAbility.ARMOR_IMPACT, SecondaryAbility.AXE_MASTERY, SecondaryAbility.CRITICAL_HIT, SecondaryAbility.GREATER_IMPACT));
|
public static final SkillType axes = createSkill("AXES" , AxesManager.class , AxesCommand.class , false, Color.AQUA, SkillUseType.COMBAT, AbilityType.skullSplitter, ToolType.AXE, ImmutableList.of(SecondaryAbility.armorImpact, SecondaryAbility.axeMastery, SecondaryAbility.criticalHit, SecondaryAbility.greaterImpact));
|
||||||
public static final SkillType excavation = createSkill("EXCAVATION" , ExcavationManager.class , ExcavationCommand.class , false, Color.fromRGB(139, 69, 19), SkillUseType.GATHERING, AbilityType.gigaDrillBreaker, ToolType.SHOVEL, ImmutableList.of(SecondaryAbility.EXCAVATION_TREASURE_HUNTER));
|
public static final SkillType excavation = createSkill("EXCAVATION" , ExcavationManager.class , ExcavationCommand.class , false, Color.fromRGB(139, 69, 19), SkillUseType.GATHERING, AbilityType.gigaDrillBreaker, ToolType.SHOVEL, ImmutableList.of(SecondaryAbility.excavationTreasureHunter));
|
||||||
public static final SkillType fishing = createSkill("FISHING" , FishingManager.class , FishingCommand.class , false, Color.NAVY, SkillUseType.GATHERING, ImmutableList.of(SecondaryAbility.FISHERMANS_DIET, SecondaryAbility.FISHING_TREASURE_HUNTER, SecondaryAbility.ICE_FISHING, SecondaryAbility.MAGIC_HUNTER, SecondaryAbility.MASTER_ANGLER, SecondaryAbility.SHAKE));
|
public static final SkillType fishing = createSkill("FISHING" , FishingManager.class , FishingCommand.class , false, Color.NAVY, SkillUseType.GATHERING, ImmutableList.of(SecondaryAbility.fishermansDiet, SecondaryAbility.fishingTreasureHunter, SecondaryAbility.iceFishing, SecondaryAbility.magicHunter, SecondaryAbility.masterAngler, SecondaryAbility.shake));
|
||||||
public static final SkillType herbalism = createSkill("HERBALISM" , HerbalismManager.class , HerbalismCommand.class , false, Color.GREEN, SkillUseType.GATHERING, AbilityType.greenTerra, ToolType.HOE, ImmutableList.of(SecondaryAbility.FARMERS_DIET, SecondaryAbility.GREEN_THUMB_PLANT, SecondaryAbility.GREEN_THUMB_BLOCK, SecondaryAbility.HERBALISM_DOUBLE_DROPS, SecondaryAbility.HYLIAN_LUCK, SecondaryAbility.SHROOM_THUMB));
|
public static final SkillType herbalism = createSkill("HERBALISM" , HerbalismManager.class , HerbalismCommand.class , false, Color.GREEN, SkillUseType.GATHERING, AbilityType.greenTerra, ToolType.HOE, ImmutableList.of(SecondaryAbility.farmersDiet, SecondaryAbility.greenThumbPlant, SecondaryAbility.greenThumbBlock, SecondaryAbility.herbalismDoubleDrops, SecondaryAbility.hylianLuck, SecondaryAbility.shroomThumb));
|
||||||
public static final SkillType mining = createSkill("MINING" , MiningManager.class , MiningCommand.class , false, Color.GRAY, SkillUseType.GATHERING, AbilityType.superBreaker, ToolType.PICKAXE, ImmutableList.of(SecondaryAbility.MINING_DOUBLE_DROPS));
|
public static final SkillType mining = createSkill("MINING" , MiningManager.class , MiningCommand.class , false, Color.GRAY, SkillUseType.GATHERING, AbilityType.superBreaker, ToolType.PICKAXE, ImmutableList.of(SecondaryAbility.miningDoubleDrops));
|
||||||
public static final SkillType repair = createSkill("REPAIR" , RepairManager.class , RepairCommand.class , false, Color.SILVER, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.ARCANE_FORGING, SecondaryAbility.REPAIR_MASTERY, SecondaryAbility.SUPER_REPAIR));
|
public static final SkillType repair = createSkill("REPAIR" , RepairManager.class , RepairCommand.class , false, Color.SILVER, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.arcaneForging, SecondaryAbility.repairMastery, SecondaryAbility.superRepair));
|
||||||
public static final SkillType salvage = createSkill("SALVAGE" , SalvageManager.class , SalvageCommand.class , true, Color.ORANGE, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.ADVANCED_SALVAGE, SecondaryAbility.ARCANE_SALVAGE));
|
public static final SkillType salvage = createSkill("SALVAGE" , SalvageManager.class , SalvageCommand.class , true, Color.ORANGE, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.advancedSalvage, SecondaryAbility.arcaneSalvage));
|
||||||
public static final SkillType smelting = createSkill("SMELTING" , SmeltingManager.class , SmeltingCommand.class , true, Color.YELLOW, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.FLUX_MINING, SecondaryAbility.FUEL_EFFICIENCY, SecondaryAbility.SECOND_SMELT));
|
public static final SkillType smelting = createSkill("SMELTING" , SmeltingManager.class , SmeltingCommand.class , true, Color.YELLOW, SkillUseType.MISC, ImmutableList.of(SecondaryAbility.fluxMining, SecondaryAbility.fuelEfficiency, SecondaryAbility.secondSmelt));
|
||||||
public static final SkillType swords = createSkill("SWORDS" , SwordsManager.class , SwordsCommand.class , false, Color.fromRGB(178, 34, 34), SkillUseType.COMBAT, AbilityType.serratedStrikes, ToolType.SWORD, ImmutableList.of(SecondaryAbility.BLEED, SecondaryAbility.COUNTER));
|
public static final SkillType swords = createSkill("SWORDS" , SwordsManager.class , SwordsCommand.class , false, Color.fromRGB(178, 34, 34), SkillUseType.COMBAT, AbilityType.serratedStrikes, ToolType.SWORD, ImmutableList.of(SecondaryAbility.bleed, SecondaryAbility.counter));
|
||||||
public static final SkillType taming = createSkill("TAMING" , TamingManager.class , TamingCommand.class , false, Color.PURPLE, SkillUseType.COMBAT, ImmutableList.of(SecondaryAbility.BEAST_LORE, SecondaryAbility.CALL_OF_THE_WILD, SecondaryAbility.ENVIROMENTALLY_AWARE, SecondaryAbility.FAST_FOOD, SecondaryAbility.GORE, SecondaryAbility.HOLY_HOUND, SecondaryAbility.SHARPENED_CLAWS, SecondaryAbility.SHOCK_PROOF, SecondaryAbility.THICK_FUR));
|
public static final SkillType taming = createSkill("TAMING" , TamingManager.class , TamingCommand.class , false, Color.PURPLE, SkillUseType.COMBAT, ImmutableList.of(SecondaryAbility.beastLore, SecondaryAbility.callOfTheWild, SecondaryAbility.enviromentallyAware, SecondaryAbility.fastFood, SecondaryAbility.gore, SecondaryAbility.holyHound, SecondaryAbility.sharpenedClaws, SecondaryAbility.shockProof, SecondaryAbility.thickFur));
|
||||||
public static final SkillType unarmed = createSkill("UNARMED" , UnarmedManager.class , UnarmedCommand.class , false, Color.BLACK, SkillUseType.COMBAT, AbilityType.berserk, ToolType.FISTS, ImmutableList.of(SecondaryAbility.BLOCK_CRACKER, SecondaryAbility.DEFLECT, SecondaryAbility.DISARM, SecondaryAbility.IRON_ARM, SecondaryAbility.IRON_GRIP));
|
public static final SkillType unarmed = createSkill("UNARMED" , UnarmedManager.class , UnarmedCommand.class , false, Color.BLACK, SkillUseType.COMBAT, AbilityType.berserk, ToolType.FISTS, ImmutableList.of(SecondaryAbility.blockCracker, SecondaryAbility.deflect, SecondaryAbility.disarm, SecondaryAbility.ironArm, SecondaryAbility.ironGrip));
|
||||||
public static final SkillType woodcutting = createSkill("WOODCUTTING", WoodcuttingManager.class , WoodcuttingCommand.class , false, Color.OLIVE, SkillUseType.GATHERING, AbilityType.treeFeller, ToolType.AXE, ImmutableList.of(SecondaryAbility.LEAF_BLOWER, SecondaryAbility.WOODCUTTING_DOUBLE_DROPS));
|
public static final SkillType woodcutting = createSkill("WOODCUTTING", WoodcuttingManager.class , WoodcuttingCommand.class , false, Color.OLIVE, SkillUseType.GATHERING, AbilityType.treeFeller, ToolType.AXE, ImmutableList.of(SecondaryAbility.leafBlower, SecondaryAbility.woodcuttingDoubleDrops));
|
||||||
|
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
|||||||
@ -545,7 +545,7 @@ public class EntityListener implements Listener {
|
|||||||
case GOLDEN_CARROT: /* RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ 1000 */
|
case GOLDEN_CARROT: /* RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ 1000 */
|
||||||
case MUSHROOM_SOUP: /* RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
|
case MUSHROOM_SOUP: /* RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
|
||||||
case PUMPKIN_PIE: /* RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
|
case PUMPKIN_PIE: /* RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FARMERS_DIET)) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.farmersDiet)) {
|
||||||
event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(Herbalism.farmersDietRankLevel1, newFoodLevel));
|
event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(Herbalism.farmersDietRankLevel1, newFoodLevel));
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -554,19 +554,19 @@ public class EntityListener implements Listener {
|
|||||||
case MELON: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
|
case MELON: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
|
||||||
case POISONOUS_POTATO: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
|
case POISONOUS_POTATO: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
|
||||||
case POTATO_ITEM: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
|
case POTATO_ITEM: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FARMERS_DIET)) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.farmersDiet)) {
|
||||||
event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(Herbalism.farmersDietRankLevel2, newFoodLevel));
|
event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(Herbalism.farmersDietRankLevel2, newFoodLevel));
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case COOKED_FISH: /* RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
|
case COOKED_FISH: /* RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHERMANS_DIET)) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fishermansDiet)) {
|
||||||
event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel1, newFoodLevel));
|
event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel1, newFoodLevel));
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case RAW_FISH: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
|
case RAW_FISH: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHERMANS_DIET)) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fishermansDiet)) {
|
||||||
event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel2, newFoodLevel));
|
event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel2, newFoodLevel));
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -95,7 +95,7 @@ public class InventoryListener implements Listener {
|
|||||||
|
|
||||||
Player player = getPlayerFromFurnace(furnaceBlock);
|
Player player = getPlayerFromFurnace(furnaceBlock);
|
||||||
|
|
||||||
if (!UserManager.hasPlayerDataKey(player) || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FUEL_EFFICIENCY)) {
|
if (!UserManager.hasPlayerDataKey(player) || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fuelEfficiency)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -155,7 +155,7 @@ public class InventoryListener implements Listener {
|
|||||||
|
|
||||||
HumanEntity whoClicked = event.getWhoClicked();
|
HumanEntity whoClicked = event.getWhoClicked();
|
||||||
|
|
||||||
if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.CONCOCTIONS)) {
|
if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.concoctions)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -254,7 +254,7 @@ public class InventoryListener implements Listener {
|
|||||||
|
|
||||||
HumanEntity whoClicked = event.getWhoClicked();
|
HumanEntity whoClicked = event.getWhoClicked();
|
||||||
|
|
||||||
if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.CONCOCTIONS)) {
|
if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.concoctions)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -36,7 +36,7 @@ public class AlchemyBrewTask extends BukkitRunnable {
|
|||||||
brewSpeed = DEFAULT_BREW_SPEED;
|
brewSpeed = DEFAULT_BREW_SPEED;
|
||||||
brewTimer = DEFAULT_BREW_TICKS;
|
brewTimer = DEFAULT_BREW_TICKS;
|
||||||
|
|
||||||
if (player != null && !Misc.isNPCEntity(player) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CATALYSIS)) {
|
if (player != null && !Misc.isNPCEntity(player) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.catalysis)) {
|
||||||
double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, SkillType.alchemy));
|
double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, SkillType.alchemy));
|
||||||
|
|
||||||
McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis);
|
McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis);
|
||||||
|
|||||||
@ -29,11 +29,11 @@ public class AcrobaticsManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canRoll() {
|
public boolean canRoll() {
|
||||||
return !exploitPrevention() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.ROLL);
|
return !exploitPrevention() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.roll);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canDodge(Entity damager) {
|
public boolean canDodge(Entity damager) {
|
||||||
if (Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.DODGE)) {
|
if (Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.dodge)) {
|
||||||
if (damager instanceof LightningStrike && Acrobatics.dodgeLightningDisabled) {
|
if (damager instanceof LightningStrike && Acrobatics.dodgeLightningDisabled) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -54,7 +54,7 @@ public class AcrobaticsManager extends SkillManager {
|
|||||||
double modifiedDamage = Acrobatics.calculateModifiedDodgeDamage(damage, Acrobatics.dodgeDamageModifier);
|
double modifiedDamage = Acrobatics.calculateModifiedDodgeDamage(damage, Acrobatics.dodgeDamageModifier);
|
||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
|
|
||||||
if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.DODGE, player, getSkillLevel(), activationChance)) {
|
if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.dodge, player, getSkillLevel(), activationChance)) {
|
||||||
ParticleEffectUtils.playDodgeEffect(player);
|
ParticleEffectUtils.playDodgeEffect(player);
|
||||||
|
|
||||||
if (mcMMOPlayer.useChatNotifications()) {
|
if (mcMMOPlayer.useChatNotifications()) {
|
||||||
@ -81,13 +81,13 @@ public class AcrobaticsManager extends SkillManager {
|
|||||||
public double rollCheck(double damage) {
|
public double rollCheck(double damage) {
|
||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
|
|
||||||
if (player.isSneaking() && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GRACEFUL_ROLL)) {
|
if (player.isSneaking() && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.gracefullRoll)) {
|
||||||
return gracefulRollCheck(damage);
|
return gracefulRollCheck(damage);
|
||||||
}
|
}
|
||||||
|
|
||||||
double modifiedDamage = Acrobatics.calculateModifiedRollDamage(damage, Acrobatics.rollThreshold);
|
double modifiedDamage = Acrobatics.calculateModifiedRollDamage(damage, Acrobatics.rollThreshold);
|
||||||
|
|
||||||
if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.ROLL, player, getSkillLevel(), activationChance)) {
|
if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.roll, player, getSkillLevel(), activationChance)) {
|
||||||
player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Text"));
|
player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Text"));
|
||||||
applyXpGain(calculateRollXP(damage, true), XPGainReason.PVE);
|
applyXpGain(calculateRollXP(damage, true), XPGainReason.PVE);
|
||||||
|
|
||||||
@ -111,7 +111,7 @@ public class AcrobaticsManager extends SkillManager {
|
|||||||
private double gracefulRollCheck(double damage) {
|
private double gracefulRollCheck(double damage) {
|
||||||
double modifiedDamage = Acrobatics.calculateModifiedRollDamage(damage, Acrobatics.gracefulRollThreshold);
|
double modifiedDamage = Acrobatics.calculateModifiedRollDamage(damage, Acrobatics.gracefulRollThreshold);
|
||||||
|
|
||||||
if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.GRACEFUL_ROLL, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!isFatal(modifiedDamage) && SkillUtils.activationSuccessful(SecondaryAbility.gracefullRoll, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
getPlayer().sendMessage(LocaleLoader.getString("Acrobatics.Ability.Proc"));
|
getPlayer().sendMessage(LocaleLoader.getString("Acrobatics.Ability.Proc"));
|
||||||
applyXpGain(calculateRollXP(damage, true), XPGainReason.PVE);
|
applyXpGain(calculateRollXP(damage, true), XPGainReason.PVE);
|
||||||
|
|
||||||
|
|||||||
@ -88,7 +88,7 @@ public final class AlchemyPotionBrewer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static List<ItemStack> getValidIngredients(Player player) {
|
private static List<ItemStack> getValidIngredients(Player player) {
|
||||||
return PotionConfig.getInstance().getIngredients((player == null || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
|
return PotionConfig.getInstance().getIngredients((player == null || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.concoctions)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void finishBrewing(BlockState brewingStand, Player player, boolean forced) {
|
public static void finishBrewing(BlockState brewingStand, Player player, boolean forced) {
|
||||||
|
|||||||
@ -24,15 +24,15 @@ public class ArcheryManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canDaze(LivingEntity target) {
|
public boolean canDaze(LivingEntity target) {
|
||||||
return target instanceof Player && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.DAZE);
|
return target instanceof Player && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.daze);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canSkillShot() {
|
public boolean canSkillShot() {
|
||||||
return getSkillLevel() >= Archery.skillShotIncreaseLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.SKILL_SHOT);
|
return getSkillLevel() >= Archery.skillShotIncreaseLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.skillShot);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canRetrieveArrows() {
|
public boolean canRetrieveArrows() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.RETRIEVE);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.retrieve);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -58,7 +58,7 @@ public class ArcheryManager extends SkillManager {
|
|||||||
* @param target The {@link LivingEntity} damaged by the arrow
|
* @param target The {@link LivingEntity} damaged by the arrow
|
||||||
*/
|
*/
|
||||||
public void retrieveArrows(LivingEntity target) {
|
public void retrieveArrows(LivingEntity target) {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.RETRIEVE, getPlayer(), getSkillLevel(), activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.retrieve, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
Archery.incrementTrackerValue(target);
|
Archery.incrementTrackerValue(target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -69,7 +69,7 @@ public class ArcheryManager extends SkillManager {
|
|||||||
* @param defender The {@link Player} being affected by the ability
|
* @param defender The {@link Player} being affected by the ability
|
||||||
*/
|
*/
|
||||||
public double daze(Player defender) {
|
public double daze(Player defender) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.DAZE, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.daze, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,7 +96,7 @@ public class ArcheryManager extends SkillManager {
|
|||||||
* @param damage The amount of damage initially dealt by the event
|
* @param damage The amount of damage initially dealt by the event
|
||||||
*/
|
*/
|
||||||
public double skillShot(double damage) {
|
public double skillShot(double damage) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.SKILL_SHOT, getPlayer())) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.skillShot, getPlayer())) {
|
||||||
return damage;
|
return damage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -27,19 +27,19 @@ public class AxesManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseAxeMastery() {
|
public boolean canUseAxeMastery() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.AXE_MASTERY);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.axeMastery);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canCriticalHit(LivingEntity target) {
|
public boolean canCriticalHit(LivingEntity target) {
|
||||||
return target.isValid() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.CRITICAL_HIT);
|
return target.isValid() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.criticalHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canImpact(LivingEntity target) {
|
public boolean canImpact(LivingEntity target) {
|
||||||
return target.isValid() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.ARMOR_IMPACT) && Axes.hasArmor(target);
|
return target.isValid() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.armorImpact) && Axes.hasArmor(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canGreaterImpact(LivingEntity target) {
|
public boolean canGreaterImpact(LivingEntity target) {
|
||||||
return target.isValid() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.GREATER_IMPACT) && !Axes.hasArmor(target);
|
return target.isValid() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.greaterImpact) && !Axes.hasArmor(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseSkullSplitter(LivingEntity target) {
|
public boolean canUseSkullSplitter(LivingEntity target) {
|
||||||
@ -54,7 +54,7 @@ public class AxesManager extends SkillManager {
|
|||||||
* Handle the effects of the Axe Mastery ability
|
* Handle the effects of the Axe Mastery ability
|
||||||
*/
|
*/
|
||||||
public double axeMastery() {
|
public double axeMastery() {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.AXE_MASTERY, getPlayer())) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.axeMastery, getPlayer())) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ public class AxesManager extends SkillManager {
|
|||||||
* @param damage The amount of damage initially dealt by the event
|
* @param damage The amount of damage initially dealt by the event
|
||||||
*/
|
*/
|
||||||
public double criticalHit(LivingEntity target, double damage) {
|
public double criticalHit(LivingEntity target, double damage) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.CRITICAL_HIT, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.criticalHit, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,7 +98,7 @@ public class AxesManager extends SkillManager {
|
|||||||
|
|
||||||
for (ItemStack armor : target.getEquipment().getArmorContents()) {
|
for (ItemStack armor : target.getEquipment().getArmorContents()) {
|
||||||
if (ItemUtils.isArmor(armor)) {
|
if (ItemUtils.isArmor(armor)) {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.ARMOR_IMPACT, getPlayer(), Axes.impactChance, activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.armorImpact, getPlayer(), Axes.impactChance, activationChance)) {
|
||||||
SkillUtils.handleDurabilityChange(armor, durabilityDamage, Axes.impactMaxDurabilityModifier);
|
SkillUtils.handleDurabilityChange(armor, durabilityDamage, Axes.impactMaxDurabilityModifier);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -111,7 +111,7 @@ public class AxesManager extends SkillManager {
|
|||||||
* @param target The {@link LivingEntity} being affected by the ability
|
* @param target The {@link LivingEntity} being affected by the ability
|
||||||
*/
|
*/
|
||||||
public double greaterImpact(LivingEntity target) {
|
public double greaterImpact(LivingEntity target) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.GREATER_IMPACT, getPlayer(), Axes.greaterImpactChance, activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.greaterImpact, getPlayer(), Axes.greaterImpactChance, activationChance)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -29,7 +29,7 @@ public class ExcavationManager extends SkillManager {
|
|||||||
public void excavationBlockCheck(BlockState blockState) {
|
public void excavationBlockCheck(BlockState blockState) {
|
||||||
int xp = Excavation.getBlockXP(blockState);
|
int xp = Excavation.getBlockXP(blockState);
|
||||||
|
|
||||||
if (Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.EXCAVATION_TREASURE_HUNTER)) {
|
if (Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.excavationTreasureHunter)) {
|
||||||
List<ExcavationTreasure> treasures = Excavation.getTreasures(blockState);
|
List<ExcavationTreasure> treasures = Excavation.getTreasures(blockState);
|
||||||
|
|
||||||
if (!treasures.isEmpty()) {
|
if (!treasures.isEmpty()) {
|
||||||
|
|||||||
@ -76,11 +76,11 @@ public class FishingManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canShake(Entity target) {
|
public boolean canShake(Entity target) {
|
||||||
return target instanceof LivingEntity && getSkillLevel() >= Tier.ONE.getLevel() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.SHAKE);
|
return target instanceof LivingEntity && getSkillLevel() >= Tier.ONE.getLevel() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.shake);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canMasterAngler() {
|
public boolean canMasterAngler() {
|
||||||
return getSkillLevel() >= AdvancedConfig.getInstance().getMasterAnglerUnlockLevel() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.MASTER_ANGLER);
|
return getSkillLevel() >= AdvancedConfig.getInstance().getMasterAnglerUnlockLevel() && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.masterAngler);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean unleashTheKraken() {
|
public boolean unleashTheKraken() {
|
||||||
@ -204,7 +204,7 @@ public class FishingManager extends SkillManager {
|
|||||||
|
|
||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
|
|
||||||
if (!Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.ICE_FISHING)) {
|
if (!Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.iceFishing)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -305,7 +305,7 @@ public class FishingManager extends SkillManager {
|
|||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
FishingTreasure treasure = null;
|
FishingTreasure treasure = null;
|
||||||
|
|
||||||
if (Config.getInstance().getFishingDropsEnabled() && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHING_TREASURE_HUNTER)) {
|
if (Config.getInstance().getFishingDropsEnabled() && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.fishingTreasureHunter)) {
|
||||||
treasure = getFishingTreasure();
|
treasure = getFishingTreasure();
|
||||||
this.fishingCatch = null;
|
this.fishingCatch = null;
|
||||||
}
|
}
|
||||||
@ -314,7 +314,7 @@ public class FishingManager extends SkillManager {
|
|||||||
ItemStack treasureDrop = treasure.getDrop().clone(); // Not cloning is bad, m'kay?
|
ItemStack treasureDrop = treasure.getDrop().clone(); // Not cloning is bad, m'kay?
|
||||||
Map<Enchantment, Integer> enchants = new HashMap<Enchantment, Integer>();
|
Map<Enchantment, Integer> enchants = new HashMap<Enchantment, Integer>();
|
||||||
|
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MAGIC_HUNTER) && ItemUtils.isEnchantable(treasureDrop)) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.magicHunter) && ItemUtils.isEnchantable(treasureDrop)) {
|
||||||
enchants = handleMagicHunter(treasureDrop);
|
enchants = handleMagicHunter(treasureDrop);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -376,7 +376,7 @@ public class FishingManager extends SkillManager {
|
|||||||
public void shakeCheck(LivingEntity target) {
|
public void shakeCheck(LivingEntity target) {
|
||||||
fishingTries--; // Because autoclicking to shake is OK.
|
fishingTries--; // Because autoclicking to shake is OK.
|
||||||
|
|
||||||
SecondaryAbilityWeightedActivationCheckEvent activationEvent = new SecondaryAbilityWeightedActivationCheckEvent(getPlayer(), SecondaryAbility.SHAKE, getShakeProbability() / activationChance);
|
SecondaryAbilityWeightedActivationCheckEvent activationEvent = new SecondaryAbilityWeightedActivationCheckEvent(getPlayer(), SecondaryAbility.shake, getShakeProbability() / activationChance);
|
||||||
mcMMO.p.getServer().getPluginManager().callEvent(activationEvent);
|
mcMMO.p.getServer().getPluginManager().callEvent(activationEvent);
|
||||||
if ((activationEvent.getChance() * activationChance) > Misc.getRandom().nextInt(activationChance)) {
|
if ((activationEvent.getChance() * activationChance) > Misc.getRandom().nextInt(activationChance)) {
|
||||||
List<ShakeTreasure> possibleDrops = Fishing.findPossibleDrops(target);
|
List<ShakeTreasure> possibleDrops = Fishing.findPossibleDrops(target);
|
||||||
|
|||||||
@ -57,11 +57,11 @@ public class HerbalismManager extends SkillManager {
|
|||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
Material itemType = player.getItemInHand().getType();
|
Material itemType = player.getItemInHand().getType();
|
||||||
|
|
||||||
return (itemType == Material.RED_MUSHROOM || itemType == Material.BROWN_MUSHROOM) && BlockUtils.canMakeShroomy(blockState) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHROOM_THUMB);
|
return (itemType == Material.RED_MUSHROOM || itemType == Material.BROWN_MUSHROOM) && BlockUtils.canMakeShroomy(blockState) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.shroomThumb);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseHylianLuck() {
|
public boolean canUseHylianLuck() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.HYLIAN_LUCK);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.hylianLuck);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canGreenTerraBlock(BlockState blockState) {
|
public boolean canGreenTerraBlock(BlockState blockState) {
|
||||||
@ -139,7 +139,7 @@ public class HerbalismManager extends SkillManager {
|
|||||||
CustomBlock customBlock = mcMMO.getModManager().getBlock(blockState);
|
CustomBlock customBlock = mcMMO.getModManager().getBlock(blockState);
|
||||||
xp = customBlock.getXpGain();
|
xp = customBlock.getXpGain();
|
||||||
|
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS) && customBlock.isDoubleDropEnabled()) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.herbalismDoubleDrops) && customBlock.isDoubleDropEnabled()) {
|
||||||
drops = blockState.getBlock().getDrops();
|
drops = blockState.getBlock().getDrops();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -155,7 +155,7 @@ public class HerbalismManager extends SkillManager {
|
|||||||
xp = ExperienceConfig.getInstance().getXp(skill, material);
|
xp = ExperienceConfig.getInstance().getXp(skill, material);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Config.getInstance().getDoubleDropsEnabled(skill, material) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS)) {
|
if (Config.getInstance().getDoubleDropsEnabled(skill, material) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.herbalismDoubleDrops)) {
|
||||||
drops = blockState.getBlock().getDrops();
|
drops = blockState.getBlock().getDrops();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -172,7 +172,7 @@ public class HerbalismManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (int i = greenTerra ? 2 : 1; i != 0; i--) {
|
for (int i = greenTerra ? 2 : 1; i != 0; i--) {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.HERBALISM_DOUBLE_DROPS, getPlayer(), getSkillLevel(), activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.herbalismDoubleDrops, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
for (ItemStack item : drops) {
|
for (ItemStack item : drops) {
|
||||||
Misc.dropItems(blockState.getLocation(), item, amount);
|
Misc.dropItems(blockState.getLocation(), item, amount);
|
||||||
}
|
}
|
||||||
@ -187,7 +187,7 @@ public class HerbalismManager extends SkillManager {
|
|||||||
* @return true if the ability was successful, false otherwise
|
* @return true if the ability was successful, false otherwise
|
||||||
*/
|
*/
|
||||||
public boolean processGreenThumbBlocks(BlockState blockState) {
|
public boolean processGreenThumbBlocks(BlockState blockState) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.GREEN_THUMB_BLOCK, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.greenThumbBlock, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
getPlayer().sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Fail"));
|
getPlayer().sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Fail"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -202,7 +202,7 @@ public class HerbalismManager extends SkillManager {
|
|||||||
* @return true if the ability was successful, false otherwise
|
* @return true if the ability was successful, false otherwise
|
||||||
*/
|
*/
|
||||||
public boolean processHylianLuck(BlockState blockState) {
|
public boolean processHylianLuck(BlockState blockState) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.HYLIAN_LUCK, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.hylianLuck, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -270,7 +270,7 @@ public class HerbalismManager extends SkillManager {
|
|||||||
playerInventory.removeItem(new ItemStack(Material.RED_MUSHROOM));
|
playerInventory.removeItem(new ItemStack(Material.RED_MUSHROOM));
|
||||||
player.updateInventory();
|
player.updateInventory();
|
||||||
|
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.SHROOM_THUMB, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.shroomThumb, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Fail"));
|
player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Fail"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -314,7 +314,7 @@ public class HerbalismManager extends SkillManager {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!greenTerra && !SkillUtils.activationSuccessful(SecondaryAbility.GREEN_THUMB_PLANT, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!greenTerra && !SkillUtils.activationSuccessful(SecondaryAbility.greenThumbPlant, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -60,7 +60,7 @@ public class MiningManager extends SkillManager {
|
|||||||
|
|
||||||
applyXpGain(Mining.getBlockXp(blockState), XPGainReason.PVE);
|
applyXpGain(Mining.getBlockXp(blockState), XPGainReason.PVE);
|
||||||
|
|
||||||
if (!Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MINING_DOUBLE_DROPS)) {
|
if (!Permissions.secondaryAbilityEnabled(player, SecondaryAbility.miningDoubleDrops)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ public class MiningManager extends SkillManager {
|
|||||||
boolean silkTouch = player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH);
|
boolean silkTouch = player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH);
|
||||||
|
|
||||||
for (int i = mcMMOPlayer.getAbilityMode(skill.getAbility()) ? 2 : 1; i != 0; i--) {
|
for (int i = mcMMOPlayer.getAbilityMode(skill.getAbility()) ? 2 : 1; i != 0; i--) {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.MINING_DOUBLE_DROPS, getPlayer(), getSkillLevel(), activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.miningDoubleDrops, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
if (silkTouch) {
|
if (silkTouch) {
|
||||||
Mining.handleSilkTouchDrops(blockState);
|
Mining.handleSilkTouchDrops(blockState);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -240,12 +240,12 @@ public class RepairManager extends SkillManager {
|
|||||||
private short repairCalculate(short durability, int repairAmount) {
|
private short repairCalculate(short durability, int repairAmount) {
|
||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
|
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.REPAIR_MASTERY)) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.repairMastery)) {
|
||||||
double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
|
double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
|
||||||
repairAmount += bonus;
|
repairAmount += bonus;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SUPER_REPAIR) && checkPlayerProcRepair()) {
|
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.superRepair) && checkPlayerProcRepair()) {
|
||||||
repairAmount *= 2.0D;
|
repairAmount *= 2.0D;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,7 +262,7 @@ public class RepairManager extends SkillManager {
|
|||||||
* @return true if bonus granted, false otherwise
|
* @return true if bonus granted, false otherwise
|
||||||
*/
|
*/
|
||||||
private boolean checkPlayerProcRepair() {
|
private boolean checkPlayerProcRepair() {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.SUPER_REPAIR, getPlayer(), getSkillLevel(), activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.superRepair, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
getPlayer().sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
|
getPlayer().sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -289,7 +289,7 @@ public class RepairManager extends SkillManager {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getArcaneForgingRank() == 0 || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_FORGING)) {
|
if (getArcaneForgingRank() == 0 || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.arcaneForging)) {
|
||||||
for (Enchantment enchant : enchants.keySet()) {
|
for (Enchantment enchant : enchants.keySet()) {
|
||||||
item.removeEnchantment(enchant);
|
item.removeEnchantment(enchant);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,11 +26,11 @@ public class SmeltingManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseFluxMining(BlockState blockState) {
|
public boolean canUseFluxMining(BlockState blockState) {
|
||||||
return getSkillLevel() >= Smelting.fluxMiningUnlockLevel && BlockUtils.affectedByFluxMining(blockState) && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.FLUX_MINING) && !mcMMO.getPlaceStore().isTrue(blockState);
|
return getSkillLevel() >= Smelting.fluxMiningUnlockLevel && BlockUtils.affectedByFluxMining(blockState) && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.fluxMining) && !mcMMO.getPlaceStore().isTrue(blockState);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isSecondSmeltSuccessful() {
|
public boolean isSecondSmeltSuccessful() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.SECOND_SMELT) && SkillUtils.activationSuccessful(SecondaryAbility.SECOND_SMELT, getPlayer(), getSkillLevel(), activationChance);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.secondSmelt) && SkillUtils.activationSuccessful(SecondaryAbility.secondSmelt, getPlayer(), getSkillLevel(), activationChance);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -42,7 +42,7 @@ public class SmeltingManager extends SkillManager {
|
|||||||
public boolean processFluxMining(BlockState blockState) {
|
public boolean processFluxMining(BlockState blockState) {
|
||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
|
|
||||||
SecondaryAbilityWeightedActivationCheckEvent event = new SecondaryAbilityWeightedActivationCheckEvent(getPlayer(), SecondaryAbility.FLUX_MINING, Smelting.fluxMiningChance / activationChance);
|
SecondaryAbilityWeightedActivationCheckEvent event = new SecondaryAbilityWeightedActivationCheckEvent(getPlayer(), SecondaryAbility.fluxMining, Smelting.fluxMiningChance / activationChance);
|
||||||
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
||||||
if ((event.getChance() * activationChance) > Misc.getRandom().nextInt(activationChance)) {
|
if ((event.getChance() * activationChance) > Misc.getRandom().nextInt(activationChance)) {
|
||||||
ItemStack item = null;
|
ItemStack item = null;
|
||||||
|
|||||||
@ -31,11 +31,11 @@ public class SwordsManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseBleed() {
|
public boolean canUseBleed() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.BLEED);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.bleed);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseCounterAttack(Entity target) {
|
public boolean canUseCounterAttack(Entity target) {
|
||||||
return target instanceof LivingEntity && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.COUNTER);
|
return target instanceof LivingEntity && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.counter);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseSerratedStrike() {
|
public boolean canUseSerratedStrike() {
|
||||||
@ -48,9 +48,9 @@ public class SwordsManager extends SkillManager {
|
|||||||
* @param target The defending entity
|
* @param target The defending entity
|
||||||
*/
|
*/
|
||||||
public void bleedCheck(LivingEntity target) {
|
public void bleedCheck(LivingEntity target) {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.BLEED, getPlayer(), getSkillLevel(), activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.bleed, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
|
|
||||||
if (getSkillLevel() >= AdvancedConfig.getInstance().getMaxBonusLevel(SecondaryAbility.BLEED)) {
|
if (getSkillLevel() >= AdvancedConfig.getInstance().getMaxBonusLevel(SecondaryAbility.bleed)) {
|
||||||
BleedTimerTask.add(target, Swords.bleedMaxTicks);
|
BleedTimerTask.add(target, Swords.bleedMaxTicks);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -82,7 +82,7 @@ public class SwordsManager extends SkillManager {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.COUNTER, getPlayer(), getSkillLevel(), activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.counter, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
CombatUtils.dealDamage(attacker, damage / Swords.counterAttackModifier);
|
CombatUtils.dealDamage(attacker, damage / Swords.counterAttackModifier);
|
||||||
|
|
||||||
getPlayer().sendMessage(LocaleLoader.getString("Swords.Combat.Countered"));
|
getPlayer().sendMessage(LocaleLoader.getString("Swords.Combat.Countered"));
|
||||||
|
|||||||
@ -32,35 +32,35 @@ public class TamingManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseThickFur() {
|
public boolean canUseThickFur() {
|
||||||
return getSkillLevel() >= Taming.thickFurUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.THICK_FUR);
|
return getSkillLevel() >= Taming.thickFurUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.thickFur);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseEnvironmentallyAware() {
|
public boolean canUseEnvironmentallyAware() {
|
||||||
return getSkillLevel() >= Taming.environmentallyAwareUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.ENVIROMENTALLY_AWARE);
|
return getSkillLevel() >= Taming.environmentallyAwareUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.enviromentallyAware);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseShockProof() {
|
public boolean canUseShockProof() {
|
||||||
return getSkillLevel() >= Taming.shockProofUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.SHOCK_PROOF);
|
return getSkillLevel() >= Taming.shockProofUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.shockProof);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseHolyHound() {
|
public boolean canUseHolyHound() {
|
||||||
return getSkillLevel() >= Taming.holyHoundUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.HOLY_HOUND);
|
return getSkillLevel() >= Taming.holyHoundUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.holyHound);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseFastFoodService() {
|
public boolean canUseFastFoodService() {
|
||||||
return getSkillLevel() >= Taming.fastFoodServiceUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.FAST_FOOD);
|
return getSkillLevel() >= Taming.fastFoodServiceUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.fastFood);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseSharpenedClaws() {
|
public boolean canUseSharpenedClaws() {
|
||||||
return getSkillLevel() >= Taming.sharpenedClawsUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.SHARPENED_CLAWS);
|
return getSkillLevel() >= Taming.sharpenedClawsUnlockLevel && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.sharpenedClaws);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseGore() {
|
public boolean canUseGore() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.GORE);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.gore);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseBeastLore() {
|
public boolean canUseBeastLore() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.BEAST_LORE);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.beastLore);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -94,7 +94,7 @@ public class TamingManager extends SkillManager {
|
|||||||
* @param damage The damage being absorbed by the wolf
|
* @param damage The damage being absorbed by the wolf
|
||||||
*/
|
*/
|
||||||
public void fastFoodService(Wolf wolf, double damage) {
|
public void fastFoodService(Wolf wolf, double damage) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.FAST_FOOD, getPlayer(), Taming.fastFoodServiceActivationChance, activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.fastFood, getPlayer(), Taming.fastFoodServiceActivationChance, activationChance)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ public class TamingManager extends SkillManager {
|
|||||||
* @param damage The initial damage
|
* @param damage The initial damage
|
||||||
*/
|
*/
|
||||||
public double gore(LivingEntity target, double damage) {
|
public double gore(LivingEntity target, double damage) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.GORE, getPlayer(), getSkillLevel(), activationChance)) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.gore, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@ public class UnarmedManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseIronArm() {
|
public boolean canUseIronArm() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.IRON_ARM);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.ironArm);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseBerserk() {
|
public boolean canUseBerserk() {
|
||||||
@ -42,21 +42,21 @@ public class UnarmedManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canDisarm(LivingEntity target) {
|
public boolean canDisarm(LivingEntity target) {
|
||||||
return target instanceof Player && ((Player) target).getItemInHand().getType() != Material.AIR && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.DISARM);
|
return target instanceof Player && ((Player) target).getItemInHand().getType() != Material.AIR && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.disarm);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canDeflect() {
|
public boolean canDeflect() {
|
||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
|
|
||||||
return player.getItemInHand().getType() == Material.AIR && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.DEFLECT);
|
return player.getItemInHand().getType() == Material.AIR && Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.deflect);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseBlockCracker() {
|
public boolean canUseBlockCracker() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.BLOCK_CRACKER);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.blockCracker);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean blockCrackerCheck(BlockState blockState) {
|
public boolean blockCrackerCheck(BlockState blockState) {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.BLOCK_CRACKER, getPlayer())) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.blockCracker, getPlayer())) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,7 +89,7 @@ public class UnarmedManager extends SkillManager {
|
|||||||
* @param defender The defending player
|
* @param defender The defending player
|
||||||
*/
|
*/
|
||||||
public void disarmCheck(Player defender) {
|
public void disarmCheck(Player defender) {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.DISARM, getPlayer(), getSkillLevel(), activationChance) && !hasIronGrip(defender)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.disarm, getPlayer(), getSkillLevel(), activationChance) && !hasIronGrip(defender)) {
|
||||||
if (EventUtils.callDisarmEvent(defender).isCancelled()) {
|
if (EventUtils.callDisarmEvent(defender).isCancelled()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -109,7 +109,7 @@ public class UnarmedManager extends SkillManager {
|
|||||||
* Check for arrow deflection.
|
* Check for arrow deflection.
|
||||||
*/
|
*/
|
||||||
public boolean deflectCheck() {
|
public boolean deflectCheck() {
|
||||||
if (SkillUtils.activationSuccessful(SecondaryAbility.DEFLECT, getPlayer(), getSkillLevel(), activationChance)) {
|
if (SkillUtils.activationSuccessful(SecondaryAbility.deflect, getPlayer(), getSkillLevel(), activationChance)) {
|
||||||
getPlayer().sendMessage(LocaleLoader.getString("Combat.ArrowDeflect"));
|
getPlayer().sendMessage(LocaleLoader.getString("Combat.ArrowDeflect"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -132,7 +132,7 @@ public class UnarmedManager extends SkillManager {
|
|||||||
* Handle the effects of the Iron Arm ability
|
* Handle the effects of the Iron Arm ability
|
||||||
*/
|
*/
|
||||||
public double ironArm() {
|
public double ironArm() {
|
||||||
if (!SkillUtils.activationSuccessful(SecondaryAbility.IRON_ARM, getPlayer())) {
|
if (!SkillUtils.activationSuccessful(SecondaryAbility.ironArm, getPlayer())) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,7 +146,7 @@ public class UnarmedManager extends SkillManager {
|
|||||||
* @return true if the defender was not disarmed, false otherwise
|
* @return true if the defender was not disarmed, false otherwise
|
||||||
*/
|
*/
|
||||||
private boolean hasIronGrip(Player defender) {
|
private boolean hasIronGrip(Player defender) {
|
||||||
if (!Misc.isNPCEntity(defender) && Permissions.secondaryAbilityEnabled(defender, SecondaryAbility.IRON_GRIP) && SkillUtils.activationSuccessful(SecondaryAbility.IRON_GRIP, defender, skill)) {
|
if (!Misc.isNPCEntity(defender) && Permissions.secondaryAbilityEnabled(defender, SecondaryAbility.ironGrip) && SkillUtils.activationSuccessful(SecondaryAbility.ironGrip, defender, skill)) {
|
||||||
defender.sendMessage(LocaleLoader.getString("Unarmed.Ability.IronGrip.Defender"));
|
defender.sendMessage(LocaleLoader.getString("Unarmed.Ability.IronGrip.Defender"));
|
||||||
getPlayer().sendMessage(LocaleLoader.getString("Unarmed.Ability.IronGrip.Attacker"));
|
getPlayer().sendMessage(LocaleLoader.getString("Unarmed.Ability.IronGrip.Attacker"));
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@ public class WoodcuttingManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseLeafBlower(ItemStack heldItem) {
|
public boolean canUseLeafBlower(ItemStack heldItem) {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.LEAF_BLOWER) && getSkillLevel() >= Woodcutting.leafBlowerUnlockLevel && ItemUtils.isAxe(heldItem);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.leafBlower) && getSkillLevel() >= Woodcutting.leafBlowerUnlockLevel && ItemUtils.isAxe(heldItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canUseTreeFeller(ItemStack heldItem) {
|
public boolean canUseTreeFeller(ItemStack heldItem) {
|
||||||
@ -42,7 +42,7 @@ public class WoodcuttingManager extends SkillManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected boolean canGetDoubleDrops() {
|
protected boolean canGetDoubleDrops() {
|
||||||
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.WOODCUTTING_DOUBLE_DROPS) && SkillUtils.activationSuccessful(SecondaryAbility.WOODCUTTING_DOUBLE_DROPS, getPlayer(), getSkillLevel(), activationChance);
|
return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.woodcuttingDoubleDrops) && SkillUtils.activationSuccessful(SecondaryAbility.woodcuttingDoubleDrops, getPlayer(), getSkillLevel(), activationChance);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -36,20 +36,20 @@ public class StringUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getPrettySecondaryAbilityString(SecondaryAbility secondaryAbility) {
|
public static String getPrettySecondaryAbilityString(SecondaryAbility secondaryAbility) {
|
||||||
switch (secondaryAbility) {
|
// switch (secondaryAbility) {
|
||||||
case HERBALISM_DOUBLE_DROPS:
|
// case herbalismDoubleDrops:
|
||||||
case MINING_DOUBLE_DROPS:
|
// case miningDoubleDrops:
|
||||||
case WOODCUTTING_DOUBLE_DROPS:
|
// case woodcuttingDoubleDrops:
|
||||||
return "Double Drops";
|
// return "Double Drops";
|
||||||
case FISHING_TREASURE_HUNTER:
|
// case fishingTreasureHunter:
|
||||||
case EXCAVATION_TREASURE_HUNTER:
|
// case excavationTreasureHunter:
|
||||||
return "Treasure Hunter";
|
// return "Treasure Hunter";
|
||||||
case GREEN_THUMB_BLOCK:
|
// case greenThumbBlock:
|
||||||
case GREEN_THUMB_PLANT:
|
// case greenThumbPlant:
|
||||||
return "Green Thumb";
|
// return "Green Thumb";
|
||||||
default:
|
// default:
|
||||||
return createPrettyEnumString(secondaryAbility.toString());
|
return createPrettyEnumString(secondaryAbility.toString());
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getPrettyPartyFeatureString(PartyFeature partyFeature) {
|
public static String getPrettyPartyFeatureString(PartyFeature partyFeature) {
|
||||||
|
|||||||
@ -223,7 +223,7 @@ public class SkillUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean treasureDropSuccessful(Player player, double dropChance, int activationChance) {
|
public static boolean treasureDropSuccessful(Player player, double dropChance, int activationChance) {
|
||||||
SecondaryAbilityWeightedActivationCheckEvent event = new SecondaryAbilityWeightedActivationCheckEvent(player, SecondaryAbility.EXCAVATION_TREASURE_HUNTER, dropChance / activationChance);
|
SecondaryAbilityWeightedActivationCheckEvent event = new SecondaryAbilityWeightedActivationCheckEvent(player, SecondaryAbility.excavationTreasureHunter, dropChance / activationChance);
|
||||||
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
||||||
return (event.getChance() * activationChance) > (Misc.getRandom().nextDouble() * activationChance) && !event.isCancelled();
|
return (event.getChance() * activationChance) > (Misc.getRandom().nextDouble() * activationChance) && !event.isCancelled();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user