Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-28 11:37:39 +01:00
Code Issues Projects Releases Wiki Activity

Make the MagicHunter Chance configurable

Browse Source
This commit is contained in:
TfT_02 2013-01-10 22:54:57 +01:00
parent 88c39dbb72
commit 085a25306c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
View File

@ -68,7 +68,7 @@ public class AdvancedConfig extends ConfigLoader {
/* FISHING */ /* FISHING */
public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); } public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
public int getFishingEnchantmentChance() { return config.getInt("Skills.Fishing.Enchantment_Chance", 10); } public int getFishingMagicMultiplier() { return config.getInt("Skills.Fishing.MagicHunter_Multiplier", 5); }
/* HERBALISM */ /* HERBALISM */
public int getFarmerDietRankChange() { return config.getInt("Skills.Herbalism.Food_RankChange", 200); } public int getFarmerDietRankChange() { return config.getInt("Skills.Herbalism.Food_RankChange", 200); }

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

@ -151,6 +151,7 @@ public class Fishing {
if (theCatch.getItemStack().getType() != Material.RAW_FISH) { if (theCatch.getItemStack().getType() != Material.RAW_FISH) {
int lootTier = Fishing.getFishingLootTier(profile); int lootTier = Fishing.getFishingLootTier(profile);
int magicHunterMultiplier = advancedConfig.getFishingMagicMultiplier();
int specificChance = 1; int specificChance = 1;
boolean enchanted = false; boolean enchanted = false;
ItemStack fishingResults = theCatch.getItemStack(); ItemStack fishingResults = theCatch.getItemStack();
@ -171,7 +172,7 @@ public class Fishing {
* 20% - Tier 4 * 20% - Tier 4
* 25% - Tier 5 * 25% - Tier 5
*/ */
if (Misc.getRandom().nextInt(randomChance) <= (lootTier * 5) && Permissions.fishingMagic(player)) { if (Misc.getRandom().nextInt(randomChance) <= (lootTier * magicHunterMultiplier) && Permissions.fishingMagic(player)) {
for (Enchantment newEnchant : Enchantment.values()) { for (Enchantment newEnchant : Enchantment.values()) {
if (newEnchant.canEnchantItem(fishingResults)) { if (newEnchant.canEnchantItem(fishingResults)) {
specificChance++; specificChance++;

4
src/main/resources/advanced.yml
View File

@ -97,8 +97,8 @@ Skills:
# Shake_UnlockLevel: Fishing level when the Shake ability unlocks # Shake_UnlockLevel: Fishing level when the Shake ability unlocks
Shake_UnlockLevel: 150 Shake_UnlockLevel: 150
# Enchantment_Chance: Chance of getting fishing treasure with enchantments # MagicHunter_Multiplier: Determines the chance of fishing enchanted items. The chance is calculated by getting the fishing TreasureHunt tier and multiplying it with MagicHunter_Multiplier
Enchantment_Chance: 10 MagicHunter_Multiplier: 5
# #
# Settings for Herbalism # Settings for Herbalism
### ###