EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 05:04:43 +02:00
Code Issues Projects Releases Wiki Activity

Skill commands now show the perk effect, if any are active

Browse Source
This commit is contained in:
TfT_02
2013-01-06 12:16:08 +01:00
parent 99c6c46d54
commit 00020a9cbb
31 changed files with 229 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@ -1,5 +1,7 @@
package com.gmail.nossr50.commands.skills;
import java.text.DecimalFormat;
import org.bukkit.ChatColor;
import com.gmail.nossr50.commands.SkillCommand;
@ -16,6 +18,7 @@ public class FishingCommand extends SkillCommand {
private String magicChance;
private int shakeUnlockLevel;
private String shakeChance;
private String shakeChanceLucky;
private String fishermansDietRank;
private int fishermansDietRankChange = advancedConfig.getFarmerDietRankChange();
@ -32,18 +35,20 @@ public class FishingCommand extends SkillCommand {
@Override
protected void dataCalculations() {
DecimalFormat df = new DecimalFormat("0.0");
//Treasure Hunter
lootTier = Fishing.getFishingLootTier(profile);
magicChance = percent.format(lootTier / 15D);
magicChance = percent.format(lootTier / 15D);
//Shake
int dropChance = Fishing.getShakeChance(lootTier);
if (player.hasPermission("mcmmo.perks.lucky.fishing")) {
dropChance = (int) (dropChance * 1.25D);
}
shakeChance = String.valueOf(dropChance);
shakeChance = df.format(dropChance);
if(dropChance + dropChance * 0.3333D >= 100D) shakeChanceLucky = df.format(100D);
else shakeChanceLucky = df.format(dropChance + dropChance * 0.3333D);
shakeUnlockLevel = advancedConfig.getShakeUnlockLevel();
//Fishermans Diet
if(skillValue >= fishermansDietRankMaxLevel) fishermansDietRank = "5";
else fishermansDietRank = String.valueOf((int) ((double) skillValue / (double) fishermansDietRankChange));
shakeUnlockLevel = advancedConfig.getShakeUnlockLevel();
else fishermansDietRank = String.valueOf((int) ((double) skillValue / (double) fishermansDietRankChange));
}
@Override
@ -103,7 +108,10 @@ public class FishingCommand extends SkillCommand {
player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0", new Object[] { shakeUnlockLevel }) }));
}
else {
player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }));
if (player.hasPermission("mcmmo.perks.lucky.fishing"))
player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { shakeChanceLucky }));
else
player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }));
}
}