EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-03 18:33:16 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup to Repair.java, fixed bug of Herbalism double drops failing,

Browse Source 
fixed bug with Super Repair calculations.
This commit is contained in:
GJ 2012-03-15 13:11:56 -04:00
parent 558e4f4dd0
commit ebc87f46f7
2 changed files with 112 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/skills/Herbalism.java
View File

@ -223,7 +223,7 @@ public class Herbalism {
return; return;
} }
else { else {
ItemStack is = new ItemStack(mat); ItemStack is = new ItemStack(mat, 1);
if (herbLevel > MAX_BONUS_LEVEL || (Math.random() * 1000 <= herbLevel)) { if (herbLevel > MAX_BONUS_LEVEL || (Math.random() * 1000 <= herbLevel)) {
if (type.equals(Material.CACTUS)) { if (type.equals(Material.CACTUS)) {

171
src/main/java/com/gmail/nossr50/skills/Repair.java
View File

@ -21,14 +21,6 @@ import com.gmail.nossr50.locale.mcLocale;
public class Repair { public class Repair {
private static String nGold = LoadProperties.nGold;
private static String nStone = LoadProperties.nStone;
private static String nWood = LoadProperties.nWood;
private static String nDiamond = LoadProperties.nDiamond;
private static String nIron = LoadProperties.nIron;
private static String nString = LoadProperties.nString;
private static String nLeather = LoadProperties.nLeather;
/** /**
* Handle all the item repair checks. * Handle all the item repair checks.
* *
@ -181,52 +173,60 @@ public class Repair {
} }
/** /**
* Handles removing & downgrading enchants.
* *
* @param player * @param player Player repairing the item
* @param is * @param is Item being repaired
*/ */
public static void addEnchants(Player player, ItemStack is) private static void addEnchants(Player player, ItemStack is) {
{
Map<Enchantment, Integer> enchants = is.getEnchantments(); Map<Enchantment, Integer> enchants = is.getEnchantments();
if(enchants.size() == 0)
if (enchants.size() == 0) {
return; return;
}
int rank = getArcaneForgingRank(Users.getProfile(player).getSkillLevel(SkillType.REPAIR)); int rank = getArcaneForgingRank(Users.getProfile(player).getSkillLevel(SkillType.REPAIR));
if(rank == 0)
{ if (rank == 0) {
for(Enchantment x : enchants.keySet()) for (Enchantment x : enchants.keySet()) {
is.removeEnchantment(x); is.removeEnchantment(x);
}
player.sendMessage(mcLocale.getString("Repair.LostEnchants")); player.sendMessage(mcLocale.getString("Repair.LostEnchants"));
return; return;
} }
boolean downgraded = false; boolean downgraded = false;
for(Entry<Enchantment, Integer> enchant : enchants.entrySet())
{ for (Entry<Enchantment, Integer> enchant : enchants.entrySet()) {
if(Math.random() * 100 <= getEnchantChance(rank)) Enchantment enchantment = enchant.getKey();
{
if (Math.random() * 100 <= getEnchantChance(rank)) {
int enchantLevel = enchant.getValue(); int enchantLevel = enchant.getValue();
if(LoadProperties.mayDowngradeEnchants && enchantLevel > 1)
{ if (LoadProperties.mayDowngradeEnchants && enchantLevel > 1) {
if(Math.random() * 100 <= getDowngradeChance(rank)) if (Math.random() * 100 <= getDowngradeChance(rank)) {
{ is.addEnchantment(enchantment, enchantLevel--);
is.addEnchantment(enchant.getKey(), enchantLevel--);
downgraded = true; downgraded = true;
} }
} }
} }
else else {
is.removeEnchantment(enchant.getKey()); is.removeEnchantment(enchantment);
}
} }
Map<Enchantment, Integer> newEnchants = is.getEnchantments(); Map<Enchantment, Integer> newEnchants = is.getEnchantments();
if(newEnchants.isEmpty())
if (newEnchants.isEmpty()) {
player.sendMessage(mcLocale.getString("Repair.ArcaneFailed")); player.sendMessage(mcLocale.getString("Repair.ArcaneFailed"));
else if(downgraded || newEnchants.size() < enchants.size()) }
else if (downgraded || newEnchants.size() < enchants.size()) {
player.sendMessage(mcLocale.getString("Repair.Downgraded")); player.sendMessage(mcLocale.getString("Repair.Downgraded"));
else }
else {
player.sendMessage(mcLocale.getString("Repair.ArcanePerfect")); player.sendMessage(mcLocale.getString("Repair.ArcanePerfect"));
} }
}
/** /**
* Gets chance of keeping enchantment during repair. * Gets chance of keeping enchantment during repair.
@ -259,8 +259,7 @@ public class Repair {
* @param rank Arcane Forging rank * @param rank Arcane Forging rank
* @return The chance of the enchantment being downgraded * @return The chance of the enchantment being downgraded
*/ */
public static int getDowngradeChance(int rank) public static int getDowngradeChance(int rank) {
{
switch (rank) { switch (rank) {
case 4: case 4:
return LoadProperties.downgradeRank4; return LoadProperties.downgradeRank4;
@ -287,16 +286,22 @@ public class Repair {
* @param ramt The base amount of durability repaired to the item * @param ramt The base amount of durability repaired to the item
* @return The final amount of durability repaired to the item * @return The final amount of durability repaired to the item
*/ */
public static short repairCalculate(Player player, short durability, int ramt){ private static short repairCalculate(Player player, short durability, int ramt) {
int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR); int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
float bonus = (float)(skillLevel/500); float bonus = (float) skillLevel / 500;
bonus = (ramt * bonus); bonus = (ramt * bonus);
ramt += bonus; ramt += bonus;
if(checkPlayerProcRepair(player))
if (checkPlayerProcRepair(player)) {
ramt = (short) (ramt * 2); ramt = (short) (ramt * 2);
}
durability -= ramt; durability -= ramt;
if(durability < 0)
if (durability < 0) {
durability = 0; durability = 0;
}
return durability; return durability;
} }
@ -307,27 +312,33 @@ public class Repair {
* @param player The player repairing the item * @param player The player repairing the item
* @return The final amount of durability repaired to the item * @return The final amount of durability repaired to the item
*/ */
public static short getRepairAmount(ItemStack is, Player player){ private static short getRepairAmount(ItemStack is, Player player){
short durability = is.getDurability();
short maxDurability = is.getType().getMaxDurability(); short maxDurability = is.getType().getMaxDurability();
int ramt = 0; int ramt = 0;
if(ItemChecks.isShovel(is)) if (ItemChecks.isShovel(is)) {
ramt = maxDurability; ramt = maxDurability;
else if(ItemChecks.isHoe(is) || ItemChecks.isSword(is) || is.getType().equals(Material.SHEARS)) }
else if (ItemChecks.isHoe(is) || ItemChecks.isSword(is) || is.getType().equals(Material.SHEARS)) {
ramt = maxDurability / 2; ramt = maxDurability / 2;
else if(ItemChecks.isAxe(is) || ItemChecks.isMiningPick(is) || is.getType().equals(Material.BOW)) }
else if (ItemChecks.isAxe(is) || ItemChecks.isMiningPick(is) || is.getType().equals(Material.BOW)) {
ramt = maxDurability / 3; ramt = maxDurability / 3;
else if(ItemChecks.isBoots(is)) }
else if (ItemChecks.isBoots(is)) {
ramt = maxDurability / 4; ramt = maxDurability / 4;
else if(ItemChecks.isHelmet(is)) }
else if (ItemChecks.isHelmet(is)) {
ramt = maxDurability / 5; ramt = maxDurability / 5;
else if(ItemChecks.isPants(is)) }
else if (ItemChecks.isPants(is)) {
ramt = maxDurability / 7; ramt = maxDurability / 7;
else if(ItemChecks.isChestplate(is)) }
else if (ItemChecks.isChestplate(is)) {
ramt = maxDurability / 8; ramt = maxDurability / 8;
}
return repairCalculate(player, durability, ramt); return repairCalculate(player, is.getDurability(), ramt);
} }
/** /**
@ -336,48 +347,54 @@ public class Repair {
* @param is The item being repaired * @param is The item being repaired
* @param player The player repairing the item * @param player The player repairing the item
*/ */
public static void needMoreVespeneGas(ItemStack is, Player player) private static void needMoreVespeneGas(ItemStack is, Player player) {
{
int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR); int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
if(is.getAmount() > 1) if (is.getAmount() != 1) {
player.sendMessage(mcLocale.getString("Skills.StackedItems")); player.sendMessage(mcLocale.getString("Skills.StackedItems"));
else }
{ else {
if(ItemChecks.isDiamondTool(is) || ItemChecks.isDiamondArmor(is)) if (ItemChecks.isDiamondTool(is) || ItemChecks.isDiamondArmor(is)) {
{ if (skillLevel < LoadProperties.repairdiamondlevel) {
if(skillLevel < LoadProperties.repairdiamondlevel)
player.sendMessage(mcLocale.getString("Skills.AdeptDiamond")); player.sendMessage(mcLocale.getString("Skills.AdeptDiamond"));
else
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.BLUE+ nDiamond);
} }
else if(ItemChecks.isIronTool(is) || ItemChecks.isIronArmor(is)) else {
{ player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.BLUE + LoadProperties.nDiamond);
if(skillLevel < LoadProperties.repairIronLevel) }
}
else if (ItemChecks.isIronTool(is) || ItemChecks.isIronArmor(is)) {
if (skillLevel < LoadProperties.repairIronLevel) {
player.sendMessage(mcLocale.getString("Skills.AdeptIron")); player.sendMessage(mcLocale.getString("Skills.AdeptIron"));
else
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.GRAY+ nIron);
} }
else if(ItemChecks.isGoldTool(is) || ItemChecks.isGoldArmor(is)) else {
{ player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + LoadProperties.nIron);
if(skillLevel < LoadProperties.repairGoldLevel) }
}
else if (ItemChecks.isGoldTool(is) || ItemChecks.isGoldArmor(is)) {
if (skillLevel < LoadProperties.repairGoldLevel) {
player.sendMessage(mcLocale.getString("Skills.AdeptGold")); player.sendMessage(mcLocale.getString("Skills.AdeptGold"));
else
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.GOLD+nGold);
} }
else if(ItemChecks.isStoneTool(is)) else {
{ player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GOLD + LoadProperties.nGold);
if(skillLevel < LoadProperties.repairStoneLevel) }
}
else if (ItemChecks.isStoneTool(is)) {
if (skillLevel < LoadProperties.repairStoneLevel) {
player.sendMessage(mcLocale.getString("Skills.AdeptStone")); player.sendMessage(mcLocale.getString("Skills.AdeptStone"));
else
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.GRAY+nStone);
} }
else if(ItemChecks.isWoodTool(is)) else {
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.DARK_GREEN+ nWood); player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GRAY + LoadProperties.nStone);
else if (ItemChecks.isLeatherArmor(is)) }
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.YELLOW+ nLeather); }
else if (is.getType().equals(Material.BOW)) else if (ItemChecks.isWoodTool(is)) {
player.sendMessage(mcLocale.getString("Skills.NeedMore")+" "+ChatColor.YELLOW+ nString); player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.DARK_GREEN + LoadProperties.nWood);
}
else if (ItemChecks.isLeatherArmor(is)) {
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + LoadProperties.nLeather);
}
else if (is.getType().equals(Material.BOW)) {
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + LoadProperties.nString);
}
} }
} }