소스 검색

Also display possible lucky perk for MagicHunter

TfT_02 12 년 전
부모
커밋
b19395b40d
1개의 변경된 파일12개의 추가작업 그리고 4개의 파일을 삭제
  1. 12 4
      src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java

+ 12 - 4
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java

@@ -17,11 +17,13 @@ public class FishingCommand extends SkillCommand {
 
     private int lootTier;
     private String magicChance;
+    private String magicChanceLucky;
     private int shakeUnlockLevel;
     private String shakeChance;
     private String shakeChanceLucky;
     private String fishermansDietRank;
 
+    private int magicHunterMultiplier = advancedConfig.getFishingMagicMultiplier();
     private int fishermansDietRankChange = advancedConfig.getFarmerDietRankChange();
     private int fishermansDietRankMaxLevel = fishermansDietRankChange * 5;
 
@@ -40,10 +42,13 @@ public class FishingCommand extends SkillCommand {
         DecimalFormat df = new DecimalFormat("0.0");
         //Treasure Hunter
         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
-        int dropChance = Fishing.getShakeChance(lootTier);
-
+        int dropChance = Fishing.getShakeChance(lootTier);
         shakeChance = df.format(dropChance);
         if (dropChance + (dropChance * 0.3333D) >= 100D) shakeChanceLucky = df.format(100D);
         else shakeChanceLucky = df.format(dropChance + (dropChance * 0.3333D));
@@ -104,7 +109,10 @@ public class FishingCommand extends SkillCommand {
         }
 
         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) {