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

Also display possible lucky perk for MagicHunter

Browse Source
This commit is contained in:
TfT_02
2013-01-10 22:56:15 +01:00
parent 085a25306c
commit b19395b40d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,11 +17,13 @@ public class FishingCommand extends SkillCommand {
private int lootTier; private int lootTier;
private String magicChance; private String magicChance;
private String magicChanceLucky;
private int shakeUnlockLevel; private int shakeUnlockLevel;
private String shakeChance; private String shakeChance;
private String shakeChanceLucky; private String shakeChanceLucky;
private String fishermansDietRank; private String fishermansDietRank;
private int magicHunterMultiplier = advancedConfig.getFishingMagicMultiplier();
private int fishermansDietRankChange = advancedConfig.getFarmerDietRankChange(); private int fishermansDietRankChange = advancedConfig.getFarmerDietRankChange();
private int fishermansDietRankMaxLevel = fishermansDietRankChange * 5; private int fishermansDietRankMaxLevel = fishermansDietRankChange * 5;
@@ -40,10 +42,13 @@ public class FishingCommand extends SkillCommand {
DecimalFormat df = new DecimalFormat("0.0"); DecimalFormat df = new DecimalFormat("0.0");
//Treasure Hunter //Treasure Hunter
lootTier = Fishing.getFishingLootTier(profile); lootTier = Fishing.getFishingLootTier(profile);
magicChance = percent.format(lootTier / 20D); int magicChanceInt = (lootTier * magicHunterMultiplier);
magicChance = df.format(magicChanceInt);
if (magicChanceInt + (magicChanceInt * 0.3333D) >= 100D) magicChanceLucky = df.format(100D);
else magicChanceLucky = df.format(magicChanceInt + (magicChanceInt * 0.3333D));
//Shake //Shake
int dropChance = Fishing.getShakeChance(lootTier); int dropChance = Fishing.getShakeChance(lootTier);
shakeChance = df.format(dropChance); shakeChance = df.format(dropChance);
if (dropChance + (dropChance * 0.3333D) >= 100D) shakeChanceLucky = df.format(100D); if (dropChance + (dropChance * 0.3333D) >= 100D) shakeChanceLucky = df.format(100D);
else shakeChanceLucky = df.format(dropChance + (dropChance * 0.3333D)); else shakeChanceLucky = df.format(dropChance + (dropChance * 0.3333D));
@@ -104,7 +109,10 @@ public class FishingCommand extends SkillCommand {
} }
if (canMagicHunt) { if (canMagicHunt) {
player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance })); if (lucky)
player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { magicChanceLucky }));
else
player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance }));
} }
if (canShake) { if (canShake) {