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

Fishing now uses custom drops. ("Attack of the Giant Config File")

Browse Source
This commit is contained in:
GJ 2012-02-21 13:10:51 -05:00
parent 93e223b2cc
commit 9ef9ffd16f
5 changed files with 693 additions and 1072 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -3,6 +3,7 @@ Changelog:
Version 1.3.00-dev
- Added ability to customize drops for Excavation skill
- Added ability to customize drops for Fishing skill
- Added player notification for when they stop Bleeding
- Added configuration option to control mcMMO reporting damage events
- Added hunger regain bonuses to Herbalism skill

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

@ -48,10 +48,7 @@ public class LoadProperties {
enableCobbleToMossy, useMySQL, toolsLoseDurabilityFromAbilities,
pvpxp, miningrequirespickaxe, excavationRequiresShovel,
woodcuttingrequiresaxe, anvilmessages, mayDowngradeEnchants,
mayLoseEnchants, fishingDrops, leatherArmor, ironArmor, goldArmor,
diamondArmor, woodenTools, stoneTools, ironTools, goldTools,
diamondTools, enderPearl, blazeRod, records, glowstoneDust,
fishingDiamonds, aDisplayNames, pDisplayNames, enableSmoothToMossy,
mayLoseEnchants, fishingDrops, aDisplayNames, pDisplayNames, enableSmoothToMossy,
enableDirtToGrass, statsTracking, eventCallback, herbalismHungerBonus;
public static String MySQLtablePrefix, MySQLuserName,
@ -70,9 +67,7 @@ public class LoadProperties {
repairdiamondlevel, rWood, rStone, rIron, rGold, rDiamond, rString,
rLeather, downgradeRank1, downgradeRank2, downgradeRank3,
downgradeRank4, keepEnchantsRank1, keepEnchantsRank2,
keepEnchantsRank3, keepEnchantsRank4, fishingDropChanceTier1,
fishingDropChanceTier2, fishingDropChanceTier3,
fishingDropChanceTier4, fishingDropChanceTier5, mnetherwart,
keepEnchantsRank3, keepEnchantsRank4, mnetherwart,
mvines, mlilypad, mendstone, mmossstone,
levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation,
levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair,
@ -89,7 +84,7 @@ public class LoadProperties {
unarmed_r, unarmed_g, unarmed_b, woodcutting_r, woodcutting_g,
woodcutting_b, pvpxprewardmodifier, tamingxpmodifier,
miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier,
sorceryxpmodifier, unarmedxpmodifier, herbalismxpmodifier,
fishingxpmodifier, unarmedxpmodifier, herbalismxpmodifier,
excavationxpmodifier, archeryxpmodifier, swordsxpmodifier,
axesxpmodifier, acrobaticsxpmodifier;
@ -325,7 +320,6 @@ public class LoadProperties {
woodcuttingrequiresaxe = readBoolean("Skills.Woodcutting.Requires_Axe", true);
repairdiamondlevel = readInteger("Skills.Repair.Diamond.Level_Required", 50);
sorceryxpmodifier = readDouble("Experience.Formula.Multiplier.Sorcery", 1.0);
tamingxpmodifier = readDouble("Experience.Formula.Multiplier.Taming", 1.0);
miningxpmodifier = readDouble("Experience.Formula.Multiplier.Mining", 1.0);
repairxpmodifier = readDouble("Experience.Formula.Multiplier.Repair", 1.0);
@ -337,6 +331,7 @@ public class LoadProperties {
swordsxpmodifier = readDouble("Experience.Formula.Multiplier.Swords", 1.0);
axesxpmodifier = readDouble("Experience.Formula.Multiplier.Axes", 1.0);
acrobaticsxpmodifier = readDouble("Experience.Formula.Multiplier.Acrobatics", 1.0);
fishingxpmodifier = readDouble("Experience.Forumla.Multiplier.Fishing", 1.0);
anvilmessages = readBoolean("Skills.Repair.Anvil_Messages", true);
anvilID = readInteger("Skills.Repair.Anvil_ID", 42);
@ -380,31 +375,12 @@ public class LoadProperties {
keepEnchantsRank3 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30);
keepEnchantsRank4 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40);
fishingDrops = readBoolean("Fishing.Drops.Item_Drops_Enabled", true);
fishingTier1 = readInteger("Fishing.Drop_Level.Tier1", 0);
fishingTier2 = readInteger("Fishing.Drop_Level.Tier2", 200);
fishingTier3 = readInteger("Fishing.Drop_Level.Tier3", 400);
fishingTier4 = readInteger("Fishing.Drop_Level.Tier4", 600);
fishingTier5 = readInteger("Fishing.Drop_Level.Tier5", 800);
fishingDropChanceTier1 = readInteger("Fishing.Drops.Drop_Chance.Tier_1", 20);
fishingDropChanceTier2 = readInteger("Fishing.Drops.Drop_Chance.Tier_2", 25);
fishingDropChanceTier3 = readInteger("Fishing.Drops.Drop_Chance.Tier_3", 30);
fishingDropChanceTier4 = readInteger("Fishing.Drops.Drop_Chance.Tier_4", 35);
fishingDropChanceTier5 = readInteger("Fishing.Drops.Drop_Chance.Tier_5", 40);
leatherArmor = readBoolean("Fishing.Drops.Leather_Armor", true);
ironArmor = readBoolean("Fishing.Drops.Iron_Armor", true);
goldArmor = readBoolean("Fishing.Drops.Gold_Armor", true);
diamondArmor = readBoolean("Fishing.Drops.Diamond_Armor", true);
woodenTools = readBoolean("Fishing.Drops.Wooden_Tools", true);
stoneTools = readBoolean("Fishing.Drops.Stone_Tools", true);
ironTools = readBoolean("Fishing.Drops.Iron_Tools", true);
goldTools = readBoolean("Fishing.Drops.Gold_Tools", true);
diamondTools = readBoolean("Fishing.Drops.Diamond_Tools", true);
enderPearl = readBoolean("Fishing.Drops.Ender_Pearl", true);
blazeRod = readBoolean("Fishing.Drops.Blaze_Rod", true);
records = readBoolean("Fishing.Drops.Records", true);
glowstoneDust = readBoolean("Fishing.Drops.Glowstone_Dust", true);
fishingDiamonds = readBoolean("Fishing.Drops.Diamonds", true);
fishingDrops = readBoolean("Fishing.Drops_Enabled", true);
fishingTier1 = readInteger("Fishing.Tier_Levels.Tier1", 0);
fishingTier2 = readInteger("Fishing.Tier_Levels.Tier2", 200);
fishingTier3 = readInteger("Fishing.Tier_Levels.Tier3", 400);
fishingTier4 = readInteger("Fishing.Tier_Levels.Tier4", 600);
fishingTier5 = readInteger("Fishing.Tier_Levels.Tier5", 800);
xplockEnable = readBoolean("Commands.xplock.Enabled", true);
xprateEnable = readBoolean("Commands.xprate.Enabled", true);
@ -473,11 +449,10 @@ public class LoadProperties {
if(config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1)
reason.add("Fishing drops cannot also be excavation drops");
if(!config.contains("Treasures." + treasureName + ".Max_Levels")) reason.add("Missing Max_Levels");
if(!config.contains("Treasures." + treasureName + ".Max_Level")) reason.add("Missing Max_Level");
int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Level");
int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Levels");
if(maxLevel < 0) reason.add("Invalid Max_Levels: " + maxLevel);
if(maxLevel < 0) reason.add("Invalid Max_Level: " + maxLevel);
if(noErrorsInTreasure(reason)) {
FishingTreasure fTreasure = new FishingTreasure(item, xp, dropChance, dropLevel, maxLevel);
@ -511,7 +486,7 @@ public class LoadProperties {
}
List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
List<String> fishingTreasures = config.getStringList("Excavation.Treasure");
List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
Iterator<String> treasureIterator = treasures.keySet().iterator();
while(treasureIterator.hasNext()) {

3
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -985,6 +985,9 @@ public class PlayerProfile
case AXES:
xp=(int) (xp/LoadProperties.axesxpmodifier);
break;
case FISHING:
xp=(int) (xp/LoadProperties.fishingxpmodifier);
break;
}
xp=xp*LoadProperties.xpGainMultiplier;

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

File diff suppressed because it is too large Load Diff

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

@ -164,7 +164,6 @@ Experience:
Swords: 1.0
Taming: 1.0
Acrobatics: 1.0
Sorcery: 1.0
Excavation: 1.0
Herbalism: 1.0
Unarmed: 1.0
@ -173,6 +172,7 @@ Experience:
Archery: 1.0
Axes: 1.0
Repair: 1.0
Fishing: 1.0
Fishing:
Base: 800
Excavation:
@ -215,34 +215,71 @@ Experience:
# Settings for Fishing
###
Fishing:
Drop_Level:
Tier1: 200
Tier2: 400
Tier3: 600
Tier4: 800
Drops:
Item_Drops_Enabled: true
Drop_Chance:
Tier_1: 20
Tier_2: 25
Tier_3: 30
Tier_4: 35
Tier_5: 40
Gold_Tools: true
Diamond_Armor: true
Stone_Tools: true
Diamonds: true
Iron_Armor: true
Iron_Tools: true
Diamond_Tools: true
Records: true
Blaze_Rod: true
Leather_Armor: true
Gold_Armor: true
Glowstone_Dust: true
Ender_Pearl: true
Wooden_Tools: true
Drops_Enabled: true
Tier_Level2:
Tier1: 0
Tier2: 200
Tier3: 400
Tier4: 600
Tier5: 800
Treasure:
- Leather_Boots
- Leather_Helmet
- Leather_Leggings
- Leather_Chestplate
- Wooden_Sword
- Wooden_Shovel
- Wooden_Pickaxe
- Wooden_Axe
- Wooden_Hoe
- Stone_Sword
- Stone_Shovel
- Stone_Pickaxe
- Stone_Axe
- Stone_Hoe
- Iron_Sword
- Iron_Shovel
- Iron_Pickaxe
- Iron_Axe
- Iron_Hoe
- Iron_Boots
- Iron_Helmet
- Iron_Leggings
- Iron_Chestplate
- Ender_Pearl
- Gold_Sword
- Gold_Shovel
- Gold_Pickaxe
- Gold_Axe
- Gold_Hoe
- Gold_Boots
- Gold_Helmet
- Gold_Leggings
- Gold_Chestplate
- Blaze_Rod
- Record_3
- Record_4
- Record_5
- Record_6
- Record_7
- Record_8
- Record_9
- Record_10
- Record_11
- Diamond_Sword
- Diamond_Shovel
- Diamond_Pickaxe
- Diamond_Axe
- Diamond_Hoe
- Diamond_Boots
- Diamond_Helmet
- Diamond_Leggings
- Diamond_Chestplate
- Ghast_Tear
- Diamonds
- Iron_Ingots
- Gold_Ingots
- Lapis_Lazuli
#
# Settings for Excavation
###
@ -476,12 +513,577 @@ Treasures:
Drops_From:
Dirt: true
Grass: true
Sand: true
Gravel: true
Clay: true
Mycelium: true
Soul_Sand: true
Leather_Boots:
ID: 301
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Leather_Helmet:
ID: 298
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Leather_Leggings:
ID: 300
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Leather_Chestplate:
ID: 299
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Wooden_Sword:
ID: 268
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 200
Drops_From:
Fishing: true
Wooden_Shovel:
ID: 269
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 200
Drops_From:
Fishing: true
Wooden_Pickaxe:
ID: 270
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 200
Drops_From:
Fishing: true
Wooden_Axe:
ID: 271
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 200
Drops_From:
Fishing: true
Wooden_Hoe:
ID: 290
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 200
Drops_From:
Fishing: true
Stone_Sword:
ID: 272
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Stone_Shovel:
ID: 273
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Stone_Pickaxe:
ID: 274
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Stone_Axe:
ID: 275
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Stone_Hoe:
ID: 291
Data: 0
Amount: 1
XP: 200
Drop_Chance: 20.0
Drop_Level: 0
Max_Level: 400
Drops_From:
Fishing: true
Iron_Sword:
ID: 267
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Shovel:
ID: 256
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Pickaxe:
ID: 257
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Axe:
ID: 258
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Hoe:
ID: 292
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Boots:
ID: 309
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Helmet:
ID: 306
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Leggings:
ID: 308
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Chestplate:
ID: 307
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Ender_Pearl:
ID: 368
Data: 0
Amount: 1
XP: 200
Drop_Chance: 25.0
Drop_Level: 200
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Sword:
ID: 283
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Shovel:
ID: 284
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Pickaxe:
ID: 285
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Axe:
ID: 286
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Hoe:
ID: 294
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Boots:
ID: 317
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Helmet:
ID: 314
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Leggings:
ID: 316
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Chestplate:
ID: 315
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Blaze_Rod:
ID: 369
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Record_3:
ID: 2258
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Record_4:
ID: 2259
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Record_5:
ID: 2260
Data: 0
Amount: 1
XP: 200
Drop_Chance: 30.0
Drop_Level: 400
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Sword:
ID: 276
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Shovel:
ID: 277
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Pickaxe:
ID: 278
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Axe:
ID: 279
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Hoe:
ID: 293
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Boots:
ID: 313
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Helmet:
ID: 310
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Leggings:
ID: 312
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamond_Chestplate:
ID: 311
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Record_6:
ID: 2261
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Record_7:
ID: 2262
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Record_8:
ID: 2263
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Record_9:
ID: 2264
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Record_10:
ID: 2265
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Record_11:
ID: 2266
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Ghast_Tear:
ID: 370
Data: 0
Amount: 1
XP: 200
Drop_Chance: 35.0
Drop_Level: 600
Max_Level: 1000
Drops_From:
Fishing: true
Diamonds:
ID: 264
Data: 0
Amount: 5
XP: 200
Drop_Chance: 40.0
Drop_Level: 800
Max_Level: 1000
Drops_From:
Fishing: true
Iron_Ingots:
ID: 265
Data: 0
Amount: 5
XP: 200
Drop_Chance: 40.0
Drop_Level: 800
Max_Level: 1000
Drops_From:
Fishing: true
Gold_Ingots:
ID: 266
Data: 0
Amount: 5
XP: 200
Drop_Chance: 40.0
Drop_Level: 800
Max_Level: 1000
Drops_From:
Fishing: true
Lapis_Lazuli:
ID: 351
Data: 4
Amount: 20
XP: 200
Drop_Chance: 40.0
Drop_Level: 800
Max_Level: 1000
Drops_From:
Fishing: true
#
# Settings for commands
###