EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Making fishing drops customizable (WIP)

Browse Source
This commit is contained in:
GJ 2012-02-21 02:19:59 -05:00
parent 1f843bc3a2
commit 7eb1d43201
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/gmail/nossr50/config/LoadProperties.java
View File

@ -77,7 +77,7 @@ public class LoadProperties {
levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation, levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation,
levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair, levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair,
levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting, levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting,
anvilID, saveInterval; anvilID, saveInterval, fishingTier1, fishingTier2, fishingTier3, fishingTier4;
public static double xpbackground_r, xpbackground_g, xpbackground_b, public static double xpbackground_r, xpbackground_g, xpbackground_b,
xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g, xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g,
@ -100,7 +100,10 @@ public class LoadProperties {
public static List<ExcavationTreasure> excavationFromClay = new ArrayList<ExcavationTreasure>(); public static List<ExcavationTreasure> excavationFromClay = new ArrayList<ExcavationTreasure>();
public static List<ExcavationTreasure> excavationFromMycel = new ArrayList<ExcavationTreasure>(); public static List<ExcavationTreasure> excavationFromMycel = new ArrayList<ExcavationTreasure>();
public static List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>(); public static List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>();
public static List<FishingTreasure> fishingRewards = new ArrayList<FishingTreasure>(); public static List<FishingTreasure> fishingRewardsTier1 = new ArrayList<FishingTreasure>();
public static List<FishingTreasure> fishingRewardsTier2 = new ArrayList<FishingTreasure>();
public static List<FishingTreasure> fishingRewardsTier3 = new ArrayList<FishingTreasure>();
public static List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>();
public static HUDType defaulthud; public static HUDType defaulthud;
protected static File configFile; protected static File configFile;
@ -377,6 +380,10 @@ public class LoadProperties {
keepEnchantsRank4 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); keepEnchantsRank4 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40);
fishingDrops = readBoolean("Fishing.Drops.Item_Drops_Enabled", true); fishingDrops = readBoolean("Fishing.Drops.Item_Drops_Enabled", true);
fishingTier1 = readInteger("Fishing.Drop_Level.Tier1", 200);
fishingTier2 = readInteger("Fishing.Drop_Level.Tier1", 400);
fishingTier3 = readInteger("Fishing.Drop_Level.Tier1", 600);
fishingTier4 = readInteger("Fishing.Drop_Level.Tier1", 800);
fishingDropChanceTier1 = readInteger("Fishing.Drops.Drop_Chance.Tier_1", 20); fishingDropChanceTier1 = readInteger("Fishing.Drops.Drop_Chance.Tier_1", 20);
fishingDropChanceTier2 = readInteger("Fishing.Drops.Drop_Chance.Tier_2", 25); fishingDropChanceTier2 = readInteger("Fishing.Drops.Drop_Chance.Tier_2", 25);
fishingDropChanceTier3 = readInteger("Fishing.Drops.Drop_Chance.Tier_3", 30); fishingDropChanceTier3 = readInteger("Fishing.Drops.Drop_Chance.Tier_3", 30);
@ -513,7 +520,17 @@ public class LoadProperties {
if(!fishingTreasures.contains(treasureKey)) continue; if(!fishingTreasures.contains(treasureKey)) continue;
FishingTreasure fTreasure = (FishingTreasure) treasure; FishingTreasure fTreasure = (FishingTreasure) treasure;
fishingRewards.add(fTreasure); int dropLevel = fTreasure.getDropLevel();
int maxLevel = fTreasure.getMaxLevel();
if(dropLevel <= fishingTier1 && maxLevel >= fishingTier1)
fishingRewardsTier1.add(fTreasure);
if(dropLevel <= fishingTier2 && maxLevel >= fishingTier2)
fishingRewardsTier2.add(fTreasure);
if(dropLevel <= fishingTier3 && maxLevel >= fishingTier3)
fishingRewardsTier3.add(fTreasure);
if(dropLevel <= fishingTier4 && maxLevel >= fishingTier4)
fishingRewardsTier4.add(fTreasure);
} else if(treasure instanceof ExcavationTreasure) { } else if(treasure instanceof ExcavationTreasure) {
if(!excavationTreasures.contains(treasureKey)) continue; if(!excavationTreasures.contains(treasureKey)) continue;

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

@ -39,21 +39,18 @@ public class Fishing {
{ {
int lvl = PP.getSkillLevel(SkillType.FISHING); int lvl = PP.getSkillLevel(SkillType.FISHING);
if(lvl < 100) if(lvl >= LoadProperties.fishingTier1 && lvl < LoadProperties.fishingTier2)
{ {
return 1; return 1;
} else if (lvl >= 100 && lvl < 300) } else if (lvl >= LoadProperties.fishingTier2 && lvl < LoadProperties.fishingTier3)
{ {
return 2; return 2;
} else if (lvl >= 300 && lvl < 600) } else if (lvl >= LoadProperties.fishingTier3 && lvl < LoadProperties.fishingTier4)
{ {
return 3; return 3;
} else if (lvl >= 600 && lvl < 900)
{
return 4;
} else } else
{ {
return 5; return 4;
} }
} }
@ -73,9 +70,6 @@ public class Fishing {
case 4: case 4:
getFishingResultsTier4(player, event); getFishingResultsTier4(player, event);
break; break;
case 5:
getFishingResultsTier5(player, event);
break;
} }
m.mcDropItem(player.getLocation(), new ItemStack(Material.RAW_FISH, 1)); m.mcDropItem(player.getLocation(), new ItemStack(Material.RAW_FISH, 1));
Users.getProfile(player).addXP(SkillType.FISHING, LoadProperties.mfishing, player); Users.getProfile(player).addXP(SkillType.FISHING, LoadProperties.mfishing, player);