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

More fishing stuff. FISHING WILL BE BROKEN TEMPORARILY IN THIS BUILD.

Browse Source
This commit is contained in:
GJ 2012-02-21 02:53:34 -05:00
parent 7eb1d43201
commit b0253f9913
3 changed files with 1035 additions and 902 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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, fishingTier1, fishingTier2, fishingTier3, fishingTier4; anvilID, saveInterval, fishingTier1, fishingTier2, fishingTier3, fishingTier4, fishingTier5;
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,
@ -104,6 +104,7 @@ public class LoadProperties {
public static List<FishingTreasure> fishingRewardsTier2 = new ArrayList<FishingTreasure>(); public static List<FishingTreasure> fishingRewardsTier2 = new ArrayList<FishingTreasure>();
public static List<FishingTreasure> fishingRewardsTier3 = new ArrayList<FishingTreasure>(); public static List<FishingTreasure> fishingRewardsTier3 = new ArrayList<FishingTreasure>();
public static List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>(); public static List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>();
public static List<FishingTreasure> fishingRewardsTier5 = new ArrayList<FishingTreasure>();
public static HUDType defaulthud; public static HUDType defaulthud;
protected static File configFile; protected static File configFile;
@ -380,10 +381,11 @@ 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); fishingTier1 = readInteger("Fishing.Drop_Level.Tier1", 0);
fishingTier2 = readInteger("Fishing.Drop_Level.Tier1", 400); fishingTier2 = readInteger("Fishing.Drop_Level.Tier2", 200);
fishingTier3 = readInteger("Fishing.Drop_Level.Tier1", 600); fishingTier3 = readInteger("Fishing.Drop_Level.Tier3", 400);
fishingTier4 = readInteger("Fishing.Drop_Level.Tier1", 800); fishingTier4 = readInteger("Fishing.Drop_Level.Tier4", 600);
fishingTier5 = readInteger("Fishing.Drop_Level.Tier4", 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);
@ -531,6 +533,8 @@ public class LoadProperties {
fishingRewardsTier3.add(fTreasure); fishingRewardsTier3.add(fTreasure);
if(dropLevel <= fishingTier4 && maxLevel >= fishingTier4) if(dropLevel <= fishingTier4 && maxLevel >= fishingTier4)
fishingRewardsTier4.add(fTreasure); fishingRewardsTier4.add(fTreasure);
if(dropLevel <= fishingTier5 && maxLevel >= fishingTier5)
fishingRewardsTier5.add(fTreasure);
} else if(treasure instanceof ExcavationTreasure) { } else if(treasure instanceof ExcavationTreasure) {
if(!excavationTreasures.contains(treasureKey)) continue; if(!excavationTreasures.contains(treasureKey)) continue;

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

File diff suppressed because it is too large Load Diff

5
src/main/resources/config.yml
View File

@ -215,6 +215,11 @@ Experience:
# Settings for Fishing # Settings for Fishing
### ###
Fishing: Fishing:
Drop_Level:
Tier1: 200
Tier2: 400
Tier3: 600
Tier4: 800
Drops: Drops:
Item_Drops_Enabled: true Item_Drops_Enabled: true
Drop_Chance: Drop_Chance: