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

Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO into fixes

Browse Source
This commit is contained in:
Glitchfinder 2012-11-12 13:48:31 -08:00
commit eebda74bb7
5 changed files with 235 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@ -1,6 +1,7 @@
package com.gmail.nossr50.commands.skills; package com.gmail.nossr50.commands.skills;
import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.gathering.Fishing; import com.gmail.nossr50.skills.gathering.Fishing;
@ -8,6 +9,7 @@ import com.gmail.nossr50.skills.gathering.Fishing;
public class FishingCommand extends SkillCommand { public class FishingCommand extends SkillCommand {
private int lootTier; private int lootTier;
private String magicChance; private String magicChance;
private String shakeChance;
private boolean canTreasureHunt; private boolean canTreasureHunt;
private boolean canMagicHunt; private boolean canMagicHunt;
@ -21,6 +23,7 @@ public class FishingCommand extends SkillCommand {
protected void dataCalculations() { protected void dataCalculations() {
lootTier = Fishing.getFishingLootTier(profile); lootTier = Fishing.getFishingLootTier(profile);
magicChance = percent.format((float) lootTier / 15); magicChance = percent.format((float) lootTier / 15);
shakeChance = String.valueOf(Fishing.getShakeChance(lootTier));
} }
@Override @Override
@ -66,12 +69,11 @@ public class FishingCommand extends SkillCommand {
} }
if (canShake) { if (canShake) {
//TODO: Do we really need to display this twice? Not like there are any associated stats.
if (skillValue < 150) { if (skillValue < 150) {
player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0") })); player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0") }));
} }
else { else {
player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake")); player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }));
} }
} }
} }

7
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -152,6 +152,13 @@ public class Config extends ConfigLoader {
public int getFishingTierLevelsTier3() { return config.getInt("Fishing.Tier_Levels.Tier3", 400); } public int getFishingTierLevelsTier3() { return config.getInt("Fishing.Tier_Levels.Tier3", 400); }
public int getFishingTierLevelsTier4() { return config.getInt("Fishing.Tier_Levels.Tier4", 600); } public int getFishingTierLevelsTier4() { return config.getInt("Fishing.Tier_Levels.Tier4", 600); }
public int getFishingTierLevelsTier5() { return config.getInt("Fishing.Tier_Levels.Tier5", 800); } public int getFishingTierLevelsTier5() { return config.getInt("Fishing.Tier_Levels.Tier5", 800); }
/* Shake */
public int getShakeChanceRank1() { return config.getInt("Shake.Chance.Rank_1", 25); }
public int getShakeChanceRank2() { return config.getInt("Shake.Chance.Rank_2", 40); }
public int getShakeChanceRank3() { return config.getInt("Shake.Chance.Rank_3", 55); }
public int getShakeChanceRank4() { return config.getInt("Shake.Chance.Rank_4", 60); }
public int getShakeChanceRank5() { return config.getInt("Shake.Chance.Rank_5", 75); }
/* Herbalism */ /* Herbalism */
public int getHerbalismXPSugarCane() { return config.getInt("Experience.Herbalism.Sugar_Cane", 30); } public int getHerbalismXPSugarCane() { return config.getInt("Experience.Herbalism.Sugar_Cane", 30); }

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

@ -157,7 +157,7 @@ public class Fishing {
int randomChance = 100; int randomChance = 100;
if (player.hasPermission("mcmmo.perks.lucky.fishing")) { if (player.hasPermission("mcmmo.perks.lucky.fishing")) {
randomChance = (int) (randomChance * 1.25); randomChance = (int) (randomChance * 0.75);
} }
if (random.nextInt(randomChance) <= ENCHANTMENT_CHANCE && Permissions.getInstance().fishingMagic(player)) { if (random.nextInt(randomChance) <= ENCHANTMENT_CHANCE && Permissions.getInstance().fishingMagic(player)) {
@ -204,242 +204,251 @@ public class Fishing {
int randomChance = 100; int randomChance = 100;
if (event.getPlayer().hasPermission("mcmmo.perks.lucky.fishing")) { if (event.getPlayer().hasPermission("mcmmo.perks.lucky.fishing")) {
randomChance = (int) (randomChance * 0.75); randomChance = (int) (randomChance * 1.25);
} }
final Player player = event.getPlayer();
final PlayerProfile profile = Users.getProfile(player);
int lootTier = getFishingLootTier(profile);
int dropChance = getShakeChance(lootTier);
if (event.getPlayer().hasPermission("mcmmo.perks.lucky.fishing")) {
dropChance = (int) (dropChance * 1.25); //With lucky perk on max level tier, its 100%
}
final int DROP_CHANCE = random.nextInt(100);
final int DROP_NUMBER = random.nextInt(randomChance) + 1; final int DROP_NUMBER = random.nextInt(randomChance) + 1;
LivingEntity le = (LivingEntity) event.getCaught(); LivingEntity le = (LivingEntity) event.getCaught();
EntityType type = le.getType(); EntityType type = le.getType();
Location location = le.getLocation(); Location location = le.getLocation();
switch (type) { if (DROP_CHANCE < dropChance) {
case BLAZE:
Misc.dropItem(location, new ItemStack(Material.BLAZE_ROD));
break;
case CAVE_SPIDER: switch (type) {
if (DROP_NUMBER > 50) { case BLAZE:
Misc.dropItem(location, new ItemStack(Material.SPIDER_EYE)); Misc.dropItem(location, new ItemStack(Material.BLAZE_ROD));
} break;
else {
Misc.dropItem(location, new ItemStack(Material.STRING));
}
break;
case CHICKEN: case CAVE_SPIDER:
if (DROP_NUMBER > 66) { if (DROP_NUMBER > 50) {
Misc.dropItem(location, new ItemStack(Material.FEATHER)); Misc.dropItem(location, new ItemStack(Material.SPIDER_EYE));
} } else {
else if (DROP_NUMBER > 33) { Misc.dropItem(location, new ItemStack(Material.STRING));
Misc.dropItem(location, new ItemStack(Material.RAW_CHICKEN)); }
} break;
else {
Misc.dropItem(location, new ItemStack(Material.EGG));
}
break;
case COW: case CHICKEN:
if (DROP_NUMBER > 99) { if (DROP_NUMBER > 66) {
Misc.dropItem(location, new ItemStack(Material.MILK_BUCKET)); Misc.dropItem(location, new ItemStack(Material.FEATHER));
} } else if (DROP_NUMBER > 33) {
else if (DROP_NUMBER > 50) { Misc.dropItem(location, new ItemStack(Material.RAW_CHICKEN));
Misc.dropItem(location, new ItemStack(Material.LEATHER)); } else {
} Misc.dropItem(location, new ItemStack(Material.EGG));
else { }
Misc.dropItem(location, new ItemStack(Material.RAW_BEEF)); break;
}
break;
case CREEPER: case COW:
if (DROP_NUMBER > 99) { if (DROP_NUMBER > 99) {
Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM, 1, (short) 4)); Misc.dropItem(location, new ItemStack(Material.MILK_BUCKET));
} } else if (DROP_NUMBER > 50) {
else { Misc.dropItem(location, new ItemStack(Material.LEATHER));
Misc.dropItem(location, new ItemStack(Material.SULPHUR)); } else {
} Misc.dropItem(location, new ItemStack(Material.RAW_BEEF));
break; }
break;
case ENDERMAN: case CREEPER:
Misc.dropItem(location, new ItemStack(Material.ENDER_PEARL)); if (DROP_NUMBER > 99) {
break; Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM, 1, (short) 4));
} else {
Misc.dropItem(location, new ItemStack(Material.SULPHUR));
}
break;
case GHAST: case ENDERMAN:
if (DROP_NUMBER > 50) { Misc.dropItem(location, new ItemStack(Material.ENDER_PEARL));
Misc.dropItem(location, new ItemStack(Material.SULPHUR)); break;
}
else {
Misc.dropItem(location, new ItemStack(Material.GHAST_TEAR));
}
break;
case IRON_GOLEM: case GHAST:
if (DROP_NUMBER > 99) { if (DROP_NUMBER > 50) {
Misc.dropItem(location, new ItemStack(Material.PUMPKIN)); Misc.dropItem(location, new ItemStack(Material.SULPHUR));
} } else {
else if (DROP_NUMBER > 90) { Misc.dropItem(location, new ItemStack(Material.GHAST_TEAR));
Misc.dropItem(location, new ItemStack(Material.IRON_INGOT)); }
} break;
else {
Misc.dropItem(location, new ItemStack(Material.RED_ROSE));
}
break;
case MAGMA_CUBE: case IRON_GOLEM:
Misc.dropItem(location, new ItemStack(Material.MAGMA_CREAM)); if (DROP_NUMBER > 99) {
break; Misc.dropItem(location, new ItemStack(Material.PUMPKIN));
} else if (DROP_NUMBER > 90) {
Misc.dropItem(location, new ItemStack(Material.IRON_INGOT));
} else {
Misc.dropItem(location, new ItemStack(Material.RED_ROSE));
}
break;
case MUSHROOM_COW: case MAGMA_CUBE:
if (DROP_NUMBER > 99) { Misc.dropItem(location, new ItemStack(Material.MAGMA_CREAM));
Misc.dropItem(location, new ItemStack(Material.MILK_BUCKET)); break;
}
else if (DROP_NUMBER > 98) {
Misc.dropItem(location, new ItemStack(Material.MUSHROOM_SOUP));
}
else if (DROP_NUMBER > 66) {
Misc.dropItem(location, new ItemStack(Material.LEATHER));
}
else if (DROP_NUMBER > 33) {
Misc.dropItem(location, new ItemStack(Material.RAW_BEEF));
}
else {
Misc.dropItems(location, new ItemStack(Material.RED_MUSHROOM), 3);
}
break;
case PIG: case MUSHROOM_COW:
Misc.dropItem(location, new ItemStack(Material.PORK)); if (DROP_NUMBER > 99) {
break; Misc.dropItem(location, new ItemStack(Material.MILK_BUCKET));
} else if (DROP_NUMBER > 98) {
Misc.dropItem(location, new ItemStack(Material.MUSHROOM_SOUP));
} else if (DROP_NUMBER > 66) {
Misc.dropItem(location, new ItemStack(Material.LEATHER));
} else if (DROP_NUMBER > 33) {
Misc.dropItem(location, new ItemStack(Material.RAW_BEEF));
} else {
Misc.dropItems(location, new ItemStack(Material.RED_MUSHROOM), 3);
}
break;
case PIG_ZOMBIE: case PIG:
if (DROP_NUMBER > 50) { Misc.dropItem(location, new ItemStack(Material.PORK));
Misc.dropItem(location, new ItemStack(Material.ROTTEN_FLESH)); break;
}
else {
Misc.dropItem(location, new ItemStack(Material.GOLD_NUGGET));
}
break;
case SHEEP: case PIG_ZOMBIE:
Sheep sheep = (Sheep) le; if (DROP_NUMBER > 50) {
Misc.dropItem(location, new ItemStack(Material.ROTTEN_FLESH));
} else {
Misc.dropItem(location, new ItemStack(Material.GOLD_NUGGET));
}
break;
if (!sheep.isSheared()) { case SHEEP:
Wool wool = new Wool(); final Sheep sheep = (Sheep) le;
wool.setColor(sheep.getColor());
ItemStack theWool = wool.toItemStack(); if (!sheep.isSheared()) {
theWool.setAmount(1 + random.nextInt(6)); final Wool wool = new Wool();
wool.setColor(sheep.getColor());
Misc.dropItem(location, theWool); final ItemStack theWool = wool.toItemStack();
sheep.setSheared(true); theWool.setAmount(1 + random.nextInt(6));
}
break;
case SKELETON: Misc.dropItem(location, theWool);
if(((CraftSkeleton) le).getHandle().getSkeletonType() == 1) { sheep.setSheared(true);
if (DROP_NUMBER > 97) { }
Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM, 1, (short) 1)); break;
}
else if (DROP_NUMBER > 50) {
Misc.dropItem(location, new ItemStack(Material.BONE));
}
else {
Misc.dropItems(location, new ItemStack(Material.COAL), 3);
}
}
else {
if (DROP_NUMBER > 99) {
Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM));
}
else if (DROP_NUMBER > 50) {
Misc.dropItem(location, new ItemStack(Material.BONE));
}
else {
Misc.dropItems(location, new ItemStack(Material.ARROW), 3);
}
}
break;
case SLIME: case SKELETON:
Misc.dropItem(location, new ItemStack(Material.SLIME_BALL)); if (((CraftSkeleton) le).getHandle().getSkeletonType() == 1) {
break; if (DROP_NUMBER > 97) {
Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM, 1, (short) 1));
} else if (DROP_NUMBER > 50) {
Misc.dropItem(location, new ItemStack(Material.BONE));
} else {
Misc.dropItems(location, new ItemStack(Material.COAL), 3);
}
} else {
if (DROP_NUMBER > 99) {
Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM));
} else if (DROP_NUMBER > 50) {
Misc.dropItem(location, new ItemStack(Material.BONE));
} else {
Misc.dropItems(location, new ItemStack(Material.ARROW), 3);
}
}
break;
case SNOWMAN: case SLIME:
if (DROP_NUMBER > 99) { Misc.dropItem(location, new ItemStack(Material.SLIME_BALL));
Misc.dropItem(location, new ItemStack(Material.PUMPKIN)); break;
}
else {
Misc.dropItems(location, new ItemStack(Material.SNOW_BALL), 5);
}
break;
case SPIDER: case SNOWMAN:
if (DROP_NUMBER > 50) { if (DROP_NUMBER > 99) {
Misc.dropItem(location, new ItemStack(Material.SPIDER_EYE)); Misc.dropItem(location, new ItemStack(Material.PUMPKIN));
} } else {
else { Misc.dropItems(location, new ItemStack(Material.SNOW_BALL), 5);
Misc.dropItem(location, new ItemStack(Material.STRING)); }
} break;
break;
case SQUID: case SPIDER:
Misc.dropItem(location, new ItemStack(Material.INK_SACK, 1, (short) 0, (byte) 0x0)); if (DROP_NUMBER > 50) {
break; Misc.dropItem(location, new ItemStack(Material.SPIDER_EYE));
} else {
Misc.dropItem(location, new ItemStack(Material.STRING));
}
break;
case WITCH: case SQUID:
final int DROP_NUMBER_2 = random.nextInt(randomChance) + 1; Misc.dropItem(location, new ItemStack(Material.INK_SACK, 1, (short) 0, (byte) 0x0));
if (DROP_NUMBER > 97) { break;
if(DROP_NUMBER_2 > 66) {
Misc.dropItem(location, new ItemStack(Material.POTION, 1, (short) 8197));
}
else if(DROP_NUMBER_2 > 33) {
Misc.dropItem(location, new ItemStack(Material.POTION, 1, (short) 8195));
}
else {
Misc.dropItem(location, new ItemStack(Material.POTION, 1, (short) 8194));
}
}
else {
if(DROP_NUMBER_2 > 88) {
Misc.dropItem(location, new ItemStack(Material.GLASS_BOTTLE));
}
else if(DROP_NUMBER_2 > 75) {
Misc.dropItem(location, new ItemStack(Material.GLOWSTONE_DUST));
}
else if(DROP_NUMBER_2 > 63) {
Misc.dropItem(location, new ItemStack(Material.SULPHUR));
}
else if(DROP_NUMBER_2 > 50) {
Misc.dropItem(location, new ItemStack(Material.REDSTONE));
}
else if(DROP_NUMBER_2 > 38) {
Misc.dropItem(location, new ItemStack(Material.SPIDER_EYE));
}
else if(DROP_NUMBER_2 > 25) {
Misc.dropItem(location, new ItemStack(Material.STICK));
}
else if(DROP_NUMBER_2 > 13) {
Misc.dropItem(location, new ItemStack(Material.SUGAR));
}
else {
Misc.dropItem(location, new ItemStack(Material.POTION));
}
}
break;
case ZOMBIE: case WITCH:
if (DROP_NUMBER > 99) { final int DROP_NUMBER_2 = random.nextInt(randomChance) + 1;
Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM, 1, (short) 2)); if (DROP_NUMBER > 97) {
} if (DROP_NUMBER_2 > 66) {
else { Misc.dropItem(location, new ItemStack(Material.POTION, 1, (short) 8197));
Misc.dropItem(location, new ItemStack(Material.ROTTEN_FLESH)); } else if (DROP_NUMBER_2 > 33) {
} Misc.dropItem(location, new ItemStack(Material.POTION, 1, (short) 8195));
break; } else {
Misc.dropItem(location, new ItemStack(Material.POTION, 1, (short) 8194));
}
} else {
if (DROP_NUMBER_2 > 88) {
Misc.dropItem(location, new ItemStack(Material.GLASS_BOTTLE));
} else if (DROP_NUMBER_2 > 75) {
Misc.dropItem(location, new ItemStack(Material.GLOWSTONE_DUST));
} else if (DROP_NUMBER_2 > 63) {
Misc.dropItem(location, new ItemStack(Material.SULPHUR));
} else if (DROP_NUMBER_2 > 50) {
Misc.dropItem(location, new ItemStack(Material.REDSTONE));
} else if (DROP_NUMBER_2 > 38) {
Misc.dropItem(location, new ItemStack(Material.SPIDER_EYE));
} else if (DROP_NUMBER_2 > 25) {
Misc.dropItem(location, new ItemStack(Material.STICK));
} else if (DROP_NUMBER_2 > 13) {
Misc.dropItem(location, new ItemStack(Material.SUGAR));
} else {
Misc.dropItem(location, new ItemStack(Material.POTION));
}
}
break;
default: case ZOMBIE:
break; if (DROP_NUMBER > 99) {
Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM, 1, (short) 2));
} else {
Misc.dropItem(location, new ItemStack(Material.ROTTEN_FLESH));
}
break;
default:
break;
}
} }
Combat.dealDamage(le, 1); Combat.dealDamage(le, 1);
} }
/**
* Gets chance of shake success.
*
* @param rank Treasure hunter rank
* @return The chance of a successful shake
*/
public static int getShakeChance(int lootTier) {
switch (lootTier) {
case 1:
return Config.getInstance().getShakeChanceRank1();
case 2:
return Config.getInstance().getShakeChanceRank2();
case 3:
return Config.getInstance().getShakeChanceRank3();
case 4:
return Config.getInstance().getShakeChanceRank4();
case 5:
return Config.getInstance().getShakeChanceRank5();
default:
return 10;
}
}
} }

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

@ -92,6 +92,14 @@ Fishing:
Tier3: 400 Tier3: 400
Tier4: 600 Tier4: 600
Tier5: 800 Tier5: 800
Shake:
Chance:
Rank_1: 25
Rank_2: 40
Rank_3: 55
Rank_4: 60
Rank_5: 75
# #
# Settings for Abilities # Settings for Abilities

6
src/main/resources/locale/locale_en_US.properties
View File

@ -102,7 +102,7 @@ Excavation.Skillup=[[YELLOW]]Excavation skill increased by {0}. Total ({1})
Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter Rank** Fishing.Ability.Info=[[RED]]Magic Hunter: [[GRAY]] **Improves With Treasure Hunter Rank**
Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE) Fishing.Ability.Locked.0=LOCKED UNTIL 150+ SKILL (SHAKE)
Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5 Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5
Fishing.Ability.Shake=[[RED]]Shake: [[YELLOW]]Tear items off mobs, mutilating them in the process ;_; Fishing.Ability.Shake=[[RED]]Shake Chance: [[YELLOW]]{0}%
Fishing.Effect.0=Treasure Hunter (Passive) Fishing.Effect.0=Treasure Hunter (Passive)
Fishing.Effect.1=Fish up misc. objects Fishing.Effect.1=Fish up misc. objects
Fishing.Effect.2=Magic Hunter Fishing.Effect.2=Magic Hunter
@ -221,8 +221,8 @@ Repair.Skills.Super.Chance=[[RED]]Super Repair Chance: [[YELLOW]]{0}
Repair.Skillup=[[YELLOW]]Repair skill increased by {0}. Total ({1}) Repair.Skillup=[[YELLOW]]Repair skill increased by {0}. Total ({1})
##Arcane Forging ##Arcane Forging
Repair.Arcane.Chance.Downgrade=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0} Repair.Arcane.Chance.Downgrade=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
Repair.Arcane.Chance.Success=[[GRAY]]AF Success Rate: [[YELLOW]]{0} Repair.Arcane.Chance.Success=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
Repair.Arcane.Downgrade=[[RED]]Arcane power has decreased for this item. Repair.Arcane.Downgrade=[[RED]]Arcane power has decreased for this item.
Repair.Arcane.Fail=[[RED]]Arcane power has permanently left the item. Repair.Arcane.Fail=[[RED]]Arcane power has permanently left the item.
Repair.Arcane.Lost=[[RED]]You were not skilled enough to keep any enchantments. Repair.Arcane.Lost=[[RED]]You were not skilled enough to keep any enchantments.