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

rename references to mining mastery -> mother lode

Browse Source
This commit is contained in:
nossr50 2021-02-08 12:02:27 -08:00
parent 1ff2c0dcfc
commit 73e36b11b3
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
View File

@ -55,8 +55,8 @@ public class MiningCommand extends SkillCommand {
}
// Mastery TRIPLE DROPS
if (Permissions.canUseSubSkill(player, SubSkillType.MINING_MASTERY)) {
String[] masteryTripleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.MINING_MASTERY);
if (Permissions.canUseSubSkill(player, SubSkillType.MINING_MOTHER_LODE)) {
String[] masteryTripleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.MINING_MOTHER_LODE);
masteryTripleDropChance = masteryTripleDropStrings[0];
masteryTripleDropChanceLucky = masteryTripleDropStrings[1];
}
@ -105,8 +105,8 @@ public class MiningCommand extends SkillCommand {
//messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
}
if(Permissions.canUseSubSkill(player, SubSkillType.MINING_MASTERY)) {
messages.add(getStatMessage(SubSkillType.MINING_MASTERY, masteryTripleDropChance)
if(Permissions.canUseSubSkill(player, SubSkillType.MINING_MOTHER_LODE)) {
messages.add(getStatMessage(SubSkillType.MINING_MOTHER_LODE, masteryTripleDropChance)
+ (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", masteryTripleDropChanceLucky) : ""));
}

2
src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java
View File

@ -49,7 +49,7 @@ public enum PrimarySkillType {
HERBALISM(HerbalismManager.class, Color.GREEN, SuperAbilityType.GREEN_TERRA, ToolType.HOE,
ImmutableList.of(SubSkillType.HERBALISM_MASTERY, SubSkillType.HERBALISM_GREEN_TERRA, SubSkillType.HERBALISM_FARMERS_DIET, SubSkillType.HERBALISM_GREEN_THUMB, SubSkillType.HERBALISM_DOUBLE_DROPS, SubSkillType.HERBALISM_HYLIAN_LUCK, SubSkillType.HERBALISM_SHROOM_THUMB)),
MINING(MiningManager.class, Color.GRAY, SuperAbilityType.SUPER_BREAKER, ToolType.PICKAXE,
ImmutableList.of(SubSkillType.MINING_MASTERY, SubSkillType.MINING_SUPER_BREAKER, SubSkillType.MINING_DEMOLITIONS_EXPERTISE, SubSkillType.MINING_BIGGER_BOMBS, SubSkillType.MINING_BLAST_MINING, SubSkillType.MINING_DOUBLE_DROPS)),
ImmutableList.of(SubSkillType.MINING_MOTHER_LODE, SubSkillType.MINING_SUPER_BREAKER, SubSkillType.MINING_DEMOLITIONS_EXPERTISE, SubSkillType.MINING_BIGGER_BOMBS, SubSkillType.MINING_BLAST_MINING, SubSkillType.MINING_DOUBLE_DROPS)),
REPAIR(RepairManager.class, Color.SILVER,
ImmutableList.of(SubSkillType.REPAIR_MASTERY, SubSkillType.REPAIR_ARCANE_FORGING, SubSkillType.REPAIR_REPAIR_MASTERY, SubSkillType.REPAIR_SUPER_REPAIR)),
SALVAGE(SalvageManager.class, Color.ORANGE,

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

@ -63,7 +63,7 @@ public enum SubSkillType {
MINING_DEMOLITIONS_EXPERTISE(1),
MINING_DOUBLE_DROPS(1),
MINING_SUPER_BREAKER(1),
MINING_MASTERY(1),
MINING_MOTHER_LODE(1),
/* Repair */
REPAIR_ARCANE_FORGING(8),

8
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -69,8 +69,8 @@ public class MiningManager extends SkillManager {
return RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS) && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS);
}
public boolean canMiningMastery() {
return Permissions.canUseSubSkill(getPlayer(), SubSkillType.MINING_MASTERY);
public boolean canMotherLode() {
return Permissions.canUseSubSkill(getPlayer(), SubSkillType.MINING_MOTHER_LODE);
}
@ -101,7 +101,7 @@ public class MiningManager extends SkillManager {
return;
//Mining mastery allows for a chance of triple drops
if(canMiningMastery()) {
if(canMotherLode()) {
//Triple Drops failed so do a normal double drops check
if(!processTripleDrops(blockState)) {
processDoubleDrops(blockState);
@ -114,7 +114,7 @@ public class MiningManager extends SkillManager {
private boolean processTripleDrops(@NotNull BlockState blockState) {
//TODO: Make this readable
if (RandomChanceUtil.checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.MINING_MASTERY, true)) {
if (RandomChanceUtil.checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.MINING_MOTHER_LODE, true)) {
BlockUtils.markDropsAsBonus(blockState, 2);
return true;
} else {

2
src/main/resources/advanced.yml
View File

@ -281,7 +281,7 @@ Skills:
# Settings for Mining
###
Mining:
Mastery:
MotherLode:
MaxBonusLevel:
Standard: 1000
RetroMode: 10000

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

@ -482,7 +482,7 @@ permissions:
mcmmo.ability.mining.blastmining.all: true
mcmmo.ability.mining.doubledrops: true
mcmmo.ability.mining.superbreaker: true
mcmmo.ability.mining.mastery: true
mcmmo.ability.mining.motherlode: true
mcmmo.ability.mining.blastmining.*:
default: false
description: Allows access to all Blast Mining abilities
@ -500,8 +500,8 @@ permissions:
description: Allows access to the Demolitions Expertise ability
mcmmo.ability.mining.blastmining.detonate:
description: Allows for remote TNT detonation
mcmmo.ability.mining.mastery:
description: Allows access to end game progression for Mining
mcmmo.ability.mining.motherlode:
description: Allows access to mother lode subskill
mcmmo.ability.mining.doubledrops:
description: Allows double drop chance when mining
mcmmo.ability.mining.superbreaker:

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

@ -356,7 +356,7 @@ Salvage:
Rank_7: 850
Rank_8: 1000
Mining:
Mastery:
MotherLode:
Standard:
Rank_1: 100
RetroMode: