diff --git a/2006Redone Server/src/redone/game/content/combat/Specials.java b/2006Redone Server/src/redone/game/content/combat/Specials.java index a6388821..825c5f9c 100644 --- a/2006Redone Server/src/redone/game/content/combat/Specials.java +++ b/2006Redone Server/src/redone/game/content/combat/Specials.java @@ -23,15 +23,15 @@ public class Specials { // ItemName(ItemId, SpecDamage, SpecAccuracy, SpecAmount, Anim, GFX0, // GFX100, DoubleHit, SsSpec, SpecEffect) - ABYSSAL_WHIP(4151, 1, 1, 5, 1658, 341, -1, false, false, 0), - DRAGON_DAGGER(1215, .95, 1.15, 2.5, 1062, -1, 252, true, false, 0), - DRAGON_DAGGER_P(1231, .85, 1.15, 2.5, 1062, -1, 252, true, false, 0), - DRAGON_DAGGER_PP(5698, .85, 1.15, 2.5, 1062, -1, 252, true, false, 0), - DRAGON_DAGGER_PPP(5680, .85, 1.15, 2.5, 1062, -1, 252, true, false, 0), - DRAGON_LONG(1305, 1.20, 1.10, 2.5, 1058, -1, 248, false, false, 0), - DRAGON_MACE(1434, 1.55, .85, 2.5, 1060, -1, 251, false, false, 0), - DRAGON_SCIMITAR(4587, 1, 1, 5.5, 1872, -1, 347, false, false, 1), - DRAGON_HALBERD(3204, 1.25, .85, 3.3, 1203, -1, 282, true, false, 0), + ABYSSAL_WHIP(4151, 1, 1.25, 5, 1658, 341, -1, false, false, 0), + DRAGON_DAGGER(1215, 1.15, 1.25, 2.5, 1062, -1, 252, true, false, 0), + DRAGON_DAGGER_P(1231, 1.15, 1.25, 2.5, 1062, -1, 252, true, false, 0), + DRAGON_DAGGER_PP(5698, 1.15, 1.25, 2.5, 1062, -1, 252, true, false, 0), + DRAGON_DAGGER_PPP(5680, 1.15, 1.25, 2.5, 1062, -1, 252, true, false, 0), + DRAGON_LONG(1305, 1.20, 1.10, 2.5, 1058, -1, 248, false, false, 0), + DRAGON_MACE(1434, 1.55, 1.25, 2.5, 1060, -1, 251, false, false, 0), + DRAGON_SCIMITAR(4587, 1, 1.25, 5.5, 1872, -1, 347, false, false, 1), + DRAGON_HALBERD(3204, 1.25, .85, 3, 1203, -1, 282, true, false, 0), GRANITE_MAUL(4153, 1.10, .85, 5, 1667, -1, 337, false, false, 0), MAGIC_SHORTBOW(861, 1.05, .95, 5.5, 1074, -1, -1, true, false, 0), MAGIC_LONGBOW(859, 1.20, 1.05, 5.5, 426, -1, -1, false, false, 0); @@ -359,7 +359,7 @@ public class Specials { player.playerLevel[2] = player.getLevelForXP(player.playerXP[2]) + player.getLevelForXP(player.playerXP[2]) * 15 / 100; player.getPlayerAssistant().refreshSkill(2); player.getItemAssistant().updateSpecialBar(); - } else { + } else { player.getActionSender().sendMessage("You don't have the required special energy to use this attack."); } } diff --git a/2006Redone Server/src/redone/game/content/skills/runecrafting/AbyssalHandler.java b/2006Redone Server/src/redone/game/content/skills/runecrafting/AbyssalHandler.java index 293103f4..bf341f7a 100644 --- a/2006Redone Server/src/redone/game/content/skills/runecrafting/AbyssalHandler.java +++ b/2006Redone Server/src/redone/game/content/skills/runecrafting/AbyssalHandler.java @@ -6,10 +6,10 @@ public class AbyssalHandler { public static void handleAbyssalTeleport(Client c, int objectId) { switch (objectId) { - case 7147:// added squeeze through gap + case 7147: // squeeze through gap c.getPlayerAssistant().movePlayer(3030, 4842, 0); break; - case 7133:// added nature + case 7133: // nature c.getPlayerAssistant().startTeleport(2395, 4841, 0, "modern"); break; case 7132: // cosmic @@ -30,24 +30,22 @@ public class AbyssalHandler { case 7139: // air c.getPlayerAssistant().startTeleport(2844, 4837, 0, "modern"); break; - case 7138: // soul - c.getActionSender().sendMessage("This altar is disabled atm."); - break; - case 7141: // blood - c.getActionSender().sendMessage("This altar is disabled atm."); - break; case 7137: // water c.getPlayerAssistant().startTeleport(2722, 4833, 0, "modern"); break; case 7136: // death c.getPlayerAssistant().startTeleport(2205, 4834, 0, "modern"); break; - case 7135: + case 7135: // law c.getPlayerAssistant().startTeleport(2464, 4830, 0, "modern"); break; case 7134: // chaos c.getPlayerAssistant().startTeleport(2274, 4842, 0, "modern"); break; + case 7138: // soul + case 7141: // blood + c.getActionSender().sendMessage("This altar is currently disabled."); + break; } } diff --git a/2006Redone Server/src/redone/game/content/skills/runecrafting/Runecrafting.java b/2006Redone Server/src/redone/game/content/skills/runecrafting/Runecrafting.java index 9f6f8e4a..001722fd 100644 --- a/2006Redone Server/src/redone/game/content/skills/runecrafting/Runecrafting.java +++ b/2006Redone Server/src/redone/game/content/skills/runecrafting/Runecrafting.java @@ -170,9 +170,7 @@ public class Runecrafting { c.getActionSender().sendSound(SoundList.RUNECRAFTING, 100, 0); } else { - c.getActionSender().sendMessage( - "You need a runecrafting level of at least " - + ad.levelReq + " to make runes here."); + c.getActionSender().sendMessage("You need a runecrafting level of at least " + ad.levelReq + " to make runes here."); } } return false; @@ -184,47 +182,22 @@ public class Runecrafting { int amount = c.getItemAssistant().getItemCount(7936); int amount2 = c.getItemAssistant().getItemCount(1436); if (amount2 > 0 && amount > 0) { - c.getItemAssistant().deleteItem(7936, - c.getItemAssistant().getItemCount(7936)); - c.getItemAssistant().addItem( - ad.rewardedRune, - amount - * (getMultiplier(ad) == 1 ? getMultiplier(ad) - : getMultiplier(ad) - 1)); - c.getPlayerAssistant().addSkillXP(ad.xp * amount, - c.playerRunecrafting); - c.getItemAssistant().deleteItem(1436, - c.getItemAssistant().getItemCount(1436)); - c.getItemAssistant().addItem( - ad.rewardedRune, - amount2 - * (getMultiplier(ad) == 1 ? getMultiplier(ad) - : getMultiplier(ad) - 1)); - c.getPlayerAssistant().addSkillXP(ad.xp * amount2, - c.playerRunecrafting); + c.getItemAssistant().deleteItem(7936, c.getItemAssistant().getItemCount(7936)); + c.getItemAssistant().addItem(ad.rewardedRune, amount * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad))); + c.getPlayerAssistant().addSkillXP(ad.xp * amount, c.playerRunecrafting); + c.getItemAssistant().deleteItem(1436, c.getItemAssistant().getItemCount(1436)); + c.getItemAssistant().addItem(ad.rewardedRune, amount2 * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad))); + c.getPlayerAssistant().addSkillXP(ad.xp * amount2, c.playerRunecrafting); } else if (amount > 0) { - c.getItemAssistant().deleteItem(7936, - c.getItemAssistant().getItemCount(7936)); - c.getItemAssistant().addItem( - ad.rewardedRune, - amount - * (getMultiplier(ad) == 1 ? getMultiplier(ad) - : getMultiplier(ad) - 1)); - c.getPlayerAssistant().addSkillXP(ad.xp * amount, - c.playerRunecrafting); + c.getItemAssistant().deleteItem(7936, c.getItemAssistant().getItemCount(7936)); + c.getItemAssistant().addItem(ad.rewardedRune, amount * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad))); + c.getPlayerAssistant().addSkillXP(ad.xp * amount, c.playerRunecrafting); } else if (amount2 > 0) { - c.getItemAssistant().deleteItem(1436, - c.getItemAssistant().getItemCount(1436)); - c.getItemAssistant().addItem( - ad.rewardedRune, - amount2 - * (getMultiplier(ad) == 1 ? getMultiplier(ad) - : getMultiplier(ad) - 1)); - c.getPlayerAssistant().addSkillXP(ad.xp * amount2, - c.playerRunecrafting); + c.getItemAssistant().deleteItem(1436, c.getItemAssistant().getItemCount(1436)); + c.getItemAssistant().addItem(ad.rewardedRune, amount2 * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad))); + c.getPlayerAssistant().addSkillXP(ad.xp * amount2, c.playerRunecrafting); } else { - c.getActionSender().sendMessage( - "You don't have any essence left."); + c.getActionSender().sendMessage("You don't have any essence left."); } } } diff --git a/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java b/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java index c0d6c41b..f743f5f0 100644 --- a/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java +++ b/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java @@ -13,7 +13,8 @@ public class NPCDropsHandler { public static int // found on http://runescape.wikia.com/wiki/Drop_rate ALWAYS = 0, - COINSRATE = 3, CHICKEN_RATE = 75 / 100, + COINSRATE = 3, + CHICKEN_RATE = 75 / 100, COMMON = 2 + r(48), UNCOMMON = 51 + r(49), RARE = 101 + r(411), diff --git a/2006Redone Server/src/redone/game/players/Player.java b/2006Redone Server/src/redone/game/players/Player.java index e2a77363..838304db 100644 --- a/2006Redone Server/src/redone/game/players/Player.java +++ b/2006Redone Server/src/redone/game/players/Player.java @@ -1525,7 +1525,7 @@ public boolean goodDistance(int objectX, int objectY, int playerX, int playerY, **/ protected void appendHitUpdate(Stream str) { - str.writeByte(getHitDiff()); // What the perseon got 'hit' for + str.writeByte(getHitDiff()); // What the person got 'hit' for if (poisonMask == 1) { str.writeByteA(2); } else if (getHitDiff() > 0) {