mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-24 14:16:45 +01:00
rename references to mining mastery -> mother lode
This commit is contained in:
parent
1ff2c0dcfc
commit
73e36b11b3
@ -55,8 +55,8 @@ public class MiningCommand extends SkillCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Mastery TRIPLE DROPS
|
// Mastery TRIPLE DROPS
|
||||||
if (Permissions.canUseSubSkill(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_MASTERY);
|
String[] masteryTripleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.MINING_MOTHER_LODE);
|
||||||
masteryTripleDropChance = masteryTripleDropStrings[0];
|
masteryTripleDropChance = masteryTripleDropStrings[0];
|
||||||
masteryTripleDropChanceLucky = masteryTripleDropStrings[1];
|
masteryTripleDropChanceLucky = masteryTripleDropStrings[1];
|
||||||
}
|
}
|
||||||
@ -105,8 +105,8 @@ public class MiningCommand extends SkillCommand {
|
|||||||
//messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
|
//messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Permissions.canUseSubSkill(player, SubSkillType.MINING_MASTERY)) {
|
if(Permissions.canUseSubSkill(player, SubSkillType.MINING_MOTHER_LODE)) {
|
||||||
messages.add(getStatMessage(SubSkillType.MINING_MASTERY, masteryTripleDropChance)
|
messages.add(getStatMessage(SubSkillType.MINING_MOTHER_LODE, masteryTripleDropChance)
|
||||||
+ (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", masteryTripleDropChanceLucky) : ""));
|
+ (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", masteryTripleDropChanceLucky) : ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ public enum PrimarySkillType {
|
|||||||
HERBALISM(HerbalismManager.class, Color.GREEN, SuperAbilityType.GREEN_TERRA, ToolType.HOE,
|
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)),
|
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,
|
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,
|
REPAIR(RepairManager.class, Color.SILVER,
|
||||||
ImmutableList.of(SubSkillType.REPAIR_MASTERY, SubSkillType.REPAIR_ARCANE_FORGING, SubSkillType.REPAIR_REPAIR_MASTERY, SubSkillType.REPAIR_SUPER_REPAIR)),
|
ImmutableList.of(SubSkillType.REPAIR_MASTERY, SubSkillType.REPAIR_ARCANE_FORGING, SubSkillType.REPAIR_REPAIR_MASTERY, SubSkillType.REPAIR_SUPER_REPAIR)),
|
||||||
SALVAGE(SalvageManager.class, Color.ORANGE,
|
SALVAGE(SalvageManager.class, Color.ORANGE,
|
||||||
|
@ -63,7 +63,7 @@ public enum SubSkillType {
|
|||||||
MINING_DEMOLITIONS_EXPERTISE(1),
|
MINING_DEMOLITIONS_EXPERTISE(1),
|
||||||
MINING_DOUBLE_DROPS(1),
|
MINING_DOUBLE_DROPS(1),
|
||||||
MINING_SUPER_BREAKER(1),
|
MINING_SUPER_BREAKER(1),
|
||||||
MINING_MASTERY(1),
|
MINING_MOTHER_LODE(1),
|
||||||
|
|
||||||
/* Repair */
|
/* Repair */
|
||||||
REPAIR_ARCANE_FORGING(8),
|
REPAIR_ARCANE_FORGING(8),
|
||||||
|
@ -69,8 +69,8 @@ public class MiningManager extends SkillManager {
|
|||||||
return RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS) && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS);
|
return RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS) && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canMiningMastery() {
|
public boolean canMotherLode() {
|
||||||
return Permissions.canUseSubSkill(getPlayer(), SubSkillType.MINING_MASTERY);
|
return Permissions.canUseSubSkill(getPlayer(), SubSkillType.MINING_MOTHER_LODE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -101,7 +101,7 @@ public class MiningManager extends SkillManager {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
//Mining mastery allows for a chance of triple drops
|
//Mining mastery allows for a chance of triple drops
|
||||||
if(canMiningMastery()) {
|
if(canMotherLode()) {
|
||||||
//Triple Drops failed so do a normal double drops check
|
//Triple Drops failed so do a normal double drops check
|
||||||
if(!processTripleDrops(blockState)) {
|
if(!processTripleDrops(blockState)) {
|
||||||
processDoubleDrops(blockState);
|
processDoubleDrops(blockState);
|
||||||
@ -114,7 +114,7 @@ public class MiningManager extends SkillManager {
|
|||||||
|
|
||||||
private boolean processTripleDrops(@NotNull BlockState blockState) {
|
private boolean processTripleDrops(@NotNull BlockState blockState) {
|
||||||
//TODO: Make this readable
|
//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);
|
BlockUtils.markDropsAsBonus(blockState, 2);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
@ -281,7 +281,7 @@ Skills:
|
|||||||
# Settings for Mining
|
# Settings for Mining
|
||||||
###
|
###
|
||||||
Mining:
|
Mining:
|
||||||
Mastery:
|
MotherLode:
|
||||||
MaxBonusLevel:
|
MaxBonusLevel:
|
||||||
Standard: 1000
|
Standard: 1000
|
||||||
RetroMode: 10000
|
RetroMode: 10000
|
||||||
|
@ -482,7 +482,7 @@ permissions:
|
|||||||
mcmmo.ability.mining.blastmining.all: true
|
mcmmo.ability.mining.blastmining.all: true
|
||||||
mcmmo.ability.mining.doubledrops: true
|
mcmmo.ability.mining.doubledrops: true
|
||||||
mcmmo.ability.mining.superbreaker: true
|
mcmmo.ability.mining.superbreaker: true
|
||||||
mcmmo.ability.mining.mastery: true
|
mcmmo.ability.mining.motherlode: true
|
||||||
mcmmo.ability.mining.blastmining.*:
|
mcmmo.ability.mining.blastmining.*:
|
||||||
default: false
|
default: false
|
||||||
description: Allows access to all Blast Mining abilities
|
description: Allows access to all Blast Mining abilities
|
||||||
@ -500,8 +500,8 @@ permissions:
|
|||||||
description: Allows access to the Demolitions Expertise ability
|
description: Allows access to the Demolitions Expertise ability
|
||||||
mcmmo.ability.mining.blastmining.detonate:
|
mcmmo.ability.mining.blastmining.detonate:
|
||||||
description: Allows for remote TNT detonation
|
description: Allows for remote TNT detonation
|
||||||
mcmmo.ability.mining.mastery:
|
mcmmo.ability.mining.motherlode:
|
||||||
description: Allows access to end game progression for Mining
|
description: Allows access to mother lode subskill
|
||||||
mcmmo.ability.mining.doubledrops:
|
mcmmo.ability.mining.doubledrops:
|
||||||
description: Allows double drop chance when mining
|
description: Allows double drop chance when mining
|
||||||
mcmmo.ability.mining.superbreaker:
|
mcmmo.ability.mining.superbreaker:
|
||||||
|
@ -356,7 +356,7 @@ Salvage:
|
|||||||
Rank_7: 850
|
Rank_7: 850
|
||||||
Rank_8: 1000
|
Rank_8: 1000
|
||||||
Mining:
|
Mining:
|
||||||
Mastery:
|
MotherLode:
|
||||||
Standard:
|
Standard:
|
||||||
Rank_1: 100
|
Rank_1: 100
|
||||||
RetroMode:
|
RetroMode:
|
||||||
|
Loading…
Reference in New Issue
Block a user