EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 19:54:44 +02:00
Code Issues Projects Releases Wiki Activity

Cleaning up Herbalism & Mining commands.

Browse Source
This commit is contained in:
GJ
2013-01-22 02:20:05 -05:00
parent b4fffe154d
commit 65d71db72f
10 changed files with 71 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/skills/mining/BiggerBombsEventHandler.java
View File

@ -17,20 +17,20 @@ public class BiggerBombsEventHandler {
}
protected void calculateRadiusIncrease() {
if (skillLevel < BlastMining.BLAST_MINING_RANK_2) {
if (skillLevel < BlastMining.rank2) {
return;
}
if (skillLevel >= BlastMining.BLAST_MINING_RANK_8) {
if (skillLevel >= BlastMining.rank8) {
radiusModifier = 4.0f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_6) {
else if (skillLevel >= BlastMining.rank6) {
radiusModifier = 3.0f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_4) {
else if (skillLevel >= BlastMining.rank4) {
radiusModifier = 2.0f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_2) {
else if (skillLevel >= BlastMining.rank2) {
radiusModifier = 1.0f;
}
}

18
src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java
View File

@ -3,16 +3,14 @@ package com.gmail.nossr50.skills.mining;
import com.gmail.nossr50.config.AdvancedConfig;
public class BlastMining {
private static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
public final static int BLAST_MINING_RANK_1 = advancedConfig.getBlastMiningRank1();
public final static int BLAST_MINING_RANK_2 = advancedConfig.getBlastMiningRank2();
public final static int BLAST_MINING_RANK_3 = advancedConfig.getBlastMiningRank3();
public final static int BLAST_MINING_RANK_4 = advancedConfig.getBlastMiningRank4();
public final static int BLAST_MINING_RANK_5 = advancedConfig.getBlastMiningRank5();
public final static int BLAST_MINING_RANK_6 = advancedConfig.getBlastMiningRank6();
public final static int BLAST_MINING_RANK_7 = advancedConfig.getBlastMiningRank7();
public final static int BLAST_MINING_RANK_8 = advancedConfig.getBlastMiningRank8();
public static int rank1 = AdvancedConfig.getInstance().getBlastMiningRank1();
public static int rank2 = AdvancedConfig.getInstance().getBlastMiningRank2();
public static int rank3 = AdvancedConfig.getInstance().getBlastMiningRank3();
public static int rank4 = AdvancedConfig.getInstance().getBlastMiningRank4();
public static int rank5 = AdvancedConfig.getInstance().getBlastMiningRank5();
public static int rank6 = AdvancedConfig.getInstance().getBlastMiningRank6();
public static int rank7 = AdvancedConfig.getInstance().getBlastMiningRank7();
public static int rank8 = AdvancedConfig.getInstance().getBlastMiningRank8();
public final static int MAXIMUM_REMOTE_DETONATION_DISTANCE = 100;
}

22
src/main/java/com/gmail/nossr50/skills/mining/BlastMiningDropEventHandler.java
View File

@ -101,25 +101,25 @@ public class BlastMiningDropEventHandler {
}
private void calculateOreBonus() {
if (skillLevel >= BlastMining.BLAST_MINING_RANK_8) {
if (skillLevel >= BlastMining.rank8) {
oreBonus = .70f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_7) {
else if (skillLevel >= BlastMining.rank7) {
oreBonus = .65f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_6) {
else if (skillLevel >= BlastMining.rank6) {
oreBonus = .60f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_5) {
else if (skillLevel >= BlastMining.rank5) {
oreBonus = .55f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_4) {
else if (skillLevel >= BlastMining.rank4) {
oreBonus = .50f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_3) {
else if (skillLevel >= BlastMining.rank3) {
oreBonus = .45f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_2) {
else if (skillLevel >= BlastMining.rank2) {
oreBonus = .40f;
}
else {
@ -128,10 +128,10 @@ public class BlastMiningDropEventHandler {
}
private void calculateDebrisReduction() {
if (skillLevel >= BlastMining.BLAST_MINING_RANK_3) {
if (skillLevel >= BlastMining.rank3) {
debrisReduction = .30f;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_2) {
else if (skillLevel >= BlastMining.rank2) {
debrisReduction = .20f;
}
else {
@ -140,10 +140,10 @@ public class BlastMiningDropEventHandler {
}
private void calculateDropMultiplier() {
if (skillLevel >= BlastMining.BLAST_MINING_RANK_7) {
if (skillLevel >= BlastMining.rank7) {
dropMultiplier = 3;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_5) {
else if (skillLevel >= BlastMining.rank5) {
dropMultiplier = 2;
}
else {

6
src/main/java/com/gmail/nossr50/skills/mining/DemoltionsExpertiseEventHandler.java
View File

@ -17,13 +17,13 @@ public class DemoltionsExpertiseEventHandler {
}
protected void calculateDamageModifier() {
if (skillLevel >= BlastMining.BLAST_MINING_RANK_8) {
if (skillLevel >= BlastMining.rank8) {
damageModifier = 0.0;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_6) {
else if (skillLevel >= BlastMining.rank6) {
damageModifier = 0.25;
}
else if (skillLevel >= BlastMining.BLAST_MINING_RANK_4) {
else if (skillLevel >= BlastMining.rank4) {
damageModifier = 0.5;
}
else {

5
src/main/java/com/gmail/nossr50/skills/mining/Mining.java
View File

@ -22,8 +22,9 @@ public class Mining {
private static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
private static Config config = Config.getInstance();
public static final int DOUBLE_DROPS_MAX_BONUS_LEVEL = advancedConfig.getMiningDoubleDropMaxLevel();
public static final double DOUBLE_DROPS_MAX_CHANCE = advancedConfig.getMiningDoubleDropChance();
public static int doubleDropsMaxLevel = advancedConfig.getMiningDoubleDropMaxLevel();
public static double doubleDropsMaxChance = advancedConfig.getMiningDoubleDropChance();
public static boolean doubleDropsDisabled = config.miningDoubleDropsDisabled();
public static final int DIAMOND_TOOL_TIER = 4;
public static final int IRON_TOOL_TIER = 3;

2
src/main/java/com/gmail/nossr50/skills/mining/MiningBlockEventHandler.java
View File

@ -30,7 +30,7 @@ public class MiningBlockEventHandler {
}
private void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Mining.DOUBLE_DROPS_MAX_BONUS_LEVEL);
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Mining.doubleDropsMaxLevel);
}
/**

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

@ -31,7 +31,7 @@ public class MiningManager extends SkillManager{
return;
}
if (skillLevel < BlastMining.BLAST_MINING_RANK_1) {
if (skillLevel < BlastMining.rank1) {
return;
}
@ -66,7 +66,7 @@ public class MiningManager extends SkillManager{
return;
}
if (skillLevel < BlastMining.BLAST_MINING_RANK_1) {
if (skillLevel < BlastMining.rank1) {
return;
}
@ -132,7 +132,7 @@ public class MiningManager extends SkillManager{
return;
}
float chance = ((float) Mining.DOUBLE_DROPS_MAX_CHANCE / Mining.DOUBLE_DROPS_MAX_BONUS_LEVEL) * eventHandler.skillModifier;
float chance = ((float) Mining.doubleDropsMaxChance / Mining.doubleDropsMaxLevel) * eventHandler.skillModifier;
if (chance > Misc.getRandom().nextInt(activationChance)) {
eventHandler.processDrops();