From e5799200d7e93859514c22a4b8900b50f0edb99e Mon Sep 17 00:00:00 2001 From: Mr Extremez Date: Fri, 6 Mar 2020 17:52:10 -0600 Subject: [PATCH] A few things (#382) - Added a distance check for item on object packet - Added cook x functionality - Removed a fair amount of dead code - Did some renaming and fixed some typos - Cleaned up a lot of the smithing code - Added a new boundary system to reduce code clutter - Fixed a firemaking bug --- .../main/java/com/rebotted/GameConstants.java | 127 +-- .../com/rebotted/game/content/BankPin.java | 48 +- .../game/content/combat/CombatAssistant.java | 7 +- .../content/combat/magic/CastOnOther.java | 4 +- .../content/combat/magic/MagicSpells.java | 13 +- .../content/combat/magic/MagicTeleports.java | 20 +- .../game/content/combat/melee/MeleeData.java | 13 +- .../combat/prayer/ActivatePrayers.java | 4 +- .../content/combat/range/DwarfCannon.java | 5 +- .../game/content/consumables/Potions.java | 2 +- .../content/guilds/impl/RangersGuild.java | 32 +- .../game/content/minigames/Dueling.java | 57 +- .../game/content/minigames/FightPits.java | 8 +- .../game/content/minigames/MageArena.java | 10 +- .../minigames/castlewars/CastleWars.java | 14 +- .../content/minigames/trawler/Trawler.java | 8 +- .../rebotted/game/content/music/PlayList.java | 8 +- .../game/content/quests/QuestAssistant.java | 88 +- .../game/content/quests/QuestRewards.java | 44 +- .../quests/impl/BlackKnightsFortress.java | 50 +- .../content/quests/impl/CooksAssistant.java | 52 +- .../game/content/quests/impl/DoricsQuest.java | 56 +- .../content/quests/impl/GertrudesCat.java | 90 +- .../game/content/quests/impl/ImpCatcher.java | 46 +- .../content/quests/impl/KnightsSword.java | 338 +++---- .../content/quests/impl/PiratesTreasure.java | 84 +- .../content/quests/impl/RestlessGhost.java | 60 +- .../game/content/quests/impl/RomeoJuliet.java | 300 +++---- .../content/quests/impl/RuneMysteries.java | 50 +- .../content/quests/impl/SheepShearer.java | 42 +- .../game/content/quests/impl/ShieldArrav.java | 6 +- .../content/quests/impl/VampyreSlayer.java | 6 +- .../content/quests/impl/WitchsPotion.java | 44 +- .../game/content/random/PartyRoom.java | 9 +- .../content/randomevents/FreakyForester.java | 2 +- .../content/randomevents/SandwhichLady.java | 16 +- .../rebotted/game/content/skills/Menus.java | 8 +- .../game/content/skills/SkillHandler.java | 2 +- .../game/content/skills/SkillInterfaces.java | 36 +- .../game/content/skills/SkillMenu.java | 12 +- .../game/content/skills/cooking/Cooking.java | 5 +- .../skills/cooking/CookingTutorialIsland.java | 2 +- .../skills/crafting/JewelryMaking.java | 12 +- .../skills/crafting/LeatherMaking.java | 6 +- .../game/content/skills/crafting/Pottery.java | 24 +- .../content/skills/crafting/Spinning.java | 8 +- .../game/content/skills/crafting/Tanning.java | 10 +- .../game/content/skills/farming/ChopTree.java | 4 +- .../game/content/skills/farming/Farmers.java | 10 +- .../skills/farming/ToolLeprechaun.java | 14 +- .../content/skills/firemaking/Firemaking.java | 23 +- .../content/skills/fletching/LogCutting.java | 16 +- .../skills/fletching/LogCuttingInterface.java | 38 +- .../skills/runecrafting/Runecrafting.java | 10 +- .../game/content/skills/slayer/Slayer.java | 10 +- .../content/skills/smithing/Smithing.java | 832 +----------------- .../content/skills/smithing/SmithingData.java | 167 ++++ .../skills/smithing/SmithingInterface.java | 608 ++++++------- .../game/content/traveling/DesertHeat.java | 46 +- .../game/content/traveling/Sailing.java | 6 +- .../game/dialogues/DialogueHandler.java | 254 +++--- .../rebotted/game/items/ItemAssistant.java | 183 ++-- .../rebotted/game/items/ItemConstants.java | 133 +++ .../com/rebotted/game/items/ItemData.java | 14 +- .../game/items/impl/RareProtection.java | 8 +- .../java/com/rebotted/game/npcs/NpcData.java | 3 +- .../com/rebotted/game/npcs/NpcHandler.java | 5 +- .../rebotted/game/objects/ObjectsActions.java | 5 +- .../com/rebotted/game/players/Player.java | 186 +--- .../game/players/PlayerAssistant.java | 712 ++++----------- .../com/rebotted/game/players/Trading.java | 70 +- .../rebotted/game/shops/ShopAssistant.java | 7 +- .../java/com/rebotted/net/PacketSender.java | 8 +- .../com/rebotted/net/packets/impl/Bank10.java | 2 +- .../com/rebotted/net/packets/impl/Bank5.java | 3 +- .../rebotted/net/packets/impl/BankAll.java | 15 +- .../com/rebotted/net/packets/impl/BankX2.java | 6 +- .../rebotted/net/packets/impl/ClickNPC.java | 1 - .../net/packets/impl/ClickingButtons.java | 48 +- .../rebotted/net/packets/impl/Commands.java | 18 +- .../rebotted/net/packets/impl/DropItem.java | 35 +- .../net/packets/impl/ItemOnObject.java | 15 +- .../net/packets/impl/ItemOnPlayer.java | 2 +- .../rebotted/net/packets/impl/PickupItem.java | 5 +- .../rebotted/net/packets/impl/RemoveItem.java | 54 +- .../rebotted/net/packets/impl/Walking.java | 2 +- .../java/com/rebotted/world/Boundary.java | 293 ++++++ .../java/com/rebotted/world/Coordinate.java | 83 ++ 88 files changed, 2575 insertions(+), 3267 deletions(-) create mode 100644 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java create mode 100644 2006Redone Server/src/main/java/com/rebotted/game/items/ItemConstants.java create mode 100644 2006Redone Server/src/main/java/com/rebotted/world/Boundary.java create mode 100644 2006Redone Server/src/main/java/com/rebotted/world/Coordinate.java diff --git a/2006Redone Server/src/main/java/com/rebotted/GameConstants.java b/2006Redone Server/src/main/java/com/rebotted/GameConstants.java index d9aa1d8d..1de73a6e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/GameConstants.java +++ b/2006Redone Server/src/main/java/com/rebotted/GameConstants.java @@ -5,146 +5,33 @@ public class GameConstants { public final static boolean SERVER_DEBUG = false; public final static String SERVER_NAME = "2006rebotted", SERVER_VERSION = "Server Stage v " + GameConstants.TEST_VERSION + "."; + public final static double TEST_VERSION = 2.1; - public static int BANK_SIZE = 352; + public final static int ITEM_LIMIT = 15000, MAXITEM_AMOUNT = Integer.MAX_VALUE, CLIENT_VERSION = 999999, WORLD = 1, IPS_ALLOWED = 250, CONNECTION_DELAY = 100, MESSAGE_DELAY = 6000, MAX_PLAYERS = 100, REQ_AMOUNT = 150; + public final static boolean SOUND = true, GUILDS = true, WORLD_LIST_FIX = false, PARTY_ROOM_DISABLED = true, PRINT_OBJECT_ID = false, EXPERIMENTS = false; + public static int[] SIDEBARS = { 2423, 3917, 638, 3213, 1644, 5608, 1151, 18128, 5065, 5715, 2449, 904, 147, 962 }; + public static boolean TUTORIAL_ISLAND = false, MEMBERS_ONLY = false, sendServerPackets = false, CLUES_ENABLED = false; - - public final static int HAT = 0, CAPE = 1, AMULET = 2, WEAPON = 3, - CHEST = 4, SHIELD = 5, LEGS = 7, HANDS = 9, FEET = 10, RING = 12, - ARROWS = 13; - - public final static int[] COMBAT_RELATED_ITEMS = { 35, 39, 40, 41, 42, 43, - 44, 50, 53, 54, 60, 64, 75, 76, 78, 88, 546, 548, 577, 581, 598, - 626, 628, 630, 632, 634, 667, 687, 746, 747, 767, 772, 775, 776, - 777, 778, 818, 837, 839, 841, 843, 845, 847, 849, 851, 853, 855, - 857, 859, 861, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, - 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, - 886, 887, 888, 889, 890, 891, 892, 893, 942, 975, 1007, 1019, 1021, - 1023, 1027, 1029, 1031, 1033, 1035, 1052, 1059, 1061, 1063, 1065, - 1067, 1069, 1071, 1073, 1075, 1077, 1079, 1081, 1083, 1085, 1087, - 1089, 1091, 1093, 1095, 1097, 1099, 1101, 1103, 1105, 1107, 1109, - 1111, 1113, 1115, 1117, 1119, 1121, 1123, 1125, 1127, 1129, 1131, - 1133, 1135, 1137, 1139, 1141, 1143, 1145, 1147, 1149, 1151, 1153, - 1155, 1157, 1159, 1161, 1163, 1165, 1167, 1169, 1171, 1173, 1175, - 1177, 1179, 1181, 1183, 1185, 1187, 1189, 1191, 1193, 1195, 1197, - 1199, 1201, 1203, 1205, 1207, 1209, 1211, 1213, 1215, 1217, 1219, - 1221, 1223, 1225, 1227, 1229, 1231, 1233, 1237, 1239, 1241, 1243, - 1245, 1247, 1249, 1251, 1253, 1255, 1257, 1259, 1261, 1263, 1265, - 1267, 1269, 1271, 1273, 1275, 1277, 1279, 1281, 1283, 1285, 1287, - 1289, 1291, 1293, 1295, 1297, 1299, 1301, 1303, 1305, 1307, 1309, - 1311, 1313, 1315, 1317, 1319, 1321, 1323, 1325, 1327, 1329, 1331, - 1333, 1335, 1337, 1339, 1341, 1343, 1345, 1347, 1349, 1351, 1353, - 1355, 1357, 1359, 1361, 1363, 1365, 1367, 1369, 1371, 1373, 1375, - 1377, 1379, 1381, 1383, 1385, 1387, 1389, 1391, 1393, 1395, 1397, - 1399, 1401, 1403, 1405, 1407, 1409, 1419, 1420, 1422, 1424, 1426, - 1428, 1430, 1432, 1434, 1540, 1718, 1724, 2402, 2412, 2413, 2414, - 2415, 2416, 2417, 2487, 2489, 2491, 2493, 2495, 2497, 2499, 2501, - 2503, 2513, 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 2540, - 2541, 2577, 2579, 2581, 2583, 2585, 2587, 2589, 2591, 2593, 2595, - 2597, 2599, 2601, 2603, 2605, 2607, 2609, 2611, 2613, 2615, 2617, - 2619, 2621, 2623, 2625, 2627, 2629, 2653, 2655, 2659, 2661, 2663, - 2667, 2669, 2671, 2673, 2861, 2864, 2865, 2866, 2890, 2896, 2906, - 2916, 2926, 2936, 2961, 2963, 3053, 3054, 3095, 3096, 3097, 3098, - 3099, 3100, 3101, 3105, 3107, 3122, 3140, 3170, 3171, 3172, 3173, - 3174, 3175, 3176, 3190, 3192, 3194, 3196, 3198, 3200, 3202, 3204, - 3327, 3329, 3331, 3333, 3335, 3337, 3339, 3341, 3343, 3385, 3387, - 3389, 3391, 3393, 3472, 3473, 3474, 3475, 3476, 3477, 3479, 3481, - 3483, 3485, 3486, 3488, 3748, 3749, 3751, 3753, 3755, 3757, 3758, - 3759, 3761, 3763, 3765, 3767, 3769, 3771, 3773, 3775, 3777, 3779, - 3781, 3783, 3785, 3787, 3789, 3791, 3797, 3840, 3841, 3842, 3843, - 3844, 4087, 4089, 4091, 4093, 4095, 4097, 4099, 4101, 4103, 4105, - 4107, 4109, 4111, 4113, 4115, 4117, 4119, 4121, 4123, 4125, 4127, - 4129, 4131, 4150, 4151, 4153, 4156, 4158, 4160, 4170, 4172, 4173, - 4174, 4175, 4212, 4214, 4215, 4216, 4217, 4218, 4219, 4220, 4221, - 4222, 4223, 4224, 4226, 4227, 4228, 4229, 4230, 4231, 4232, 4233, - 4234, 4298, 4300, 4302, 4304, 4308, 4310, 4502, 4503, 4504, 4505, - 4506, 4507, 4508, 4509, 4510, 4511, 4512, 4580, 4582, 4585, 4587, - 4600, 4675, 4708, 4710, 4712, 4714, 4716, 4718, 4720, 4722, 4724, - 4726, 4728, 4730, 4732, 4734, 4736, 4738, 4740, 4745, 4747, 4749, - 4751, 4753, 4755, 4757, 4759, 4778, 4783, 4788, 4793, 4803, 4827, - 4860, 4866, 4872, 4878, 4884, 4890, 4896, 4902, 4908, 4914, 4920, - 4926, 4932, 4938, 4944, 4950, 4956, 4962, 4968, 4974, 4980, 4986, - 4992, 4998, 5014, 5016, 5018, 5553, 5554, 5555, 5556, 5557, 5574, - 5575, 5576, 5616, 5617, 5618, 5619, 5620, 5621, 5622, 5623, 5624, - 5625, 5626, 5627, 5648, 5654, 5655, 5656, 5657, 5658, 5659, 5660, - 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5670, 5672, 5674, - 5676, 5678, 5680, 5682, 5686, 5688, 5690, 5692, 5694, 5696, 5698, - 5700, 5704, 5706, 5708, 5710, 5712, 5714, 5716, 5718, 5720, 5722, - 5724, 5726, 5728, 5730, 5734, 5736, 6061, 6062, 6106, 6107, 6108, - 6109, 6110, 6111, 6128, 6129, 6130, 6131, 6133, 6135, 6137, 6139, - 6141, 6143, 6145, 6147, 6149, 6151, 6153, 6235, 6257, 6279, 6313, - 6315, 6317, 6322, 6324, 6326, 6328, 6330, 6416, 6522, 6523, 6524, - 6525, 6526, 6527, 6528, 6562, 6563, 6568, 6570, 6587, 6589, 6591, - 6593, 6595, 6597, 6599, 6601, 6603, 6605, 6607, 6609, 6611, 6613, - 6615, 6617, 6619, 6621, 6623, 6625, 6627, 6629, 6631, 6633, 6720, - 6724, 6726, 6739, 6745, 6746, 6760, 6762, 6764, 6809, 6889, 6893, - 6894, 6895, 6897, 6908, 6910, 6912, 6914, 6916, 6918, 6920, 6922, - 6924, 6959, 7158, 7159, 7332, 7334, 7336, 7338, 7340, 7342, 7344, - 7346, 7348, 7350, 7352, 7354, 7356, 7358, 7360, 7362, 7364, 7366, - 7368, 7374, 7390, 7392, 7394, 7396, 7398, 7399, 7400, 7410, 7433, - 7435, 7437, 7439, 7441, 7443, 7445, 7447, 7449, 7451, 7453, 7454, - 7455, 7456, 7457, 7458, 7459, 7460, 7461, 7462, 7539, 7552, 7553, - 7639, 7640, 7641, 7642, 7643, 7644, 7645, 7646, 7647, 7648, 7668, - 7686, 7687, 7806, 7807, 7808, 7809 }; - - public final static int[] ALCOHOL_RELATED_ITEMS = { 8940, 3803, 3712, 3711, - 2092, 2074, 3801 }; - - public final static int[] ITEM_SELLABLE = { 3842, 3844, 3840, 8844, 8845, - 8846, 8847, 8848, 8849, 8850, 10551, 6570, 7462, 7461, 7460, 7459, - 7458, 7457, 7456, 7455, 7454, 8839, 8840, 8842, 11663, 11664, 11666, - 10499, 9748, 9754, 9751, 9769, 9757, 9760, 9763, 9802, 9808, 9784, - 9799, 9805, 9781, 9796, 9793, 9775, 9772, 9778, 9787, 9811, 9766, - 9749, 9755, 9752, 9770, 9758, 9761, 9764, 9803, 9809, 9785, 9800, - 9806, 9782, 9797, 9794, 9776, 9773, 9779, 9788, 9812, 9767, 9747, - 9753, 9750, 9768, 9756, 9759, 9762, 9801, 9807, 9783, 9798, 9804, - 9780, 9795, 9792, 9774, 9771, 9777, 9786, 9810, 9765, 995, 2415, - 2416, 2417, 88, 1540, 2714, 432, 433, 1555, 1556, 1557, 1558, 1559, - 1560, 1561, 1562, 1563, 1564, 1565, 7585, 7584, 300, 775, 776, 777, - 6180, 6181, 6182, 6183, 6184, 6185, 6186, 6187, 6188, 2528, 4447, - 290, 666, 667 }; - public final static int[] ITEM_TRADEABLE = { 3842, 3844, 3840, 8844, 8845, - 8846, 8847, 8848, 8849, 8850, 10551, 6570, 7462, 7461, 7460, 7459, - 7458, 7457, 7456, 7455, 7454, 8839, 8840, 8842, 11663, 11664, - 11665, 10499, 9748, 9754, 9751, 9769, 9757, 9760, 9763, 9802, 9808, - 9784, 9799, 9805, 9781, 9796, 9793, 9775, 9772, 9778, 9787, 9811, - 9766, 9749, 9755, 9752, 9770, 9758, 9761, 9764, 9803, 9809, 9785, - 9800, 9806, 9782, 9797, 9794, 9776, 9773, 9779, 9788, 9812, 9767, - 9747, 9753, 9750, 9768, 9756, 9759, 9762, 9801, 9807, 9783, 9798, - 9804, 9780, 9795, 9792, 9774, 9771, 9777, 9786, 9810, 9765, 2528, - 4447, 772, 6180, 6181, 6182, 6183, 6184, 6185, 6186, 6187, 6188, - 775, 776, 777, 300, 88, 2415, 2416, 2417, 4214, 4215, 4216, 4217, - 4218, 4219, 4220, 4221, 4222, 4223, 4224, 1555, 1556, 1557, 1558, - 1559, 1560, 1561, 1562, 1563, 1564, 1565, 7585, 7584, 2714, 432, - 433, 290, 5075, 5074, 5073, 5071, 5070, 7413, 6529, 4067, 2996, 1464, 666, 667, - 2412, 2413, 2414 }; - - public final static int[] ITEM_UNALCHABLE = { 995, 1555, 1556, 1557, 1558, - 1559, 1560, 1561, 1562, 1563, 1564, 1565, 7583, 1566, 7585, 2528, - 4214, 4212, 2714, 432, 433, 300, 775, 776, 777, 6180, 6181, 6182, - 6183, 6184, 6185, 6186, 6187, 6188, 2528, 4447, 290, 666, 667}; - - public final static int[] ITEM_BANKABLE = {2528, 4447}; - - public final static int[] DESTROYABLE_ITEMS = {775, 776, 777, 2528, 6570, 2714, 432, 433, 300, 666}; public final static int[] FUN_WEAPONS = { 2460, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2471, 2473, 2474, 2475, 2476, 2477 }; // fun weapons for dueling public static boolean ADMIN_CAN_TRADE = false; // can admins trade? + public final static boolean ADMIN_DROP_ITEMS = false; + public final static boolean ADMIN_CAN_SELL_ITEMS = false; public final static int RESPAWN_X = 3222; // when dead respawn here diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/BankPin.java b/2006Redone Server/src/main/java/com/rebotted/game/content/BankPin.java index f3e01399..3bcf44b0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/BankPin.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/BankPin.java @@ -48,26 +48,26 @@ public class BankPin { int pinSendFrames[] = { 15075, 15080, 15110, 15171, 15076, 15176, 15104, 15082, 15079 }; for (int j = 0; j < 9; j++) { - client.getPacketSender().sendFrame126("", pinSendFrames[j]); + client.getPacketSender().sendString("", pinSendFrames[j]); } - client.getPacketSender().sendFrame126("Welcome to our bank", 15038); - client.getPacketSender().sendFrame126("recovery system.", 15039); - client.getPacketSender().sendFrame126("Remember, it's important", 15040); - client.getPacketSender().sendFrame126("to change your recovery", 15041); - client.getPacketSender().sendFrame126("pin and password", 15042); - client.getPacketSender().sendFrame126("every 1-3 months", 15043); + client.getPacketSender().sendString("Welcome to our bank", 15038); + client.getPacketSender().sendString("recovery system.", 15039); + client.getPacketSender().sendString("Remember, it's important", 15040); + client.getPacketSender().sendString("to change your recovery", 15041); + client.getPacketSender().sendString("pin and password", 15042); + client.getPacketSender().sendString("every 1-3 months", 15043); if (!client.hasBankpin) { - client.getPacketSender().sendFrame126("Set a Bank Pin", 15078); - client.getPacketSender().sendFrame126("No PIN Set", 15105); + client.getPacketSender().sendString("Set a Bank Pin", 15078); + client.getPacketSender().sendString("No PIN Set", 15105); } else { - client.getPacketSender().sendFrame126("Delete your PIN", 15078); + client.getPacketSender().sendString("Delete your PIN", 15078); if (client.requestPinDelete) { - client.getPacketSender().sendFrame126("Pending delete", 15105); + client.getPacketSender().sendString("Pending delete", 15105); } else { - client.getPacketSender().sendFrame126("Has Bank PIN", 15105); + client.getPacketSender().sendString("Has Bank PIN", 15105); } } - client.getPacketSender().sendFrame126(recovery_Delay + " days", 15107); + client.getPacketSender().sendString(recovery_Delay + " days", 15107); } public void bankPinSettings() { @@ -127,12 +127,12 @@ public class BankPin { return; } randomizeNumbers(); - client.getPacketSender().sendFrame126("First click the FIRST digit", + client.getPacketSender().sendString("First click the FIRST digit", 15313); - client.getPacketSender().sendFrame126("", 14923); + client.getPacketSender().sendString("", 14923); int pinSendFrames[] = { 14913, 14914, 14915, 14916 }; for (int j = 0; j < 4; j++) { - client.getPacketSender().sendFrame126("?", pinSendFrames[j]); + client.getPacketSender().sendString("?", pinSendFrames[j]); } client.getPacketSender().showInterface(7424); sendPins(); @@ -144,15 +144,15 @@ public class BankPin { return; } for (int i = 0; i < getBankPins().length; i++) { - client.getPacketSender().sendFrame126("" + getBankPins()[i], + client.getPacketSender().sendString("" + getBankPins()[i], stringIds[i]); } } private void handleButtonOne(int button) { - client.getPacketSender().sendFrame126("Now click the SECOND digit", + client.getPacketSender().sendString("Now click the SECOND digit", 15313); - client.getPacketSender().sendFrame126("*", 14913); + client.getPacketSender().sendString("*", 14913); for (int i = 0; i < getActionButtons().length; i++) { if (getActionButtons()[i] == button) { firstPin = getBankPins()[i]; @@ -163,9 +163,9 @@ public class BankPin { } private void handleButtonTwo(int button) { - client.getPacketSender().sendFrame126("Now click the THIRD digit", + client.getPacketSender().sendString("Now click the THIRD digit", 15313); - client.getPacketSender().sendFrame126("*", 14914); + client.getPacketSender().sendString("*", 14914); for (int i = 0; i < getActionButtons().length; i++) { if (getActionButtons()[i] == button) { secondPin = getBankPins()[i]; @@ -176,9 +176,9 @@ public class BankPin { } private void handleButtonThree(int button) { - client.getPacketSender().sendFrame126("Now click the LAST digit", + client.getPacketSender().sendString("Now click the LAST digit", 15313); - client.getPacketSender().sendFrame126("*", 14915); + client.getPacketSender().sendString("*", 14915); for (int i = 0; i < getActionButtons().length; i++) { if (getActionButtons()[i] == button) { thirdPin = getBankPins()[i]; @@ -197,7 +197,7 @@ public class BankPin { client.getPacketSender().openUpBank(); return; } - client.getPacketSender().sendFrame126("*", 14916); + client.getPacketSender().sendString("*", 14916); for (int i = 0; i < getActionButtons().length; i++) { if (getActionButtons()[i] == button) { fourthPin = getBankPins()[i]; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java index fbf0ff6c..fa3856d5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java @@ -27,6 +27,7 @@ import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.clip.PathFinder; /** @@ -544,7 +545,7 @@ public class CombatAssistant { player.getPacketSender().sendMessage("This monster is already in combat."); return; } - if ((player.underAttackBy > 0 || player.underAttackBy2 > 0) && player.underAttackBy2 != i && !player.inMulti()) { + if ((player.underAttackBy > 0 || player.underAttackBy2 > 0) && player.underAttackBy2 != i && !Boundary.isIn(player, Boundary.MULTI)) { resetPlayerAttack(); player.getPacketSender().sendMessage("I am already under attack."); return; @@ -1418,7 +1419,7 @@ public class CombatAssistant { PlayerHandler.players[i].updateRequired = true; player.usingMagic = false; player.castingMagic = false; - if (o.inMulti() && MagicSpells.multis(player)) { + if (Boundary.isIn(o, Boundary.MULTI) && MagicSpells.multis(player)) { player.barrageCount = 0; for (int j = 0; j < PlayerHandler.players.length; j++) { if (PlayerHandler.players[j] != null) { @@ -1717,7 +1718,7 @@ public class CombatAssistant { } } if (CombatConstants.SINGLE_AND_MULTI_ZONES) { - if (!PlayerHandler.players[player.playerIndex].inMulti()) { // single single zones + if (!Boundary.isIn(PlayerHandler.players[player.playerIndex], Boundary.MULTI)) { // single single zones if (PlayerHandler.players[player.playerIndex].underAttackBy != player.playerId && PlayerHandler.players[player.playerIndex].underAttackBy != 0) { player.getPacketSender().sendMessage("That player is already in combat."); player.stopMovement(); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastOnOther.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastOnOther.java index bd98d677..6c77b07c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastOnOther.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastOnOther.java @@ -45,8 +45,8 @@ public class CastOnOther extends CastRequirements { if (castOn != null) { if (castOn.distanceToPoint(c.absX, c.absY) <= 15) { if (c.heightLevel == castOn.heightLevel) { - castOn.getPacketSender().sendFrame126(location[type], 12560); - castOn.getPacketSender().sendFrame126(c.playerName, 12558); + castOn.getPacketSender().sendString(location[type], 12560); + castOn.getPacketSender().sendString(c.playerName, 12558); castOn.getPacketSender().showInterface(12468); castOn.teleotherType = type; } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicSpells.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicSpells.java index 1528862d..6cdb9fa5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicSpells.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicSpells.java @@ -6,6 +6,7 @@ import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; public class MagicSpells extends MagicData { @@ -113,16 +114,12 @@ public class MagicSpells extends MagicData { } if (CombatConstants.SINGLE_AND_MULTI_ZONES) { - if (!PlayerHandler.players[i].inMulti()) { // single combat - // zones - if (PlayerHandler.players[i].underAttackBy != c.playerId - && PlayerHandler.players[i].underAttackBy != 0) { + if (!Boundary.isIn(PlayerHandler.players[i], Boundary.MULTI)) { // single combat zones + if (PlayerHandler.players[i].underAttackBy != c.playerId && PlayerHandler.players[i].underAttackBy != 0) { return false; } - if (PlayerHandler.players[i].playerId != c.underAttackBy - && c.underAttackBy != 0) { - c.getPacketSender().sendMessage( - "You are already in combat."); + if (PlayerHandler.players[i].playerId != c.underAttackBy && c.underAttackBy != 0) { + c.getPacketSender().sendMessage("You are already in combat."); return false; } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicTeleports.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicTeleports.java index c4d0f439..dc06e18b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicTeleports.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicTeleports.java @@ -6,16 +6,16 @@ import com.rebotted.game.players.Player; public class MagicTeleports { public static void handleLoginText(Player player) { - player.getPacketSender().sendFrame126("Level 25: Varrock Teleport", 1300); - player.getPacketSender().sendFrame126("Level 31: Lumbridge Teleport", 1325); - player.getPacketSender().sendFrame126("Level 37: Falador Teleport", 1350); - player.getPacketSender().sendFrame126("Level 45: Camelot Teleport", 1382); - player.getPacketSender().sendFrame126("Level 51: Ardougne Teleport", 1415); - player.getPacketSender().sendFrame126("Level 54: Paddewwa Teleport", 13037); - player.getPacketSender().sendFrame126("Level 60: Senntisten Teleport", 13047); - player.getPacketSender().sendFrame126("Level 66: Kharyrll Teleport", 13055); - player.getPacketSender().sendFrame126("Level 72: Lassar Teleport", 13063); - player.getPacketSender().sendFrame126("Level 78: Dareeyak Teleport", 13071); + player.getPacketSender().sendString("Level 25: Varrock Teleport", 1300); + player.getPacketSender().sendString("Level 31: Lumbridge Teleport", 1325); + player.getPacketSender().sendString("Level 37: Falador Teleport", 1350); + player.getPacketSender().sendString("Level 45: Camelot Teleport", 1382); + player.getPacketSender().sendString("Level 51: Ardougne Teleport", 1415); + player.getPacketSender().sendString("Level 54: Paddewwa Teleport", 13037); + player.getPacketSender().sendString("Level 60: Senntisten Teleport", 13047); + player.getPacketSender().sendString("Level 66: Kharyrll Teleport", 13055); + player.getPacketSender().sendString("Level 72: Lassar Teleport", 13063); + player.getPacketSender().sendString("Level 78: Dareeyak Teleport", 13071); } public static final boolean MAGIC_LEVEL_REQUIRED = true, RUNES_REQUIRED = true; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java index 441b0d9d..bc744013 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java @@ -1,8 +1,8 @@ package com.rebotted.game.content.combat.melee; -import com.rebotted.GameConstants; import com.rebotted.game.content.combat.magic.MagicData; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.players.Player; public class MeleeData { @@ -91,7 +91,7 @@ public class MeleeData { **/ public static int getAttackDelay(Player c) { - String s = ItemAssistant.getItemName(c.playerEquipment[GameConstants.WEAPON]).toLowerCase(); + String s = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase(); if (c.usingMagic) { switch (MagicData.MAGIC_SPELLS[c.spellId][0]) { case 12871: // ice blitz @@ -212,8 +212,7 @@ public class MeleeData { **/ public static void getPlayerAnimIndex(Player c) { - String weaponName = ItemAssistant.getItemName( - c.playerEquipment[GameConstants.WEAPON]).toLowerCase(); + String weaponName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase(); c.playerStandIndex = 0x328; c.playerTurnIndex = 0x337; c.playerWalkIndex = 0x333; @@ -307,8 +306,7 @@ public class MeleeData { **/ public static int getWeaponAnimation(Player c) { - String weaponName = ItemAssistant.getItemName( - c.playerEquipment[GameConstants.WEAPON]).toLowerCase(); + String weaponName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase(); if (c.playerEquipment[c.playerWeapon] <= 0) { switch (c.fightMode) { case 0: @@ -424,8 +422,7 @@ public class MeleeData { * How long it takes to hit your enemy **/ public static int getHitDelay(Player c) { - String weaponName = ItemAssistant.getItemName( - c.playerEquipment[GameConstants.WEAPON]).toLowerCase(); + String weaponName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase(); if (c.usingMagic) { switch (MagicData.MAGIC_SPELLS[c.spellId][0]) { case 12891: diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/ActivatePrayers.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/ActivatePrayers.java index 23444709..d093817b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/ActivatePrayers.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/ActivatePrayers.java @@ -268,12 +268,12 @@ public class ActivatePrayers { } else { player.getPacketSender().sendConfig(player.getPrayer().PRAYER_GLOW[i], 0); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "You need a @blu@Prayer level of " + player.getPrayer().PRAYER_LEVEL_REQUIRED[i] + " to use " + player.getPrayer().PRAYER_NAME[i] + ".", 357); - player.getPacketSender().sendFrame126("Click here to continue", 358); + player.getPacketSender().sendString("Click here to continue", 358); player.getPacketSender().sendChatInterface(356); } } else { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/DwarfCannon.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/DwarfCannon.java index 30e5fe2f..f534f19b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/DwarfCannon.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/DwarfCannon.java @@ -10,6 +10,7 @@ import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.objects.Objects; import com.rebotted.game.players.Player; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.clip.Region; /** @@ -390,7 +391,7 @@ public class DwarfCannon { } public boolean noSetUpArea() { - return player.inBank() || player.inFightCaves(); + return Boundary.isIn(player, Boundary.BANK_AREA) || player.inFightCaves(); } private int getHit() { @@ -413,7 +414,7 @@ public class DwarfCannon { if (damage > target.HP) { damage = target.HP; } - if (!player.inMulti()) { + if (!Boundary.isIn(player, Boundary.MULTI)) { if (target.underAttackBy > 0 && target.underAttackBy != player.playerId) { return; } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Potions.java b/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Potions.java index b3744a12..2ac75127 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Potions.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Potions.java @@ -298,7 +298,7 @@ public class Potions { if (c.playerEnergy > 100) { c.playerEnergy = 100; } - c.getPacketSender().sendFrame126((int) Math.ceil(c.playerEnergy) + "%", 149); + c.getPacketSender().sendString((int) Math.ceil(c.playerEnergy) + "%", 149); } public void drinkAntiPoison(int itemId, int replaceItem, int slot, diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/impl/RangersGuild.java b/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/impl/RangersGuild.java index 36d9d93e..038332f8 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/impl/RangersGuild.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/impl/RangersGuild.java @@ -63,7 +63,7 @@ public class RangersGuild { if (hitChance >= 10 && hitChance <= 20) { playerScore += 10; sendConfiguration(80 + Misc.random(10), -60 + Misc.random(90)); - c.getPacketSender().sendFrame126(BLACK, 567); + c.getPacketSender().sendString(BLACK, 567); c.getPlayerAssistant().addSkillXP(5, 4); c.getItemAssistant().deleteArrow(); //c.getPlayerAction().setAction(false); @@ -71,7 +71,7 @@ public class RangersGuild { } else if (hitChance >= 20 && hitChance < 30) { playerScore += 20; sendConfiguration(-70 + Misc.random(10),10 - Misc.random(40)); - c.getPacketSender().sendFrame126(BLUE,567); + c.getPacketSender().sendString(BLUE,567); c.getPlayerAssistant().addSkillXP(10, 4); c.getItemAssistant().deleteArrow(); //c.getPlayerAction().setAction(false); @@ -79,7 +79,7 @@ public class RangersGuild { } else if (hitChance >= 30 && hitChance < 50) { playerScore += 30; sendConfiguration(-30 - Misc.random(15),10 - Misc.random(25)); - c.getPacketSender().sendFrame126(RED, 567); + c.getPacketSender().sendString(RED, 567); c.getPlayerAssistant().addSkillXP(15, 4); c.getItemAssistant().deleteArrow(); //c.getPlayerAction().setAction(false); @@ -87,7 +87,7 @@ public class RangersGuild { } else if (hitChance >= 50 && hitChance < 75) { playerScore += 50; sendConfiguration(5 - Misc.random(20),0 - Misc.random(20)); - c.getPacketSender().sendFrame126(YELLOW, 567); + c.getPacketSender().sendString(YELLOW, 567); c.getPlayerAssistant().addSkillXP(15, 4); c.getItemAssistant().deleteArrow(); //c.getPlayerAction().setAction(false); @@ -95,13 +95,13 @@ public class RangersGuild { } else if (hitChance >= 75) { playerScore += 100; sendConfiguration(0, 0); - c.getPacketSender().sendFrame126(BULLSEYE, 567); + c.getPacketSender().sendString(BULLSEYE, 567); c.getPlayerAssistant().addSkillXP(50, 4); c.getItemAssistant().deleteArrow(); //c.getPlayerAction().setAction(false); //c.getPlayerAction().canWalk(true); } else { - c.getPacketSender().sendFrame126(MISSED, 567); + c.getPacketSender().sendString(MISSED, 567); sendConfiguration(1200, 1200); c.getItemAssistant().deleteArrow(); //c.getPlayerAction().setAction(false); @@ -142,7 +142,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -159,7 +159,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -176,7 +176,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -193,7 +193,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -210,7 +210,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -227,7 +227,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -244,7 +244,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -261,7 +261,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(1200, 1200, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -278,7 +278,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(0, 0, 564); c.getPacketSender().sendFrame70(1200, 1200, 565); c.getPacketSender().sendFrame70(1200, 1200, 566); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; @@ -294,7 +294,7 @@ public class RangersGuild { c.getPacketSender().sendFrame70(0, 0, 563); c.getPacketSender().sendFrame70(0, 0, 564); c.getPacketSender().sendFrame70(0, 0, 565); - c.getPacketSender().sendFrame126("" + playerScore, 551); + c.getPacketSender().sendString("" + playerScore, 551); c.getPacketSender().sendFrame70(xPos, yPos, 536); c.getPacketSender().showInterface(446); break; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Dueling.java b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Dueling.java index 5d0977f8..19c836f6 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Dueling.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Dueling.java @@ -8,6 +8,7 @@ import com.rebotted.game.content.minigames.castlewars.CastleWars; import com.rebotted.game.items.GameItem; import com.rebotted.game.items.ItemData; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.items.impl.RareProtection; import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; @@ -98,8 +99,8 @@ public class Dueling { for (int i = 0; i < player.playerEquipment.length; i++) { sendDuelEquipment(player.playerEquipment[i], player.playerEquipmentN[i], i); } - player.getPacketSender().sendFrame126("Dueling with: " + o.playerName + " (level-" + o.combatLevel + ")", 6671); - player.getPacketSender().sendFrame126("", 6684); + player.getPacketSender().sendString("Dueling with: " + o.playerName + " (level-" + o.combatLevel + ")", 6671); + player.getPacketSender().sendString("", 6684); player.getPacketSender().sendFrame248(6575, 3321); player.getItemAssistant().resetItems(3322); } @@ -198,11 +199,9 @@ public class Dueling { } public boolean stakeItem(int itemID, int fromSlot, int amount) { - - for (int i : GameConstants.ITEM_TRADEABLE) { + for (int i : ItemConstants.ITEM_TRADEABLE) { if (i == itemID || itemID >= 6864 && itemID <= 6882) { - player.getPacketSender().sendMessage( - "You can't stake this item."); + player.getPacketSender().sendMessage("You can't stake that item."); return false; } } @@ -257,8 +256,8 @@ public class Dueling { o.getItemAssistant().resetItems(3322); refreshDuelScreen(); o.getDueling().refreshDuelScreen(); - player.getPacketSender().sendFrame126("", 6684); - o.getPacketSender().sendFrame126("", 6684); + player.getPacketSender().sendString("", 6684); + o.getPacketSender().sendString("", 6684); } if (ItemData.itemStackable[itemID] || ItemData.itemIsNote[itemID]) { boolean found = false; @@ -282,8 +281,8 @@ public class Dueling { o.getItemAssistant().resetItems(3322); refreshDuelScreen(); o.getDueling().refreshDuelScreen(); - player.getPacketSender().sendFrame126("", 6684); - o.getPacketSender().sendFrame126("", 6684); + player.getPacketSender().sendString("", 6684); + o.getPacketSender().sendString("", 6684); return true; } @@ -363,7 +362,7 @@ public class Dueling { o.getItemAssistant().resetItems(3322); player.getDueling().refreshDuelScreen(); o.getDueling().refreshDuelScreen(); - o.getPacketSender().sendFrame126("", 6684); + o.getPacketSender().sendString("", 6684); } } } @@ -392,7 +391,7 @@ public class Dueling { o.getItemAssistant().resetItems(3322); player.getDueling().refreshDuelScreen(); o.getDueling().refreshDuelScreen(); - o.getPacketSender().sendFrame126("", 6684); + o.getPacketSender().sendString("", 6684); if (!goodSpace) { player.getPacketSender().sendMessage( "You have too many rules set to remove that item."); @@ -430,7 +429,7 @@ public class Dueling { itemId += ItemAssistant.getItemName(item.id) + "\\n"; } } - player.getPacketSender().sendFrame126(itemId, 6516); + player.getPacketSender().sendString(itemId, 6516); itemId = ""; for (GameItem item : o.getDueling().stakedItems) { if (ItemData.itemStackable[item.id] || ItemData.itemIsNote[item.id]) { @@ -440,20 +439,20 @@ public class Dueling { itemId += ItemAssistant.getItemName(item.id) + "\\n"; } } - player.getPacketSender().sendFrame126(itemId, 6517); - player.getPacketSender().sendFrame126("", 8242); + player.getPacketSender().sendString(itemId, 6517); + player.getPacketSender().sendString("", 8242); for (int i = 8238; i <= 8253; i++) { - player.getPacketSender().sendFrame126("", i); + player.getPacketSender().sendString("", i); } - player.getPacketSender().sendFrame126("Hitpoints will be restored.", 8250); - player.getPacketSender().sendFrame126("Boosted stats will be restored.", + player.getPacketSender().sendString("Hitpoints will be restored.", 8250); + player.getPacketSender().sendString("Boosted stats will be restored.", 8238); if (player.duelRule[8]) { - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "There will be obstacles in the arena.", 8239); } - player.getPacketSender().sendFrame126("", 8240); - player.getPacketSender().sendFrame126("", 8241); + player.getPacketSender().sendString("", 8240); + player.getPacketSender().sendString("", 8241); String[] rulesOption = { "Players cannot forfeit!", "Players cannot move.", "Players cannot use range.", @@ -464,12 +463,12 @@ public class Dueling { int lineNumber = 8242; for (int i = 0; i < 8; i++) { if (player.duelRule[i]) { - player.getPacketSender().sendFrame126("" + rulesOption[i], + player.getPacketSender().sendString("" + rulesOption[i], lineNumber); lineNumber++; } } - player.getPacketSender().sendFrame126("", 6571); + player.getPacketSender().sendString("", 6571); player.getPacketSender().sendFrame248(6412, 197); // c.getPA().showInterface(6412); } @@ -584,12 +583,12 @@ public class Dueling { public void duelVictory() { Client opponent = (Client) PlayerHandler.players[player.duelingWith]; if (opponent != null) { - player.getPacketSender().sendFrame126("" + opponent.combatLevel, 6839); - player.getPacketSender().sendFrame126(opponent.playerName, 6840); + player.getPacketSender().sendString("" + opponent.combatLevel, 6839); + player.getPacketSender().sendString(opponent.playerName, 6840); opponent.duelStatus = 0; } else { - player.getPacketSender().sendFrame126("", 6839); - player.getPacketSender().sendFrame126("", 6840); + player.getPacketSender().sendString("", 6839); + player.getPacketSender().sendString("", 6840); } PrayerDrain.resetPrayers(player); for (int i = 0; i < 20; i++) { @@ -759,8 +758,8 @@ public class Dueling { } o.duelStatus = 1; player.duelStatus = 1; - o.getPacketSender().sendFrame126("", 6684); - player.getPacketSender().sendFrame126("", 6684); + o.getPacketSender().sendString("", 6684); + player.getPacketSender().sendString("", 6684); } public void selectRule(int i) { // rules diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightPits.java b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightPits.java index a8e9861e..4bdcb58f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightPits.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightPits.java @@ -160,8 +160,8 @@ public class FightPits { * @note Updates waiting room interfaces etc. */ public static boolean updateWaitingRoom(Player c) { - c.getPacketSender().sendFrame126("Next Game Begins In : " + gameStartTimer, 2805); - c.getPacketSender().sendFrame126("Champion: JalYt-Ket-" + pitsChampion, 2806); + c.getPacketSender().sendString("Next Game Begins In : " + gameStartTimer, 2805); + c.getPacketSender().sendString("Champion: JalYt-Ket-" + pitsChampion, 2806); c.getPacketSender().sendConfig(560, 1); c.getPacketSender().walkableInterface(2804); return true; @@ -171,8 +171,8 @@ public class FightPits { * @note Updates players in game interfaces etc. */ public static boolean updateGame(Player c) { - c.getPacketSender().sendFrame126("Foes Remaining: " + getListCount(PLAYING), 2805); - c.getPacketSender().sendFrame126("Champion: JalYt-Ket-" + pitsChampion, 2806); + c.getPacketSender().sendString("Foes Remaining: " + getListCount(PLAYING), 2805); + c.getPacketSender().sendString("Champion: JalYt-Ket-" + pitsChampion, 2806); c.getPacketSender().sendConfig(560, 1); c.getPacketSender().walkableInterface(2804); return true; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/MageArena.java b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/MageArena.java index ed99396e..a7c4e029 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/MageArena.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/MageArena.java @@ -39,14 +39,14 @@ public class MageArena { } for (int i = 15950; i < interfaceText.length; i++) { - c.getPacketSender().sendFrame126(interfaceText[i - 15950], i); + c.getPacketSender().sendString(interfaceText[i - 15950], i); } - c.getPacketSender().sendFrame126(Integer.toString(telePoints), 15955); - c.getPacketSender().sendFrame126(Integer.toString(enchantPoints), + c.getPacketSender().sendString(Integer.toString(telePoints), 15955); + c.getPacketSender().sendString(Integer.toString(enchantPoints), 15956); - c.getPacketSender().sendFrame126(Integer.toString(gravePoints), 15957); - c.getPacketSender().sendFrame126(Integer.toString(alchPoints), 15958); + c.getPacketSender().sendString(Integer.toString(gravePoints), 15957); + c.getPacketSender().sendString(Integer.toString(alchPoints), 15958); c.getPacketSender().showInterface(15944); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWars.java b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWars.java index be02e2a4..835ba365 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWars.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWars.java @@ -67,7 +67,7 @@ public class CastleWars { public static boolean deleteCastleWarsItems(Player c, int itemId) { int[] items = { 4049, 4045, 4053, 4042, 4041, 4037, 4039, 4043 }; for (int item : items) { - int amount = c.getItemAssistant().getItemCount(item); + int amount = c.getItemAssistant().getItemAmount(item); if (itemId == item && !isInCw(c)) { c.getItemAssistant().deleteItem(item, amount); c.getPacketSender().sendMessage("You shouldn't have " + ItemAssistant.getItemName(itemId) + " outside of castlewars!"); @@ -502,9 +502,9 @@ public class CastleWars { while (iterator.hasNext()) { Player player = iterator.next(); if (player != null) { - player.getPacketSender().sendFrame126("Next Game Begins In: " + (gameStartTimer * 3 + timeRemaining * 3) + " seconds.", 6570); - player.getPacketSender().sendFrame126("Zamorak Players: " + getZammyPlayers() + ".", 6572); - player.getPacketSender().sendFrame126("Saradomin Players: " + getSaraPlayers() + ".", 6664); + player.getPacketSender().sendString("Next Game Begins In: " + (gameStartTimer * 3 + timeRemaining * 3) + " seconds.", 6570); + player.getPacketSender().sendString("Zamorak Players: " + getZammyPlayers() + ".", 6572); + player.getPacketSender().sendString("Saradomin Players: " + getSaraPlayers() + ".", 6664); player.getPacketSender().walkableInterface(6673); } } @@ -523,11 +523,11 @@ public class CastleWars { continue; } player.getPacketSender().walkableInterface(11146); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Zamorak = " + scores[1], 11147); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( scores[0] + " = Saradomin", 11148); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( timeRemaining * 3 + " secs", 11155); config = 2097152 * saraFlag; player.getPacketSender().sendFrame87(378, config); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/Trawler.java b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/Trawler.java index 60b39e01..259af7e4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/Trawler.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/Trawler.java @@ -247,9 +247,9 @@ public class Trawler extends GroupMinigame { public void playerUpdates() { for (Player p : players) { if (p != null) { - p.asClient().getPacketSender().sendFrame126(net_ripped ? "@red@Ripped" : "@gre@Okay", 11935); - p.getPacketSender().sendFrame126("" + fish_caught, 11937); - p.getPacketSender().sendFrame126(game_time + " mins", 11938); + p.asClient().getPacketSender().sendString(net_ripped ? "@red@Ripped" : "@gre@Okay", 11935); + p.getPacketSender().sendString("" + fish_caught, 11937); + p.getPacketSender().sendString(game_time + " mins", 11938); p.getPacketSender().sendFrame20(391, water_level); } else { players_to_remove.add(p); @@ -288,7 +288,7 @@ public class Trawler extends GroupMinigame { p.getPacketSender().showInterface(3281); p.getPacketSender().sendFrame20(75, 11); p.getPlayerAssistant().movePlayer(1885, 4825, 1); - p.getPacketSender().sendFrame126("", 11936); + p.getPacketSender().sendString("", 11936); } } CycleEventHandler.getSingleton().addEvent(this, new CycleEvent() { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/music/PlayList.java b/2006Redone Server/src/main/java/com/rebotted/game/content/music/PlayList.java index 5775db81..0e76796a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/music/PlayList.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/music/PlayList.java @@ -150,7 +150,7 @@ public class PlayList { if (Songs.get(songID) == null) { // player.sendMessage("This song has not yet been added to the playlist. - Song ID = "+songID); if (auto) { - player.getPacketSender().sendFrame126("Song Unavailable!", + player.getPacketSender().sendString("Song Unavailable!", 4439); updateList(4439); } @@ -164,12 +164,12 @@ public class PlayList { // names[Songs.get(songID).arraySlot]); unlocked[Songs.get(songID).arraySlot] = true; updateList(Songs.get(songID).childId); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( names[Songs.get(songID).arraySlot], 4439); updateList(4439); } else { if (auto) { - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( names[Songs.get(songID).arraySlot], 4439); updateList(4439); } @@ -216,7 +216,7 @@ public class PlayList { playSong(songId); // System.out.println("sending music to ActionSender packet - song id = "+songId); player.getPacketSender().sendSong(songId); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( names[Songs.get(songId).arraySlot], 4439); updateList(4439); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestAssistant.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestAssistant.java index c559b09d..5cdf7159 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestAssistant.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestAssistant.java @@ -26,111 +26,111 @@ public class QuestAssistant { public static final int MAXIMUM_QUESTPOINTS = 23; public static void sendStages(Player player) { - player.getPacketSender().sendFrame126("QP: " + player.questPoints + " ", 3985); + player.getPacketSender().sendString("QP: " + player.questPoints + " ", 3985); for (Quests quests : Quests.values()) { if (!quests.questStatus() && quests.getStringId() > 0) { - player.getPacketSender().sendFrame126("", quests.getStringId()); + player.getPacketSender().sendString("", quests.getStringId()); } } if (player.pirateTreasure == 0) { - player.getPacketSender().sendFrame126("Pirate's Treasure", 7341); + player.getPacketSender().sendString("Pirate's Treasure", 7341); } else if (player.pirateTreasure == 6) { - player.getPacketSender().sendFrame126("@gre@Pirate's Treasure", 7341); + player.getPacketSender().sendString("@gre@Pirate's Treasure", 7341); } else { - player.getPacketSender().sendFrame126("@yel@Pirate's Treasure", 7341); + player.getPacketSender().sendString("@yel@Pirate's Treasure", 7341); } if (player.witchspot == 0) { - player.getPacketSender().sendFrame126("Witch's Potion", 7348); + player.getPacketSender().sendString("Witch's Potion", 7348); } else if (player.witchspot == 3) { - player.getPacketSender().sendFrame126("@gre@Witch's Potion", 7348); + player.getPacketSender().sendString("@gre@Witch's Potion", 7348); } else { - player.getPacketSender().sendFrame126("@yel@Witch's Potion", 7348); + player.getPacketSender().sendString("@yel@Witch's Potion", 7348); } if (player.romeojuliet == 0) { - player.getPacketSender().sendFrame126("Romeo and Juliet", 7343); + player.getPacketSender().sendString("Romeo and Juliet", 7343); } else if (player.romeojuliet < 9) { - player.getPacketSender().sendFrame126("@yel@Romeo and Juliet", + player.getPacketSender().sendString("@yel@Romeo and Juliet", 7343); } else if (player.romeojuliet >= 9) { - player.getPacketSender().sendFrame126("@gre@Romeo and Juliet", + player.getPacketSender().sendString("@gre@Romeo and Juliet", 7343); } if (player.vampSlayer == 0) { - player.getPacketSender().sendFrame126("Vampyre Slayer", 7347); + player.getPacketSender().sendString("Vampyre Slayer", 7347); } else if (player.vampSlayer == 5) { - player.getPacketSender().sendFrame126("@gre@Vampyre Slayer", 7347); + player.getPacketSender().sendString("@gre@Vampyre Slayer", 7347); } else { - player.getPacketSender().sendFrame126("@yel@Vampyre Slayer", 7347); + player.getPacketSender().sendString("@yel@Vampyre Slayer", 7347); } if (player.doricQuest == 0) { - player.getPacketSender().sendFrame126("Doric's Quest", 7336); + player.getPacketSender().sendString("Doric's Quest", 7336); } else if (player.doricQuest == 3) { - player.getPacketSender().sendFrame126("@gre@Doric's Quest", 7336); + player.getPacketSender().sendString("@gre@Doric's Quest", 7336); } else { - player.getPacketSender().sendFrame126("@yel@Doric's Quest", 7336); + player.getPacketSender().sendString("@yel@Doric's Quest", 7336); } if (player.restGhost == 0) { - player.getPacketSender().sendFrame126("Restless Ghost", 7337); + player.getPacketSender().sendString("Restless Ghost", 7337); } else if (player.restGhost == 5) { - player.getPacketSender().sendFrame126("@gre@Restless Ghost", 7337); + player.getPacketSender().sendString("@gre@Restless Ghost", 7337); } else { - player.getPacketSender().sendFrame126("@yel@Restless Ghost", 7337); + player.getPacketSender().sendString("@yel@Restless Ghost", 7337); } if (player.impsC == 0) { - player.getPacketSender().sendFrame126("Imp Catcher", 7340); + player.getPacketSender().sendString("Imp Catcher", 7340); } else if (player.impsC == 1) { - player.getPacketSender().sendFrame126("@yel@Imp Catcher", 7340); + player.getPacketSender().sendString("@yel@Imp Catcher", 7340); } else if (player.impsC == 2) { - player.getPacketSender().sendFrame126("@gre@Imp Catcher", 7340); + player.getPacketSender().sendString("@gre@Imp Catcher", 7340); } if (player.gertCat == 0) { - player.getPacketSender().sendFrame126("Gertrudes Cat", 7360); + player.getPacketSender().sendString("Gertrudes Cat", 7360); } else if (player.gertCat == 7) { - player.getPacketSender().sendFrame126("@gre@Gertrudes Cat", 7360); + player.getPacketSender().sendString("@gre@Gertrudes Cat", 7360); } else { - player.getPacketSender().sendFrame126("@yel@Gertrudes Cat", 7360); + player.getPacketSender().sendString("@yel@Gertrudes Cat", 7360); } if (player.sheepShear == 0) { - player.getPacketSender().sendFrame126("Sheep Shearer", 7344); + player.getPacketSender().sendString("Sheep Shearer", 7344); } else if (player.sheepShear == 2) { - player.getPacketSender().sendFrame126("@gre@Sheep Shearer", 7344); + player.getPacketSender().sendString("@gre@Sheep Shearer", 7344); } else { - player.getPacketSender().sendFrame126("@yel@Sheep Shearer", 7344); + player.getPacketSender().sendString("@yel@Sheep Shearer", 7344); } if (player.runeMist == 0) { - player.getPacketSender().sendFrame126("Rune Mysteries", 7335); + player.getPacketSender().sendString("Rune Mysteries", 7335); } else if (player.runeMist == 4) { - player.getPacketSender().sendFrame126("@gre@Rune Mysteries", 7335); + player.getPacketSender().sendString("@gre@Rune Mysteries", 7335); } else { - player.getPacketSender().sendFrame126("@yel@Rune Mysteries", 7335); + player.getPacketSender().sendString("@yel@Rune Mysteries", 7335); } if (player.knightS == 0) { - player.getPacketSender().sendFrame126("The Knight's Sword", 7346); + player.getPacketSender().sendString("The Knight's Sword", 7346); } else if (player.knightS < 9) { - player.getPacketSender().sendFrame126("@yel@The Knight's Sword", 7346); + player.getPacketSender().sendString("@yel@The Knight's Sword", 7346); } else if (player.knightS == 9) { - player.getPacketSender().sendFrame126("@gre@The Knight's Sword", 7346); + player.getPacketSender().sendString("@gre@The Knight's Sword", 7346); } if (player.cookAss == 0) { - player.getPacketSender().sendFrame126("Cook's Assistant", 7333); + player.getPacketSender().sendString("Cook's Assistant", 7333); } else if (player.cookAss == 3) { - player.getPacketSender().sendFrame126("@gre@Cook's Assistant", 7333); + player.getPacketSender().sendString("@gre@Cook's Assistant", 7333); } else if (player.cookAss > 0 && player.cookAss < 3) { - player.getPacketSender().sendFrame126("@yel@Cook's Assistant", 7333); + player.getPacketSender().sendString("@yel@Cook's Assistant", 7333); } if (player.blackKnight == 0) { - player.getPacketSender().sendFrame126("Black Knights' Fortress", 7332); + player.getPacketSender().sendString("Black Knights' Fortress", 7332); } else if (player.blackKnight == 3) { - player.getPacketSender().sendFrame126("@gre@Black Knights' Fortress", 7332); + player.getPacketSender().sendString("@gre@Black Knights' Fortress", 7332); } else { - player.getPacketSender().sendFrame126("@yel@Black Knights' Fortress", 7332); + player.getPacketSender().sendString("@yel@Black Knights' Fortress", 7332); } if (player.shieldArrav == 0) { - player.getPacketSender().sendFrame126("Shield of Arrav", 7345); + player.getPacketSender().sendString("Shield of Arrav", 7345); } else if (player.shieldArrav == 8) { - player.getPacketSender().sendFrame126("@gre@Shield of Arrav", 7345); + player.getPacketSender().sendString("@gre@Shield of Arrav", 7345); } else { - player.getPacketSender().sendFrame126("@yel@Shield of Arrav", 7345); + player.getPacketSender().sendString("@yel@Shield of Arrav", 7345); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestRewards.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestRewards.java index 37a3403c..70594f87 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestRewards.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestRewards.java @@ -12,14 +12,14 @@ public class QuestRewards { public static String QUEST_NAME; public static void questReward(Player player, String questName, String Line1, String Line2, String Line3, String Line4, String Line5, String Line6, int itemID) { - player.getPacketSender().sendFrame126("You have completed " + questName + "!", 12144); - player.getPacketSender().sendFrame126("" + player.questPoints, 12147); - player.getPacketSender().sendFrame126(Line1, 12150); - player.getPacketSender().sendFrame126(Line2, 12151); - player.getPacketSender().sendFrame126(Line3, 12152); - player.getPacketSender().sendFrame126(Line4, 12153); - player.getPacketSender().sendFrame126(Line5, 12154); - player.getPacketSender().sendFrame126(Line6, 12155); + player.getPacketSender().sendString("You have completed " + questName + "!", 12144); + player.getPacketSender().sendString("" + player.questPoints, 12147); + player.getPacketSender().sendString(Line1, 12150); + player.getPacketSender().sendString(Line2, 12151); + player.getPacketSender().sendString(Line3, 12152); + player.getPacketSender().sendString(Line4, 12153); + player.getPacketSender().sendString(Line5, 12154); + player.getPacketSender().sendString(Line6, 12155); if (itemID > 0) { player.getPacketSender().sendFrame246(12145, 250, itemID); } @@ -32,7 +32,7 @@ public class QuestRewards { public static void knightsReward(Player player) { questReward(player, "Knight's Sword Quest", "1 Quest Point", "12,725 Smithing XP", "", "", "", "", 0); QUEST_NAME = "The Knight's Sword"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7346); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7346); player.getPlayerAssistant().addSkillXP(12725, player.playerSmithing); player.questPoints ++; player.knightS = 9; @@ -41,7 +41,7 @@ public class QuestRewards { public static void gertFinish(Player player) { questReward(player, "Gertrude's Cat", "1 Quest Point", "1,525 Cooking XP", "A kitten!", "Ability to raise cats", "A chocolate cake", "A bowl of stew", 1897); QUEST_NAME = "Gertrude's Cat"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7360); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7360); player.getItemAssistant().addItem(1897, 1); player.getItemAssistant().addItem(2003, 1); player.getItemAssistant().addItem(1560, 1); @@ -53,7 +53,7 @@ public class QuestRewards { public static void pirateFinish(Player c) { questReward(c, "Pirate's Treasure", "2 Quest Points", "One-Eyed Hector's Treasure", "", "", "", "", 2714); QUEST_NAME = "Pirate's Treasure"; - c.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7341); + c.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7341); c.getItemAssistant().addItem(2714, 1); c.questPoints += 2; c.pirateTreasure = 6; @@ -62,7 +62,7 @@ public class QuestRewards { public static void witchFinish(Player client) { questReward(client, "Witch's Potion", "1 Quest Point", "325 Magic XP", "", "", "", "", 325); QUEST_NAME = "Witch's Potion"; - client.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7348); + client.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7348); client.getPlayerAssistant().addSkillXP(325, client.playerMagic); client.questPoints++; client.witchspot = 3; @@ -71,7 +71,7 @@ public class QuestRewards { public static void julietFinish(Player player) { questReward(player, "Romeo and Juliet", "5 Quest Points", "", "", "", "", "", 0); QUEST_NAME = "Romeo and Juliet"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7343); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7343); player.questPoints += 5; player.romeojuliet = 9; } @@ -79,7 +79,7 @@ public class QuestRewards { public static void restFinish(Player client) { questReward(client, "Restless Ghost", "1 Quest Point", "125 Prayer XP", "", "", "", "", 0); QUEST_NAME = "Restless Ghost"; - client.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7337); + client.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7337); client.getPlayerAssistant().addSkillXP(125, client.playerPrayer); client.questPoints++; client.restGhost = 5; @@ -88,7 +88,7 @@ public class QuestRewards { public static void vampFinish(Player player) { questReward(player, "Vampyre Slayer", "3 Quest Points", "4,825 Attack XP", "", "", "", "", 0); QUEST_NAME = "Vampyre Slayer"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7347); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7347); player.getPlayerAssistant().addSkillXP(4825, player.playerAttack); player.questPoints += 3; player.vampSlayer = 5; @@ -97,7 +97,7 @@ public class QuestRewards { public static void runeFinish(Player player) { questReward(player, "Rune Mysteries", "1 Quest Point", "Air Talisman", "", "", "", "", 1438); QUEST_NAME = "Rune Mysteries"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7335); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7335); player.getItemAssistant().addItem(1438, 1); player.questPoints++; player.runeMist = 4; @@ -106,7 +106,7 @@ public class QuestRewards { public static void sheepFinish(Player player) { questReward(player, "Sheep Shearer", "1 Quest Point", "150 Crafting Exp", "60 Coins", "", "", "", 995); QUEST_NAME = "Sheep Shearer"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7344); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7344); player.getItemAssistant().addItem(995, 60); player.getPlayerAssistant().addSkillXP(150, player.playerCrafting); player.questPoints++; @@ -116,7 +116,7 @@ public class QuestRewards { public static void doricFinish(Player player) { questReward(player, "Doric's Quest", "1 Quest Point", "1,300 Mining XP", "180 Coins", "", "", "", 995); QUEST_NAME = "Doric's Quest"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7336); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7336); player.getItemAssistant().addItem(995, 180); player.getPlayerAssistant().addSkillXP(1300, player.playerMining); player.questPoints++; @@ -126,7 +126,7 @@ public class QuestRewards { public static void impFinish(Player player) { questReward(player, "Imp Catcher", "1 Quest Point", "875 Magic XP", "Amulet of Accuracy", "", "", "", 1478); QUEST_NAME = "Imp Catcher"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7340); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7340); player.getItemAssistant().addItem(1478, 1); player.getPlayerAssistant().addSkillXP(875, player.playerMagic); player.questPoints++; @@ -136,7 +136,7 @@ public class QuestRewards { public static void cookReward(Player player) { questReward(player, "Cook's Assistant", "1 Quest Point", "500 Coins", "300 Cooking XP", "", "", "", 326); QUEST_NAME = "Cook's Assistant"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7333); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7333); player.getItemAssistant().addItem(995, 500); player.getPlayerAssistant().addSkillXP(300, player.playerCooking); player.questPoints++; @@ -146,7 +146,7 @@ public class QuestRewards { public static void blackKnightReward(Player player) { questReward(player, "Black Knights' Fortress", "3 Quest Points", "2,500 Coins", "", "", "", "", 0); QUEST_NAME = "Black Knights' Fortress"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7332); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7332); player.getItemAssistant().addItem(995, 2500); player.questPoints += 3; player.blackKnight = 3; @@ -155,7 +155,7 @@ public class QuestRewards { public static void shieldArravReward(Player player) { questReward(player, "Shield of Arrav", "1 Quest Point", "1,200 Coins", "", "", "", "", 767); QUEST_NAME = "Shield of Arrav"; - player.getPacketSender().sendFrame126("@gre@" + QUEST_NAME + "", 7345); + player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7345); player.getItemAssistant().addItem(995, 1200); player.questPoints++; player.shieldArrav = 8; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java index 188d9341..a20481ab 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java @@ -6,37 +6,37 @@ public class BlackKnightsFortress { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("Black Knights' Fortress", 8144); + client.getPacketSender().sendString("Black Knights' Fortress", 8144); if (client.blackKnight == 0) { - client.getPacketSender().sendFrame126("I can start this quest by speaking to Sir Amik Varze in", 8147); - client.getPacketSender().sendFrame126("Falador Castle.", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126("Quest Requirements:", 8150); - client.getPacketSender().sendFrame126("12 Quest Points", 8151); + client.getPacketSender().sendString("I can start this quest by speaking to Sir Amik Varze in", 8147); + client.getPacketSender().sendString("Falador Castle.", 8148); + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString("Quest Requirements:", 8150); + client.getPacketSender().sendString("12 Quest Points", 8151); } else if (client.blackKnight == 1) { - client.getPacketSender().sendFrame126("@str@I've talked with Sir Amik Varze", 8147); - client.getPacketSender().sendFrame126("He wants me to kill 30 Black Knights and", 8148); - client.getPacketSender().sendFrame126("collect their notes.", 8149); - client.getPacketSender().sendFrame126("", 8150); - client.getPacketSender().sendFrame126("@red@30 Black Knight notes", 8151); + client.getPacketSender().sendString("@str@I've talked with Sir Amik Varze", 8147); + client.getPacketSender().sendString("He wants me to kill 30 Black Knights and", 8148); + client.getPacketSender().sendString("collect their notes.", 8149); + client.getPacketSender().sendString("", 8150); + client.getPacketSender().sendString("@red@30 Black Knight notes", 8151); } else if (client.blackKnight == 2) { - client.getPacketSender().sendFrame126("@str@I talked to Sir Amik Varze.", 8147); - client.getPacketSender().sendFrame126("@str@I've killed 30 Black Knights", 8148); - client.getPacketSender().sendFrame126("@str@and given Sir Amik Varze his items.", 8149); - client.getPacketSender().sendFrame126("I should go speak to Sir Amik Varze.", 8150); + client.getPacketSender().sendString("@str@I talked to Sir Amik Varze.", 8147); + client.getPacketSender().sendString("@str@I've killed 30 Black Knights", 8148); + client.getPacketSender().sendString("@str@and given Sir Amik Varze his items.", 8149); + client.getPacketSender().sendString("I should go speak to Sir Amik Varze.", 8150); } else if (client.blackKnight == 3) { - client.getPacketSender().sendFrame126("@str@I talked to Sir Amik Varze.", 8147); - client.getPacketSender().sendFrame126("@str@I've killed 30 Black Knights", 8148); - client.getPacketSender().sendFrame126("@str@and given Sir Amik Varze his items.", 8149); - client.getPacketSender().sendFrame126("", 8150); - client.getPacketSender().sendFrame126("@red@QUEST COMPLETE", 8151); - client.getPacketSender().sendFrame126("", 8152); - client.getPacketSender().sendFrame126("REWARDS:", 8153); - client.getPacketSender().sendFrame126("2,500 coins", 8154); - client.getPacketSender().sendFrame126("3 Quest Points", 8155); + client.getPacketSender().sendString("@str@I talked to Sir Amik Varze.", 8147); + client.getPacketSender().sendString("@str@I've killed 30 Black Knights", 8148); + client.getPacketSender().sendString("@str@and given Sir Amik Varze his items.", 8149); + client.getPacketSender().sendString("", 8150); + client.getPacketSender().sendString("@red@QUEST COMPLETE", 8151); + client.getPacketSender().sendString("", 8152); + client.getPacketSender().sendString("REWARDS:", 8153); + client.getPacketSender().sendString("2,500 coins", 8154); + client.getPacketSender().sendString("3 Quest Points", 8155); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/CooksAssistant.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/CooksAssistant.java index b476cbb3..ab063ee2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/CooksAssistant.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/CooksAssistant.java @@ -15,46 +15,46 @@ public class CooksAssistant { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Cook's Assistant", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Cook's Assistant", 8144); + client.getPacketSender().sendString("", 8145); if (client.cookAss == 0) { - client.getPacketSender().sendFrame126("Cook's Assistant", 8144); - client.getPacketSender().sendFrame126("I can start this quest by speaking to the Cook in the", 8147); - client.getPacketSender().sendFrame126("Lumbridge Castle kitchen.", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126("There are no minimum requirements.", 8150); + client.getPacketSender().sendString("Cook's Assistant", 8144); + client.getPacketSender().sendString("I can start this quest by speaking to the Cook in the", 8147); + client.getPacketSender().sendString("Lumbridge Castle kitchen.", 8148); + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString("There are no minimum requirements.", 8150); } else if (client.cookAss == 1) { - client.getPacketSender().sendFrame126("Cook's Assistant", 8144); - client.getPacketSender().sendFrame126("@str@I've talked to the cook.", 8147); - client.getPacketSender().sendFrame126("He wants me to gather the following materials:", 8148); + client.getPacketSender().sendString("Cook's Assistant", 8144); + client.getPacketSender().sendString("@str@I've talked to the cook.", 8147); + client.getPacketSender().sendString("He wants me to gather the following materials:", 8148); if (client.getItemAssistant().playerHasItem(EGG, 1)) { - client.getPacketSender().sendFrame126("@str@1 egg", 8149); + client.getPacketSender().sendString("@str@1 egg", 8149); } else { - client.getPacketSender().sendFrame126("@red@1 egg", 8149); + client.getPacketSender().sendString("@red@1 egg", 8149); } if (client.getItemAssistant().playerHasItem(MILK, 1)) { - client.getPacketSender().sendFrame126("@str@1 bucket of milk", 8150); + client.getPacketSender().sendString("@str@1 bucket of milk", 8150); } else { - client.getPacketSender().sendFrame126("@red@1 bucket of milk", 8150); + client.getPacketSender().sendString("@red@1 bucket of milk", 8150); } if (client.getItemAssistant().playerHasItem(FLOUR, 1)) { - client.getPacketSender().sendFrame126("@str@1 heap of flour", 8151); + client.getPacketSender().sendString("@str@1 heap of flour", 8151); } else { - client.getPacketSender().sendFrame126("@red@1 pot of flour", 8151); + client.getPacketSender().sendString("@red@1 pot of flour", 8151); } } else if (client.cookAss == 2) { - client.getPacketSender().sendFrame126("Cook's Assistant", 8144); - client.getPacketSender().sendFrame126("@str@I talked to the cook.", 8147); - client.getPacketSender().sendFrame126("@str@I gave the cook his items.", 8148); - client.getPacketSender().sendFrame126("I should go speak to the cook.", 8149); + client.getPacketSender().sendString("Cook's Assistant", 8144); + client.getPacketSender().sendString("@str@I talked to the cook.", 8147); + client.getPacketSender().sendString("@str@I gave the cook his items.", 8148); + client.getPacketSender().sendString("I should go speak to the cook.", 8149); } else if (client.cookAss == 3) { - client.getPacketSender().sendFrame126("Cook's Assistant", 8144); - client.getPacketSender().sendFrame126("@str@I talked to the cook.", 8147); - client.getPacketSender().sendFrame126("@str@I gave him his items.", 8148); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", 8150); - client.getPacketSender().sendFrame126("As a reward, I gained 150 Cooking Experience.", 8151); + client.getPacketSender().sendString("Cook's Assistant", 8144); + client.getPacketSender().sendString("@str@I talked to the cook.", 8147); + client.getPacketSender().sendString("@str@I gave him his items.", 8148); + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8150); + client.getPacketSender().sendString("As a reward, I gained 150 Cooking Experience.", 8151); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/DoricsQuest.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/DoricsQuest.java index 5bd7514c..b316f53f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/DoricsQuest.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/DoricsQuest.java @@ -11,60 +11,60 @@ public class DoricsQuest { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Dorics Quest", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Dorics Quest", 8144); + client.getPacketSender().sendString("", 8145); if (client.doricQuest == 0) { - client.getPacketSender().sendFrame126("Dorics Quest", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Dorics Quest", 8144); + client.getPacketSender().sendString( "I can start this quest by speaking to doric", 8147); - client.getPacketSender().sendFrame126("Northwest of falador.", + client.getPacketSender().sendString("Northwest of falador.", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString( "Recommended Levels: 15 Mining", 8150); } else if (client.doricQuest == 1) { - client.getPacketSender().sendFrame126("Dorics Quest", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Dorics Quest", 8144); + client.getPacketSender().sendString( "@str@I've talked to the doric.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "He wants me to gather the following materials:", 8148); if (client.getItemAssistant().playerHasItem(434, 6)) { - client.getPacketSender().sendFrame126("@str@6 Clay", 8149); + client.getPacketSender().sendString("@str@6 Clay", 8149); } else { - client.getPacketSender().sendFrame126("@red@6 Clay", 8149); + client.getPacketSender().sendString("@red@6 Clay", 8149); } if (client.getItemAssistant().playerHasItem(436, 4)) { - client.getPacketSender().sendFrame126("@str@4 Copper", 8150); + client.getPacketSender().sendString("@str@4 Copper", 8150); } else { - client.getPacketSender().sendFrame126("@red@4 Copper", 8150); + client.getPacketSender().sendString("@red@4 Copper", 8150); } if (client.getItemAssistant().playerHasItem(440, 2)) { - client.getPacketSender().sendFrame126("@str@2 Iron ore", 8151); + client.getPacketSender().sendString("@str@2 Iron ore", 8151); } else { - client.getPacketSender().sendFrame126("@red@2 Iron ore", 8151); + client.getPacketSender().sendString("@red@2 Iron ore", 8151); } } else if (client.doricQuest == 2) { - client.getPacketSender().sendFrame126("Dorics Quest", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Dorics Quest", 8144); + client.getPacketSender().sendString( "@str@I talked to the doric.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I gave the doric his items.", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should go speak to the doric.", 8149); } else if (client.doricQuest == 3) { - client.getPacketSender().sendFrame126("Dorics Quest", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Dorics Quest", 8144); + client.getPacketSender().sendString( "@str@I talked to the doric.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I gave him his items.", 8148); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8150); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "As a reward, I gained 26000 Mining Exp", 8151); - client.getPacketSender().sendFrame126("180 Coins", 8152); - client.getPacketSender().sendFrame126("And 1 Quest Point.", 8152); + client.getPacketSender().sendString("180 Coins", 8152); + client.getPacketSender().sendString("And 1 Quest Point.", 8152); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/GertrudesCat.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/GertrudesCat.java index 6f723d13..3768ca8b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/GertrudesCat.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/GertrudesCat.java @@ -11,80 +11,80 @@ public class GertrudesCat { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Gertrudes Cat", 8144); + client.getPacketSender().sendString("", 8145); if (client.gertCat == 0) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString( "I can start this quest by speaking to Gertrude in", 8147); - client.getPacketSender().sendFrame126("Varrock.", 8148); - client.getPacketSender().sendFrame126("Minimum Requirments:", 8149); - client.getPacketSender().sendFrame126("5 Fishing.", 8150); + client.getPacketSender().sendString("Varrock.", 8148); + client.getPacketSender().sendString("Minimum Requirments:", 8149); + client.getPacketSender().sendString("5 Fishing.", 8150); } else if (client.gertCat == 1) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString( "@str@I've talked to Gertrude", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should speak to Wilough and Shilop.", 8148); - client.getPacketSender().sendFrame126("They are in the varrock square.", 8149); + client.getPacketSender().sendString("They are in the varrock square.", 8149); } else if (client.gertCat == 2) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString( "@str@I've talked to Wilough and Shilop", 8147); - client.getPacketSender().sendFrame126("@str@I gave them 100 coins", + client.getPacketSender().sendString("@str@I gave them 100 coins", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should try to find Gertrudes Cat.", 8149); } else if (client.gertCat == 3) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString( "@str@I've talked to the Gertrudes Cat", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@She seemed mad so I gave her", 8148); - client.getPacketSender().sendFrame126("@str@a bucket of milk", + client.getPacketSender().sendString("@str@a bucket of milk", 8149); - client.getPacketSender().sendFrame126("The cat still seems mad you should give her some,", 8150); - client.getPacketSender().sendFrame126("seasoned salmon.", 8151); + client.getPacketSender().sendString("The cat still seems mad you should give her some,", 8150); + client.getPacketSender().sendString("seasoned salmon.", 8151); } else if (client.gertCat == 4) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126("@str@The cat is still mad", + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString("@str@The cat is still mad", 8147); - client.getPacketSender().sendFrame126("@str@So i gave her some", + client.getPacketSender().sendString("@str@So i gave her some", 8148); - client.getPacketSender().sendFrame126("@str@seasoned samon.", 8149); - client.getPacketSender().sendFrame126("I should talk to Gertrudes cat to see how she feels.", 8150); + client.getPacketSender().sendString("@str@seasoned samon.", 8149); + client.getPacketSender().sendString("I should talk to Gertrudes cat to see how she feels.", 8150); } else if (client.gertCat == 5) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString( "@str@The cat seems to be mad", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@because she can't find her kittens.", 8148); - client.getPacketSender().sendFrame126("I should go in the lumberyard and", 8149); - client.getPacketSender().sendFrame126("check it out.", 8150); + client.getPacketSender().sendString("I should go in the lumberyard and", 8149); + client.getPacketSender().sendString("check it out.", 8150); } else if (client.gertCat == 6) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126("@str@I gave gertrudes cat", + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString("@str@I gave gertrudes cat", 8147); - client.getPacketSender().sendFrame126("@str@her kittens", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("@str@her kittens", 8148); + client.getPacketSender().sendString( "@str@and she now seems happy.", 8149); - client.getPacketSender().sendFrame126("I should head back to Gertrude.", 8150); + client.getPacketSender().sendString("I should head back to Gertrude.", 8150); } else if (client.gertCat == 7) { - client.getPacketSender().sendFrame126("Gertrudes Cat", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Gertrudes Cat", 8144); + client.getPacketSender().sendString( "@str@I helped gertrude with her", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@Cat so she awarded me.", 8148); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "As a reward, I gained 1525 Cooking exp.", 8150); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "A kitten! And the ability to raise cats.", 8150); - client.getPacketSender().sendFrame126("And 1 Quest Point", 8151); - client.getPacketSender().sendFrame126("", 8152); + client.getPacketSender().sendString("And 1 Quest Point", 8151); + client.getPacketSender().sendString("", 8152); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ImpCatcher.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ImpCatcher.java index a70c5d9c..b464fc1a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ImpCatcher.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ImpCatcher.java @@ -12,33 +12,33 @@ public class ImpCatcher { public static void showInformation(Player client) { for (int i = 8144; i < 8295; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Imp Catcher", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Imp Catcher", 8144); + client.getPacketSender().sendString("", 8145); if (client.impsC == 0) { - client.getPacketSender().sendFrame126( "I can start this quest by speaking to Wizard Mizgog who is", 8147); - client.getPacketSender().sendFrame126("in the Wizard's Tower.", 8148); + client.getPacketSender().sendString( "I can start this quest by speaking to Wizard Mizgog who is", 8147); + client.getPacketSender().sendString("in the Wizard's Tower.", 8148); } else if (client.impsC == 1) { - client.getPacketSender().sendFrame126("@str@I can start this quest by speaking to Wizard Mizgog who is", 8147); - client.getPacketSender().sendFrame126("@str@in the Wizard's Tower.", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126("Wizard Mizgog have asked you to get the following items:", 8150); - client.getPacketSender().sendFrame126("Red bead", 8151); - client.getPacketSender().sendFrame126("Yellow bead", 8152); - client.getPacketSender().sendFrame126("Black bead", 8153); - client.getPacketSender().sendFrame126("White bead", 8154); + client.getPacketSender().sendString("@str@I can start this quest by speaking to Wizard Mizgog who is", 8147); + client.getPacketSender().sendString("@str@in the Wizard's Tower.", 8148); + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString("Wizard Mizgog have asked you to get the following items:", 8150); + client.getPacketSender().sendString("Red bead", 8151); + client.getPacketSender().sendString("Yellow bead", 8152); + client.getPacketSender().sendString("Black bead", 8153); + client.getPacketSender().sendString("White bead", 8154); } else if (client.impsC == 2) { - client.getPacketSender().sendFrame126("@str@I can start this quest by speaking to Wizard Mizgog who is", 8147); - client.getPacketSender().sendFrame126("@str@in the Wizard's Tower.", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126("@str@Wizard Mizgog have asked you to get the following items:", 8150); - client.getPacketSender().sendFrame126("@str@Red bead", 8151); - client.getPacketSender().sendFrame126("@str@Yellow bead", 8152); - client.getPacketSender().sendFrame126("@str@Black bead", 8153); - client.getPacketSender().sendFrame126("@str@White bead", 8154); - client.getPacketSender().sendFrame126("", 8155); - client.getPacketSender().sendFrame126("You have completed this quest!", 8156); + client.getPacketSender().sendString("@str@I can start this quest by speaking to Wizard Mizgog who is", 8147); + client.getPacketSender().sendString("@str@in the Wizard's Tower.", 8148); + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString("@str@Wizard Mizgog have asked you to get the following items:", 8150); + client.getPacketSender().sendString("@str@Red bead", 8151); + client.getPacketSender().sendString("@str@Yellow bead", 8152); + client.getPacketSender().sendString("@str@Black bead", 8153); + client.getPacketSender().sendString("@str@White bead", 8154); + client.getPacketSender().sendString("", 8155); + client.getPacketSender().sendString("You have completed this quest!", 8156); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/KnightsSword.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/KnightsSword.java index 5e2ddf31..185598ac 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/KnightsSword.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/KnightsSword.java @@ -6,186 +6,186 @@ public class KnightsSword { public static void showInformation(Player player) { for(int i = 8144; i < 8195; i++) { - player.getPacketSender().sendFrame126("", i); + player.getPacketSender().sendString("", i); } - player.getPacketSender().sendFrame126("@dre@The Knight's Sword", 8144); - player.getPacketSender().sendFrame126("", 8145); + player.getPacketSender().sendString("@dre@The Knight's Sword", 8144); + player.getPacketSender().sendString("", 8145); if(player.knightS == 0) { - player.getPacketSender().sendFrame126("I can start this quest by speaking to the squire", 8147); - player.getPacketSender().sendFrame126("who is in the courtyard of the White Knight's castle", 8148); - player.getPacketSender().sendFrame126("", 8149); - player.getPacketSender().sendFrame126("I will need at least 10 mining to complete this quest", 8150); + player.getPacketSender().sendString("I can start this quest by speaking to the squire", 8147); + player.getPacketSender().sendString("who is in the courtyard of the White Knight's castle", 8148); + player.getPacketSender().sendString("", 8149); + player.getPacketSender().sendString("I will need at least 10 mining to complete this quest", 8150); } else if(player.knightS == 1) { - player.getPacketSender().sendFrame126("The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("to find a replacement. He suggested that I start", 8148); - player.getPacketSender().sendFrame126("by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("to find a replacement. He suggested that I start", 8148); + player.getPacketSender().sendString("by speaking to Reldo, the librarian in the Varrock Castle", 8149); } else if (player.knightS == 2) { - player.getPacketSender().sendFrame126("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("@str@to find a replacement. He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("Red Berry Pie to get him to be willing to talk to me", 8153); + player.getPacketSender().sendString("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("@str@to find a replacement. He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("Red Berry Pie to get him to be willing to talk to me", 8153); } else if(player.knightS == 3) { - player.getPacketSender().sendFrame126("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("@str@to find a replacement. He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("@str@Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("@str@Red Berry Pie to get him to be willing to talk to me", 8153); - player.getPacketSender().sendFrame126("", 8154); - player.getPacketSender().sendFrame126("I found the Imcando dwarf named Thurgo and gave him some", 8155); - player.getPacketSender().sendFrame126("Red berry pie. Now that he likes me I should talk to him", 8156); - player.getPacketSender().sendFrame126("and find out if he'll make the sword for me.", 8157); + player.getPacketSender().sendString("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("@str@to find a replacement. He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("@str@Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("@str@Red Berry Pie to get him to be willing to talk to me", 8153); + player.getPacketSender().sendString("", 8154); + player.getPacketSender().sendString("I found the Imcando dwarf named Thurgo and gave him some", 8155); + player.getPacketSender().sendString("Red berry pie. Now that he likes me I should talk to him", 8156); + player.getPacketSender().sendString("and find out if he'll make the sword for me.", 8157); } else if(player.knightS == 4) { - player.getPacketSender().sendFrame126("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("@str@to find a replacement. He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("@str@Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("@str@Red Berry Pie to get him to be willing to talk to me", 8153); - player.getPacketSender().sendFrame126("", 8154); - player.getPacketSender().sendFrame126("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); - player.getPacketSender().sendFrame126("@str@Red berry pie. Now that he likes me I should talk to him", 8156); - player.getPacketSender().sendFrame126("@str@and find out if he'll make the sword for me.", 8157); - player.getPacketSender().sendFrame126("", 8158); - player.getPacketSender().sendFrame126("Thurgo says he needs a picture of the sword.", 8159); - player.getPacketSender().sendFrame126("Maybe the squire will have one?", 8160); - player.getPacketSender().sendFrame126("", 8161); + player.getPacketSender().sendString("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("@str@to find a replacement. He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("@str@Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("@str@Red Berry Pie to get him to be willing to talk to me", 8153); + player.getPacketSender().sendString("", 8154); + player.getPacketSender().sendString("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); + player.getPacketSender().sendString("@str@Red berry pie. Now that he likes me I should talk to him", 8156); + player.getPacketSender().sendString("@str@and find out if he'll make the sword for me.", 8157); + player.getPacketSender().sendString("", 8158); + player.getPacketSender().sendString("Thurgo says he needs a picture of the sword.", 8159); + player.getPacketSender().sendString("Maybe the squire will have one?", 8160); + player.getPacketSender().sendString("", 8161); } else if(player.knightS == 5) { - player.getPacketSender().sendFrame126("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("@str@to find a replacement. He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("@str@Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); - player.getPacketSender().sendFrame126("", 8154); - player.getPacketSender().sendFrame126("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); - player.getPacketSender().sendFrame126("@str@Red berry pie. Now that he likes me I should talk to him", 8156); - player.getPacketSender().sendFrame126("@str@and find out if he'll make the sword for me.", 8157); - player.getPacketSender().sendFrame126("", 8158); - player.getPacketSender().sendFrame126("Thurgo says he needs a picture of the sword.", 8159); - player.getPacketSender().sendFrame126("@str@Maybe the squire will have one?", 8160); - player.getPacketSender().sendFrame126("", 8161); - player.getPacketSender().sendFrame126("The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); - player.getPacketSender().sendFrame126("a cupboard in his room, but I must be very careful not to", 8163); - player.getPacketSender().sendFrame126("get caught.", 8164); - player.getPacketSender().sendFrame126("", 8165); - player.getPacketSender().sendFrame126("", 8166); - player.getPacketSender().sendFrame126("", 8167); - player.getPacketSender().sendFrame126("", 8168); - player.getPacketSender().sendFrame126("", 8169); + player.getPacketSender().sendString("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("@str@to find a replacement. He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("@str@Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); + player.getPacketSender().sendString("", 8154); + player.getPacketSender().sendString("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); + player.getPacketSender().sendString("@str@Red berry pie. Now that he likes me I should talk to him", 8156); + player.getPacketSender().sendString("@str@and find out if he'll make the sword for me.", 8157); + player.getPacketSender().sendString("", 8158); + player.getPacketSender().sendString("Thurgo says he needs a picture of the sword.", 8159); + player.getPacketSender().sendString("@str@Maybe the squire will have one?", 8160); + player.getPacketSender().sendString("", 8161); + player.getPacketSender().sendString("The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); + player.getPacketSender().sendString("a cupboard in his room, but I must be very careful not to", 8163); + player.getPacketSender().sendString("get caught.", 8164); + player.getPacketSender().sendString("", 8165); + player.getPacketSender().sendString("", 8166); + player.getPacketSender().sendString("", 8167); + player.getPacketSender().sendString("", 8168); + player.getPacketSender().sendString("", 8169); } else if(player.knightS == 6) { - player.getPacketSender().sendFrame126("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("@str@to find a replacement. He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("@str@Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); - player.getPacketSender().sendFrame126("", 8154); - player.getPacketSender().sendFrame126("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); - player.getPacketSender().sendFrame126("@str@Red berry pie. Now that he likes me I should talk to him", 8156); - player.getPacketSender().sendFrame126("@str@and find out if he'll make the sword for me.", 8157); - player.getPacketSender().sendFrame126("", 8158); - player.getPacketSender().sendFrame126("Thurgo says he needs a picture of the sword.", 8159); - player.getPacketSender().sendFrame126("@str@Maybe the squire will have one?", 8160); - player.getPacketSender().sendFrame126("", 8161); - player.getPacketSender().sendFrame126("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); - player.getPacketSender().sendFrame126("@str@a cupboard in his room, but I must be very careful not to", 8163); - player.getPacketSender().sendFrame126("@str@get caught.", 8164); - player.getPacketSender().sendFrame126("I should bring the picture to Thurgo", 8165); - player.getPacketSender().sendFrame126("", 8166); - player.getPacketSender().sendFrame126("", 8167); - player.getPacketSender().sendFrame126("", 8168); - player.getPacketSender().sendFrame126("", 8169); + player.getPacketSender().sendString("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("@str@to find a replacement. He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("@str@Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); + player.getPacketSender().sendString("", 8154); + player.getPacketSender().sendString("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); + player.getPacketSender().sendString("@str@Red berry pie. Now that he likes me I should talk to him", 8156); + player.getPacketSender().sendString("@str@and find out if he'll make the sword for me.", 8157); + player.getPacketSender().sendString("", 8158); + player.getPacketSender().sendString("Thurgo says he needs a picture of the sword.", 8159); + player.getPacketSender().sendString("@str@Maybe the squire will have one?", 8160); + player.getPacketSender().sendString("", 8161); + player.getPacketSender().sendString("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); + player.getPacketSender().sendString("@str@a cupboard in his room, but I must be very careful not to", 8163); + player.getPacketSender().sendString("@str@get caught.", 8164); + player.getPacketSender().sendString("I should bring the picture to Thurgo", 8165); + player.getPacketSender().sendString("", 8166); + player.getPacketSender().sendString("", 8167); + player.getPacketSender().sendString("", 8168); + player.getPacketSender().sendString("", 8169); } else if(player.knightS == 7) { - player.getPacketSender().sendFrame126("The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("to find a replacement.@str@ He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("@str@Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); - player.getPacketSender().sendFrame126("", 8154); - player.getPacketSender().sendFrame126("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); - player.getPacketSender().sendFrame126("@str@Red berry Pie. Now that he likes me I should talk to him", 8156); - player.getPacketSender().sendFrame126("@str@and find out if he'll make the sword for me.", 8157); - player.getPacketSender().sendFrame126("", 8158); - player.getPacketSender().sendFrame126("@str@Thurgo says he needs a picture of the sword.", 8159); - player.getPacketSender().sendFrame126("@str@Maybe the squire will have one?", 8160); - player.getPacketSender().sendFrame126("", 8161); - player.getPacketSender().sendFrame126("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); - player.getPacketSender().sendFrame126("@str@cupboard in his room, but I must be very careful not to", 8163); - player.getPacketSender().sendFrame126("@str@get caught.", 8164); - player.getPacketSender().sendFrame126("@str@I should bring the picture to Thurgo", 8165); - player.getPacketSender().sendFrame126("", 8166); - player.getPacketSender().sendFrame126("Thurgo has asked me to bring him 2 iron bars and 1 blurite", 8167); - player.getPacketSender().sendFrame126("ore for him to make the sword with. He says blurite can be", 8168); - player.getPacketSender().sendFrame126("mined in the cave by his home, but it is guarded by", 8169); - player.getPacketSender().sendFrame126("dangerous monsters. So I should be very careful.", 8170); + player.getPacketSender().sendString("The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("to find a replacement.@str@ He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("@str@Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); + player.getPacketSender().sendString("", 8154); + player.getPacketSender().sendString("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); + player.getPacketSender().sendString("@str@Red berry Pie. Now that he likes me I should talk to him", 8156); + player.getPacketSender().sendString("@str@and find out if he'll make the sword for me.", 8157); + player.getPacketSender().sendString("", 8158); + player.getPacketSender().sendString("@str@Thurgo says he needs a picture of the sword.", 8159); + player.getPacketSender().sendString("@str@Maybe the squire will have one?", 8160); + player.getPacketSender().sendString("", 8161); + player.getPacketSender().sendString("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); + player.getPacketSender().sendString("@str@cupboard in his room, but I must be very careful not to", 8163); + player.getPacketSender().sendString("@str@get caught.", 8164); + player.getPacketSender().sendString("@str@I should bring the picture to Thurgo", 8165); + player.getPacketSender().sendString("", 8166); + player.getPacketSender().sendString("Thurgo has asked me to bring him 2 iron bars and 1 blurite", 8167); + player.getPacketSender().sendString("ore for him to make the sword with. He says blurite can be", 8168); + player.getPacketSender().sendString("mined in the cave by his home, but it is guarded by", 8169); + player.getPacketSender().sendString("dangerous monsters. So I should be very careful.", 8170); } else if(player.knightS == 8) { - player.getPacketSender().sendFrame126("The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("to find a replacement.@str@ He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("@str@Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); - player.getPacketSender().sendFrame126("", 8154); - player.getPacketSender().sendFrame126("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); - player.getPacketSender().sendFrame126("@str@Red berry pie. Now that he likes me I should talk to him", 8156); - player.getPacketSender().sendFrame126("@str@and find out if he'll make the sword for me.", 8157); - player.getPacketSender().sendFrame126("", 8158); - player.getPacketSender().sendFrame126("@str@Thurgo says he needs a picture of the sword.", 8159); - player.getPacketSender().sendFrame126("@str@Maybe the squire will have one?", 8160); - player.getPacketSender().sendFrame126("", 8161); - player.getPacketSender().sendFrame126("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); - player.getPacketSender().sendFrame126("@str@cupboard in his room, but I must be very careful not to", 8163); - player.getPacketSender().sendFrame126("@str@get caught.", 8164); - player.getPacketSender().sendFrame126("@str@I should bring the picture to Thurgo", 8165); - player.getPacketSender().sendFrame126("", 8166); - player.getPacketSender().sendFrame126("@str@Thurgo has asked me to bring him 2 iron bars and 1 blurite", 8167); - player.getPacketSender().sendFrame126("@str@ore for him to make the sword with. He says blurite can be", 8168); - player.getPacketSender().sendFrame126("@str@mined in the cave by his home, but it is guarded by", 8169); - player.getPacketSender().sendFrame126("@str@dangerous monsters. So I should be very careful.", 8170); - player.getPacketSender().sendFrame126("", 8171); - player.getPacketSender().sendFrame126("Thurgo made me the sword, I should bring it back to the", 8172); - player.getPacketSender().sendFrame126("knight to get my reward!", 8173); - player.getPacketSender().sendFrame126("", 8174); + player.getPacketSender().sendString("The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("to find a replacement.@str@ He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("@str@Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); + player.getPacketSender().sendString("", 8154); + player.getPacketSender().sendString("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); + player.getPacketSender().sendString("@str@Red berry pie. Now that he likes me I should talk to him", 8156); + player.getPacketSender().sendString("@str@and find out if he'll make the sword for me.", 8157); + player.getPacketSender().sendString("", 8158); + player.getPacketSender().sendString("@str@Thurgo says he needs a picture of the sword.", 8159); + player.getPacketSender().sendString("@str@Maybe the squire will have one?", 8160); + player.getPacketSender().sendString("", 8161); + player.getPacketSender().sendString("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); + player.getPacketSender().sendString("@str@cupboard in his room, but I must be very careful not to", 8163); + player.getPacketSender().sendString("@str@get caught.", 8164); + player.getPacketSender().sendString("@str@I should bring the picture to Thurgo", 8165); + player.getPacketSender().sendString("", 8166); + player.getPacketSender().sendString("@str@Thurgo has asked me to bring him 2 iron bars and 1 blurite", 8167); + player.getPacketSender().sendString("@str@ore for him to make the sword with. He says blurite can be", 8168); + player.getPacketSender().sendString("@str@mined in the cave by his home, but it is guarded by", 8169); + player.getPacketSender().sendString("@str@dangerous monsters. So I should be very careful.", 8170); + player.getPacketSender().sendString("", 8171); + player.getPacketSender().sendString("Thurgo made me the sword, I should bring it back to the", 8172); + player.getPacketSender().sendString("knight to get my reward!", 8173); + player.getPacketSender().sendString("", 8174); } else if(player.knightS == 9) { - player.getPacketSender().sendFrame126("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); - player.getPacketSender().sendFrame126("@str@to find a replacement. He suggested that I start", 8148); - player.getPacketSender().sendFrame126("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); - player.getPacketSender().sendFrame126("", 8150); - player.getPacketSender().sendFrame126("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); - player.getPacketSender().sendFrame126("@str@Asgarnian peninsula. He said I should bring him some", 8152); - player.getPacketSender().sendFrame126("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); - player.getPacketSender().sendFrame126("", 8154); - player.getPacketSender().sendFrame126("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); - player.getPacketSender().sendFrame126("@str@Red berry pie. Now that he likes me I should talk to him", 8156); - player.getPacketSender().sendFrame126("@str@and find out if he'll make the sword for me.", 8157); - player.getPacketSender().sendFrame126("", 8158); - player.getPacketSender().sendFrame126("@str@Thurgo says he needs a picture of the sword.", 8159); - player.getPacketSender().sendFrame126("@str@Maybe the squire will have one?", 8160); - player.getPacketSender().sendFrame126("", 8161); - player.getPacketSender().sendFrame126("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); - player.getPacketSender().sendFrame126("@str@a cupboard in his room, but I must be very careful not to", 8163); - player.getPacketSender().sendFrame126("@str@get caught.", 8164); - player.getPacketSender().sendFrame126("@str@I should bring the picture to Thurgo", 8165); - player.getPacketSender().sendFrame126("", 8166); - player.getPacketSender().sendFrame126("@str@Thurgo has asked me to bring him 2 iron bars and 1 blurite", 8167); - player.getPacketSender().sendFrame126("@str@ore for him to make the sword with. He says blurite can be", 8168); - player.getPacketSender().sendFrame126("@str@mined in the cave by his home, but it is guarded by", 8169); - player.getPacketSender().sendFrame126("@str@dangerous monsters. So I should be very careful.", 8170); - player.getPacketSender().sendFrame126("@str@Thurgo made me the sword, I should bring it back to the", 8172); - player.getPacketSender().sendFrame126("@str@knight to get my reward!", 8173); - player.getPacketSender().sendFrame126("", 8173); - player.getPacketSender().sendFrame126("@red@Quest Complete!", 8174); + player.getPacketSender().sendString("@str@The squire has lost Sir Vyvin's sword and asked me", 8147); + player.getPacketSender().sendString("@str@to find a replacement. He suggested that I start", 8148); + player.getPacketSender().sendString("@str@by speaking to Reldo, the librarian in the Varrock Castle", 8149); + player.getPacketSender().sendString("", 8150); + player.getPacketSender().sendString("@str@Reldo told me there may be an Imcando dwarf living near the", 8151); + player.getPacketSender().sendString("@str@Asgarnian peninsula. He said I should bring him some", 8152); + player.getPacketSender().sendString("@str@Red Berry Pie to get him to be willing to talk to me.", 8153); + player.getPacketSender().sendString("", 8154); + player.getPacketSender().sendString("@str@I found the Imcando dwarf named Thurgo and gave him some", 8155); + player.getPacketSender().sendString("@str@Red berry pie. Now that he likes me I should talk to him", 8156); + player.getPacketSender().sendString("@str@and find out if he'll make the sword for me.", 8157); + player.getPacketSender().sendString("", 8158); + player.getPacketSender().sendString("@str@Thurgo says he needs a picture of the sword.", 8159); + player.getPacketSender().sendString("@str@Maybe the squire will have one?", 8160); + player.getPacketSender().sendString("", 8161); + player.getPacketSender().sendString("@str@The squire thinks Sir Vyvin keeps a picture of the sword in", 8162); + player.getPacketSender().sendString("@str@a cupboard in his room, but I must be very careful not to", 8163); + player.getPacketSender().sendString("@str@get caught.", 8164); + player.getPacketSender().sendString("@str@I should bring the picture to Thurgo", 8165); + player.getPacketSender().sendString("", 8166); + player.getPacketSender().sendString("@str@Thurgo has asked me to bring him 2 iron bars and 1 blurite", 8167); + player.getPacketSender().sendString("@str@ore for him to make the sword with. He says blurite can be", 8168); + player.getPacketSender().sendString("@str@mined in the cave by his home, but it is guarded by", 8169); + player.getPacketSender().sendString("@str@dangerous monsters. So I should be very careful.", 8170); + player.getPacketSender().sendString("@str@Thurgo made me the sword, I should bring it back to the", 8172); + player.getPacketSender().sendString("@str@knight to get my reward!", 8173); + player.getPacketSender().sendString("", 8173); + player.getPacketSender().sendString("@red@Quest Complete!", 8174); } player.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/PiratesTreasure.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/PiratesTreasure.java index fea8e8f0..307754d5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/PiratesTreasure.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/PiratesTreasure.java @@ -12,87 +12,87 @@ public class PiratesTreasure { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Pirate's Treasure", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Pirate's Treasure", 8144); + client.getPacketSender().sendString("", 8145); if (client.pirateTreasure == 0) { - client.getPacketSender().sendFrame126("Pirate's Treasure", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Pirate's Treasure", 8144); + client.getPacketSender().sendString( "I can start this quest by speaking to Redbeard Frank in", 8147); - client.getPacketSender().sendFrame126("Port Sarim", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Port Sarim", 8148); + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString( "There are no minimum requirements.", 8150); } else if (client.pirateTreasure == 1) { - client.getPacketSender().sendFrame126("Pirate's Treasure", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Pirate's Treasure", 8144); + client.getPacketSender().sendString( "@str@I've talked to Redbeard.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "He wants me to get him some rum", 8148); } else if (client.pirateTreasure == 2) { - client.getPacketSender().sendFrame126("Pirate's Treasure", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Pirate's Treasure", 8144); + client.getPacketSender().sendString( "@str@I talked to Redbeard.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I found a way to get the rum", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should get the rum and return to Redbeard.", 8149); } else if (client.pirateTreasure == 3) { - client.getPacketSender().sendFrame126("Pirate's Treasure", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Pirate's Treasure", 8144); + client.getPacketSender().sendString( "@str@I talked to Redbeard.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I found a way to get the rum", 8148); - client.getPacketSender().sendFrame126("@str@I gave him the rum", + client.getPacketSender().sendString("@str@I gave him the rum", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "He told me I need to look at the chest in", 8149); - client.getPacketSender().sendFrame126("The blue moon inn", 8150); + client.getPacketSender().sendString("The blue moon inn", 8150); } else if (client.pirateTreasure == 4) { - client.getPacketSender().sendFrame126("Pirate's Treasure", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Pirate's Treasure", 8144); + client.getPacketSender().sendString( "@str@I talked to Redbeard.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I found a way to get the rum", 8148); - client.getPacketSender().sendFrame126("@str@I gave him the rum", + client.getPacketSender().sendString("@str@I gave him the rum", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I looked in the chest", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I need to go to falador and kill the gardener", 8150); } else if (client.pirateTreasure == 5) { - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I talked to Redbeard.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I found a way to get the rum", 8148); - client.getPacketSender().sendFrame126("@str@I gave him the rum", + client.getPacketSender().sendString("@str@I gave him the rum", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I looked in the chest", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I went to falador and killed the gardener", 8150); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should find the casket now", 8151); } else if (client.pirateTreasure == 6) { - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I talked to Redbeard.", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I found a way to get the rum", 8148); - client.getPacketSender().sendFrame126("@str@I gave him the rum", + client.getPacketSender().sendString("@str@I gave him the rum", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I looked in the chest", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I went to falador and killed the gardener", 8150); - client.getPacketSender().sendFrame126("@str@I found the casket ", + client.getPacketSender().sendString("@str@I found the casket ", 8181); - client.getPacketSender().sendFrame126("@red@QUEST COMPLETE", + client.getPacketSender().sendString("@red@QUEST COMPLETE", 8152); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "As a reward, I gained a casket.", 8153); - client.getPacketSender().sendFrame126("2 Quest Points.", 8153); + client.getPacketSender().sendString("2 Quest Points.", 8153); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java index b240a1e5..a68d886c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java @@ -12,57 +12,57 @@ public class RestlessGhost { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Restless Ghost", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Restless Ghost", 8144); + client.getPacketSender().sendString("", 8145); if (client.restGhost == 0) { - client.getPacketSender().sendFrame126("Restless Ghost", 8144); - client.getPacketSender().sendFrame126("I can start this quest by speaking to Father Aereck in", 8147); - client.getPacketSender().sendFrame126("Lumbridge", 8148); - client.getPacketSender().sendFrame126("Minimum Requirments:", 8149); - client.getPacketSender().sendFrame126("None.", 8150); + client.getPacketSender().sendString("Restless Ghost", 8144); + client.getPacketSender().sendString("I can start this quest by speaking to Father Aereck in", 8147); + client.getPacketSender().sendString("Lumbridge", 8148); + client.getPacketSender().sendString("Minimum Requirments:", 8149); + client.getPacketSender().sendString("None.", 8150); } else if (client.restGhost == 1) { - client.getPacketSender().sendFrame126("Restless Ghost", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Restless Ghost", 8144); + client.getPacketSender().sendString( "@str@I've talked to Father Aereck", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should speak to Father Urhey", 8148); } else if (client.restGhost == 2) { - client.getPacketSender().sendFrame126("Restless Ghost", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Restless Ghost", 8144); + client.getPacketSender().sendString( "@str@I've talked Father Urhey", 8147); - client.getPacketSender().sendFrame126("@str@He gave me an amulet", + client.getPacketSender().sendString("@str@He gave me an amulet", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should speak to the ghost", 8149); } else if (client.restGhost == 3) { - client.getPacketSender().sendFrame126("Restless Ghost", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Restless Ghost", 8144); + client.getPacketSender().sendString( "@str@I've talked to the Ghost", 8147); - client.getPacketSender().sendFrame126("I should travel to the wizards tower and kill the skeleton", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("I should travel to the wizards tower and kill the skeleton", 8148); + client.getPacketSender().sendString( "I should find the ghosts skull", 8149); } else if (client.restGhost == 4) { - client.getPacketSender().sendFrame126("Restless Ghost", 8144); - client.getPacketSender().sendFrame126("@str@I've found the skull", + client.getPacketSender().sendString("Restless Ghost", 8144); + client.getPacketSender().sendString("@str@I've found the skull", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I killed the skeleton", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should travel back to the ghost", 8149); } else if (client.restGhost == 5) { - client.getPacketSender().sendFrame126("Restless Ghost", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Restless Ghost", 8144); + client.getPacketSender().sendString( "@str@I've set the skull in the coffin", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I've freed the ghost.", 8148); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8150); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "As a reward, I gained 125 Prayer Exp.", 8151); - client.getPacketSender().sendFrame126("And 1 Quest Point", 8152); - client.getPacketSender().sendFrame126("", 8152); + client.getPacketSender().sendString("And 1 Quest Point", 8152); + client.getPacketSender().sendString("", 8152); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RomeoJuliet.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RomeoJuliet.java index a912ea60..12c386f4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RomeoJuliet.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RomeoJuliet.java @@ -11,343 +11,343 @@ public class RomeoJuliet { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Romeo & Juliet", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Romeo & Juliet", 8144); + client.getPacketSender().sendString("", 8145); if (client.romeojuliet == 0) { - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126("found in Varrock Square.", + client.getPacketSender().sendString("found in Varrock Square.", 8148); } else if (client.romeojuliet == 1) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString( "Romeo has asked you to speak to Juliet for him", 8150); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("his letters lately.", 8152); + client.getPacketSender().sendString("his letters lately.", 8152); } else if (client.romeojuliet == 2) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); client.getPacketSender() - .sendFrame126( + .sendString( "@str@Romeo has asked you to speak to Juliet for him", 8150); client.getPacketSender() - .sendFrame126( + .sendString( "@str@and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("@str@his letters lately.", + client.getPacketSender().sendString("@str@his letters lately.", 8152); - client.getPacketSender().sendFrame126("", 8153); + client.getPacketSender().sendString("", 8153); client.getPacketSender() - .sendFrame126( + .sendString( "You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126("Could this be for Romeo?", + client.getPacketSender().sendString("Could this be for Romeo?", 8156); } else if (client.romeojuliet == 4) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); client.getPacketSender() - .sendFrame126( + .sendString( "@str@Romeo has asked you to speak to Juliet for him", 8150); client.getPacketSender() - .sendFrame126( + .sendString( "@str@and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("@str@his letters lately.", + client.getPacketSender().sendString("@str@his letters lately.", 8152); - client.getPacketSender().sendFrame126("", 8153); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8153); + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126("", 8157); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8157); + client.getPacketSender().sendString( "You have spoken to Romeo and given him the message", 8158); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "You should try to talk to him again", 8159); } else if (client.romeojuliet == 5) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); client.getPacketSender() - .sendFrame126( + .sendString( "@str@Romeo has asked you to speak to Juliet for him", 8150); client.getPacketSender() - .sendFrame126( + .sendString( "@str@and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("@str@his letters lately.", + client.getPacketSender().sendString("@str@his letters lately.", 8152); - client.getPacketSender().sendFrame126("", 8153); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8153); + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126("", 8157); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8157); + client.getPacketSender().sendString( "@str@You have spoken to Romeo and given him the message", 8158); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You should try to talk to him again", 8159); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "Romeo says you should see a witch called Winelda", 8160); } else if (client.romeojuliet == 6) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); client.getPacketSender() - .sendFrame126( + .sendString( "@str@Romeo has asked you to speak to Juliet for him", 8150); client.getPacketSender() - .sendFrame126( + .sendString( "@str@and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("@str@his letters lately.", + client.getPacketSender().sendString("@str@his letters lately.", 8152); - client.getPacketSender().sendFrame126("", 8153); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8153); + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126("", 8157); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8157); + client.getPacketSender().sendString( "@str@You have spoken to Romeo and given him the message", 8158); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You should try to talk to him again", 8159); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@Romeo says you should see a witch called Winelda", 8160); - client.getPacketSender().sendFrame126("", 8161); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8161); + client.getPacketSender().sendString( "Winelda needs me to bring her 1 rats tail, 1 bone, and 1", 8162); - client.getPacketSender().sendFrame126("vial of water", 8163); + client.getPacketSender().sendString("vial of water", 8163); } else if (client.romeojuliet == 7) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); client.getPacketSender() - .sendFrame126( + .sendString( "@str@Romeo has asked you to speak to Juliet for him", 8150); client.getPacketSender() - .sendFrame126( + .sendString( "@str@and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("@str@his letters lately.", + client.getPacketSender().sendString("@str@his letters lately.", 8152); - client.getPacketSender().sendFrame126("", 8153); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8153); + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126("", 8157); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8157); + client.getPacketSender().sendString( "@str@You have spoken to Romeo and given him the message", 8158); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You should try to talk to him again", 8159); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@Romeo says you should see a witch called Winelda", 8160); - client.getPacketSender().sendFrame126("", 8161); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8161); + client.getPacketSender().sendString( "@str@Winelda needs me to bring her 1 rats tail, 1 bone", 8162); - client.getPacketSender().sendFrame126("@str@and 1 vial of water", + client.getPacketSender().sendString("@str@and 1 vial of water", 8163); - client.getPacketSender().sendFrame126("", 8164); + client.getPacketSender().sendString("", 8164); client.getPacketSender() - .sendFrame126( + .sendString( "I brought Winelda 1 rats tail, 1 bone, and 1 vail of water", 8162); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should go speak to Juliet", 8163); } else if (client.romeojuliet == 8) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); client.getPacketSender() - .sendFrame126( + .sendString( "@str@Romeo has asked you to speak to Juliet for him", 8150); client.getPacketSender() - .sendFrame126( + .sendString( "@str@and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("@str@his letters lately.", + client.getPacketSender().sendString("@str@his letters lately.", 8152); - client.getPacketSender().sendFrame126("", 8153); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8153); + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126("", 8157); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8157); + client.getPacketSender().sendString( "@str@You have spoken to Romeo and given him the message", 8158); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You should try to talk to him again", 8159); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@Romeo says you should see a witch called Winelda", 8160); - client.getPacketSender().sendFrame126("", 8161); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8161); + client.getPacketSender().sendString( "@str@Winelda needs me to bring her 1 rats tail, 1 bone", 8162); - client.getPacketSender().sendFrame126("@str@and 1 vial of water", + client.getPacketSender().sendString("@str@and 1 vial of water", 8163); - client.getPacketSender().sendFrame126("", 8164); + client.getPacketSender().sendString("", 8164); client.getPacketSender() - .sendFrame126( + .sendString( "@str@I brought Winelda 1 rats tail, 1 bone, and 1 vail of water", 8165); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I should go speak to Juliet and give her the potion", 8166); - client.getPacketSender().sendFrame126("", 8167); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8167); + client.getPacketSender().sendString( "I should speak to juliet and give her the potion", 8168); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should go speak to Romeo", 8169); } else if (client.romeojuliet == 9) { client.getPacketSender() - .sendFrame126( + .sendString( "@str@To start the quest, you should talk with Romeo", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@found in Varrock Square.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); client.getPacketSender() - .sendFrame126( + .sendString( "@str@Romeo has asked you to speak to Juliet for him", 8150); client.getPacketSender() - .sendFrame126( + .sendString( "@str@and return to him, as she hasn't been responding to any", 8151); - client.getPacketSender().sendFrame126("@str@his letters lately.", + client.getPacketSender().sendString("@str@his letters lately.", 8152); - client.getPacketSender().sendFrame126("", 8153); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8153); + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@You have spoken to Juliet who's been acting strange", 8154); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@she gave you a message and asked you to leave", 8155); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@could this be for Romeo?", 8156); - client.getPacketSender().sendFrame126("", 8157); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8157); + client.getPacketSender().sendString( "@str@You have spoken to Romeo and given him the message", 8158); - client.getPacketSender().sendFrame126("@str@You should try to talk to him again", 8159); - client.getPacketSender().sendFrame126("@str@Romeo says you should see a witch called Winelda", 8160); - client.getPacketSender().sendFrame126("", 8161); - client.getPacketSender().sendFrame126("@str@Winelda needs me to bring her 1 rats tail, 1 bone", 8162); - client.getPacketSender().sendFrame126("@str@and 1 vial of water",8163); - client.getPacketSender().sendFrame126("", 8164); - client.getPacketSender().sendFrame126("@str@I brought Winelda 1 rats tail, 1 bone, and 1 vail of water",8165); - client.getPacketSender().sendFrame126("@str@I should go speak to Juliet and give her the potion", 8166); - client.getPacketSender().sendFrame126("", 8167); - client.getPacketSender().sendFrame126("@str@I have spoken to Juliet, she drank the potion", 8168); - client.getPacketSender().sendFrame126("@str@I should go speak to Romeo", 8169); - client.getPacketSender().sendFrame126("", 8168); - client.getPacketSender().sendFrame126("I have spoken to Romeo, he's thankful for all of our help", 8169); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", 8170); - client.getPacketSender().sendFrame126("As a reward, I gained 5 quest points.", 8171); + client.getPacketSender().sendString("@str@You should try to talk to him again", 8159); + client.getPacketSender().sendString("@str@Romeo says you should see a witch called Winelda", 8160); + client.getPacketSender().sendString("", 8161); + client.getPacketSender().sendString("@str@Winelda needs me to bring her 1 rats tail, 1 bone", 8162); + client.getPacketSender().sendString("@str@and 1 vial of water",8163); + client.getPacketSender().sendString("", 8164); + client.getPacketSender().sendString("@str@I brought Winelda 1 rats tail, 1 bone, and 1 vail of water",8165); + client.getPacketSender().sendString("@str@I should go speak to Juliet and give her the potion", 8166); + client.getPacketSender().sendString("", 8167); + client.getPacketSender().sendString("@str@I have spoken to Juliet, she drank the potion", 8168); + client.getPacketSender().sendString("@str@I should go speak to Romeo", 8169); + client.getPacketSender().sendString("", 8168); + client.getPacketSender().sendString("I have spoken to Romeo, he's thankful for all of our help", 8169); + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8170); + client.getPacketSender().sendString("As a reward, I gained 5 quest points.", 8171); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RuneMysteries.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RuneMysteries.java index e545d7e3..130954a2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RuneMysteries.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RuneMysteries.java @@ -11,53 +11,53 @@ public class RuneMysteries { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Rune Mysteries", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Rune Mysteries", 8144); + client.getPacketSender().sendString("", 8145); if (client.runeMist == 0) { - client.getPacketSender().sendFrame126("Rune Mysteries", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Rune Mysteries", 8144); + client.getPacketSender().sendString( "I can start this quest by speaking to Duke Horiaco", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "who is located on the 2nd floor of the Lumbridge Castle.", 8148); - client.getPacketSender().sendFrame126("", 8149); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("", 8149); + client.getPacketSender().sendString( "There are no minimum requirments.", 8150); } else if (client.runeMist == 1) { - client.getPacketSender().sendFrame126("Rune Mysteries", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Rune Mysteries", 8144); + client.getPacketSender().sendString( "@str@I've talked to the duke", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should take the talisman to the Head Wizard.", 8148); } else if (client.runeMist == 2) { - client.getPacketSender().sendFrame126("Rune Mysteries", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Rune Mysteries", 8144); + client.getPacketSender().sendString( "@str@I've talked to Sedridor", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I gave him the talisman", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should bring the notes to Aubury.", 8149); } else if (client.runeMist == 3) { - client.getPacketSender().sendFrame126("Rune Mysteries", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Rune Mysteries", 8144); + client.getPacketSender().sendString( "@str@I've talked to Aubury.", 8147); - client.getPacketSender().sendFrame126("@str@I gave him the notes", + client.getPacketSender().sendString("@str@I gave him the notes", 8148); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I should go back to the wizard tower", 8149); } else if (client.runeMist == 4) { - client.getPacketSender().sendFrame126("Rune Mysteries", 8144); - client.getPacketSender().sendFrame126("@str@I talked to Sedridor", + client.getPacketSender().sendString("Rune Mysteries", 8144); + client.getPacketSender().sendString("@str@I talked to Sedridor", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I gave him his items.", 8148); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8150); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "As a reward, I gained 1 Quest point", 8151); - client.getPacketSender().sendFrame126("And an air talisman.", 8152); + client.getPacketSender().sendString("And an air talisman.", 8152); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/SheepShearer.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/SheepShearer.java index 1a0617a7..763bf6b2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/SheepShearer.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/SheepShearer.java @@ -11,42 +11,42 @@ public class SheepShearer { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Sheep Shearer", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Sheep Shearer", 8144); + client.getPacketSender().sendString("", 8145); if (client.sheepShear == 0) { - client.getPacketSender().sendFrame126("Sheep Shearer", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Sheep Shearer", 8144); + client.getPacketSender().sendString( "I can start this quest by speaking to Fred in", 8147); - client.getPacketSender().sendFrame126("Lumbridge.", 8148); - client.getPacketSender().sendFrame126("Minimum Requirments:", 8149); - client.getPacketSender().sendFrame126("None.", 8150); + client.getPacketSender().sendString("Lumbridge.", 8148); + client.getPacketSender().sendString("Minimum Requirments:", 8149); + client.getPacketSender().sendString("None.", 8150); } else if (client.sheepShear == 1) { - client.getPacketSender().sendFrame126("Sheep Shearer", 8144); - client.getPacketSender().sendFrame126("@str@I've talked to fred", + client.getPacketSender().sendString("Sheep Shearer", 8144); + client.getPacketSender().sendString("@str@I've talked to fred", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I've agreed to get him some wool.", 8148); if (client.getItemAssistant().playerHasItem(1759, 20)) { - client.getPacketSender().sendFrame126("@str@Ball of Wool", 8149); + client.getPacketSender().sendString("@str@Ball of Wool", 8149); } else { - client.getPacketSender().sendFrame126("@red@Ball of Wool", + client.getPacketSender().sendString("@red@Ball of Wool", 8149); } } else if (client.sheepShear == 2) { - client.getPacketSender().sendFrame126("Sheep Shearer", 8144); - client.getPacketSender().sendFrame126("@str@I gave fred his wool", + client.getPacketSender().sendString("Sheep Shearer", 8144); + client.getPacketSender().sendString("@str@I gave fred his wool", 8147); - client.getPacketSender().sendFrame126("@str@So he awarded me.", + client.getPacketSender().sendString("@str@So he awarded me.", 8148); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8149); - client.getPacketSender().sendFrame126("As a reward, 60 coins.", + client.getPacketSender().sendString("As a reward, 60 coins.", 8150); - client.getPacketSender().sendFrame126("150 crating exp", 8150); - client.getPacketSender().sendFrame126("And 1 Quest Point", 8151); - client.getPacketSender().sendFrame126("", 8152); + client.getPacketSender().sendString("150 crating exp", 8150); + client.getPacketSender().sendString("And 1 Quest Point", 8151); + client.getPacketSender().sendString("", 8152); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ShieldArrav.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ShieldArrav.java index 0e7bd93e..40e74be7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ShieldArrav.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ShieldArrav.java @@ -20,9 +20,9 @@ public class ShieldArrav { public static void showInformation(Player player) { // Clear all lines - for (int i = 8144; i < 8195; i++) player.getPacketSender().sendFrame126("", i); + for (int i = 8144; i < 8195; i++) player.getPacketSender().sendString("", i); // Set the title - player.getPacketSender().sendFrame126("Shield of Arrav", 8144); + player.getPacketSender().sendString("Shield of Arrav", 8144); // Add content if (player.shieldArrav == 0) { lines = new String[]{ @@ -108,7 +108,7 @@ public class ShieldArrav { } // Send the lines to the client int lineNumber = 8147; - for (String line : lines) player.getPacketSender().sendFrame126(line, lineNumber++); + for (String line : lines) player.getPacketSender().sendString(line, lineNumber++); player.getPacketSender().showInterface(8134); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/VampyreSlayer.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/VampyreSlayer.java index 5b5b4da6..4bb0cf2c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/VampyreSlayer.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/VampyreSlayer.java @@ -14,9 +14,9 @@ public class VampyreSlayer { public static void showInformation(Player client) { // Clear all lines - for (int i = 8144; i < 8195; i++) client.getPacketSender().sendFrame126("", i); + for (int i = 8144; i < 8195; i++) client.getPacketSender().sendString("", i); // Set the title - client.getPacketSender().sendFrame126("Vampyre Slayer", 8144); + client.getPacketSender().sendString("Vampyre Slayer", 8144); // Add content if (client.vampSlayer == 0) { lines = new String[]{ @@ -64,7 +64,7 @@ public class VampyreSlayer { } // Send the lines to the client int lineNumber = 8147; - for (String line : lines) client.getPacketSender().sendFrame126(line, lineNumber++); + for (String line : lines) client.getPacketSender().sendString(line, lineNumber++); client.getPacketSender().showInterface(8134); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/WitchsPotion.java b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/WitchsPotion.java index f756150c..9ed92efe 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/WitchsPotion.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/WitchsPotion.java @@ -11,42 +11,42 @@ public class WitchsPotion { public static void showInformation(Player client) { for (int i = 8144; i < 8195; i++) { - client.getPacketSender().sendFrame126("", i); + client.getPacketSender().sendString("", i); } - client.getPacketSender().sendFrame126("@dre@Witch's Potion", 8144); - client.getPacketSender().sendFrame126("", 8145); + client.getPacketSender().sendString("@dre@Witch's Potion", 8144); + client.getPacketSender().sendString("", 8145); if (client.witchspot == 0) { - client.getPacketSender().sendFrame126("Witch's Potion", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Witch's Potion", 8144); + client.getPacketSender().sendString( "I can start this quest by speaking to Hetty", 8147); - client.getPacketSender().sendFrame126("Rimmington.", 8148); - client.getPacketSender().sendFrame126("Minimum Requirments:", 8149); - client.getPacketSender().sendFrame126("None.", 8150); + client.getPacketSender().sendString("Rimmington.", 8148); + client.getPacketSender().sendString("Minimum Requirments:", 8149); + client.getPacketSender().sendString("None.", 8150); } else if (client.witchspot == 1) { - client.getPacketSender().sendFrame126("Witch's Potion", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Witch's Potion", 8144); + client.getPacketSender().sendString( "@str@I've talked to the Hetty", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "I've agreed to get her the ingredients", 8148); } else if (client.witchspot == 2) { - client.getPacketSender().sendFrame126("Witch's Potion", 8144); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString("Witch's Potion", 8144); + client.getPacketSender().sendString( "@str@I have all the ingredients", 8147); - client.getPacketSender().sendFrame126("I should talk to hetty.", + client.getPacketSender().sendString("I should talk to hetty.", 8148); - client.getPacketSender().sendFrame126("", 8149); + client.getPacketSender().sendString("", 8149); } else if (client.witchspot == 3) { - client.getPacketSender().sendFrame126("Witch's Potion", 8144); - client.getPacketSender().sendFrame126("@str@I've Talked to Hetty", + client.getPacketSender().sendString("Witch's Potion", 8144); + client.getPacketSender().sendString("@str@I've Talked to Hetty", 8147); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "@str@I drank from the Cauldron", 8148); - client.getPacketSender().sendFrame126("@red@ QUEST COMPLETE", + client.getPacketSender().sendString("@red@ QUEST COMPLETE", 8150); - client.getPacketSender().sendFrame126( + client.getPacketSender().sendString( "As a reward, I gained 325 Magic Exp.", 8151); - client.getPacketSender().sendFrame126("And 1 Quest Point", 8152); - client.getPacketSender().sendFrame126("", 8152); + client.getPacketSender().sendString("And 1 Quest Point", 8152); + client.getPacketSender().sendString("", 8152); } client.getPacketSender().showInterface(8134); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/random/PartyRoom.java b/2006Redone Server/src/main/java/com/rebotted/game/content/random/PartyRoom.java index 44742f1e..d97d2759 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/random/PartyRoom.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/random/PartyRoom.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Random; import com.rebotted.GameConstants; import com.rebotted.GameEngine; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.items.ItemData; import com.rebotted.game.objects.Objects; import com.rebotted.game.players.Player; @@ -156,7 +157,7 @@ public class PartyRoom { public static void depositItem(Player player, int id, int amount) { int slot = arraySlot(player.party, id); - for (int i : GameConstants.ITEM_TRADEABLE) { + for (int i : ItemConstants.ITEM_TRADEABLE) { if (i == id) { player.getPacketSender().sendMessage("You can't deposit this item."); return; @@ -170,13 +171,11 @@ public class PartyRoom { amount = player.getItemAssistant().getItemAmount(id); } if (!player.getItemAssistant().playerHasItem(id, amount)) { - player.getPacketSender().sendMessage( - "You don't have that many items!"); + player.getPacketSender().sendMessage("You don't have that many items!"); return; } if (slot == -1) { - player.getPacketSender().sendMessage( - "You cant deposit more than 8 items at once."); + player.getPacketSender().sendMessage("You cant deposit more than 8 items at once."); return; } player.getItemAssistant().deleteItem(id, amount); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/FreakyForester.java b/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/FreakyForester.java index 0322e546..955ff5da 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/FreakyForester.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/FreakyForester.java @@ -38,7 +38,7 @@ public class FreakyForester { client.getItemAssistant().addItem(995, 500); client.getPacketSender().sendMessage("You have already beat the freaky forester event so you get 500 coins."); } - int delete = client.getItemAssistant().getItemCount(6178); + int delete = client.getItemAssistant().getItemAmount(6178); client.getItemAssistant().deleteItem(6178, delete); client.randomActions = 0; } else { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/SandwhichLady.java b/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/SandwhichLady.java index 965804b6..2b869202 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/SandwhichLady.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/SandwhichLady.java @@ -116,42 +116,42 @@ public class SandwhichLady { public static void openSandwhichLady(Player c) { c.hasSandwhichLady = true; - c.getPacketSender().sendFrame126(" ", 16131); + c.getPacketSender().sendString(" ", 16131); c.getPacketSender().showInterface(16135); int randomMessage = Misc.random(6); switch (randomMessage) { case 0: - c.getPacketSender().sendFrame126("Please select the pie.", + c.getPacketSender().sendString("Please select the pie.", 16145); itemType = 0; break; case 1: - c.getPacketSender().sendFrame126("Please select the kebab.", + c.getPacketSender().sendString("Please select the kebab.", 16145); itemType = 1; break; case 2: - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "Please select the chocolate.", 16145); itemType = 2; break; case 3: - c.getPacketSender().sendFrame126("Please select the bagel.", + c.getPacketSender().sendString("Please select the bagel.", 16145); itemType = 3; break; case 4: - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "Please select the triangle sandwich.", 16145); itemType = 4; break; case 5: - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "Please select the square sandwich.", 16145); itemType = 5; break; case 6: - c.getPacketSender().sendFrame126("Please select the bread.", + c.getPacketSender().sendString("Please select the bread.", 16145); itemType = 6; break; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/Menus.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/Menus.java index 1efe4bb7..cf2f3cb9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/Menus.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/Menus.java @@ -20,10 +20,10 @@ public class Menus { player.getPacketSender().sendItemOnInterface(8903, 150, i2); player.getPacketSender().sendItemOnInterface(8904, 200, i3); player.getPacketSender().sendItemOnInterface(8905, 250, i4); - player.getPacketSender().sendFrame126(s1, 8909); - player.getPacketSender().sendFrame126(s2, 8913); - player.getPacketSender().sendFrame126(s3, 8917); - player.getPacketSender().sendFrame126(s4, 8921); + player.getPacketSender().sendString(s1, 8909); + player.getPacketSender().sendString(s2, 8913); + player.getPacketSender().sendString(s3, 8917); + player.getPacketSender().sendString(s4, 8921); player.getPacketSender().sendChatInterface(8899); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java index 429a365e..23e7bb81 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java @@ -139,7 +139,7 @@ public class SkillHandler { public static void send1Item(Player c, int itemId) { c.getPacketSender().sendFrame246(1746, view190 ? 190 : 150, itemId); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( getLine(c) + "" + ItemAssistant.getItemName(itemId) + "", 2799); c.getPacketSender().sendChatInterface(4429); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java index e1afe116..73ee816f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java @@ -83,21 +83,21 @@ public class SkillInterfaces { "You can't open this while skilling!"); return; } - c.getPacketSender().sendFrame126(title, 8716); - c.getPacketSender().sendFrame126(currentTab, 8849); - c.getPacketSender().sendFrame126(op1, 8846); - c.getPacketSender().sendFrame126(op2, 8823); - c.getPacketSender().sendFrame126(op3, 8824); - c.getPacketSender().sendFrame126(op4, 8827); - c.getPacketSender().sendFrame126(op5, 8837); - c.getPacketSender().sendFrame126(op6, 8840); - c.getPacketSender().sendFrame126(op7, 8843); - c.getPacketSender().sendFrame126(op8, 8859); - c.getPacketSender().sendFrame126(op9, 8862); - c.getPacketSender().sendFrame126(op10, 8865); - c.getPacketSender().sendFrame126(op11, 15303); - c.getPacketSender().sendFrame126(op12, 15306); - c.getPacketSender().sendFrame126(op13, 15309); + c.getPacketSender().sendString(title, 8716); + c.getPacketSender().sendString(currentTab, 8849); + c.getPacketSender().sendString(op1, 8846); + c.getPacketSender().sendString(op2, 8823); + c.getPacketSender().sendString(op3, 8824); + c.getPacketSender().sendString(op4, 8827); + c.getPacketSender().sendString(op5, 8837); + c.getPacketSender().sendString(op6, 8840); + c.getPacketSender().sendString(op7, 8843); + c.getPacketSender().sendString(op8, 8859); + c.getPacketSender().sendString(op9, 8862); + c.getPacketSender().sendString(op10, 8865); + c.getPacketSender().sendString(op11, 15303); + c.getPacketSender().sendString(op12, 15306); + c.getPacketSender().sendString(op13, 15309); c.getPacketSender().showInterface(8714); } @@ -115,8 +115,8 @@ public class SkillInterfaces { if (SkillHandler.isSkilling(c)) { return; } - c.getPacketSender().sendFrame126(lines, 8760 + lineCounter); - c.getPacketSender().sendFrame126(levels, 8720 + lineCounter); + c.getPacketSender().sendString(lines, 8760 + lineCounter); + c.getPacketSender().sendString(levels, 8720 + lineCounter); item[0 + lineCounter] = ids; writeInterfaceItem(item); } @@ -129,7 +129,7 @@ public class SkillInterfaces { item[i] = 0; } for (int i = 8720; i < 8799; i++) { - c.getPacketSender().sendFrame126("", i); + c.getPacketSender().sendString("", i); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillMenu.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillMenu.java index 8a70d050..db12756f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillMenu.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillMenu.java @@ -69,7 +69,7 @@ public class SkillMenu { int[] temp = { 8849, 8846, 8823, 8824, 8827, 8837, 8840, 8843, 8859, 8862, 8865, 15303, 15306, 15309 }; for (int element : temp) { - c.getPacketSender().sendFrame126("", element); + c.getPacketSender().sendString("", element); } } @@ -92,21 +92,21 @@ public class SkillMenu { } private static void writeText(Client c, int skillType) { - c.getPacketSender().sendFrame126(SKILLS[skillType], TITLE_LINE); + c.getPacketSender().sendString(SKILLS[skillType], TITLE_LINE); for (int j = 0; j < LEVELS[skillType].length; j++) { - c.getPacketSender().sendFrame126(LEVELS[skillType][j], + c.getPacketSender().sendString(LEVELS[skillType][j], LEVEL_LINE + j); } for (int j = 0; j < DESCRIPTION[skillType].length; j++) { - c.getPacketSender().sendFrame126(DESCRIPTION[skillType][j], + c.getPacketSender().sendString(DESCRIPTION[skillType][j], TEXT_LINE + j); } for (int j = DESCRIPTION[skillType].length; j < 30; j++) { - c.getPacketSender().sendFrame126("", LEVEL_LINE + j); + c.getPacketSender().sendString("", LEVEL_LINE + j); } for (int j = LEVELS[skillType].length; j < 30; j++) { - c.getPacketSender().sendFrame126("", TEXT_LINE + j); + c.getPacketSender().sendString("", TEXT_LINE + j); } } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java index e42dd096..eb4c2122 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java @@ -9,6 +9,7 @@ import com.rebotted.game.content.music.sound.SoundList; import com.rebotted.game.content.randomevents.RandomEventHandler; import com.rebotted.game.content.skills.SkillHandler; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.players.Player; import com.rebotted.util.Misc; @@ -144,7 +145,7 @@ public class Cooking extends SkillHandler { private static void viewCookInterface(Player c, int item) { c.getPacketSender().sendChatInterface(1743); c.getPacketSender().sendFrame246(13716, view190 ? 190 : 170, item); - c.getPacketSender().sendFrame126(getLine(c) + "" + ItemAssistant.getItemName(item) + "", 13717); + c.getPacketSender().sendString(getLine(c) + "" + ItemAssistant.getItemName(item) + "", 13717); } public static boolean startCooking(Player c, int itemId, int objectId) { @@ -218,7 +219,7 @@ public class Cooking extends SkillHandler { return; } boolean burn; - if (player.playerEquipment[GameConstants.HANDS] == 775) { + if (player.playerEquipment[ItemConstants.HANDS] == 775) { burn = !getSuccess(player, 3, item.getLevelReq(), item.getStopBurnGloves()); } else { burn = !getSuccess(player, 3, item.getLevelReq(), item.getStopBurn()); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java index 1c45407a..8c9dcdf7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java @@ -77,7 +77,7 @@ public class CookingTutorialIsland extends SkillHandler { private static void viewCookInterface(Player c, int item) { c.getPacketSender().sendChatInterface(1743); c.getPacketSender().sendFrame246(13716, 190, item); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "" + ItemAssistant.getItemName(item) + "", 13717); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java index 2b687894..bb17aca8 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java @@ -37,14 +37,14 @@ public class JewelryMaking { i, 4233, 1); } c.getPacketSender().sendFrame34(1643, 4, 4233, 1); - c.getPacketSender().sendFrame126("", 4230); + c.getPacketSender().sendString("", 4230); c.getPacketSender().sendFrame246(4229, 0, -1); } else { c.getPacketSender().sendFrame246(4229, 120, 1592); for (int i = 0; i < MOULD_INTERFACE_IDS[0].length; i++) { c.getPacketSender().sendFrame34(-1, i, 4233, 1); } - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "You need a ring mould to craft rings.", 4230); } /* Necklace */ @@ -55,10 +55,10 @@ public class JewelryMaking { } c.getPacketSender().sendFrame34(1662, 4, 4239, 1); c.getPacketSender().sendFrame246(4235, 0, -1); - c.getPacketSender().sendFrame126("", 4236); + c.getPacketSender().sendString("", 4236); } else { c.getPacketSender().sendFrame246(4235, 120, 1597); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "You need a necklace mould to craft necklaces", 4236); for (int i = 0; i < MOULD_INTERFACE_IDS[1].length; i++) { c.getPacketSender().sendFrame34(-1, i, 4239, 1); @@ -72,10 +72,10 @@ public class JewelryMaking { } c.getPacketSender().sendFrame34(1681, 4, 4245, 1); c.getPacketSender().sendFrame246(4241, 0, -1); - c.getPacketSender().sendFrame126("", 4242); + c.getPacketSender().sendString("", 4242); } else { c.getPacketSender().sendFrame246(4241, 120, 1595); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "You need an amulet mould to craft necklaces", 4242); for (int i = 0; i < MOULD_INTERFACE_IDS[2].length; i++) { c.getPacketSender().sendFrame34(-1, i, 4245, 1); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/LeatherMaking.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/LeatherMaking.java index f5b30074..1ccf6923 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/LeatherMaking.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/LeatherMaking.java @@ -22,7 +22,7 @@ public class LeatherMaking extends CraftingData { if (l.getLeather() == 1743) { c.getPacketSender().sendChatInterface(4429); c.getPacketSender().sendFrame246(1746, 200, 1131); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( ItemAssistant.getItemName(1131), 2799); c.leatherType = leather; } @@ -34,7 +34,7 @@ public class LeatherMaking extends CraftingData { c.getPacketSender().itemOnInterface(8944, 180, 6328); c.getPacketSender().itemOnInterface(8945, 180, 6330); for (int i = 0; i < name.length; i++) { - c.getPacketSender().sendFrame126(name[i], 8949 + i * 4); + c.getPacketSender().sendString(name[i], 8949 + i * 4); } c.leatherType = leather; return; @@ -51,7 +51,7 @@ public class LeatherMaking extends CraftingData { .itemOnInterface(8884, 180, d.getChaps()); c.getPacketSender().itemOnInterface(8885, 180, d.getBody()); for (int i = 0; i < name.length; i++) { - c.getPacketSender().sendFrame126(name[i], 8889 + i * 4); + c.getPacketSender().sendString(name[i], 8889 + i * 4); } c.leatherType = leather; return; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java index 471fcdc4..328f29ed 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java @@ -18,33 +18,33 @@ public class Pottery { public static void showUnfire(Player c) { c.getPacketSender().sendChatInterface(8938); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8941, 120, 1787); // first c.getPacketSender().sendFrame246(8942, 150, 1789); // second c.getPacketSender().sendFrame246(8943, 150, 1791); // third c.getPacketSender().sendFrame246(8944, 120, 5352); // 4th c.getPacketSender().sendFrame246(8945, 150, 4438); // 5th - c.getPacketSender().sendFrame126("Pot", 8949); - c.getPacketSender().sendFrame126("Pie Dish", 8953); - c.getPacketSender().sendFrame126("Bowl", 8957); - c.getPacketSender().sendFrame126("Plant pot", 8961); - c.getPacketSender().sendFrame126("Pot lid", 8965); + c.getPacketSender().sendString("Pot", 8949); + c.getPacketSender().sendString("Pie Dish", 8953); + c.getPacketSender().sendString("Bowl", 8957); + c.getPacketSender().sendString("Plant pot", 8961); + c.getPacketSender().sendString("Pot lid", 8965); c.showedUnfire = true; } public static void showFire(Player c) { c.getPacketSender().sendChatInterface(8938); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8941, 120, 1931); // first c.getPacketSender().sendFrame246(8942, 150, 2313); // second c.getPacketSender().sendFrame246(8943, 150, 1923); // third c.getPacketSender().sendFrame246(8944, 120, 5350); // 4th c.getPacketSender().sendFrame246(8945, 150, 4440); // 5th - c.getPacketSender().sendFrame126("Pot", 8949); - c.getPacketSender().sendFrame126("Pie Dish", 8953); - c.getPacketSender().sendFrame126("Bowl", 8957); - c.getPacketSender().sendFrame126("Plant pot", 8961); - c.getPacketSender().sendFrame126("Pot lid", 8965); + c.getPacketSender().sendString("Pot", 8949); + c.getPacketSender().sendString("Pie Dish", 8953); + c.getPacketSender().sendString("Bowl", 8957); + c.getPacketSender().sendString("Plant pot", 8961); + c.getPacketSender().sendString("Pot lid", 8965); c.showedFire = true; } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java index bd6f0d50..a4d1a301 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java @@ -13,13 +13,13 @@ public class Spinning extends CraftingData { public static void showSpinning(Player player) { player.getPacketSender().sendChatInterface(8880); - player.getPacketSender().sendFrame126("What would you like to make?", 8879); + player.getPacketSender().sendString("What would you like to make?", 8879); player.getPacketSender().sendFrame246(8883, 180, 1737); // left player.getPacketSender().sendFrame246(8884, 180, 1779); // middle player.getPacketSender().sendFrame246(8885, 180, 6051); // right - player.getPacketSender().sendFrame126("Wool", 8889); - player.getPacketSender().sendFrame126("Flax", 8893); - player.getPacketSender().sendFrame126("Magic tree", 8897); + player.getPacketSender().sendString("Wool", 8889); + player.getPacketSender().sendString("Flax", 8893); + player.getPacketSender().sendString("Magic tree", 8897); player.clickedSpinning = true; } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Tanning.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Tanning.java index 329e13d9..801ba608 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Tanning.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Tanning.java @@ -9,12 +9,12 @@ public class Tanning extends CraftingData { for (final tanningData t : tanningData.values()) { c.getPacketSender().itemOnInterface(t.getItemFrame(), 250, t.getLeatherId()); - c.getPacketSender().sendFrame126(t.getName(), t.getNameFrame()); + c.getPacketSender().sendString(t.getName(), t.getNameFrame()); if (c.getItemAssistant().playerHasItem(995, t.getPrice())) { - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "@gre@Price: " + t.getPrice(), t.getCostFrame()); } else { - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "@red@Price: " + t.getPrice(), t.getCostFrame()); } } @@ -23,12 +23,12 @@ public class Tanning extends CraftingData { public static void tanHide(final Player player, final int buttonId) { for (final tanningData t : tanningData.values()) { if (buttonId == t.getButtonId(buttonId)) { - int amount = player.getItemAssistant().getItemCount(t.getHideId()); + int amount = player.getItemAssistant().getItemAmount(t.getHideId()); if (amount > t.getAmount(buttonId)) { amount = t.getAmount(buttonId); } int price = amount * t.getPrice(); - int coins = player.getItemAssistant().getItemCount(995); + int coins = player.getItemAssistant().getItemAmount(995); if (price > coins) { price = coins - coins % t.getPrice(); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ChopTree.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ChopTree.java index 198af059..5dcc6355 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ChopTree.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ChopTree.java @@ -4,8 +4,8 @@ */ package com.rebotted.game.content.skills.farming; -import com.rebotted.GameConstants; import com.rebotted.game.content.skills.SkillConstants; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.players.Player; import com.rebotted.util.Misc; @@ -214,7 +214,7 @@ public class ChopTree { public static int getAxeIndex(Player player) { for (int i = 0; i < axes.length; i++) { - if (player.playerEquipment[GameConstants.WEAPON] == (axes[i].getId())) { + if (player.playerEquipment[ItemConstants.WEAPON] == (axes[i].getId())) { return i; } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farmers.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farmers.java index d28d3ce0..2a421df4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farmers.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farmers.java @@ -240,15 +240,11 @@ public class Farmers { public static void chopDownTree(Player player, int npcId) { int index = WoodTrees.TreeFieldsData.forId(npcId).getTreeIndex(); - - if (player.getItemAssistant().getItemCount(995) < 200) { - player.getDialogueHandler().sendNpcChat(player.npcType, ChatEmotes.DEFAULT, "I am sorry, but you do not have enough money", - "to pay me to chop down this tree."); - + if (player.getItemAssistant().getItemAmount(995) < 200) { + player.getDialogueHandler().sendNpcChat(player.npcType, ChatEmotes.DEFAULT, "I am sorry, but you do not have enough money", "to pay me to chop down this tree."); } else { player.getItemAssistant().deleteItem(995, 200); - player.getDialogueHandler().sendNpcChat(player.npcType, ChatEmotes.DEFAULT, "There you go, I have chopped down your tree but I am ", - "keeping the logs and roots as compensation."); + player.getDialogueHandler().sendNpcChat(player.npcType, ChatEmotes.DEFAULT, "There you go, I have chopped down your tree but I am ", "keeping the logs and roots as compensation."); player.getTrees().resetTrees(index); player.getTrees().treeStages[index] = 3; player.getTrees().treeTimer[index] = GameEngine.getMinutesCounter(); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ToolLeprechaun.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ToolLeprechaun.java index d7d109e3..971a6b40 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ToolLeprechaun.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ToolLeprechaun.java @@ -261,9 +261,9 @@ public class ToolLeprechaun { if (index >= 5 && index <= 13) { player.tempBoolean = true; } - player.getPacketSender().sendFrame126("@gre@" + toolStoreData.getToolName(), + player.getPacketSender().sendString("@gre@" + toolStoreData.getToolName(), toolStoreData.getToolFrameId()); - player.getPacketSender().sendFrame126("@gre@" + count, + player.getPacketSender().sendString("@gre@" + count, toolStoreData.getToolCountFrameId()); } else { // watering can doses @@ -277,9 +277,9 @@ public class ToolLeprechaun { return; } - player.getPacketSender().sendFrame126("" + toolStoreData.getToolName(), + player.getPacketSender().sendString("" + toolStoreData.getToolName(), toolStoreData.getToolFrameId()); - player.getPacketSender().sendFrame126("" + count, + player.getPacketSender().sendString("" + count, toolStoreData.getToolCountFrameId()); } @@ -305,12 +305,12 @@ public class ToolLeprechaun { player.getPacketSender().sendMessage("You can't store any more of those."); return; } - if (player.getItemAssistant().getItemCount(itemId) <= 0) { + if (player.getItemAssistant().getItemAmount(itemId) <= 0) { player.getPacketSender().sendMessage("You aren't carrying any of those."); return; } - if (player.getItemAssistant().getItemCount(itemId) < amount) { - finalAmount = player.getItemAssistant().getItemCount(itemId); + if (player.getItemAssistant().getItemAmount(itemId) < amount) { + finalAmount = player.getItemAssistant().getItemAmount(itemId); } player.getItemAssistant().deleteItem(itemId, finalAmount); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java index 7e37d874..2453cf93 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java @@ -11,29 +11,28 @@ import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.objects.Object; import com.rebotted.game.players.Player; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.clip.Region; public class Firemaking { - - public static boolean stopFiremaking = false, pickedUpFiremakingLog = false, logLit; public static void stopFiremaking(Player c) { c.startAnimation(65535); SkillHandler.lastSkillingAction = System.currentTimeMillis(); c.isFiremaking = false; Cooking.setCooking(c, false); - logLit = false; + c.logLit = false; } public static void attemptFire(final Player c, final int itemUsed, final int usedWith, final int x, final int y, final boolean groundObject) { int firemakingItems[] = {590, 7329, 7330, 7331}; for (int i = 0; i < firemakingItems.length; i++) { - if (Firemaking.pickedUpFiremakingLog) { + if (c.pickedUpFiremakingLog) { c.getPacketSender().sendMessage("You can't do that!"); - Firemaking.pickedUpFiremakingLog = false; + c.pickedUpFiremakingLog = false; return; } - if (c.isFiremaking && logLit == false) { + if (c.isFiremaking && c.logLit == false) { return; } if (!SkillHandler.FIREMAKING) { @@ -47,7 +46,7 @@ public class Firemaking { c.getPacketSender().sendMessage("You need a firemaking level of " + l.getLevel() + " to light " + ItemAssistant.getItemName(logId)); return; } - if (c.inBank() || c.inLumbBuilding() || c.inDraynorBuilding()) { + if (Boundary.isIn(c, Boundary.BANK_AREA) || c.inLumbBuilding() || c.inDraynorBuilding()) { c.getPacketSender().sendMessage("You cannot light a fire here."); return; } @@ -56,7 +55,7 @@ public class Firemaking { return; } c.isFiremaking = true; - logLit = false; + c.logLit = false; boolean notInstant = System.currentTimeMillis() - SkillHandler.lastSkillingAction > 2500; int cycle = 2; if (notInstant) { @@ -88,13 +87,13 @@ public class Firemaking { } c.startAnimation(733); c.getPlayerAssistant().walkTo(walk ? -1 : 1, 0); - stopFiremaking = false; + c.stopFiremaking = false; CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() { @Override public void execute(CycleEventContainer container) { - if (stopFiremaking) { - stopFiremaking = false; + if (c.stopFiremaking) { + c.stopFiremaking = false; return; } if (c.isWoodcutting || c.playerIsFletching || c.isFletching) { @@ -121,7 +120,7 @@ public class Firemaking { @Override public void execute(CycleEventContainer container) { c.turnPlayerTo(walk ? x + 1 : x - 1, y); - logLit = true; + c.logLit = true; stopFiremaking(c); container.stop(); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java index 6b20910a..4baca9f0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java @@ -293,9 +293,9 @@ public class LogCutting { public static void wolfBoneArrow(Player c) { if (c.getItemAssistant().playerHasItem(2859) && c.getItemAssistant().playerHasItem(1755)) { - final int amount = c.getItemAssistant().getItemCount(2859); - final int makeAmount = c.getItemAssistant().getItemCount(2859) - + c.getItemAssistant().getItemCount(2859) * Misc.random(4); + final int amount = c.getItemAssistant().getItemAmount(2859); + final int makeAmount = c.getItemAssistant().getItemAmount(2859) + + c.getItemAssistant().getItemAmount(2859) * Misc.random(4); if (!c.getItemAssistant().playerHasItem(2859)) { c.getDialogueHandler().sendStatement( "You don't have any bones left to chisel."); @@ -323,8 +323,8 @@ public class LogCutting { } if (c.getItemAssistant().playerHasItem(314) && c.getItemAssistant().playerHasItem(2864)) { - final int feather = c.getItemAssistant().getItemCount(314), arrowShaft = c - .getItemAssistant().getItemCount(2864); + final int feather = c.getItemAssistant().getItemAmount(314), arrowShaft = c + .getItemAssistant().getItemAmount(2864); if (feather == arrowShaft * 4) { c.startAnimation(1248); c.getItemAssistant().deleteItem(314, feather * 4); @@ -348,7 +348,7 @@ public class LogCutting { c.nextChat = 0; return; } - final int wolfBoneArrow = c.getItemAssistant().getItemCount(2861), flightedArrow = c.getItemAssistant().getItemCount(2865); + final int wolfBoneArrow = c.getItemAssistant().getItemAmount(2861), flightedArrow = c.getItemAssistant().getItemAmount(2865); if (c.getItemAssistant().playerHasItem(2861) && c.getItemAssistant().playerHasItem(2865)) { if (wolfBoneArrow == flightedArrow) { @@ -378,8 +378,8 @@ public class LogCutting { public static void makeShafts(Player c) { if (c.getItemAssistant().playerHasItem(2862) && c.getItemAssistant().playerHasItem(946)) { - final int amount = c.getItemAssistant().getItemCount(2862); - final int makeAmount = c.getItemAssistant().getItemCount(2862) + c.getItemAssistant().getItemCount(2862) * Misc.random(4); + final int amount = c.getItemAssistant().getItemAmount(2862); + final int makeAmount = c.getItemAssistant().getItemAmount(2862) + c.getItemAssistant().getItemAmount(2862) * Misc.random(4); if (!c.getItemAssistant().playerHasItem(2862)) { c.getDialogueHandler().sendStatement("You don't have any logs left to fletch."); c.nextChat = 0; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCuttingInterface.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCuttingInterface.java index c65e3d41..4eccbb47 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCuttingInterface.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCuttingInterface.java @@ -32,48 +32,48 @@ public class LogCuttingInterface { c.getFletching().log = item; if (item == 1511) { c.getPacketSender().sendChatInterface(8880); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8883, 180, 52); // left c.getPacketSender().sendFrame246(8884, 180, 50); // middle c.getPacketSender().sendFrame246(8885, 180, 48); // right - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(52), 8889); - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(50), 8893); - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(48), 8897); + c.getPacketSender().sendString(ItemAssistant.getItemName(52), 8889); + c.getPacketSender().sendString(ItemAssistant.getItemName(50), 8893); + c.getPacketSender().sendString(ItemAssistant.getItemName(48), 8897); } else if (item == 1521) { c.getPacketSender().sendChatInterface(8866); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8869, 180, 54); // left c.getPacketSender().sendFrame246(8870, 180, 56); // right - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(54), 8874); - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(56), 8878); + c.getPacketSender().sendString(ItemAssistant.getItemName(54), 8874); + c.getPacketSender().sendString(ItemAssistant.getItemName(56), 8878); } else if (item == 1519) { c.getPacketSender().sendChatInterface(8866); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8869, 180, 60); // left c.getPacketSender().sendFrame246(8870, 180, 58); // right - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(60), 8874); - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(58), 8878); + c.getPacketSender().sendString(ItemAssistant.getItemName(60), 8874); + c.getPacketSender().sendString(ItemAssistant.getItemName(58), 8878); } else if (item == 1517) { c.getPacketSender().sendChatInterface(8866); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8869, 180, 64); // left c.getPacketSender().sendFrame246(8870, 180, 62); // right - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(64), 8874); - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(62), 8878); + c.getPacketSender().sendString(ItemAssistant.getItemName(64), 8874); + c.getPacketSender().sendString(ItemAssistant.getItemName(62), 8878); } else if (item == 1515) { c.getPacketSender().sendChatInterface(8866); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8869, 180, 68); // left c.getPacketSender().sendFrame246(8870, 180, 66); // right - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(68), 8874); - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(66), 8878); + c.getPacketSender().sendString(ItemAssistant.getItemName(68), 8874); + c.getPacketSender().sendString(ItemAssistant.getItemName(66), 8878); } else if (item == 1513) { c.getPacketSender().sendChatInterface(8866); - c.getPacketSender().sendFrame126("What would you like to make?", 8879); + c.getPacketSender().sendString("What would you like to make?", 8879); c.getPacketSender().sendFrame246(8869, 180, 72); // left c.getPacketSender().sendFrame246(8870, 180, 70); // right - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(72), 8874); - c.getPacketSender().sendFrame126(ItemAssistant.getItemName(70), 8878); + c.getPacketSender().sendString(ItemAssistant.getItemName(72), 8874); + c.getPacketSender().sendString(ItemAssistant.getItemName(70), 8878); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java index eb5ba82f..623fd1c7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java @@ -169,20 +169,20 @@ public class Runecrafting { public void getMultiSupport(int obj) { Altar_Data ad = forObj(obj); if (ad != null) { - int amount = c.getItemAssistant().getItemCount(7936), amount2 = c.getItemAssistant().getItemCount(1436); + int amount = c.getItemAssistant().getItemAmount(7936), amount2 = c.getItemAssistant().getItemAmount(1436); if (amount2 > 0 && amount > 0) { - c.getItemAssistant().deleteItem(7936, c.getItemAssistant().getItemCount(7936)); + c.getItemAssistant().deleteItem(7936, c.getItemAssistant().getItemAmount(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().deleteItem(1436, c.getItemAssistant().getItemAmount(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().deleteItem(7936, c.getItemAssistant().getItemAmount(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().deleteItem(1436, c.getItemAssistant().getItemAmount(1436)); c.getItemAssistant().addItem(ad.rewardedRune, amount2 * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad))); c.getPlayerAssistant().addSkillXP(ad.xp * amount2, c.playerRunecrafting); } else { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/Slayer.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/Slayer.java index 84a6bffb..a37608d3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/Slayer.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/Slayer.java @@ -478,18 +478,18 @@ public class Slayer { } public void updatePoints() { - c.getPacketSender().sendFrame126("Slayer Points: " + c.slayerPoints, 41011); - c.getPacketSender().sendFrame126("Slayer Points: " + c.slayerPoints, 41511); - c.getPacketSender().sendFrame126("Slayer Points: " + c.slayerPoints, 42011); + c.getPacketSender().sendString("Slayer Points: " + c.slayerPoints, 41011); + c.getPacketSender().sendString("Slayer Points: " + c.slayerPoints, 41511); + c.getPacketSender().sendString("Slayer Points: " + c.slayerPoints, 42011); } public void updateCurrentlyRemoved() { int line[] = { 42014, 42015, 42016, 42017 }; for (int i = 0; i < c.removedTasks.length; i++) { if (c.removedTasks[i] != -1) { - c.getPacketSender().sendFrame126(getTaskName(c.removedTasks[i]), line[i]); + c.getPacketSender().sendString(getTaskName(c.removedTasks[i]), line[i]); } else { - c.getPacketSender().sendFrame126("", line[i]); + c.getPacketSender().sendString("", line[i]); } } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java index 9d298b6c..e19898be 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java @@ -6,799 +6,45 @@ import com.rebotted.event.CycleEventHandler; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.players.Player; -/** - * Cleaned by Andrew - * @author Andrew (Mr Extremez) - */ - public class Smithing { - private int addItem, xpRecieved, removeItem, removeAmount, makeTimes; + private int addItem, xp, removeItem, removeAmount, makeTimes; - public void readInput(int levelReq, String type, Player player, int amountToMake) { - if (ItemAssistant.getItemName(Integer.parseInt(type)).contains("Bronze")) { - checkBronze(player, levelReq, amountToMake, type); - } else if (ItemAssistant.getItemName(Integer.parseInt(type)).contains("Iron")) { - checkIron(player, levelReq, amountToMake, type); - } else if (ItemAssistant.getItemName(Integer.parseInt(type)).contains("Steel") || ItemAssistant.getItemName(Integer.parseInt(type)).contains("ball")) { - checkSteel(player, levelReq, amountToMake, type); - } else if (ItemAssistant.getItemName(Integer.parseInt(type)).contains("Mith")) { - checkMith(player, levelReq, amountToMake, type); - } else if (ItemAssistant.getItemName(Integer.parseInt(type)).contains("Adam") || ItemAssistant.getItemName(Integer.parseInt(type)).contains("Addy")) { - checkAddy(player, levelReq, amountToMake, type); - } else if (ItemAssistant.getItemName(Integer.parseInt(type)).contains("Rune") || ItemAssistant.getItemName(Integer.parseInt(type)).contains("Runite")) { - checkRune(player, levelReq, amountToMake, type); - } - if (player.playerRights > 1) { - player.getPacketSender().sendMessage("You made item id: " + type + "."); + public void readInput(Player player, int levelReq, int type, int amountToMake) { + if (ItemAssistant.getItemName(type).contains("Bronze")) { + removeItem = 2349; + } else if (ItemAssistant.getItemName(type).contains("Iron")) { + removeItem = 2351; + } else if (ItemAssistant.getItemName(type).contains("Steel")) { + removeItem = 2353; + } else if (ItemAssistant.getItemName(type).contains("Mith")) { + removeItem = 2359; + } else if (ItemAssistant.getItemName(type).contains("Adam") || ItemAssistant.getItemName(type).contains("Addy")) { + removeItem = 2361; + } else if (ItemAssistant.getItemName(type).contains("Rune") || ItemAssistant.getItemName(type).contains("Runite")) { + removeItem = 2363; } + checkBar(player, levelReq, amountToMake, type); } - - private void checkBronze(Player player, int levelReq, int amountToMake, String type) { - if (player.tutorialProgress == 20 && !type.equalsIgnoreCase("1205")) { - player.getDialogueHandler().sendStatement("You can only make a bronze dagger on this step."); - player.nextChat = 0; - return; + + private void checkBar(Player player, int level, int amountToMake, int type) { + SmithingData item = SmithingData.forId(type); + if (item != null) { + if (player.playerLevel[player.playerSmithing] >= item.getLvl()) { + if (type == item.getId()) { + addItem = item.getId(); + removeAmount = item.getAmount(); + makeTimes = amountToMake; + xp = item.getXp(); + smithItem(player, addItem, removeItem, removeAmount, makeTimes, xp); + } + } else { + player.getPacketSender().sendMessage("You don't have a high enough level to make this item."); + } } - if (type.equalsIgnoreCase("1351") && levelReq >= 1) { - xpRecieved = 13; - addItem = 1351; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equalsIgnoreCase("1205") && levelReq >= 1 && player.tutorialProgress > 20) { - xpRecieved = 13; - addItem = 1205; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equalsIgnoreCase("1205") && levelReq >= 1 && player.tutorialProgress == 20) { - xpRecieved = 13; - addItem = 1205; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - player.getDialogueHandler().sendDialogues(3066, -1); - } else if (type.equals("1422") && levelReq >= 2) { - xpRecieved = 13; - addItem = 1422; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1139") && levelReq >= 3) { - xpRecieved = 13; - addItem = 1139; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("819") && levelReq >= 4) { - xpRecieved = 13; - addItem = 819; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1277") && levelReq >= 4) { - xpRecieved = 13; - addItem = 1277; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("4819") && levelReq >= 4) { - xpRecieved = 13; - addItem = 4819; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("39") && levelReq >= 5) { - xpRecieved = 13; - addItem = 39; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1321") && levelReq >= 5) { - xpRecieved = 25; - addItem = 1321; - removeItem = 2349; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1291") && levelReq >= 6) { - xpRecieved = 25; - addItem = 1291; - removeItem = 2349; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("864") && levelReq >= 7) { - xpRecieved = 25; - addItem = 864; - removeItem = 2349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1155") && levelReq >= 7) { - xpRecieved = 25; - addItem = 1155; - removeItem = 2349; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1173") && levelReq >= 8) { - xpRecieved = 25; - addItem = 1173; - removeItem = 2349; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("3095") && levelReq >= 8) { // claws - xpRecieved = 25; - addItem = 3095; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1337") && levelReq >= 9) { - xpRecieved = 38; - addItem = 1337; - removeItem = 2349; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1375") && levelReq >= 10) { - xpRecieved = 38; - addItem = 1375; - removeItem = 2349; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1103") && levelReq >= 11) { - xpRecieved = 38; - addItem = 1103; - removeItem = 2349; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1189") && levelReq >= 12) { - xpRecieved = 38; - addItem = 1189; - removeItem = 2349; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1307") && levelReq >= 14) { - xpRecieved = 38; - addItem = 1307; - removeItem = 2349; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1075") && levelReq >= 16) { - xpRecieved = 38; - addItem = 1075; - removeItem = 2349; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1087") && levelReq >= 16) { - xpRecieved = 38; - addItem = 1087; - removeItem = 2349; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1117") && levelReq >= 18) { - xpRecieved = 63; - addItem = 1117; - removeItem = 2349; - removeAmount = 5; - makeTimes = amountToMake; - } else if (player.playerLevel[player.playerSmithing] < levelReq) { - player.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); - return; - } - smithItem(player, addItem, removeItem, removeAmount, makeTimes, xpRecieved); - } + } - private void checkIron(Player c, int levelReq, int amountToMake, String type) { - removeItem = 2351; - if (type.equalsIgnoreCase("1349") && levelReq >= 16) { // Axe - xpRecieved = 25; - addItem = 1349; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equalsIgnoreCase("1203") && levelReq >= 15) { // Dagger - xpRecieved = 25; - addItem = 1203; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1420") && levelReq >= 17) { // Mace - xpRecieved = 25; - addItem = 1420; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1137") && levelReq >= 18) { // Med helm - xpRecieved = 25; - addItem = 1137; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("820") && levelReq >= 19) { // Dart tips - xpRecieved = 25; - addItem = 820; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1279") && levelReq >= 19) { // Sword (s) - xpRecieved = 25; - addItem = 1279; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("4820") && levelReq >= 19) { // Nails - xpRecieved = 25; - addItem = 4820; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("40") && levelReq >= 20) { // Arrow tips - xpRecieved = 25; - addItem = 40; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1323") && levelReq >= 20) {// Scim - xpRecieved = 50; - addItem = 1323; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1293") && levelReq >= 21) { // Longsword - xpRecieved = 50; - addItem = 1293; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("863") && levelReq >= 22) { // Knives - xpRecieved = 25; - addItem = 863; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1153") && levelReq >= 22) { // Full Helm - xpRecieved = 50; - addItem = 1153; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1175") && levelReq >= 23) { // Square shield - xpRecieved = 50; - addItem = 1175; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1335") && levelReq >= 24) { // Warhammer - xpRecieved = 38; - addItem = 1335; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1363") && levelReq >= 25) { // Battle axe - xpRecieved = 75; - addItem = 1363; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1101") && levelReq >= 26) { // Chain - xpRecieved = 75; - addItem = 1101; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("4540") && levelReq >= 26) { // lantern - xpRecieved = 25; - addItem = 4540; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1191") && levelReq >= 27) { // Kite - xpRecieved = 75; - addItem = 1191; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("3096") && levelReq >= 28) { // claws - xpRecieved = 50; - addItem = 3096; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1309") && levelReq >= 29) { // 2h Sword - xpRecieved = 75; - addItem = 1309; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1067") && levelReq >= 31) { // Platelegs - xpRecieved = 75; - addItem = 1067; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1081") && levelReq >= 31) { // PlateSkirt - xpRecieved = 75; - addItem = 1081; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1115") && levelReq >= 33) { // Platebody - xpRecieved = 125; - addItem = 1115; - removeAmount = 5; - makeTimes = amountToMake; - } else if (c.playerLevel[c.playerSmithing] < levelReq) { - c.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); - return; - } - - smithItem(c, addItem, removeItem, removeAmount, makeTimes, xpRecieved); - - } - - private void checkSteel(Player c, int levelReq, int amountToMake, String type) { - removeItem = 2353; - if (type.equalsIgnoreCase("1353") && levelReq >= 31) { // Axe - xpRecieved = 38; - addItem = 1353; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("2") && levelReq >= 35) { // Cannonball - xpRecieved = 26; - addItem = 2; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equalsIgnoreCase("1207") && levelReq >= 30) { // Dagger - xpRecieved = 50; - addItem = 1207; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1424") && levelReq >= 32) { // Mace - xpRecieved = 50; - addItem = 1424; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1141") && levelReq >= 33) { // Med helm - xpRecieved = 50; - addItem = 1141; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("821") && levelReq >= 34) { // Dart tips - xpRecieved = 50; - addItem = 821; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1281") && levelReq >= 34) { // Sword (s) - xpRecieved = 50; - addItem = 1281; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1539") && levelReq >= 34) { // Nails - xpRecieved = 50; - addItem = 1539; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("41") && levelReq >= 35) { // Arrow tips - xpRecieved = 50; - addItem = 41; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1325") && levelReq >= 35) {// Scim - xpRecieved = 75; - addItem = 1325; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("2370") && levelReq >= 36) {// Studs - xpRecieved = 37; - addItem = 2370; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1295") && levelReq >= 36) { // Longsword - xpRecieved = 75; - addItem = 1295; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("865") && levelReq >= 37) { // Knives - xpRecieved = 50; - addItem = 865; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1157") && levelReq >= 37) { // Full Helm - xpRecieved = 75; - addItem = 1157; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1177") && levelReq >= 38) { // Square shield - xpRecieved = 75; - addItem = 1177; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1339") && levelReq >= 39) { // Warhammer - xpRecieved = 113; - addItem = 1339; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1365") && levelReq >= 40) { // Battle axe - xpRecieved = 113; - addItem = 1365; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1105") && levelReq >= 41) { // Chain - xpRecieved = 113; - addItem = 1105; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1193") && levelReq >= 42) { // Kite - xpRecieved = 113; - addItem = 1193; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("3097") && levelReq >= 43) { // claws - xpRecieved = 75; - addItem = 3097; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1311") && levelReq >= 44) { // 2h Sword - xpRecieved = 113; - addItem = 1311; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1069") && levelReq >= 46) { // Platelegs - xpRecieved = 113; - addItem = 1069; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1083") && levelReq >= 46) { // PlateSkirt - xpRecieved = 113; - addItem = 1083; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1119") && levelReq >= 48) { // Platebody - xpRecieved = 188; - addItem = 1119; - removeAmount = 5; - makeTimes = amountToMake; - } else if (c.playerLevel[c.playerSmithing] < levelReq) { - c.getPacketSender().sendMessage( - "You need " + levelReq + " smithing to do this!"); - return; - } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, xpRecieved); - } - - private void checkMith(Player c, int levelReq, int amountToMake, String type) { - removeItem = 2359; - if (type.equalsIgnoreCase("1355") && levelReq >= 51) { // Axe - xpRecieved = 50; - addItem = 1355; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equalsIgnoreCase("1209") && levelReq >= 50) { // Dagger - xpRecieved = 50; - addItem = 1209; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1428") && levelReq >= 52) { // Mace - xpRecieved = 50; - addItem = 1428; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1143") && levelReq >= 53) {// Med helm - xpRecieved = 50; - addItem = 1143; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("822") && levelReq >= 54) { // Dart tips - xpRecieved = 50; - addItem = 822; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1285") && levelReq >= 54) { // Sword (s) - xpRecieved = 50; - addItem = 1285; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("4822") && levelReq >= 54) { // Nails - xpRecieved = 50; - addItem = 4822; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("42") && levelReq >= 55) { // Arrow tips - xpRecieved = 50; - addItem = 42; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1329") && levelReq >= 55) {// Scim - xpRecieved = 100; - addItem = 1329; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1299") && levelReq >= 56) { // Longsword - xpRecieved = 100; - addItem = 1299; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("866") && levelReq >= 57) { // Knives - xpRecieved = 50; - addItem = 866; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1159") && levelReq >= 57) { // Full Helm - xpRecieved = 100; - addItem = 1159; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1181") && levelReq >= 58) { // Square shield - xpRecieved = 100; - addItem = 1181; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1343") && levelReq >= 59) { // Warhammer - xpRecieved = 150; - addItem = 1343; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1369") && levelReq >= 60) { // Battle axe - xpRecieved = 150; - addItem = 1369; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1109") && levelReq >= 61) { // Chain - xpRecieved = 150; - addItem = 1109; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1197") && levelReq >= 62) { // Kite - xpRecieved = 150; - addItem = 1197; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("3099") && levelReq >= 63) { // claws - xpRecieved = 100; - addItem = 3099; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1315") && levelReq >= 64) { // 2h Sword - xpRecieved = 150; - addItem = 1315; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1071") && levelReq >= 66) { // Platelegs - xpRecieved = 150; - addItem = 1071; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1085") && levelReq >= 66) { // PlateSkirt - xpRecieved = 150; - addItem = 1085; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1121") && levelReq >= 68) { // Platebody - xpRecieved = 250; - addItem = 1121; - removeAmount = 5; - makeTimes = amountToMake; - } else if (c.playerLevel[c.playerSmithing] < levelReq) { - c.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); - return; - } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, xpRecieved); - } - - private void checkAddy(Player c, int levelReq, int amountToMake, String type) { - removeItem = 2361; - if (type.equalsIgnoreCase("1357") && levelReq >= 71) { // Axe - xpRecieved = 63; - addItem = 1357; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equalsIgnoreCase("1211") && levelReq >= 70) { // Dagger - xpRecieved = 63; - addItem = 1211; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1430") && levelReq >= 72) { // Mace - xpRecieved = 63; - addItem = 1430; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1145") && levelReq >= 73) { // Med helm - xpRecieved = 63; - addItem = 1145; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("823") && levelReq >= 74) { // Dart tips - xpRecieved = 63; - addItem = 823; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1287") && levelReq >= 74) { // Sword (s) - xpRecieved = 63; - addItem = 1287; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("4823") && levelReq >= 74) { // Nails - xpRecieved = 63; - addItem = 4823; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("43") && levelReq >= 75) { // Arrow tips - xpRecieved = 63; - addItem = 43; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1331") && levelReq >= 75) {// Scim - xpRecieved = 125; - addItem = 1331; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1301") && levelReq >= 76) { // Longsword - xpRecieved = 125; - addItem = 1301; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("867") && levelReq >= 77) { // Knives - xpRecieved = 63; - addItem = 867; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1161") && levelReq >= 77) { // Full Helm - xpRecieved = 125; - addItem = 1161; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1183") && levelReq >= 78) { // Square shield - xpRecieved = 125; - addItem = 1183; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1345") && levelReq >= 79) { // Warhammer - xpRecieved = 188; - addItem = 1345; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1371") && levelReq >= 80) { // Battle axe - xpRecieved = 188; - addItem = 1371; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1111") && levelReq >= 81) { // Chain - xpRecieved = 188; - addItem = 1111; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1199") && levelReq >= 82) { // Kite - xpRecieved = 188; - addItem = 1199; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("3100") && levelReq >= 83) { // claws - xpRecieved = 125; - addItem = 3100; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1317") && levelReq >= 84) { // 2h Sword - xpRecieved = 188; - addItem = 1317; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1073") && levelReq >= 86) { // Platelegs - xpRecieved = 188; - addItem = 1073; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1091") && levelReq >= 86) { // PlateSkirt - xpRecieved = 188; - addItem = 1091; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1123") && levelReq >= 88) { // Platebody - xpRecieved = 313; - addItem = 1123; - removeAmount = 5; - makeTimes = amountToMake; - } else if (c.playerLevel[c.playerSmithing] < levelReq) { - c.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); - return; - } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, xpRecieved); - } - - private void checkRune(Player c, int levelReq, int amountToMake, String type) { - removeItem = 2363; - if (type.equalsIgnoreCase("1359") && levelReq >= 86) { // Axe - xpRecieved = 75; - addItem = 1359; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equalsIgnoreCase("1213") && levelReq >= 85) { // Dagger - xpRecieved = 75; - addItem = 1213; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1432") && levelReq >= 87) { // Mace - xpRecieved = 75; - addItem = 1432; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1147") && levelReq >= 88) { // Med helm - xpRecieved = 75; - addItem = 1147; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("824") && levelReq >= 89) { // Dart tips - xpRecieved = 75; - addItem = 824; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1289") && levelReq >= 89) { // Sword (s) - xpRecieved = 75; - addItem = 1289; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("4824") && levelReq >= 89) { // Nails - xpRecieved = 75; - addItem = 4824; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("44") && levelReq >= 90) { // Arrow tips - xpRecieved = 75; - addItem = 44; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1333") && levelReq >= 90) {// Scim - xpRecieved = 150; - addItem = 1333; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1303") && levelReq >= 91) { // Longsword - xpRecieved = 150; - addItem = 1303; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("868") && levelReq >= 92) { // Knives - xpRecieved = 75; - addItem = 868; - removeAmount = 1; - makeTimes = amountToMake; - } else if (type.equals("1163") && levelReq >= 92) { // Full Helm - xpRecieved = 150; - addItem = 1163; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1185") && levelReq >= 93) { // Square shield - xpRecieved = 150; - addItem = 1185; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1347") && levelReq >= 94) { // Warhammer - xpRecieved = 225; - addItem = 1347; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1373") && levelReq >= 95) { // Battle axe - xpRecieved = 225; - addItem = 1373; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1113") && levelReq >= 96) { // Chain - xpRecieved = 225; - addItem = 1113; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1201") && levelReq >= 97) { // Kite - xpRecieved = 225; - addItem = 1201; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1319") && levelReq >= 99) { // 2h Sword - xpRecieved = 225; - addItem = 1319; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1079") && levelReq >= 99) { // Platelegs - xpRecieved = 225; - addItem = 1079; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("3101") && levelReq >= 98) { // claws - xpRecieved = 150; - addItem = 3101; - removeAmount = 2; - makeTimes = amountToMake; - } else if (type.equals("1093") && levelReq >= 99) { // PlateSkirt - xpRecieved = 225; - addItem = 1093; - removeAmount = 3; - makeTimes = amountToMake; - } else if (type.equals("1127") && levelReq >= 99) { // Platebody - xpRecieved = 313; - addItem = 1127; - removeAmount = 5; - makeTimes = amountToMake; - } else if (c.playerLevel[c.playerSmithing] < levelReq) { - c.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); - return; - } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, xpRecieved); - } - - public static void smithItem(Player player, int addItem, int removeItem, int removeItem2, int timesToMake, int XP) { + public static void smithItem(Player player, int addItem, int removeItem, int removeItem2, int timesToMake, int XP) { player.doAmount = timesToMake; player.getPacketSender().closeAllWindows(); String name = ItemAssistant.getItemName(addItem); @@ -809,7 +55,16 @@ public class Smithing { CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { @Override public void execute(CycleEventContainer container) { - if (player.doAmount <= 0 || !player.getItemAssistant().playerHasItem(removeItem, removeItem2) || !player.isSmithing || player.isWoodcutting || player.isCrafting || player.isMoving || player.isMining || player.isBusy || player.isShopping || player.isFletching || player.isFiremaking || player.isSpinning || player.isPotionMaking || player.playerIsFishing || player.isBanking || player.isSmelting || player.isTeleporting || player.isHarvesting || player.playerIsCooking || player.isPotCrafting) { + if (player.doAmount <= 0 || !player.getItemAssistant().playerHasItem(removeItem, removeItem2) + || !player.isSmithing || player.isWoodcutting + || player.isCrafting || player.isMoving + || player.isMining || player.isBusy + || player.isShopping || player.isFletching + || player.isFiremaking || player.isSpinning + || player.isPotionMaking || player.playerIsFishing + || player.isBanking || player.isSmelting + || player.isTeleporting || player.isHarvesting + || player.playerIsCooking || player.isPotCrafting) { container.stop(); } else { player.startAnimation(898); @@ -826,7 +81,6 @@ public class Smithing { } } player.getItemAssistant().deleteItem(removeItem, removeItem2); - player.getPacketSender().sendMessage(ItemAssistant.getItemName(addItem)); if (name.contains("bolt")) { player.getItemAssistant().addItem(addItem, 10); } else if (name.contains("dart tip")) { @@ -856,5 +110,5 @@ public class Smithing { player.isSmithing = false; } } - + } \ No newline at end of file diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java new file mode 100644 index 00000000..36b7ee9d --- /dev/null +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java @@ -0,0 +1,167 @@ +package com.rebotted.game.content.skills.smithing; + +/** + * SmithingData + * @author Andrew (Mr Extremez) + */ + +public enum SmithingData { + + //id, xp, lvl, amount + BRONZE_AXE(1351, 13, 1, 1), + BRONZE_DAGGER(1205, 13, 1, 1), + BRONZE_MACE(1422, 13, 2, 1), + BRONZE_MED(1139, 13, 3, 1), + BRONZE_DART(819, 13, 4, 1), + BRONZE_SWORD(1277, 13, 4, 1), + BRONZE_NAILS(4819, 13, 4, 1), + BRONZE_TIPS(39, 13, 5, 1), + BRONZE_KNIFE(864, 25, 7, 1), + BRONZE_SCIM(1321, 25, 5, 2), + BRONZE_LONG(1291, 25, 6, 2), + BRONZE_FULL(1155, 25, 7, 2), + BRONZE_SQ(1173, 25, 8, 2), + BRONZE_HAMMER(1337, 38, 9, 3), + BRONZE_BATTLE(1375, 38, 10, 3), + BRONZE_CHAIN(1103, 38, 11, 3), + BRONZE_KITE(1189, 38, 12, 3), + BRONZE_2H(1307, 38, 14, 3), + BRONZE_PLATELEGS(1075, 38, 16, 3), + BRONZE_PLATESKIRT(1087, 38, 16, 3), + BRONZE_PLATEBODY(1117, 63, 18, 5), + IRON_AXE(1349, 25, 16, 1), + IRON_DAGGER(1203, 25, 15, 1), + IRON_MACE(1420, 25, 17, 1), + IRON_MED(1137, 25, 18, 1), + IRON_DART(820, 25, 19, 1), + IRON_SWORD(1279, 25, 19, 1), + IRON_NAILS(4820, 25, 19, 1), + IRON_TIPS(40, 25, 20, 1), + IRON_SCIM(1323, 25, 20, 2), + IRON_LONG(1293, 50, 21, 2), + IRON_KNIFE(863, 25, 22, 1), + IRON_FULL(1153, 50, 22, 1), + IRON_SQ(1175, 50, 23, 2), + IRON_HAMMER(1335, 38, 24, 3), + IRON_BATTLEAXE(1363, 75, 25, 3), + IRON_CHAIN(1101, 75, 26, 3), + IRON_KITE(1191, 75, 27, 3), + IRON_2H(1309, 75, 29, 3), + IRON_LEGS(1067, 75, 31, 3), + IRON_SKIRT(1081, 75, 31, 3), + IRON_BODY(1115, 100, 33, 3), + STEEL_AXE(1353, 38, 31, 1), + STEEL_DAGGER(1207, 50, 30, 1), + STEEL_MACE(1424, 50, 32, 1), + STEEL_MED(1141, 50, 33, 1), + STEEL_SWORD(1281, 50, 34, 1), + STEEL_NAILS(1539, 50, 34, 1), + STEEL_TIPS(41, 50, 35, 1), + STEEL_SCIM(1325, 75, 35, 2), + STEEL_LONG(1295, 75, 36, 2), + STEEL_KNIFE(865, 50, 37, 1), + STEEL_FULL(1157, 75, 37, 2), + STEEL_SQ(1177, 75, 38, 2), + STEEL_HAMMER(1339, 113, 39, 3), + STEEL_BATTLEAXE(1365, 113, 40, 3), + STEEL_CHAIN(1105, 113, 41, 3), + STEEL_KITE(1193, 113, 42, 3), + STEEL_2H(1311, 113, 44, 3), + STEEL_LEGS(1069, 113, 46, 3), + STEEL_SKIRT(1083, 113, 46, 3), + STEEL_PLATE(1119, 188, 48, 5), + MITH_AXE(1355, 50, 51, 1), + MITH_DAGGER(1209, 50, 50, 1), + MITH_MACE(1428, 50, 52, 1), + MITH_MED(1143, 50, 53, 1), + MITH_SWORD(1285, 50, 54, 1), + MITH_NAILS(4822, 50, 54, 1), + MITH_TIPS(42, 50, 55, 1), + MITH_SCIM(1329, 100, 55, 2), + MITH_LONG(1299, 100, 56, 2), + MITH_KNIFE(866, 50, 57, 1), + MITH_FULL(1159, 100, 57, 2), + MITH_SQ(1181, 100, 58, 2), + MITH_HAMMER(1343, 150, 59, 3), + MITH_BATTLEAXE(1369, 150, 60, 3), + MITH_CHAIN(1109, 150, 61, 3), + MITH_KITE(1197, 150, 62, 3), + MITH_2H(1315, 150, 64, 3), + MITH_LEGS(1071, 150, 66, 3), + MITH_SKIRT(1085, 150, 66, 3), + MITH_PLATE(1121, 250, 68, 5), + ADDY_AXE(1357, 63, 71, 1), + ADDY_DAGGER(1211, 63, 70, 1), + ADDY_MACE(1430, 63, 72, 1), + ADDY_MED(1145, 63, 73, 1), + ADDY_SWORD(1287, 63, 74, 1), + ADDY_NAILS(4823, 63, 74, 1), + ADDY_TIPS(43, 63, 75, 1), + ADDY_SCIM(1331, 125, 75, 2), + ADDY_LONG(1301, 125, 76, 2), + ADDY_KNIFE(867, 63, 77, 1), + ADDY_HELM(1161, 125, 77, 2), + ADDY_SQ(1183, 125, 78, 2), + ADDY_HAMMER(1345, 188, 79, 3), + ADDY_BATTLEAXE(1371, 188, 80, 3), + ADDY_CHAIN(1111, 188, 81, 3), + ADDY_KITE(1199, 188, 82, 3), + ADDY_2H(1317, 188, 84, 3), + ADDY_LEGS(1073, 188, 86, 3), + ADDY_SKIRT(1091, 188, 86, 3), + ADDY_PLATE(1123, 313, 88, 5), + RUNE_AXE(1359, 75, 86, 1), + RUNE_DAGGER(1213, 75, 85, 1), + RUNE_MACE(1432, 75, 87, 1), + RUNE_MED(1147, 75, 88, 1), + RUNE_SWORD(1289, 75, 89, 1), + RUNE_NAILS(4824, 75, 89, 1), + RUNE_TIPS(44, 75, 90, 1), + RUNE_SCIM(1333, 150, 90, 2), + RUNE_LONG(1303, 150, 91, 2), + RUNE_KNIFE(868, 75, 92, 1), + RUNE_HELM(1163, 150, 92, 2), + RUNE_SQ(1185, 150, 93, 2), + RUNE_HAMMER(1347, 225, 94, 3), + RUNE_BATTLEAXE(1373, 225, 95, 3), + RUNE_CHAIN(1113, 225, 96, 3), + RUNE_KITE(1201, 225, 97, 3), + RUNE_2H(1319, 225, 99, 3), + RUNE_LEGS(1079, 225, 99, 3), + RUNE_SKIRT(1093, 225, 99, 3), + RUNE_PLATE(1127, 313, 99, 5); + + private final int id, xp, lvl, barsNeeded; + + SmithingData(int id, int xp, int lvl, int barsNeeded) { + this.id = id; + this.xp = xp; + this.lvl = lvl; + this.barsNeeded = barsNeeded; + } + + public int getId() { + return id; + } + + public int getXp() { + return xp; + } + + public int getLvl() { + return lvl; + } + + public int getAmount() { + return barsNeeded; + } + + public static SmithingData forId(int itemId) { + for (SmithingData item : SmithingData.values()) { + if (itemId == item.getId()) { + return item; + } + } + return null; + } +} diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingInterface.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingInterface.java index 73ac9c25..d467cc49 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingInterface.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingInterface.java @@ -42,72 +42,72 @@ public class SmithingInterface { String threeb = GetForBars(2363, 3, c); String twob = GetForBars(2363, 2, c); String oneb = GetForBars(2363, 1, c); - c.getPacketSender().sendFrame126(fiveb + "5 Bars" + fiveb, 1112); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1109); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1110); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1118); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1111); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1095); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1115); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1090); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1113); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1116); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1114); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1089); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 8428); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1124); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1125); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1126); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1127); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1128); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1129); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1130); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1131); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 13357); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 11459); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString(fiveb + "5 Bars" + fiveb, 1112); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1109); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1110); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1118); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1111); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1095); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1115); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1090); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1113); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1116); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1114); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1089); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 8428); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1124); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1125); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1126); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1127); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1128); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1129); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1130); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1131); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 13357); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 11459); + c.getPacketSender().sendString( GetForlvl(88, c) + "Plate Body" + GetForlvl(18, c), 1101); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(99, c) + "Plate Legs" + GetForlvl(16, c), 1099); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(99, c) + "Plate Skirt" + GetForlvl(16, c), 1100); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(99, c) + "2 Hand Sword" + GetForlvl(14, c), 1088); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(97, c) + "Kite Shield" + GetForlvl(12, c), 1105); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(96, c) + "Chain Body" + GetForlvl(11, c), 1098); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(95, c) + "Battle Axe" + GetForlvl(10, c), 1092); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Claws" + GetForlvl(11, c), 8429); // claws - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(94, c) + "Warhammer" + GetForlvl(9, c), 1083); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(93, c) + "Square Shield" + GetForlvl(8, c), 1104); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(92, c) + "Full Helm" + GetForlvl(7, c), 1103); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(92, c) + "Throwing Knives" + GetForlvl(7, c), 1106); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(91, c) + "Long Sword" + GetForlvl(6, c), 1086); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(90, c) + "Scimitar" + GetForlvl(5, c), 1087); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(90, c) + "Arrowtips" + GetForlvl(5, c), 1108); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(89, c) + "Sword" + GetForlvl(4, c), 1085); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(89, c) + "Dart Tips" + GetForlvl(4, c), 1107); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(89, c) + "Nails" + GetForlvl(4, c), 13358); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(88, c) + "Medium Helm" + GetForlvl(3, c), 1102); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(87, c) + "Mace" + GetForlvl(2, c), 1093); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(85, c) + "Dagger" + GetForlvl(1, c), 1094); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(86, c) + "Axe" + GetForlvl(1, c), 1091); c.getPacketSender().sendFrame34(1213, 0, 1119, 1); // dagger c.getPacketSender().sendFrame34(1359, 0, 1120, 1); // axe @@ -133,12 +133,12 @@ public class SmithingInterface { c.getPacketSender().sendFrame34(3101, 4, 1120, 1); // claws c.getPacketSender().sendFrame34(4824, 4, 1122, 15); // nails c.getPacketSender().sendFrame34(-1, 3, 1123, 1); - c.getPacketSender().sendFrame126("", 1135); - c.getPacketSender().sendFrame126("", 1134); - c.getPacketSender().sendFrame126("", 11461); - c.getPacketSender().sendFrame126("", 11459); - c.getPacketSender().sendFrame126("", 1132); - c.getPacketSender().sendFrame126("", 1096); + c.getPacketSender().sendString("", 1135); + c.getPacketSender().sendString("", 1134); + c.getPacketSender().sendString("", 11461); + c.getPacketSender().sendString("", 11459); + c.getPacketSender().sendString("", 1132); + c.getPacketSender().sendString("", 1096); c.getPacketSender().showInterface(994); } @@ -147,72 +147,72 @@ public class SmithingInterface { String threeb = GetForBars(2361, 3, c); String twob = GetForBars(2361, 2, c); String oneb = GetForBars(2361, 1, c); - c.getPacketSender().sendFrame126(fiveb + "5 Bars" + fiveb, 1112); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1109); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1110); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1118); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1111); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1095); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1115); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1090); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1113); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1116); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1114); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1089); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 8428); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1124); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1125); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1126); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1127); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1128); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1129); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1130); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1131); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 13357); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 11459); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString(fiveb + "5 Bars" + fiveb, 1112); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1109); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1110); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1118); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1111); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1095); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1115); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1090); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1113); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1116); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1114); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1089); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 8428); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1124); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1125); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1126); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1127); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1128); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1129); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1130); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1131); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 13357); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 11459); + c.getPacketSender().sendString( GetForlvl(88, c) + "Plate Body" + GetForlvl(18, c), 1101); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(86, c) + "Plate Legs" + GetForlvl(16, c), 1099); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(86, c) + "Plate Skirt" + GetForlvl(16, c), 1100); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Claws" + GetForlvl(11, c), 8429); // claws - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(84, c) + "2 Hand Sword" + GetForlvl(14, c), 1088); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(82, c) + "Kite Shield" + GetForlvl(12, c), 1105); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(81, c) + "Chain Body" + GetForlvl(11, c), 1098); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(80, c) + "Battle Axe" + GetForlvl(10, c), 1092); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(79, c) + "Warhammer" + GetForlvl(9, c), 1083); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(78, c) + "Square Shield" + GetForlvl(8, c), 1104); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(77, c) + "Full Helm" + GetForlvl(7, c), 1103); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(77, c) + "Throwing Knives" + GetForlvl(7, c), 1106); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(76, c) + "Long Sword" + GetForlvl(6, c), 1086); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(75, c) + "Scimitar" + GetForlvl(5, c), 1087); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(75, c) + "Arrowtips" + GetForlvl(5, c), 1108); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(74, c) + "Sword" + GetForlvl(4, c), 1085); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(74, c) + "Dart Tips" + GetForlvl(4, c), 1107); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(74, c) + "Nails" + GetForlvl(4, c), 13358); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(73, c) + "Medium Helm" + GetForlvl(3, c), 1102); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(72, c) + "Mace" + GetForlvl(2, c), 1093); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(70, c) + "Dagger" + GetForlvl(1, c), 1094); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(71, c) + "Axe" + GetForlvl(1, c), 1091); c.getPacketSender().sendFrame34(1211, 0, 1119, 1); // dagger c.getPacketSender().sendFrame34(1357, 0, 1120, 1); // axe @@ -237,12 +237,12 @@ public class SmithingInterface { c.getPacketSender().sendFrame34(3100, 4, 1120, 1); // claws c.getPacketSender().sendFrame34(4823, 4, 1122, 15); // nails c.getPacketSender().sendFrame34(-1, 3, 1123, 1); - c.getPacketSender().sendFrame126("", 1135); - c.getPacketSender().sendFrame126("", 1134); - c.getPacketSender().sendFrame126("", 11461); - c.getPacketSender().sendFrame126("", 11459); - c.getPacketSender().sendFrame126("", 1132); - c.getPacketSender().sendFrame126("", 1096); + c.getPacketSender().sendString("", 1135); + c.getPacketSender().sendString("", 1134); + c.getPacketSender().sendString("", 11461); + c.getPacketSender().sendString("", 11459); + c.getPacketSender().sendString("", 1132); + c.getPacketSender().sendString("", 1096); c.getPacketSender().showInterface(994); } @@ -251,72 +251,72 @@ public class SmithingInterface { String threeb = GetForBars(2359, 3, c); String twob = GetForBars(2359, 2, c); String oneb = GetForBars(2359, 1, c); - c.getPacketSender().sendFrame126(fiveb + "5 Bars" + fiveb, 1112); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1109); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1110); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1118); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1111); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1095); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1115); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1090); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1113); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1116); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1114); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1089); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 8428); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1124); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1125); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1126); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1127); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1128); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1129); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1130); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1131); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 13357); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 11459); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString(fiveb + "5 Bars" + fiveb, 1112); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1109); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1110); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1118); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1111); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1095); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1115); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1090); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1113); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1116); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1114); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1089); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 8428); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1124); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1125); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1126); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1127); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1128); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1129); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1130); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1131); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 13357); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 11459); + c.getPacketSender().sendString( GetForlvl(68, c) + "Plate Body" + GetForlvl(18, c), 1101); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(66, c) + "Plate Legs" + GetForlvl(16, c), 1099); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(66, c) + "Plate Skirt" + GetForlvl(16, c), 1100); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(64, c) + "2 Hand Sword" + GetForlvl(14, c), 1088); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(62, c) + "Kite Shield" + GetForlvl(12, c), 1105); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(61, c) + "Chain Body" + GetForlvl(11, c), 1098); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(60, c) + "Battle Axe" + GetForlvl(10, c), 1092); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(59, c) + "Warhammer" + GetForlvl(9, c), 1083); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(58, c) + "Square Shield" + GetForlvl(8, c), 1104); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Claws" + GetForlvl(11, c), 8429); // claws - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(57, c) + "Full Helm" + GetForlvl(7, c), 1103); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(57, c) + "Throwing Knives" + GetForlvl(7, c), 1106); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(56, c) + "Long Sword" + GetForlvl(6, c), 1086); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(55, c) + "Scimitar" + GetForlvl(5, c), 1087); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(55, c) + "Arrowtips" + GetForlvl(5, c), 1108); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(54, c) + "Sword" + GetForlvl(4, c), 1085); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(54, c) + "Dart Tips" + GetForlvl(4, c), 1107); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(54, c) + "Nails" + GetForlvl(4, c), 13358); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(53, c) + "Medium Helm" + GetForlvl(3, c), 1102); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(52, c) + "Mace" + GetForlvl(2, c), 1093); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(50, c) + "Dagger" + GetForlvl(1, c), 1094); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(51, c) + "Axe" + GetForlvl(1, c), 1091); c.getPacketSender().sendFrame34(1209, 0, 1119, 1); // dagger c.getPacketSender().sendFrame34(1355, 0, 1120, 1); // axe @@ -341,12 +341,12 @@ public class SmithingInterface { c.getPacketSender().sendFrame34(3099, 4, 1120, 1); // claws c.getPacketSender().sendFrame34(4822, 4, 1122, 15); // nails c.getPacketSender().sendFrame34(-1, 3, 1123, 1); - c.getPacketSender().sendFrame126("", 1135); - c.getPacketSender().sendFrame126("", 1134); - c.getPacketSender().sendFrame126("", 11461); - c.getPacketSender().sendFrame126("", 11459); - c.getPacketSender().sendFrame126("", 1132); - c.getPacketSender().sendFrame126("", 1096); + c.getPacketSender().sendString("", 1135); + c.getPacketSender().sendString("", 1134); + c.getPacketSender().sendString("", 11461); + c.getPacketSender().sendString("", 11459); + c.getPacketSender().sendString("", 1132); + c.getPacketSender().sendString("", 1096); c.getPacketSender().showInterface(994); } @@ -355,79 +355,79 @@ public class SmithingInterface { String threeb = GetForBars(2353, 3, c); String twob = GetForBars(2353, 2, c); String oneb = GetForBars(2353, 1, c); - c.getPacketSender().sendFrame126(fiveb + "5 Bars" + fiveb, 1112); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1109); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1110); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1118); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1111); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1095); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1115); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1090); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1113); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1116); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1114); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1089); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 8428); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1124); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1125); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1126); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1127); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1128); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1129); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1130); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1131); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 13357); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1132); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1135); - c.getPacketSender().sendFrame126("", 11459); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString(fiveb + "5 Bars" + fiveb, 1112); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1109); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1110); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1118); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1111); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1095); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1115); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1090); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1113); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1116); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1114); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1089); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 8428); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1124); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1125); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1126); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1127); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1128); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1129); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1130); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1131); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 13357); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1132); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1135); + c.getPacketSender().sendString("", 11459); + c.getPacketSender().sendString( GetForlvl(48, c) + "Plate Body" + GetForlvl(18, c), 1101); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(46, c) + "Plate Legs" + GetForlvl(16, c), 1099); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(46, c) + "Plate Skirt" + GetForlvl(16, c), 1100); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(44, c) + "2 Hand Sword" + GetForlvl(14, c), 1088); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(42, c) + "Kite Shield" + GetForlvl(12, c), 1105); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(41, c) + "Chain Body" + GetForlvl(11, c), 1098); - c.getPacketSender().sendFrame126("", 11461); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString("", 11461); + c.getPacketSender().sendString( GetForlvl(40, c) + "Battle Axe" + GetForlvl(10, c), 1092); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(39, c) + "Warhammer" + GetForlvl(9, c), 1083); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Claws" + GetForlvl(11, c), 8429); // claws - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(38, c) + "Square Shield" + GetForlvl(8, c), 1104); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(37, c) + "Full Helm" + GetForlvl(7, c), 1103); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(37, c) + "Throwing Knives" + GetForlvl(7, c), 1106); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(36, c) + "Long Sword" + GetForlvl(6, c), 1086); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(35, c) + "Scimitar" + GetForlvl(5, c), 1087); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(35, c) + "Arrowtips" + GetForlvl(5, c), 1108); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(34, c) + "Sword" + GetForlvl(4, c), 1085); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(34, c) + "Dart Tips" + GetForlvl(4, c), 1107); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(34, c) + "Nails" + GetForlvl(4, c), 13358); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(33, c) + "Medium Helm" + GetForlvl(3, c), 1102); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(32, c) + "Mace" + GetForlvl(2, c), 1093); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(30, c) + "Dagger" + GetForlvl(1, c), 1094); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(31, c) + "Axe" + GetForlvl(1, c), 1091); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(35, c) + "Cannon Ball" + GetForlvl(35, c), 1096); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(36, c) + "Studs" + GetForlvl(36, c), 1134); c.getPacketSender().sendFrame34(1207, 0, 1119, 1); c.getPacketSender().sendFrame34(1353, 0, 1120, 1); @@ -461,75 +461,75 @@ public class SmithingInterface { String threeb = GetForBars(2351, 3, c); String twob = GetForBars(2351, 2, c); String oneb = GetForBars(2351, 1, c); - c.getPacketSender().sendFrame126(fiveb + "5 Bars" + fiveb, 1112); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1109); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1110); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1118); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1111); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1095); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1115); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1090); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1113); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1116); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1114); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1089); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 8428); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1124); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1125); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1126); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1127); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1128); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1129); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1130); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1131); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 13357); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 11459); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString(fiveb + "5 Bars" + fiveb, 1112); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1109); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1110); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1118); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1111); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1095); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1115); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1090); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1113); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1116); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1114); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1089); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 8428); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1124); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1125); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1126); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1127); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1128); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1129); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1130); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1131); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 13357); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 11459); + c.getPacketSender().sendString( GetForlvl(33, c) + "Plate Body" + GetForlvl(18, c), 1101); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(31, c) + "Plate Legs" + GetForlvl(16, c), 1099); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(31, c) + "Plate Skirt" + GetForlvl(16, c), 1100); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(29, c) + "2 Hand Sword" + GetForlvl(14, c), 1088); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(27, c) + "Kite Shield" + GetForlvl(12, c), 1105); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Chain Body" + GetForlvl(11, c), 1098); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Oil Lantern Frame" + GetForlvl(11, c), 11461); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(25, c) + "Battle Axe" + GetForlvl(10, c), 1092); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(24, c) + "Warhammer" + GetForlvl(9, c), 1083); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Claws" + GetForlvl(11, c), 8429); // claws - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(23, c) + "Square Shield" + GetForlvl(8, c), 1104); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(22, c) + "Full Helm" + GetForlvl(7, c), 1103); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(21, c) + "Throwing Knives" + GetForlvl(7, c), 1106); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(21, c) + "Long Sword" + GetForlvl(6, c), 1086); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(20, c) + "Scimitar" + GetForlvl(5, c), 1087); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(20, c) + "Arrowtips" + GetForlvl(5, c), 1108); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(19, c) + "Sword" + GetForlvl(4, c), 1085); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(19, c) + "Dart Tips" + GetForlvl(4, c), 1107); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(19, c) + "Nails" + GetForlvl(4, c), 13358); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(18, c) + "Medium Helm" + GetForlvl(3, c), 1102); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(17, c) + "Mace" + GetForlvl(2, c), 1093); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(15, c) + "Dagger" + GetForlvl(1, c), 1094); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(16, c) + "Axe" + GetForlvl(1, c), 1091); c.getPacketSender().sendFrame34(1203, 0, 1119, 1); c.getPacketSender().sendFrame34(1349, 0, 1120, 1); @@ -554,10 +554,10 @@ public class SmithingInterface { c.getPacketSender().sendFrame34(4820, 4, 1122, 15); c.getPacketSender().sendFrame34(4540, 4, 1121, 1); c.getPacketSender().sendFrame34(3096, 4, 1120, 1); // claws - c.getPacketSender().sendFrame126("", 1135); - c.getPacketSender().sendFrame126("", 1134); - c.getPacketSender().sendFrame126("", 1132); - c.getPacketSender().sendFrame126("", 1096); + c.getPacketSender().sendString("", 1135); + c.getPacketSender().sendString("", 1134); + c.getPacketSender().sendString("", 1132); + c.getPacketSender().sendString("", 1096); c.getPacketSender().showInterface(994); } @@ -566,72 +566,72 @@ public class SmithingInterface { String threeb = GetForBars(2349, 3, c); String twob = GetForBars(2349, 2, c); String oneb = GetForBars(2349, 1, c); - c.getPacketSender().sendFrame126(fiveb + "5 Bars" + fiveb, 1112); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1109); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1110); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1118); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1111); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1095); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1115); - c.getPacketSender().sendFrame126(threeb + "3 Bars" + threeb, 1090); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1113); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1116); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1114); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 1089); - c.getPacketSender().sendFrame126(twob + "2 Bars" + twob, 8428); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1124); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1125); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1126); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1127); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1128); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1129); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1130); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 1131); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 13357); - c.getPacketSender().sendFrame126(oneb + "1 Bar" + oneb, 11459); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString(fiveb + "5 Bars" + fiveb, 1112); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1109); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1110); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1118); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1111); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1095); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1115); + c.getPacketSender().sendString(threeb + "3 Bars" + threeb, 1090); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1113); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1116); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1114); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 1089); + c.getPacketSender().sendString(twob + "2 Bars" + twob, 8428); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1124); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1125); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1126); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1127); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1128); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1129); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1130); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 1131); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 13357); + c.getPacketSender().sendString(oneb + "1 Bar" + oneb, 11459); + c.getPacketSender().sendString( GetForlvl(18, c) + "Plate Body" + GetForlvl(18, c), 1101); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(16, c) + "Plate Legs" + GetForlvl(16, c), 1099); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(16, c) + "Plate Skirt" + GetForlvl(16, c), 1100); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(14, c) + "2 Hand Sword" + GetForlvl(14, c), 1088); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(26, c) + "Claws" + GetForlvl(11, c), 8429); // claws - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(12, c) + "Kite Shield" + GetForlvl(12, c), 1105); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(11, c) + "Chain Body" + GetForlvl(11, c), 1098); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(10, c) + "Battle Axe" + GetForlvl(10, c), 1092); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(9, c) + "Warhammer" + GetForlvl(9, c), 1083); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(8, c) + "Square Shield" + GetForlvl(8, c), 1104); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(7, c) + "Full Helm" + GetForlvl(7, c), 1103); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(7, c) + "Throwing Knives" + GetForlvl(7, c), 1106); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(6, c) + "Long Sword" + GetForlvl(6, c), 1086); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(5, c) + "Scimitar" + GetForlvl(5, c), 1087); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(5, c) + "Arrowtips" + GetForlvl(5, c), 1108); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(4, c) + "Sword" + GetForlvl(4, c), 1085); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(4, c) + "Dart Tips" + GetForlvl(4, c), 1107); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(4, c) + "Nails" + GetForlvl(4, c), 13358); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(3, c) + "Medium Helm" + GetForlvl(3, c), 1102); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(2, c) + "Mace" + GetForlvl(2, c), 1093); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(1, c) + "Dagger" + GetForlvl(1, c), 1094); - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( GetForlvl(1, c) + "Axe" + GetForlvl(1, c), 1091); c.getPacketSender().sendFrame34(1205, 0, 1119, 1); c.getPacketSender().sendFrame34(1351, 0, 1120, 1); @@ -656,12 +656,12 @@ public class SmithingInterface { c.getPacketSender().sendFrame34(3095, 4, 1120, 1); // claws c.getPacketSender().sendFrame34(4819, 4, 1122, 15); c.getPacketSender().sendFrame34(-1, 3, 1123, 1); - c.getPacketSender().sendFrame126("", 1135); - c.getPacketSender().sendFrame126("", 1134); - c.getPacketSender().sendFrame126("", 11461); - c.getPacketSender().sendFrame126("", 11459); - c.getPacketSender().sendFrame126("", 1132); - c.getPacketSender().sendFrame126("", 1096); + c.getPacketSender().sendString("", 1135); + c.getPacketSender().sendString("", 1134); + c.getPacketSender().sendString("", 11461); + c.getPacketSender().sendString("", 11459); + c.getPacketSender().sendString("", 1132); + c.getPacketSender().sendString("", 1096); c.getPacketSender().showInterface(994); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java b/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java index 3ebc2340..918a3557 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java @@ -1,11 +1,12 @@ package com.rebotted.game.content.traveling; -import com.rebotted.GameConstants; import com.rebotted.event.CycleEvent; import com.rebotted.event.CycleEventContainer; import com.rebotted.event.CycleEventHandler; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.players.Player; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; /** * Aug 12, 2017 : 1:51:21 AM @@ -23,9 +24,9 @@ public class DesertHeat { */ private static final int ANIMATION = 829; /** - * Time player has if they don't have protection + * Time player has if they don't have protection (90 seconds) */ - private static int REGULAR_TIMER = 30000; + private static int REGULAR_TIMER = 90000; /** * Integer to check if player has waterskins */ @@ -43,7 +44,7 @@ public class DesertHeat { * Desert clothes */ private static final int[][] CLOTHES = { - {1833, GameConstants.CHEST}, {1835, GameConstants.LEGS}, {1837, GameConstants.FEET} + {1833, ItemConstants.CHEST}, {1835, ItemConstants.LEGS}, {1837, ItemConstants.FEET} }; private static void doDamage(Player player) { @@ -71,14 +72,23 @@ public class DesertHeat { return REGULAR_TIMER + heat; } + private static boolean preventHeat(Player player) { + return (Boundary.isIn(player, Boundary.NO_HEAT)); + } + public static void callHeat(final Player player) { - if (!player.inDesert() || player.playerLevel[player.playerHitpoints] < 0) { + if (!Boundary.isIn(player, Boundary.DESERT) + || player.playerLevel[player.playerHitpoints] < 0 + || preventHeat(player)) { return; } CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { @Override public void execute(CycleEventContainer container) { - if (!player.inDesert() || player.playerLevel[player.playerHitpoints] < 0 || player.disconnected) { + if (!Boundary.isIn(player, Boundary.DESERT) + || player.playerLevel[player.playerHitpoints] < 0 + || player.disconnected + || preventHeat(player)) { container.stop(); return; } @@ -120,19 +130,19 @@ public class DesertHeat { public static void showWarning(Player player) { for (int i = 8144; i < 8195; i++) { - player.getPacketSender().sendFrame126("", i); + player.getPacketSender().sendString("", i); } - player.getPacketSender().sendFrame126("@dre@DESERT WARNING", 8144); - player.getPacketSender().sendFrame126("", 8145); - player.getPacketSender().sendFrame126("The intense heat of the desert reduces your health.", 8147); - player.getPacketSender().sendFrame126("Bring 2-5 waterskins to avoid receiving any damage.", 8148); - player.getPacketSender().sendFrame126("", 8149); - player.getPacketSender().sendFrame126("Wearing desert robes will not prevent the damage, but", 8150); - player.getPacketSender().sendFrame126("will reduce it significantly.", 8151); - player.getPacketSender().sendFrame126("", 8152); - player.getPacketSender().sendFrame126("The waterskins however need to be re-filled. Bring a", 8153); - player.getPacketSender().sendFrame126("knife and cut healthy cacti to re-fill the waterskins.", 8154); - player.getPacketSender().sendFrame126("@red@Any water vessels will evaporate, such as jug of water.", 8155); + player.getPacketSender().sendString("@dre@DESERT WARNING", 8144); + player.getPacketSender().sendString("", 8145); + player.getPacketSender().sendString("The intense heat of the desert reduces your health.", 8147); + player.getPacketSender().sendString("Bring 2-5 waterskins to avoid receiving any damage.", 8148); + player.getPacketSender().sendString("", 8149); + player.getPacketSender().sendString("Wearing desert robes will not prevent the damage, but", 8150); + player.getPacketSender().sendString("will reduce it significantly.", 8151); + player.getPacketSender().sendString("", 8152); + player.getPacketSender().sendString("The waterskins however need to be re-filled. Bring a", 8153); + player.getPacketSender().sendString("knife and cut healthy cacti to re-fill the waterskins.", 8154); + player.getPacketSender().sendString("@red@Any water vessels will evaporate, such as jug of water.", 8155); player.getPacketSender().showInterface(8134); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/Sailing.java b/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/Sailing.java index 78be83c2..560b7085 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/Sailing.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/Sailing.java @@ -1,9 +1,9 @@ package com.rebotted.game.content.traveling; -import com.rebotted.GameConstants; import com.rebotted.event.CycleEvent; import com.rebotted.event.CycleEventContainer; import com.rebotted.event.CycleEventHandler; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.players.Player; @@ -58,7 +58,7 @@ public class Sailing { } public static boolean searchForAlcohol(Player c) { - for (int element : GameConstants.ALCOHOL_RELATED_ITEMS) { + for (int element : ItemConstants.ALCOHOL_RELATED_ITEMS) { if (c.getItemAssistant().playerHasItem(element, 1)) { c.getDialogueHandler().sendNpcChat1("You can't bring intoxicating items to Asgarnia!", c.npcType, NpcHandler.getNpcListName(c.npcType)); c.nextChat = 0; @@ -71,7 +71,7 @@ public class Sailing { } public static boolean quickSearch(Player c) { - for (int element : GameConstants.COMBAT_RELATED_ITEMS) { + for (int element : ItemConstants.COMBAT_RELATED_ITEMS) { if (c.getItemAssistant().playerHasItem(element, 1) || c.getItemAssistant().playerHasEquipped(element)) { c.getDialogueHandler().sendNpcChat2("Grr! I see you brought some illegal items! Get", "out of my sight immediately!", 657, NpcHandler.getNpcListName(c.npcType)); c.nextChat = 0; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java b/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java index a5e1320d..8aef3704 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java @@ -32,7 +32,7 @@ public class DialogueHandler { } public void sendDialogues(int dialogue, int npcId) { - int MOLE_SKIN = player.getItemAssistant().getItemCount(7418), MOLE_CLAW = player.getItemAssistant().getItemCount(7416); + int MOLE_SKIN = player.getItemAssistant().getItemAmount(7418), MOLE_CLAW = player.getItemAssistant().getItemAmount(7416); Farmers.FarmersData farmersData = Farmers.FarmersData.forId(player.npcType); player.talkingNpc = npcId; switch (dialogue) { @@ -7049,27 +7049,27 @@ public class DialogueHandler { public void chatboxText(String text, String text1, String text2, String text3, String title) { - player.getPacketSender().sendFrame126(title, 6180); - player.getPacketSender().sendFrame126(text, 6181); - player.getPacketSender().sendFrame126(text1, 6182); - player.getPacketSender().sendFrame126(text2, 6183); - player.getPacketSender().sendFrame126(text3, 6184); + player.getPacketSender().sendString(title, 6180); + player.getPacketSender().sendString(text, 6181); + player.getPacketSender().sendString(text1, 6182); + player.getPacketSender().sendString(text2, 6183); + player.getPacketSender().sendString(text3, 6184); } public void clearChatBoxText(Player c) { - player.getPacketSender().sendFrame126("", 6180); - player.getPacketSender().sendFrame126("", 6181); - player.getPacketSender().sendFrame126("", 6182); - player.getPacketSender().sendFrame126("", 6183); - player.getPacketSender().sendFrame126("", 6184); + player.getPacketSender().sendString("", 6180); + player.getPacketSender().sendString("", 6181); + player.getPacketSender().sendString("", 6182); + player.getPacketSender().sendString("", 6183); + player.getPacketSender().sendString("", 6184); } public void sendStartInfo(String text, String text1, String text2, String text3, String title, boolean send) { - player.getPacketSender().sendFrame126(title, 6180); - player.getPacketSender().sendFrame126(text, 6181); - player.getPacketSender().sendFrame126(text1, 6182); - player.getPacketSender().sendFrame126(text2, 6183); - player.getPacketSender().sendFrame126(text3, 6184); + player.getPacketSender().sendString(title, 6180); + player.getPacketSender().sendString(text, 6181); + player.getPacketSender().sendString(text1, 6182); + player.getPacketSender().sendString(text2, 6183); + player.getPacketSender().sendString(text3, 6184); player.getPacketSender().sendChatInterface(6179); } @@ -7081,35 +7081,35 @@ public class DialogueHandler { switch (line.length) { case 1: player.getPacketSender().sendDialogueAnimation(969, getChatAnim(ChatEmotes.DEFAULT)); - player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 970); - player.getPacketSender().sendFrame126(line[0], 971); + player.getPacketSender().sendString(Misc.capitalize(player.playerName), 970); + player.getPacketSender().sendString(line[0], 971); player.getPacketSender().sendPlayerDialogueHead(969); player.getPacketSender().sendChatInterface(968); break; case 2: player.getPacketSender().sendDialogueAnimation(974, getChatAnim(ChatEmotes.DEFAULT)); - player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 975); - player.getPacketSender().sendFrame126(line[0], 976); - player.getPacketSender().sendFrame126(line[1], 977); + player.getPacketSender().sendString(Misc.capitalize(player.playerName), 975); + player.getPacketSender().sendString(line[0], 976); + player.getPacketSender().sendString(line[1], 977); player.getPacketSender().sendPlayerDialogueHead(974); player.getPacketSender().sendChatInterface(973); break; case 3: player.getPacketSender().sendDialogueAnimation(980, getChatAnim(ChatEmotes.DEFAULT)); - player.getPacketSender().sendFrame126(player.playerName, 981); - player.getPacketSender().sendFrame126(line[0], 982); - player.getPacketSender().sendFrame126(line[1], 983); - player.getPacketSender().sendFrame126(line[2], 984); + player.getPacketSender().sendString(player.playerName, 981); + player.getPacketSender().sendString(line[0], 982); + player.getPacketSender().sendString(line[1], 983); + player.getPacketSender().sendString(line[2], 984); player.getPacketSender().sendPlayerDialogueHead(980); player.getPacketSender().sendChatInterface(979); break; case 4: player.getPacketSender().sendDialogueAnimation(987, getChatAnim(ChatEmotes.DEFAULT)); - player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 988); - player.getPacketSender().sendFrame126(line[0], 989); - player.getPacketSender().sendFrame126(line[1], 990); - player.getPacketSender().sendFrame126(line[2], 991); - player.getPacketSender().sendFrame126(line[3], 992); + player.getPacketSender().sendString(Misc.capitalize(player.playerName), 988); + player.getPacketSender().sendString(line[0], 989); + player.getPacketSender().sendString(line[1], 990); + player.getPacketSender().sendString(line[2], 991); + player.getPacketSender().sendString(line[3], 992); player.getPacketSender().sendPlayerDialogueHead(987); player.getPacketSender().sendChatInterface(986); break; @@ -7120,35 +7120,35 @@ public class DialogueHandler { switch (line.length) { case 1: player.getPacketSender().sendDialogueAnimation(969, getChatAnim(e)); - player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 970); - player.getPacketSender().sendFrame126(line[0], 971); + player.getPacketSender().sendString(Misc.capitalize(player.playerName), 970); + player.getPacketSender().sendString(line[0], 971); player.getPacketSender().sendPlayerDialogueHead(969); player.getPacketSender().sendChatInterface(968); break; case 2: player.getPacketSender().sendDialogueAnimation(974, getChatAnim(e)); - player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 975); - player.getPacketSender().sendFrame126(line[0], 976); - player.getPacketSender().sendFrame126(line[1], 977); + player.getPacketSender().sendString(Misc.capitalize(player.playerName), 975); + player.getPacketSender().sendString(line[0], 976); + player.getPacketSender().sendString(line[1], 977); player.getPacketSender().sendPlayerDialogueHead(974); player.getPacketSender().sendChatInterface(973); break; case 3: player.getPacketSender().sendDialogueAnimation(980, getChatAnim(e)); - player.getPacketSender().sendFrame126(player.playerName, 981); - player.getPacketSender().sendFrame126(line[0], 982); - player.getPacketSender().sendFrame126(line[1], 983); - player.getPacketSender().sendFrame126(line[2], 984); + player.getPacketSender().sendString(player.playerName, 981); + player.getPacketSender().sendString(line[0], 982); + player.getPacketSender().sendString(line[1], 983); + player.getPacketSender().sendString(line[2], 984); player.getPacketSender().sendPlayerDialogueHead(980); player.getPacketSender().sendChatInterface(979); break; case 4: player.getPacketSender().sendDialogueAnimation(987, getChatAnim(e)); - player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 988); - player.getPacketSender().sendFrame126(line[0], 989); - player.getPacketSender().sendFrame126(line[1], 990); - player.getPacketSender().sendFrame126(line[2], 991); - player.getPacketSender().sendFrame126(line[3], 992); + player.getPacketSender().sendString(Misc.capitalize(player.playerName), 988); + player.getPacketSender().sendString(line[0], 989); + player.getPacketSender().sendString(line[1], 990); + player.getPacketSender().sendString(line[2], 991); + player.getPacketSender().sendString(line[3], 992); player.getPacketSender().sendPlayerDialogueHead(987); player.getPacketSender().sendChatInterface(986); break; @@ -7163,33 +7163,33 @@ public class DialogueHandler { public void sendOption(String... line) { switch (line.length) { case 2: - player.getPacketSender().sendFrame126("Select an Option", 2460); - player.getPacketSender().sendFrame126(line[0], 2461); - player.getPacketSender().sendFrame126(line[1], 2462); + player.getPacketSender().sendString("Select an Option", 2460); + player.getPacketSender().sendString(line[0], 2461); + player.getPacketSender().sendString(line[1], 2462); player.getPacketSender().sendChatInterface(2459); break; case 3: - player.getPacketSender().sendFrame126("Select an Option", 2470); - player.getPacketSender().sendFrame126(line[0], 2471); - player.getPacketSender().sendFrame126(line[1], 2472); - player.getPacketSender().sendFrame126(line[2], 2473); + player.getPacketSender().sendString("Select an Option", 2470); + player.getPacketSender().sendString(line[0], 2471); + player.getPacketSender().sendString(line[1], 2472); + player.getPacketSender().sendString(line[2], 2473); player.getPacketSender().sendChatInterface(2469); break; case 4: - player.getPacketSender().sendFrame126("Select an Option", 2481); - player.getPacketSender().sendFrame126(line[0], 2482); - player.getPacketSender().sendFrame126(line[1], 2483); - player.getPacketSender().sendFrame126(line[2], 2484); - player.getPacketSender().sendFrame126(line[3], 2485); + player.getPacketSender().sendString("Select an Option", 2481); + player.getPacketSender().sendString(line[0], 2482); + player.getPacketSender().sendString(line[1], 2483); + player.getPacketSender().sendString(line[2], 2484); + player.getPacketSender().sendString(line[3], 2485); player.getPacketSender().sendChatInterface(2480); break; case 5: - player.getPacketSender().sendFrame126("Select an Option", 2493); - player.getPacketSender().sendFrame126(line[0], 2494); - player.getPacketSender().sendFrame126(line[1], 2495); - player.getPacketSender().sendFrame126(line[2], 2496); - player.getPacketSender().sendFrame126(line[3], 2497); - player.getPacketSender().sendFrame126(line[4], 2498); + player.getPacketSender().sendString("Select an Option", 2493); + player.getPacketSender().sendString(line[0], 2494); + player.getPacketSender().sendString(line[1], 2495); + player.getPacketSender().sendString(line[2], 2496); + player.getPacketSender().sendString(line[3], 2497); + player.getPacketSender().sendString(line[4], 2498); player.getPacketSender().sendChatInterface(2492); break; } @@ -7203,29 +7203,29 @@ public class DialogueHandler { public void sendStatement(String... line) { switch (line.length) { case 1: - player.getPacketSender().sendFrame126(line[0], 357); - player.getPacketSender().sendFrame126("Click here to continue", 358); + player.getPacketSender().sendString(line[0], 357); + player.getPacketSender().sendString("Click here to continue", 358); player.getPacketSender().sendChatInterface(356); break; case 2: - player.getPacketSender().sendFrame126(line[0], 360); - player.getPacketSender().sendFrame126(line[1], 361); - player.getPacketSender().sendFrame126("Click here to continue", 362); + player.getPacketSender().sendString(line[0], 360); + player.getPacketSender().sendString(line[1], 361); + player.getPacketSender().sendString("Click here to continue", 362); player.getPacketSender().sendChatInterface(359); break; case 3: - player.getPacketSender().sendFrame126(line[0], 364); - player.getPacketSender().sendFrame126(line[1], 365); - player.getPacketSender().sendFrame126(line[2], 366); - player.getPacketSender().sendFrame126("Click here to continue", 367); + player.getPacketSender().sendString(line[0], 364); + player.getPacketSender().sendString(line[1], 365); + player.getPacketSender().sendString(line[2], 366); + player.getPacketSender().sendString("Click here to continue", 367); player.getPacketSender().sendChatInterface(363); break; case 4: - player.getPacketSender().sendFrame126(line[0], 369); - player.getPacketSender().sendFrame126(line[1], 370); - player.getPacketSender().sendFrame126(line[2], 371); - player.getPacketSender().sendFrame126(line[3], 372); - player.getPacketSender().sendFrame126("Click here to continue", 373); + player.getPacketSender().sendString(line[0], 369); + player.getPacketSender().sendString(line[1], 370); + player.getPacketSender().sendString(line[2], 371); + player.getPacketSender().sendString(line[3], 372); + player.getPacketSender().sendString("Click here to continue", 373); player.getPacketSender().sendChatInterface(368); break; } @@ -7233,9 +7233,9 @@ public class DialogueHandler { public void itemMessage(String title, String message, int itemid, int size) { player.getPacketSender().sendDialogueAnimation(4883, 591); - player.getPacketSender().sendFrame126(title, 4884); - player.getPacketSender().sendFrame126(message, 4885); - player.getPacketSender().sendFrame126("Click here to continue.", 4886); + player.getPacketSender().sendString(title, 4884); + player.getPacketSender().sendString(message, 4885); + player.getPacketSender().sendString("Click here to continue.", 4886); player.getPacketSender().sendFrame246(4883, size, itemid); player.getPacketSender().sendChatInterface(4882); } @@ -7249,35 +7249,35 @@ public class DialogueHandler { switch (line.length) { case 1: player.getPacketSender().sendDialogueAnimation(4883, getChatAnim(e)); - player.getPacketSender().sendFrame126(npcName, 4884); - player.getPacketSender().sendFrame126(line[0], 4885); + player.getPacketSender().sendString(npcName, 4884); + player.getPacketSender().sendString(line[0], 4885); player.getPacketSender().sendNPCDialogueHead(npcId, 4883); player.getPacketSender().sendChatInterface(4882); break; case 2: player.getPacketSender().sendDialogueAnimation(4888, getChatAnim(e)); - player.getPacketSender().sendFrame126(npcName, 4889); - player.getPacketSender().sendFrame126(line[0], 4890); - player.getPacketSender().sendFrame126(line[1], 4891); + player.getPacketSender().sendString(npcName, 4889); + player.getPacketSender().sendString(line[0], 4890); + player.getPacketSender().sendString(line[1], 4891); player.getPacketSender().sendNPCDialogueHead(npcId, 4888); player.getPacketSender().sendChatInterface(4887); break; case 3: player.getPacketSender().sendDialogueAnimation(4894, getChatAnim(e)); - player.getPacketSender().sendFrame126(npcName, 4895); - player.getPacketSender().sendFrame126(line[0], 4896); - player.getPacketSender().sendFrame126(line[1], 4897); - player.getPacketSender().sendFrame126(line[2], 4898); + player.getPacketSender().sendString(npcName, 4895); + player.getPacketSender().sendString(line[0], 4896); + player.getPacketSender().sendString(line[1], 4897); + player.getPacketSender().sendString(line[2], 4898); player.getPacketSender().sendNPCDialogueHead(npcId, 4894); player.getPacketSender().sendChatInterface(4893); break; case 4: player.getPacketSender().sendDialogueAnimation(4901, getChatAnim(e)); - player.getPacketSender().sendFrame126(npcName, 4902); - player.getPacketSender().sendFrame126(line[0], 4903); - player.getPacketSender().sendFrame126(line[1], 4904); - player.getPacketSender().sendFrame126(line[2], 4905); - player.getPacketSender().sendFrame126(line[3], 4906); + player.getPacketSender().sendString(npcName, 4902); + player.getPacketSender().sendString(line[0], 4903); + player.getPacketSender().sendString(line[1], 4904); + player.getPacketSender().sendString(line[2], 4905); + player.getPacketSender().sendString(line[3], 4906); player.getPacketSender().sendNPCDialogueHead(npcId, 4901); player.getPacketSender().sendChatInterface(4900); break; @@ -7286,17 +7286,17 @@ public class DialogueHandler { public void sendNpcChat1(String s, int ChatNpc, String name) { player.getPacketSender().sendDialogueAnimation(4883, 591); - player.getPacketSender().sendFrame126(name, 4884); - player.getPacketSender().sendFrame126(s, 4885); + player.getPacketSender().sendString(name, 4884); + player.getPacketSender().sendString(s, 4885); player.getPacketSender().sendNPCDialogueHead(ChatNpc, 4883); player.getPacketSender().sendChatInterface(4882); } public void sendNpcChat2(String s, String s1, int ChatNpc, String name) { player.getPacketSender().sendDialogueAnimation(4888, 591); - player.getPacketSender().sendFrame126(name, 4889); - player.getPacketSender().sendFrame126(s, 4890); - player.getPacketSender().sendFrame126(s1, 4891); + player.getPacketSender().sendString(name, 4889); + player.getPacketSender().sendString(s, 4890); + player.getPacketSender().sendString(s1, 4891); player.getPacketSender().sendNPCDialogueHead(ChatNpc, 4888); player.getPacketSender().sendChatInterface(4887); } @@ -7304,10 +7304,10 @@ public class DialogueHandler { public void sendNpcChat3(String s, String s1, String s2, int ChatNpc, String name) { player.getPacketSender().sendDialogueAnimation(4894, 591); - player.getPacketSender().sendFrame126(name, 4895); - player.getPacketSender().sendFrame126(s, 4896); - player.getPacketSender().sendFrame126(s1, 4897); - player.getPacketSender().sendFrame126(s2, 4898); + player.getPacketSender().sendString(name, 4895); + player.getPacketSender().sendString(s, 4896); + player.getPacketSender().sendString(s1, 4897); + player.getPacketSender().sendString(s2, 4898); player.getPacketSender().sendNPCDialogueHead(ChatNpc, 4894); player.getPacketSender().sendChatInterface(4893); } @@ -7316,11 +7316,11 @@ public class DialogueHandler { public void sendNpcChat4(String s, String s1, String s2, String s3, int ChatNpc, String name) { player.getPacketSender().sendDialogueAnimation(4901, 591); - player.getPacketSender().sendFrame126(name, 4902); - player.getPacketSender().sendFrame126(s, 4903); - player.getPacketSender().sendFrame126(s1, 4904); - player.getPacketSender().sendFrame126(s2, 4905); - player.getPacketSender().sendFrame126(s3, 4906); + player.getPacketSender().sendString(name, 4902); + player.getPacketSender().sendString(s, 4903); + player.getPacketSender().sendString(s1, 4904); + player.getPacketSender().sendString(s2, 4905); + player.getPacketSender().sendString(s3, 4906); player.getPacketSender().sendNPCDialogueHead(ChatNpc, 4901); player.getPacketSender().sendChatInterface(4900); } @@ -7331,11 +7331,11 @@ public class DialogueHandler { public void sendStartInfo(String text, String text1, String text2, String text3, String title) { - player.getPacketSender().sendFrame126(title, 6180); - player.getPacketSender().sendFrame126(text, 6181); - player.getPacketSender().sendFrame126(text1, 6182); - player.getPacketSender().sendFrame126(text2, 6183); - player.getPacketSender().sendFrame126(text3, 6184); + player.getPacketSender().sendString(title, 6180); + player.getPacketSender().sendString(text, 6181); + player.getPacketSender().sendString(text1, 6182); + player.getPacketSender().sendString(text2, 6183); + player.getPacketSender().sendString(text3, 6184); player.getPacketSender().sendChatInterface(6179); } @@ -7345,7 +7345,7 @@ public class DialogueHandler { public void itemMessage(String message1, int itemid, int size) { player.getPacketSender().sendDialogueAnimation(307, 591); - player.getPacketSender().sendFrame126(message1, 308); + player.getPacketSender().sendString(message1, 308); player.getPacketSender().sendFrame246(307, size, itemid); player.getPacketSender().sendChatInterface(306); player.nextChat = 0; @@ -7355,32 +7355,32 @@ public class DialogueHandler { switch (line.length) { case 1: player.getPacketSender().sendFrame246(4883, zoom, item); - player.getPacketSender().sendFrame126(header, 4884); - player.getPacketSender().sendFrame126(line[0], 4885); + player.getPacketSender().sendString(header, 4884); + player.getPacketSender().sendString(line[0], 4885); player.getPacketSender().sendChatInterface(4882); break; case 2: player.getPacketSender().sendFrame246(4888, zoom, item); - player.getPacketSender().sendFrame126(header, 4889); - player.getPacketSender().sendFrame126(line[0], 4890); - player.getPacketSender().sendFrame126(line[1], 4891); + player.getPacketSender().sendString(header, 4889); + player.getPacketSender().sendString(line[0], 4890); + player.getPacketSender().sendString(line[1], 4891); player.getPacketSender().sendChatInterface(4887); break; case 3: player.getPacketSender().sendFrame246(4894, zoom, item); - player.getPacketSender().sendFrame126(header, 4895); - player.getPacketSender().sendFrame126(line[0], 4896); - player.getPacketSender().sendFrame126(line[1], 4897); - player.getPacketSender().sendFrame126(line[2], 4898); + player.getPacketSender().sendString(header, 4895); + player.getPacketSender().sendString(line[0], 4896); + player.getPacketSender().sendString(line[1], 4897); + player.getPacketSender().sendString(line[2], 4898); player.getPacketSender().sendChatInterface(4893); break; case 4: player.getPacketSender().sendFrame246(4901, zoom, item); - player.getPacketSender().sendFrame126(header, 4902); - player.getPacketSender().sendFrame126(line[0], 4903); - player.getPacketSender().sendFrame126(line[1], 4904); - player.getPacketSender().sendFrame126(line[2], 4905); - player.getPacketSender().sendFrame126(line[3], 4906); + player.getPacketSender().sendString(header, 4902); + player.getPacketSender().sendString(line[0], 4903); + player.getPacketSender().sendString(line[1], 4904); + player.getPacketSender().sendString(line[2], 4905); + player.getPacketSender().sendString(line[3], 4906); player.getPacketSender().sendChatInterface(4900); break; } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java b/2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java index 169438bb..03d90494 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java @@ -10,6 +10,7 @@ import com.rebotted.game.players.MainFrameIDs; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; public class ItemAssistant { @@ -65,7 +66,7 @@ public class ItemAssistant { { itemName, "14184" } };// make some kind of c.getItemInfo c.getPacketSender().sendFrame34(itemId, 0, 14171, 1); for (int i = 0; i < info.length; i++) - c.getPacketSender().sendFrame126(info[i][0], Integer.parseInt(info[i][1])); + c.getPacketSender().sendString(info[i][0], Integer.parseInt(info[i][1])); c.getPacketSender().sendChatInterface(14170); } @@ -165,7 +166,7 @@ public class ItemAssistant { public void addItemToBank(int itemId, int amount) { itemId++; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] <= 0 || c.bankItems[i] == itemId && c.bankItemsN[i] + amount < Integer.MAX_VALUE) { c.bankItems[i] = itemId; c.bankItemsN[i] += amount; @@ -177,7 +178,7 @@ public class ItemAssistant { public void removeItemFromBank(int itemId, int amount) { itemId++; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] == itemId) { c.bankItemsN[i] -= amount; if (c.bankItemsN[i] <= 0) { @@ -209,17 +210,18 @@ public class ItemAssistant { c.flushOutStream(); } } - - public int getItemCount(int itemID) { - int count = 0; - for (int j = 0; j < c.playerItems.length; j++) { - if (c.playerItems[j] == itemID + 1) { - count += c.playerItemsN[j]; + + public int getItemAmount(int itemID) { + int itemCount = 0; + for (int i = 0; i < c.playerItems.length; i++) { + if (c.playerItems[i] - 1 == itemID) { + itemCount += c.playerItemsN[i]; } } - return count; + return itemCount; } + public void writeBonus() { int offset = 0; String send = ""; @@ -233,7 +235,7 @@ public class ItemAssistant { if (i == 10) { offset = 1; } - c.getPacketSender().sendFrame126(send, 1675 + i + offset); + c.getPacketSender().sendString(send, 1675 + i + offset); } } @@ -447,7 +449,7 @@ public class ItemAssistant { } public boolean tradeable(int itemId) { - for (int element : GameConstants.ITEM_TRADEABLE) { + for (int element : ItemConstants.ITEM_TRADEABLE) { if (itemId == element) { return false; } @@ -575,13 +577,13 @@ public class ItemAssistant { c.getPacketSender().setSidebarInterface(0, 5855); // punch, // kick, // block - c.getPacketSender().sendFrame126(weaponName, 5857); + c.getPacketSender().sendString(weaponName, 5857); } else if (weaponName.endsWith("whip")) { c.getPacketSender().setSidebarInterface(0, 12290); // flick, // lash, // deflect c.getPacketSender().sendFrame246(12291, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 12293); + c.getPacketSender().sendString(weaponName, 12293); } else if (weaponName.endsWith("bow") || weaponName.endsWith("10") || weaponName.endsWith("full") || weaponName.startsWith("seercull")) { @@ -589,7 +591,7 @@ public class ItemAssistant { // rapid, // longrange c.getPacketSender().sendFrame246(1765, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 1767); + c.getPacketSender().sendString(weaponName, 1767); } else if (weaponName.startsWith("Staff") || weaponName.endsWith("staff") || weaponName.endsWith("wand")) { c.getPacketSender().setSidebarInterface(0, 328); // spike, @@ -597,7 +599,7 @@ public class ItemAssistant { // smash, // block c.getPacketSender().sendFrame246(329, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 331); + c.getPacketSender().sendString(weaponName, 331); } else if (newWeapon.startsWith("dart") || newWeapon.startsWith("knife") || newWeapon.startsWith("javelin") @@ -606,7 +608,7 @@ public class ItemAssistant { // rapid, // longrange c.getPacketSender().sendFrame246(4447, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 4449); + c.getPacketSender().sendString(weaponName, 4449); } else if (newWeapon.startsWith("dagger") || newWeapon.contains("sword")) { c.getPacketSender().setSidebarInterface(0, 2276); // stab, @@ -614,14 +616,14 @@ public class ItemAssistant { // slash, // block c.getPacketSender().sendFrame246(2277, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 2279); + c.getPacketSender().sendString(weaponName, 2279); } else if (newWeapon.startsWith("pickaxe")) { c.getPacketSender().setSidebarInterface(0, 5570); // spike, // impale, // smash, // block c.getPacketSender().sendFrame246(5571, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 5573); + c.getPacketSender().sendString(weaponName, 5573); } else if (newWeapon.startsWith("axe") || newWeapon.startsWith("battleaxe")) { c.getPacketSender().setSidebarInterface(0, 1698); // chop, @@ -629,43 +631,43 @@ public class ItemAssistant { // smash, // block c.getPacketSender().sendFrame246(1699, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 1701); + c.getPacketSender().sendString(weaponName, 1701); } else if (newWeapon.startsWith("halberd")) { c.getPacketSender().setSidebarInterface(0, 8460); // jab, // swipe, // fend c.getPacketSender().sendFrame246(8461, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 8463); + c.getPacketSender().sendString(weaponName, 8463); } else if (newWeapon.startsWith("Scythe")) { c.getPacketSender().setSidebarInterface(0, 8460); // jab, // swipe, // fend c.getPacketSender().sendFrame246(8461, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 8463); + c.getPacketSender().sendString(weaponName, 8463); } else if (newWeapon.startsWith("spear")) { c.getPacketSender().setSidebarInterface(0, 4679); // lunge, // swipe, // pound, // block c.getPacketSender().sendFrame246(4680, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 4682); + c.getPacketSender().sendString(weaponName, 4682); } else if (newWeapon.toLowerCase().contains("mace")) { c.getPacketSender().setSidebarInterface(0, 3796); c.getPacketSender().sendFrame246(3797, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 3799); + c.getPacketSender().sendString(weaponName, 3799); } else if (c.playerEquipment[c.playerWeapon] == 4153) { c.getPacketSender().setSidebarInterface(0, 425); // war hamer // equip. c.getPacketSender().sendFrame246(426, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 428); + c.getPacketSender().sendString(weaponName, 428); } else { c.getPacketSender().setSidebarInterface(0, 2423); // chop, // slash, // lunge, // block c.getPacketSender().sendFrame246(2424, 200, weapon); - c.getPacketSender().sendFrame126(weaponName, 2426); + c.getPacketSender().sendString(weaponName, 2426); } } @@ -1216,7 +1218,7 @@ public class ItemAssistant { public void updateSpecialBar() { if (c.usingSpecial) { - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "" + (c.specAmount >= 2 ? "@yel@S P" : "@bla@S P") @@ -1245,7 +1247,7 @@ public class ItemAssistant { + (c.specAmount >= 10 ? "@yel@ K" : "@bla@ K"), c.specBarId); } else { - c.getPacketSender().sendFrame126( + c.getPacketSender().sendString( "@bla@S P E C I A L A T T A C K", c.specBarId); } } @@ -1294,7 +1296,7 @@ public class ItemAssistant { return false; } - int targetSlot = GameConstants.HAT; + int targetSlot = ItemConstants.HAT; boolean canWearItem = true; if (c.playerItems[slot] == wearID + 1) { getRequirements(getItemName(wearID).toLowerCase(), wearID); @@ -1347,12 +1349,12 @@ public class ItemAssistant { if (GameConstants.ITEM_REQUIREMENTS) { // Check if slot is armor - if (targetSlot == GameConstants.FEET - || targetSlot == GameConstants.LEGS - || targetSlot == GameConstants.SHIELD - || targetSlot == GameConstants.CHEST - || targetSlot == GameConstants.HAT - || targetSlot == GameConstants.HANDS) { + if (targetSlot == ItemConstants.FEET + || targetSlot == ItemConstants.LEGS + || targetSlot == ItemConstants.SHIELD + || targetSlot == ItemConstants.CHEST + || targetSlot == ItemConstants.HAT + || targetSlot == ItemConstants.HANDS) { if (c.defenceLevelReq > 0) { if (c.getPlayerAssistant().getLevelForXP(c.playerXP[1]) < c.defenceLevelReq) { c.getPacketSender().sendMessage("You need a defence level of " + c.defenceLevelReq + " to wear this item."); @@ -1385,7 +1387,7 @@ public class ItemAssistant { } } // Weapon - if (targetSlot == GameConstants.WEAPON) { + if (targetSlot == ItemConstants.WEAPON) { if (c.attackLevelReq > 0) { if (c.getPlayerAssistant().getLevelForXP(c.playerXP[0]) < c.attackLevelReq) { c.getPacketSender().sendMessage("You need an attack level of " + c.attackLevelReq + " to wield this weapon."); @@ -1430,13 +1432,13 @@ public class ItemAssistant { } if (CastleWars.isInCw(c) || CastleWars.isInCwWait(c)) { - if (targetSlot == GameConstants.CAPE || targetSlot == GameConstants.HAT) { + if (targetSlot == ItemConstants.CAPE || targetSlot == ItemConstants.HAT) { c.getPacketSender().sendMessage("You can't wear your own capes or hats in a Castle Wars Game!"); return false; } } - if (targetSlot == GameConstants.WEAPON) { + if (targetSlot == ItemConstants.WEAPON) { c.autocasting = false; c.autocastId = 0; c.getPacketSender().sendConfig(108, 0); @@ -1450,26 +1452,26 @@ public class ItemAssistant { if (toEquip == toRemove + 1 && ItemData.itemStackable[toRemove]) { deleteItem(toRemove, getItemSlot(toRemove), toEquipN); c.playerEquipmentN[targetSlot] += toEquipN; - } else if (targetSlot != GameConstants.SHIELD && targetSlot != GameConstants.WEAPON) { + } else if (targetSlot != ItemConstants.SHIELD && targetSlot != ItemConstants.WEAPON) { c.playerItems[slot] = toRemove + 1; c.playerItemsN[slot] = toRemoveN; c.playerEquipment[targetSlot] = toEquip - 1; c.playerEquipmentN[targetSlot] = toEquipN; - } else if (targetSlot == GameConstants.SHIELD) { - boolean wearing2h = is2handed(getItemName(c.playerEquipment[GameConstants.WEAPON]).toLowerCase(), c.playerEquipment[GameConstants.WEAPON]); + } else if (targetSlot == ItemConstants.SHIELD) { + boolean wearing2h = is2handed(getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase(), c.playerEquipment[ItemConstants.WEAPON]); if (wearing2h) { // remove the weapon, add to inventory toRemove = c.playerEquipment[c.playerWeapon]; toRemoveN = c.playerEquipmentN[c.playerWeapon]; c.playerEquipment[c.playerWeapon] = -1; c.playerEquipmentN[c.playerWeapon] = 0; - updateSlot(GameConstants.WEAPON); + updateSlot(ItemConstants.WEAPON); } c.playerItems[slot] = toRemove + 1; c.playerItemsN[slot] = toRemoveN; c.playerEquipment[targetSlot] = toEquip - 1; c.playerEquipmentN[targetSlot] = toEquipN; - } else if (targetSlot == GameConstants.WEAPON) { + } else if (targetSlot == ItemConstants.WEAPON) { if (CastleWars.SARA_BANNER == toRemove || CastleWars.ZAMMY_BANNER == toRemove) { // alk // update CastleWars.dropFlag(c, toRemove); @@ -1477,8 +1479,8 @@ public class ItemAssistant { toRemoveN = 0; } boolean is2h = is2handed(getItemName(wearID).toLowerCase(), wearID); - boolean wearingShield = c.playerEquipment[GameConstants.SHIELD] > 0; - boolean wearingWeapon = c.playerEquipment[GameConstants.WEAPON] > 0; + boolean wearingShield = c.playerEquipment[ItemConstants.SHIELD] > 0; + boolean wearingWeapon = c.playerEquipment[ItemConstants.WEAPON] > 0; if (is2h) { if (wearingShield && wearingWeapon) { if (freeSlots() > 0) { @@ -1486,19 +1488,19 @@ public class ItemAssistant { c.playerItemsN[slot] = toRemoveN; c.playerEquipment[targetSlot] = toEquip - 1; c.playerEquipmentN[targetSlot] = toEquipN; - removeItem(c.playerEquipment[GameConstants.SHIELD], GameConstants.SHIELD); + removeItem(c.playerEquipment[ItemConstants.SHIELD], ItemConstants.SHIELD); } else { c.getPacketSender().sendMessage("You do not have enough inventory space to do this."); return false; } } else if (wearingShield && !wearingWeapon) { - c.playerItems[slot] = c.playerEquipment[GameConstants.SHIELD] + 1; - c.playerItemsN[slot] = c.playerEquipmentN[GameConstants.SHIELD]; + c.playerItems[slot] = c.playerEquipment[ItemConstants.SHIELD] + 1; + c.playerItemsN[slot] = c.playerEquipmentN[ItemConstants.SHIELD]; c.playerEquipment[targetSlot] = toEquip - 1; c.playerEquipmentN[targetSlot] = toEquipN; - c.playerEquipment[GameConstants.SHIELD] = -1; - c.playerEquipmentN[GameConstants.SHIELD] = 0; - updateSlot(GameConstants.SHIELD); + c.playerEquipment[ItemConstants.SHIELD] = -1; + c.playerEquipmentN[ItemConstants.SHIELD] = 0; + updateSlot(ItemConstants.SHIELD); } else { c.playerItems[slot] = toRemove + 1; c.playerItemsN[slot] = toRemoveN; @@ -1514,7 +1516,7 @@ public class ItemAssistant { } } resetItems(3214); - if (targetSlot == GameConstants.WEAPON) { + if (targetSlot == ItemConstants.WEAPON) { c.usingSpecial = false; addSpecialBar(wearID); } @@ -1642,7 +1644,7 @@ public class ItemAssistant { public void rearrangeBank() { int totalItems = 0; int highestSlot = 0; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] != 0) { totalItems++; if (highestSlot <= i) { @@ -1673,7 +1675,7 @@ public class ItemAssistant { } int totalItemsAfter = 0; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] != 0) { totalItemsAfter++; } @@ -1689,9 +1691,9 @@ public class ItemAssistant { if (c.getOutStream() != null) { c.getOutStream().createFrameVarSizeWord(53); c.getOutStream().writeWord(5382); // bank - c.getOutStream().writeWord(GameConstants.BANK_SIZE); + c.getOutStream().writeWord(ItemConstants.BANK_SIZE); } - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.getOutStream() != null) { if (c.bankItemsN[i] > 254) { c.getOutStream().writeByte(255); @@ -1757,8 +1759,8 @@ public class ItemAssistant { c.getPacketSender().sendMessage("You can't store items while trading!"); return false; } - for (int i = 0; i < GameConstants.ITEM_BANKABLE.length; i++) { - if (itemID == GameConstants.ITEM_BANKABLE[i]) { + for (int i = 0; i < ItemConstants.ITEM_BANKABLE.length; i++) { + if (itemID == ItemConstants.ITEM_BANKABLE[i]) { c.getPacketSender().sendMessage("You can't bank that item!"); return false; } @@ -1773,7 +1775,7 @@ public class ItemAssistant { return false; } - if (!(c.lastMainFrameInterface == MainFrameIDs.DEPOSIT_BOX || c.lastMainFrameInterface == MainFrameIDs.BANK || c.inBankArea())) { //Packet exploit prevention + if (!(c.lastMainFrameInterface == MainFrameIDs.DEPOSIT_BOX || c.lastMainFrameInterface == MainFrameIDs.BANK || Boundary.isIn(c, Boundary.BANK_AREA))) { //Packet exploit prevention c.getPacketSender().sendMessage("You don't have a bank open! Report this ID to developers: " + c.lastMainFrameInterface); return false; } @@ -1788,22 +1790,22 @@ public class ItemAssistant { if (ItemData.itemStackable[c.playerItems[fromSlot] - 1] || c.playerItemsN[fromSlot] > 1) { int toBankSlot = 0; boolean alreadyInBank = false; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] == c.playerItems[fromSlot]) { if (c.playerItemsN[fromSlot] < amount) { amount = c.playerItemsN[fromSlot]; } alreadyInBank = true; toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } if (!alreadyInBank && freeBankSlots() > 0) { - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] <= 0) { toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } c.bankItems[toBankSlot] = c.playerItems[fromSlot]; @@ -1841,18 +1843,18 @@ public class ItemAssistant { itemID = c.playerItems[fromSlot]; int toBankSlot = 0; boolean alreadyInBank = false; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] == c.playerItems[fromSlot]) { alreadyInBank = true; toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } if (!alreadyInBank && freeBankSlots() > 0) { - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] <= 0) { toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } int firstPossibleSlot = 0; @@ -1915,22 +1917,22 @@ public class ItemAssistant { if (ItemData.itemStackable[c.playerItems[fromSlot] - 1] || c.playerItemsN[fromSlot] > 1) { int toBankSlot = 0; boolean alreadyInBank = false; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] == c.playerItems[fromSlot] - 1) { if (c.playerItemsN[fromSlot] < amount) { amount = c.playerItemsN[fromSlot]; } alreadyInBank = true; toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } if (!alreadyInBank && freeBankSlots() > 0) { - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] <= 0) { toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } c.bankItems[toBankSlot] = c.playerItems[fromSlot] - 1; @@ -1964,18 +1966,18 @@ public class ItemAssistant { itemID = c.playerItems[fromSlot]; int toBankSlot = 0; boolean alreadyInBank = false; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] == c.playerItems[fromSlot] - 1) { alreadyInBank = true; toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } if (!alreadyInBank && freeBankSlots() > 0) { - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] <= 0) { toBankSlot = i; - i = GameConstants.BANK_SIZE + 1; + i = ItemConstants.BANK_SIZE + 1; } } int firstPossibleSlot = 0; @@ -2039,7 +2041,7 @@ public class ItemAssistant { public int freeBankSlots() { int freeS = 0; - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { if (c.bankItems[i] <= 0) { freeS++; } @@ -2060,8 +2062,7 @@ public class ItemAssistant { public void fromBank(int itemID, int fromSlot, int amount) { boolean cantWithdrawCuzMaxStack = false; - if (!(c.lastMainFrameInterface == MainFrameIDs.BANK || c.inBankArea())) - { + if (!(c.lastMainFrameInterface == MainFrameIDs.BANK || Boundary.isIn(c, Boundary.BANK_AREA))) { c.getPacketSender().sendMessage("Your bank isn't open!"); return; } @@ -2175,16 +2176,6 @@ public class ItemAssistant { } } - public int itemAmount(int itemID) { - int tempAmount = 0; - for (int i = 0; i < c.playerItems.length; i++) { - if (c.playerItems[i] == itemID) { - tempAmount += c.playerItemsN[i]; - } - } - return tempAmount; - } - public boolean isStackable(int itemID) { return ItemData.itemStackable[itemID]; } @@ -2231,8 +2222,8 @@ public class ItemAssistant { } if (moveWindow == 5382 && from >= 0 && to >= 0 - && from < GameConstants.BANK_SIZE && to < GameConstants.BANK_SIZE - && to < GameConstants.BANK_SIZE) { + && from < ItemConstants.BANK_SIZE && to < ItemConstants.BANK_SIZE + && to < ItemConstants.BANK_SIZE) { if (insertMode) { int tempFrom = from; for (int tempTo = to; tempFrom != tempTo;) @@ -2521,17 +2512,7 @@ public class ItemAssistant { } return -1; } - - public int getItemAmount(int ItemID) { - int itemCount = 0; - for (int i = 0; i < c.playerItems.length; i++) { - if (c.playerItems[i] - 1 == ItemID) { - itemCount += c.playerItemsN[i]; - } - } - return itemCount; - } - + public boolean playerHasItem(int itemID, int amt, int slot) { itemID++; int found = 0; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemConstants.java b/2006Redone Server/src/main/java/com/rebotted/game/items/ItemConstants.java new file mode 100644 index 00000000..cfad1a9d --- /dev/null +++ b/2006Redone Server/src/main/java/com/rebotted/game/items/ItemConstants.java @@ -0,0 +1,133 @@ +package com.rebotted.game.items; + +/** + * Aug 14, 2017 : 2:03:05 AM + * ItemConstants.java + * @author Andrew (Mr Extremez) + */ +public class ItemConstants { + + public static int BANK_SIZE = 352; + + public final static boolean itemRequirements = true; + + public final static int HAT = 0, CAPE = 1, AMULET = 2, WEAPON = 3, + CHEST = 4, SHIELD = 5, LEGS = 7, HANDS = 9, FEET = 10, RING = 12, + ARROWS = 13, ITEM_LIMIT = 15000, MAX_ITEM_AMOUNT = Integer.MAX_VALUE; + + public final static int[] COMBAT_RELATED_ITEMS = { 35, 39, 40, 41, 42, 43, + 44, 50, 53, 54, 60, 64, 75, 76, 78, 88, 546, 548, 577, 581, 598, + 626, 628, 630, 632, 634, 667, 687, 746, 747, 767, 772, 775, 776, + 777, 778, 818, 837, 839, 841, 843, 845, 847, 849, 851, 853, 855, + 857, 859, 861, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, + 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, + 886, 887, 888, 889, 890, 891, 892, 893, 942, 975, 1007, 1019, 1021, + 1023, 1027, 1029, 1031, 1033, 1035, 1052, 1059, 1061, 1063, 1065, + 1067, 1069, 1071, 1073, 1075, 1077, 1079, 1081, 1083, 1085, 1087, + 1089, 1091, 1093, 1095, 1097, 1099, 1101, 1103, 1105, 1107, 1109, + 1111, 1113, 1115, 1117, 1119, 1121, 1123, 1125, 1127, 1129, 1131, + 1133, 1135, 1137, 1139, 1141, 1143, 1145, 1147, 1149, 1151, 1153, + 1155, 1157, 1159, 1161, 1163, 1165, 1167, 1169, 1171, 1173, 1175, + 1177, 1179, 1181, 1183, 1185, 1187, 1189, 1191, 1193, 1195, 1197, + 1199, 1201, 1203, 1205, 1207, 1209, 1211, 1213, 1215, 1217, 1219, + 1221, 1223, 1225, 1227, 1229, 1231, 1233, 1237, 1239, 1241, 1243, + 1245, 1247, 1249, 1251, 1253, 1255, 1257, 1259, 1261, 1263, 1265, + 1267, 1269, 1271, 1273, 1275, 1277, 1279, 1281, 1283, 1285, 1287, + 1289, 1291, 1293, 1295, 1297, 1299, 1301, 1303, 1305, 1307, 1309, + 1311, 1313, 1315, 1317, 1319, 1321, 1323, 1325, 1327, 1329, 1331, + 1333, 1335, 1337, 1339, 1341, 1343, 1345, 1347, 1349, 1351, 1353, + 1355, 1357, 1359, 1361, 1363, 1365, 1367, 1369, 1371, 1373, 1375, + 1377, 1379, 1381, 1383, 1385, 1387, 1389, 1391, 1393, 1395, 1397, + 1399, 1401, 1403, 1405, 1407, 1409, 1419, 1420, 1422, 1424, 1426, + 1428, 1430, 1432, 1434, 1540, 1718, 1724, 2402, 2412, 2413, 2414, + 2415, 2416, 2417, 2487, 2489, 2491, 2493, 2495, 2497, 2499, 2501, + 2503, 2513, 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 2540, + 2541, 2577, 2579, 2581, 2583, 2585, 2587, 2589, 2591, 2593, 2595, + 2597, 2599, 2601, 2603, 2605, 2607, 2609, 2611, 2613, 2615, 2617, + 2619, 2621, 2623, 2625, 2627, 2629, 2653, 2655, 2659, 2661, 2663, + 2667, 2669, 2671, 2673, 2861, 2864, 2865, 2866, 2890, 2896, 2906, + 2916, 2926, 2936, 2961, 2963, 3053, 3054, 3095, 3096, 3097, 3098, + 3099, 3100, 3101, 3105, 3107, 3122, 3140, 3170, 3171, 3172, 3173, + 3174, 3175, 3176, 3190, 3192, 3194, 3196, 3198, 3200, 3202, 3204, + 3327, 3329, 3331, 3333, 3335, 3337, 3339, 3341, 3343, 3385, 3387, + 3389, 3391, 3393, 3472, 3473, 3474, 3475, 3476, 3477, 3479, 3481, + 3483, 3485, 3486, 3488, 3748, 3749, 3751, 3753, 3755, 3757, 3758, + 3759, 3761, 3763, 3765, 3767, 3769, 3771, 3773, 3775, 3777, 3779, + 3781, 3783, 3785, 3787, 3789, 3791, 3797, 3840, 3841, 3842, 3843, + 3844, 4087, 4089, 4091, 4093, 4095, 4097, 4099, 4101, 4103, 4105, + 4107, 4109, 4111, 4113, 4115, 4117, 4119, 4121, 4123, 4125, 4127, + 4129, 4131, 4150, 4151, 4153, 4156, 4158, 4160, 4170, 4172, 4173, + 4174, 4175, 4212, 4214, 4215, 4216, 4217, 4218, 4219, 4220, 4221, + 4222, 4223, 4224, 4226, 4227, 4228, 4229, 4230, 4231, 4232, 4233, + 4234, 4298, 4300, 4302, 4304, 4308, 4310, 4502, 4503, 4504, 4505, + 4506, 4507, 4508, 4509, 4510, 4511, 4512, 4580, 4582, 4585, 4587, + 4600, 4675, 4708, 4710, 4712, 4714, 4716, 4718, 4720, 4722, 4724, + 4726, 4728, 4730, 4732, 4734, 4736, 4738, 4740, 4745, 4747, 4749, + 4751, 4753, 4755, 4757, 4759, 4778, 4783, 4788, 4793, 4803, 4827, + 4860, 4866, 4872, 4878, 4884, 4890, 4896, 4902, 4908, 4914, 4920, + 4926, 4932, 4938, 4944, 4950, 4956, 4962, 4968, 4974, 4980, 4986, + 4992, 4998, 5014, 5016, 5018, 5553, 5554, 5555, 5556, 5557, 5574, + 5575, 5576, 5616, 5617, 5618, 5619, 5620, 5621, 5622, 5623, 5624, + 5625, 5626, 5627, 5648, 5654, 5655, 5656, 5657, 5658, 5659, 5660, + 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5670, 5672, 5674, + 5676, 5678, 5680, 5682, 5686, 5688, 5690, 5692, 5694, 5696, 5698, + 5700, 5704, 5706, 5708, 5710, 5712, 5714, 5716, 5718, 5720, 5722, + 5724, 5726, 5728, 5730, 5734, 5736, 6061, 6062, 6106, 6107, 6108, + 6109, 6110, 6111, 6128, 6129, 6130, 6131, 6133, 6135, 6137, 6139, + 6141, 6143, 6145, 6147, 6149, 6151, 6153, 6235, 6257, 6279, 6313, + 6315, 6317, 6322, 6324, 6326, 6328, 6330, 6416, 6522, 6523, 6524, + 6525, 6526, 6527, 6528, 6562, 6563, 6568, 6570, 6587, 6589, 6591, + 6593, 6595, 6597, 6599, 6601, 6603, 6605, 6607, 6609, 6611, 6613, + 6615, 6617, 6619, 6621, 6623, 6625, 6627, 6629, 6631, 6633, 6720, + 6724, 6726, 6739, 6745, 6746, 6760, 6762, 6764, 6809, 6889, 6893, + 6894, 6895, 6897, 6908, 6910, 6912, 6914, 6916, 6918, 6920, 6922, + 6924, 6959, 7158, 7159, 7332, 7334, 7336, 7338, 7340, 7342, 7344, + 7346, 7348, 7350, 7352, 7354, 7356, 7358, 7360, 7362, 7364, 7366, + 7368, 7374, 7390, 7392, 7394, 7396, 7398, 7399, 7400, 7410, 7433, + 7435, 7437, 7439, 7441, 7443, 7445, 7447, 7449, 7451, 7453, 7454, + 7455, 7456, 7457, 7458, 7459, 7460, 7461, 7462, 7539, 7552, 7553, + 7639, 7640, 7641, 7642, 7643, 7644, 7645, 7646, 7647, 7648, 7668, + 7686, 7687, 7806, 7807, 7808, 7809 }; + + public final static int[] ALCOHOL_RELATED_ITEMS = { 8940, 3803, 3712, 3711, + 2092, 2074, 3801 }; + + public final static int[] ITEM_SELLABLE = { 3842, 3844, 3840, 8844, 8845, + 8846, 8847, 8848, 8849, 8850, 10551, 6570, 7462, 7461, 7460, 7459, + 7458, 7457, 7456, 7455, 7454, 8839, 8840, 8842, 11663, 11664, 11666, + 10499, 9748, 9754, 9751, 9769, 9757, 9760, 9763, 9802, 9808, 9784, + 9799, 9805, 9781, 9796, 9793, 9775, 9772, 9778, 9787, 9811, 9766, + 9749, 9755, 9752, 9770, 9758, 9761, 9764, 9803, 9809, 9785, 9800, + 9806, 9782, 9797, 9794, 9776, 9773, 9779, 9788, 9812, 9767, 9747, + 9753, 9750, 9768, 9756, 9759, 9762, 9801, 9807, 9783, 9798, 9804, + 9780, 9795, 9792, 9774, 9771, 9777, 9786, 9810, 9765, 995, 2415, + 2416, 2417, 88, 1540, 2714, 432, 433, 1555, 1556, 1557, 1558, 1559, + 1560, 1561, 1562, 1563, 1564, 1565, 7585, 7584, 300, 775, 776, 777, + 6180, 6181, 6182, 6183, 6184, 6185, 6186, 6187, 6188, 2528, 4447, + 290, 666, 667 }; + public final static int[] ITEM_TRADEABLE = { 5317, 3842, 3844, 3840, 8844, 8845, + 8846, 8847, 8848, 8849, 8850, 10551, 6570, 7462, 7461, 7460, 7459, + 7458, 7457, 7456, 7455, 7454, 8839, 8840, 8842, 11663, 11664, + 11665, 10499, 9748, 9754, 9751, 9769, 9757, 9760, 9763, 9802, 9808, + 9784, 9799, 9805, 9781, 9796, 9793, 9775, 9772, 9778, 9787, 9811, + 9766, 9749, 9755, 9752, 9770, 9758, 9761, 9764, 9803, 9809, 9785, + 9800, 9806, 9782, 9797, 9794, 9776, 9773, 9779, 9788, 9812, 9767, + 9747, 9753, 9750, 9768, 9756, 9759, 9762, 9801, 9807, 9783, 9798, + 9804, 9780, 9795, 9792, 9774, 9771, 9777, 9786, 9810, 9765, 2528, + 4447, 772, 6180, 6181, 6182, 6183, 6184, 6185, 6186, 6187, 6188, + 775, 776, 777, 300, 88, 2415, 2416, 2417, 4214, 4215, 4216, 4217, + 4218, 4219, 4220, 4221, 4222, 4223, 4224, 1555, 1556, 1557, 1558, + 1559, 1560, 1561, 1562, 1563, 1564, 1565, 7585, 7584, 2714, 432, + 433, 290, 5075, 5074, 5073, 5071, 5070, 7413, 6529, 4067, 2996, 1464, 666, 667, + 2412, 2413, 2414 }; + + public final static int[] ITEM_UNALCHABLE = { 995, 1555, 1556, 1557, 1558, + 1559, 1560, 1561, 1562, 1563, 1564, 1565, 7583, 1566, 7585, 2528, + 4214, 4212, 2714, 432, 433, 300, 775, 776, 777, 6180, 6181, 6182, + 6183, 6184, 6185, 6186, 6187, 6188, 2528, 4447, 290, 666, 667}; + + public final static int[] ITEM_BANKABLE = {2528, 4447}; + + public final static int[] DESTROYABLE_ITEMS = {775, 776, 777, 2528, 6570, 2714, 432, 433, 300, 666}; + +} diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java b/2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java index 418c6653..4471e012 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java @@ -269,7 +269,7 @@ public class ItemData { case 7138: case 548: case 6185: - slot = GameConstants.LEGS; + slot = ItemConstants.LEGS; break; // Hats case 4166: @@ -295,7 +295,7 @@ public class ItemData { case 5543: case 5545: case 5547: - slot = GameConstants.HAT; + slot = ItemConstants.HAT; break; // Cape case 4304: @@ -312,12 +312,12 @@ public class ItemData { case 3789: case 4514: case 4516: - slot = GameConstants.CAPE; + slot = ItemConstants.CAPE; break; // Shield case 7051: case 7053: - slot = GameConstants.SHIELD; + slot = ItemConstants.SHIELD; break; // Chest case 577: @@ -340,7 +340,7 @@ public class ItemData { case 7390: case 7392: case 6186: - slot = GameConstants.CHEST; + slot = ItemConstants.CHEST; break; // Amulet case 3853: @@ -354,11 +354,11 @@ public class ItemData { case 4306: case 3867: case 1702: - slot = GameConstants.AMULET; + slot = ItemConstants.AMULET; break; // Hands case 776: - slot = GameConstants.HANDS; + slot = ItemConstants.HANDS; break; default: slot = c; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/RareProtection.java b/2006Redone Server/src/main/java/com/rebotted/game/items/impl/RareProtection.java index fea45d22..79bdfb67 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/RareProtection.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/items/impl/RareProtection.java @@ -18,7 +18,7 @@ public class RareProtection { for (int element : RARE_ITEMS) { if (c.wearId == element && (RARES || CRACKERS)) { c.getPacketSender().sendMessage("You shouldn't have that item!"); - int amountToDelete = c.getItemAssistant().getItemCount(element); + int amountToDelete = c.getItemAssistant().getItemAmount(element); c.getItemAssistant().deleteItem(element, amountToDelete); return false; } @@ -29,7 +29,7 @@ public class RareProtection { for (int element : RARE_ITEMS) { if (player.getItemAssistant().playerHasItem(element) && (RARES || CRACKERS)) { player.getPacketSender().sendMessage("You shouldn't have that item!"); - int amountToDelete = player.getItemAssistant().getItemCount(element); + int amountToDelete = player.getItemAssistant().getItemAmount(element); player.getItemAssistant().deleteItem(element, amountToDelete); return false; } @@ -51,7 +51,7 @@ public class RareProtection { for (int element : RARE_ITEMS) { if (c.getItemAssistant().playerHasItem(element)) { c.getPacketSender().sendMessage("You can't have these items!"); - int amountToDelete = c.getItemAssistant().getItemCount(element); + int amountToDelete = c.getItemAssistant().getItemAmount(element); c.getItemAssistant().deleteItem(element, amountToDelete); return false; } @@ -63,7 +63,7 @@ public class RareProtection { for (int element : EDIBLE_RARES) { if (itemId == element && RARES) { c.getPacketSender().sendMessage("You can't eat that item!"); - int amountToDelete = c.getItemAssistant().getItemCount(element); + int amountToDelete = c.getItemAssistant().getItemAmount(element); c.getItemAssistant().deleteItem(element, amountToDelete); return false; } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcData.java b/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcData.java index 2bcec04a..5c8257cb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcData.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcData.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import com.rebotted.game.content.minigames.FightCaves; import com.rebotted.game.players.PlayerHandler; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.clip.Region; public class NpcData { @@ -85,7 +86,7 @@ public class NpcData { || FightCaves.isFightCaveNpc(i)) { if (PlayerHandler.players[j].underAttackBy <= 0 && PlayerHandler.players[j].underAttackBy2 <= 0 - || PlayerHandler.players[j].inMulti()) { + || Boundary.isIn(PlayerHandler.players[j], Boundary.MULTI)) { if (PlayerHandler.players[j].heightLevel == NpcHandler.npcs[i].heightLevel) { players.add(j); } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java b/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java index fa97341f..73acee6e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java @@ -26,6 +26,7 @@ import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.clip.Region; // Facetypes: 1-Walk, 2-North, 3-South, 4-East, 5-West @@ -226,7 +227,7 @@ public class NpcHandler { return j; } if (goodDistance(PlayerHandler.players[j].absX, PlayerHandler.players[j].absY, npcs[i].absX, npcs[i].absY, 2 + distanceRequired(i) + followDistance(i)) || FightCaves.isFightCaveNpc(i)) { - if (PlayerHandler.players[j].underAttackBy <= 0 && PlayerHandler.players[j].underAttackBy2 <= 0 || PlayerHandler.players[j].inMulti()) { + if (PlayerHandler.players[j].underAttackBy <= 0 && PlayerHandler.players[j].underAttackBy2 <= 0 || Boundary.isIn(PlayerHandler.players[j], Boundary.MULTI)) { if (PlayerHandler.players[j].heightLevel == npcs[i].heightLevel) { return j; } @@ -339,7 +340,7 @@ public class NpcHandler { for(int o = 0; o < c.barrowCrypt.length; o++){ if(npcs[i].npcType == c.barrowCrypt[o][0]) { c.barrowsKillCount++; - c.getPacketSender().sendFrame126(""+c.barrowsKillCount, 4536); + c.getPacketSender().sendString(""+c.barrowsKillCount, 4536); } } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java b/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java index b5802f18..4630c7a1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java @@ -47,6 +47,7 @@ import com.rebotted.game.objects.impl.Webs; import com.rebotted.game.players.Player; import com.rebotted.game.players.Position; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.clip.Region; public class ObjectsActions { @@ -1478,7 +1479,7 @@ public class ObjectsActions { } break; case 14314: - if (player.inPcBoat()) { + if (Boundary.isIn(player, Boundary.PC_BOAT)) { if (PestControl.waitingBoat.containsKey(player)) { PestControl.leaveWaitingBoat(player); } else { @@ -2090,7 +2091,7 @@ public class ObjectsActions { break; case 9398:// deposit box - player.getPacketSender().sendFrame126("The Bank of " + GameConstants.SERVER_NAME + " - Deposit Box", 7421); + player.getPacketSender().sendString("The Bank of " + GameConstants.SERVER_NAME + " - Deposit Box", 7421); player.getPacketSender().sendFrame248(4465, 197); player.getItemAssistant().resetItems(7423); break; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/Player.java b/2006Redone Server/src/main/java/com/rebotted/game/players/Player.java index 61a2490e..1710c411 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/Player.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/players/Player.java @@ -71,6 +71,7 @@ import com.rebotted.game.items.GameItem; import com.rebotted.game.items.Inventory; import com.rebotted.game.items.ItemData; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.items.impl.PotionMixing; import com.rebotted.game.items.impl.Teles; import com.rebotted.game.npcs.Npc; @@ -88,6 +89,7 @@ import com.rebotted.net.packets.impl.ChallengePlayer; import com.rebotted.util.ISAACRandomGen; import com.rebotted.util.Misc; import com.rebotted.util.Stream; +import com.rebotted.world.Boundary; import com.rebotted.world.ObjectManager; public abstract class Player { @@ -523,13 +525,13 @@ public abstract class Player { public void puzzleBarrow() { getPacketSender().sendFrame246(4545, 250, 6833); - getPacketSender().sendFrame126("1.", 4553); + getPacketSender().sendString("1.", 4553); getPacketSender().sendFrame246(4546, 250, 6832); - getPacketSender().sendFrame126("2.", 4554); + getPacketSender().sendString("2.", 4554); getPacketSender().sendFrame246(4547, 250, 6830); - getPacketSender().sendFrame126("3.", 4555); + getPacketSender().sendString("3.", 4555); getPacketSender().sendFrame246(4548, 250, 6829); - getPacketSender().sendFrame126("4.", 4556); + getPacketSender().sendString("4.", 4556); getPacketSender().sendFrame246(4550, 250, 3454); getPacketSender().sendFrame246(4551, 250, 8746); getPacketSender().sendFrame246(4552, 250, 6830); @@ -776,16 +778,14 @@ public abstract class Player { getPacketSender().walkableInterface(197); isSnowy = false; if (CombatConstants.SINGLE_AND_MULTI_ZONES) { - if (inMulti()) { - getPacketSender().sendFrame126("@yel@Level: " + wildLevel, - 199); + if (Boundary.isIn(this, Boundary.MULTI)) { + getPacketSender().sendString("@yel@Level: " + wildLevel, 199); } else { - getPacketSender().sendFrame126("@yel@Level: " + wildLevel, - 199); + getPacketSender().sendString("@yel@Level: " + wildLevel, 199); } } else { getPacketSender().multiWay(-1); - getPacketSender().sendFrame126("@yel@Level: " + wildLevel, 199); + getPacketSender().sendString("@yel@Level: " + wildLevel, 199); } getPacketSender().showOption(3, 0, "Attack", 1); } else if (inDuelArena()) { @@ -802,7 +802,7 @@ public abstract class Player { getPacketSender().walkableInterface(11908); isSnowy = false; } else if (isInBarrows() || isInBarrows2()) { - getPacketSender().sendFrame126("Kill Count: " + barrowsKillCount, 4536); + getPacketSender().sendString("Kill Count: " + barrowsKillCount, 4536); getPacketSender().walkableInterface(4535); isSnowy = false; } else if (inCw() || inPits) { @@ -850,7 +850,7 @@ public abstract class Player { } public void process() { - if (inDesert() && heightLevel == 0) { + if (Boundary.isIn(this, Boundary.DESERT) && heightLevel == 0) { DesertHeat.callHeat(this); } if (playerEnergy < 100 && System.currentTimeMillis() - lastIncrease >= getPlayerAssistant().raiseTimer()) { @@ -917,12 +917,12 @@ public abstract class Player { } } - if (!hasMultiSign && inMulti()) { + if (!hasMultiSign && Boundary.isIn(this, Boundary.MULTI)) { hasMultiSign = true; getPacketSender().multiWay(1); } - if (hasMultiSign && !inMulti()) { + if (hasMultiSign && !Boundary.isIn(this, Boundary.MULTI)) { hasMultiSign = false; getPacketSender().multiWay(-1); } @@ -1164,7 +1164,7 @@ public abstract class Player { } public void correctCoordinates() { - if (inPcGame()) { + if (Boundary.isIn(this, Boundary.PC_GAME)) { getPlayerAssistant().movePlayer(2657, 2639, 0); } else if (FightPitsArea()) { getPlayerAssistant().movePlayer(2399, 5178, 0); @@ -1571,35 +1571,6 @@ public abstract class Player { } } - public boolean inCWsaraBase() { - if (absX > 2422 && absX < 2432 && absY > 3071 && absY < 3081 - && heightLevel == 1) { - return true; - } - return false; - } - - public boolean inCWzammyBase() { - if (absX > 2367 && absX < 2377 && absY > 3126 && absY < 3136 - && heightLevel == 1) { - return true; - } - return false; - } - - public boolean saraTeam() { - return playerEquipment[GameConstants.CAPE] == 4041; - } - - public boolean zammyTeam() { - return playerEquipment[GameConstants.CAPE] == 4042; - } - - public boolean inCwSafe() { - return (isInAreaxxyy(2423, 2431, 3072, 3080) || isInAreaxxyy(2368, 2376, 3127, 3135)) - && heightLevel == 1; - } - public boolean inZammyWait() { return isInAreaxxyy(2409, 2431, 9511, 9535); } @@ -1609,20 +1580,7 @@ public abstract class Player { } public boolean inCwGame() { - return isInAreaxxyy(2368, 2431, 9479, 9535) || isInAreaxxyy(2368, 2431, 3072, 3135) - && !inSaraWait() && !inZammyWait(); - } - - public boolean inCwUnderground() { - return isInAreaxxyy(2368, 2431, 9479, 9535) && !inSaraWait() && !inZammyWait(); - } - - public boolean inZammyBase() { - return isInAreaxxyy(2368, 2384, 3118, 3135); - } - - public boolean inSaraBase() { - return isInAreaxxyy(2414, 2431, 3072, 3088); + return isInAreaxxyy(2368, 2431, 9479, 9535) || isInAreaxxyy(2368, 2431, 3072, 3135) && !inSaraWait() && !inZammyWait(); } public void gameInterface(int id) { @@ -1634,7 +1592,6 @@ public abstract class Player { public int gameInterface; public int lastGame; - public int[][] barrowsNpcs = { { 2030, 0 }, // verac { 2029, 0 }, // toarg { 2028, 0 }, // karil @@ -1706,6 +1663,7 @@ public abstract class Player { public boolean isMining; public boolean hasThievedStall; + public boolean stopFiremaking = false, pickedUpFiremakingLog = false, logLit; public boolean hasThievedStall() { return hasThievedStall; @@ -1808,44 +1766,6 @@ public abstract class Player { return false; } - public boolean inMulti() { - if (absX >= 3136 - && absX <= 3327 - && absY >= 3519 - && absY <= 3607// duel? - || absX >= 2360 - && absX <= 2445 - && absY >= 5045 - && absY <= 5125 - || absX >= 3190 - && absX <= 3327 - && absY >= 3648 - && absY <= 3839// duel? - || absX >= 3200 && absX <= 3390 && absY >= 3840 && absY <= 3967 - || absX >= 2992 && absX <= 3007 && absY >= 3912 && absY <= 3967 - || absX >= 2946 && absX <= 2959 && absY >= 3816 && absY <= 3831 - || absX >= 3008 && absX <= 3199 && absY >= 3856 && absY <= 3903 - || absX >= 3008 && absX <= 3071 && absY >= 3600 && absY <= 3711 - || absX >= 3072 && absX <= 3327 && absY >= 3608 && absY <= 3647 - || absX >= 2624 - && absX <= 2690 - && absY >= 2550 - && absY <= 2619 - || absX >= 2667 - && absX <= 2685 - && absY >= 3712 - && absY <= 3730 // rock - // crabs - || absX >= 2371 && absX <= 2422 && absY >= 5062 && absY <= 5117 - || absX >= 2896 && absX <= 2927 && absY >= 3595 && absY <= 3630 - || absX >= 2892 && absX <= 2932 && absY >= 4435 && absY <= 4464 - || absX >= 2256 && absX <= 2287 && absY >= 4680 && absY <= 4711 - || inKqArea()) { - return true; - } - return false; - } - public boolean inKqArea() { if (absX >= 3467 && absX <= 3506 && absY >= 9477 && absY <= 9513) { return true; @@ -1861,7 +1781,7 @@ public abstract class Player { if (!wildernessWarning) { resetWalkingQueue(); wildernessWarning = true; - getPacketSender().sendFrame126("WARNING!", 6940); + getPacketSender().sendString("WARNING!", 6940); getPacketSender().showInterface(1908); } return true; @@ -1869,46 +1789,6 @@ public abstract class Player { return false; } - public boolean inBankArea() { - return isInArea(3205,3226,3214,3211) && heightLevel == 2|| //Lumbridge Bank - isInArea(3266,3171,3272,3162) || //Al Kharid Bank - isInArea(2436,5186,2453,5174) || //Tzhaar area - isInArea(2842,2957,2860,2950) || //Shilo Bank - isInArea(3492,3215,3456,3200) || //Burgh d rott - isInArea(3377,3275,3386,3266) || //Clan Wars - isInArea(3087,3248,3098,3239) || //Draynor - isInArea(3248,3423,3260,3414) || //Varrock East - isInArea(3183,3446,3193,3432) || //Varrock West - isInArea(3088,3501,3100,3486) || //Edgeville - isInArea(3009,3358,3020,3352) || //Falador East - isInArea(2942,3374,2950,3365) || //Falador West - isInArea(2839,3547,2844,3540) || //Warriors guild - isInArea(2804,3447,2815,3438) || //Catherby - isInArea(2718,3500,2733,3485) || //Seer's village - isInArea(2610,3338,2622,3326) || //North ardy - isInArea(2645,3288,2660,3281) || //South ardy - isInArea(2658,3165,2670,3158) || //Khazard - isInArea(2607,3098,2618,3087) || //Yanille - isInArea(2442,3084,2444,3081) || //Castle Wars - isInArea(2348,3168,2358,3159) || //Lleyta - isInArea(2324,3694,2334,3685) || //Piscatoris - isInArea(2527,3581,2539,3563) || //Barbarian Assault - isInArea(2448,3420,2442,3430) || //Tree Gnome Stronghold - isInArea(2453,3491,2440,3478) && heightLevel == 1 || //Grand Tree Area - isInArea(2843,2958,2816,2944) || //Shilo Village - isInArea(3113,3131,3131,3118) || //Tutorial Island - isInArea(3422,2895,3433,2885) || //Nardah - isInArea(3685,3473,3694,3461) || //Phasmatys - isInArea(2530,4725,2550,4705) || //Phasmatys - isInArea(2834, 10215, 2841, 10204) || // Keldagrim - isInArea(2379, 4453, 2386, 4462) || // Zanaris - isInArea(2582, 3423, 2591, 3417) || //Fishing Guild - isInArea(3509, 3483, 3516, 3476) || //Canifis - isInArea(3297, 3133, 3311, 3115) || //Shantay Pass - isInArea(3049, 4977, 3035, 4967) && heightLevel == 1 || //Rogues den - false; - } - public boolean inPlayerShopArea() { return isInArea(2938, 3389, 3059, 3329) || // Falador isInArea(3172, 3449, 3270, 3384) || // Varrock @@ -1926,13 +1806,6 @@ public abstract class Player { isInArea(2451, 3408, 2425, 3437) || false; } - - public boolean inDesert() { - if (tutorialProgress >= 0 && tutorialProgress <= 36) { - return false; - } - return (getX() >= 3137 && getX() <= 3321 && getY() >= 2880 && getY() <= 3115); - } public boolean duelingArena() { if (absX > 3331 && absX < 3391 && absY > 3242 && absY < 3260) { @@ -1963,14 +1836,6 @@ public abstract class Player { return false; } - public boolean inPcBoat() { - return absX >= 2660 && absX <= 2663 && absY >= 2638 && absY <= 2643; - } - - public boolean inPcGame() { - return absX >= 2624 && absX <= 2690 && absY >= 2550 && absY <= 2619; - } - public boolean inDuelArena() { if (absX > 3322 && absX < 3394 && absY > 3195 && absY < 3291 || absX > 3311 && absX < 3323 && absY > 3223 && absY < 3248) { return true; @@ -1978,11 +1843,6 @@ public abstract class Player { return false; } - public boolean inBank() { // Area(top left X, bottom right X, bottom right Y, top left Y) - return isInAreaxxyy(3090, 3099, 3487, 3500) || isInAreaxxyy(3089, 3090, 3492, 3498) || isInAreaxxyy(3249, 3258, 3413, 3428) || isInAreaxxyy(3180, 3191, 3432, 3448) || isInAreaxxyy(2945, 2948, 3365, 3374) || - isInAreaxxyy(2943, 2948, 3367, 3374) || isInAreaxxyy(2945, 2950, 3365, 3370) || isInAreaxxyy(3009, 3018, 3352, 3359) || isInAreaxxyy(3017, 3022, 3353, 3357); - } - public boolean inLumbBuilding() { return isInAreaxxyy(3205, 3216, 3209, 3228) || isInAreaxxyy(3229, 3233, 3206, 3208) || isInAreaxxyy(3228, 3233, 3201, 3205) || isInAreaxxyy(3230, 3237, 3195, 3198) || isInAreaxxyy(3238, 3229, 3209, 3211) || isInAreaxxyy(3240, 3247, 3204, 3215) || isInAreaxxyy(3247, 3252, 3190, 3195) || isInAreaxxyy(3227, 3230, 3212, 3216) || isInAreaxxyy(3227, 3230, 3221, 3225) || isInAreaxxyy(3229, 3232, 3236, 3241) || @@ -2032,10 +1892,10 @@ public abstract class Player { public PlayerHandler handler = null; public int playerItems[] = new int[28]; public int playerItemsN[] = new int[28]; - public int bankItems[] = new int[GameConstants.BANK_SIZE]; - public int bankItemsN[] = new int[GameConstants.BANK_SIZE]; + public int bankItems[] = new int[ItemConstants.BANK_SIZE]; + public int bankItemsN[] = new int[ItemConstants.BANK_SIZE]; // used for player owned shops - public int bankItemsV[] = new int[GameConstants.BANK_SIZE]; + public int bankItemsV[] = new int[ItemConstants.BANK_SIZE]; public boolean bankNotes = false; public boolean shouldSave = false; @@ -2125,11 +1985,11 @@ public abstract class Player { playerXP[i] = 0; } } - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { bankItems[i] = 0; } - for (int i = 0; i < GameConstants.BANK_SIZE; i++) { + for (int i = 0; i < ItemConstants.BANK_SIZE; i++) { bankItemsN[i] = 0; } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java b/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java index 8103a976..cf7442b9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java @@ -20,11 +20,13 @@ import com.rebotted.game.content.skills.SkillHandler; import com.rebotted.game.content.skills.smithing.Superheat; import com.rebotted.game.items.GameItem; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.items.impl.LightSources; import com.rebotted.game.npcs.Npc; import com.rebotted.game.npcs.NpcHandler; import com.rebotted.util.GameLogger; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.TileControl; import com.rebotted.world.clip.PathFinder; import com.rebotted.world.clip.Region; @@ -38,14 +40,14 @@ public class PlayerAssistant { } public boolean savePlayer() { - return (player.wildLevel < 20 && player.playerEquipment[GameConstants.RING] == 2570 && player.playerLevel[3] > 0 && player.playerLevel[3] <= player.getLevelForXP(player.playerXP[3]) / 10 && player.underAttackBy > 0); + return (player.wildLevel < 20 && player.playerEquipment[ItemConstants.RING] == 2570 && player.playerLevel[3] > 0 && player.playerLevel[3] <= player.getLevelForXP(player.playerXP[3]) / 10 && player.underAttackBy > 0); } public void handleROL() { if (!savePlayer()) { return; } - player.getItemAssistant().deleteEquipment(2570, GameConstants.RING); + player.getItemAssistant().deleteEquipment(2570, ItemConstants.RING); player.getPlayerAssistant().startTeleport(3222, 3218, 0, "modern"); player.getPacketSender().sendMessage("Your ring of life saves you."); } @@ -78,7 +80,6 @@ public class PlayerAssistant { return player.playerRights < 2 || player.playerRights > 3; } - public void handleObjectRegion(int objectId, int minX, int minY, int maxX, int maxY) { for (int i = minX; i < maxX+1; i++) { for (int j = minY; j < maxY+1; j++) { @@ -93,7 +94,7 @@ public class PlayerAssistant { public void loginScreen() { player.getPacketSender().showInterface(15244); - player.getPacketSender().sendFrame126("Welcome to " + GameConstants.SERVER_NAME + "\\n", 15257); + player.getPacketSender().sendString("Welcome to " + GameConstants.SERVER_NAME + "\\n", 15257); int currentDay = player.getLastLogin() - player.lastLoginDate; if (player.playerLevel[15] < 3) { @@ -103,24 +104,24 @@ public class PlayerAssistant { player.getPlayerAssistant().refreshSkill(15); } if (player.lastLoginDate <= 0) { - player.getPacketSender().sendFrame126("This is your first time logging in!", 15258); + player.getPacketSender().sendString("This is your first time logging in!", 15258); } else if (player.lastLoginDate == 1) { - player.getPacketSender().sendFrame126("You last login @red@yesterday@bla@", 15258); + player.getPacketSender().sendString("You last login @red@yesterday@bla@", 15258); } else { - player.getPacketSender().sendFrame126("You last login @red@" + (currentDay > 1 ? (currentDay + " @bla@days ago") : ("ealier today")) + " @bla@", 15258); + player.getPacketSender().sendString("You last login @red@" + (currentDay > 1 ? (currentDay + " @bla@days ago") : ("ealier today")) + " @bla@", 15258); } - player.getPacketSender().sendFrame126("" +GameConstants.SERVER_NAME + " will NEVER email you.\\n We use the forums or we \\nWill contact you through game.", 15260); - player.getPacketSender().sendFrame126("You have 0 unread messages\\nOn forums!", 15261); - player.getPacketSender().sendFrame126("You have @gre@unlimited@yel@ days of member credit.", 15262); - player.getPacketSender().sendFrame126("CLICK HERE TO PLAY", 15263); + player.getPacketSender().sendString("" +GameConstants.SERVER_NAME + " will NEVER email you.\\n We use the forums or we \\nWill contact you through game.", 15260); + player.getPacketSender().sendString("You have 0 unread messages\\nOn forums!", 15261); + player.getPacketSender().sendString("You have @gre@unlimited@yel@ days of member credit.", 15262); + player.getPacketSender().sendString("CLICK HERE TO PLAY", 15263); if (!player.hasBankpin) { - player.getPacketSender().sendFrame126("You currently have no bank pin set!\\nWe strongly advise you to set\\n one.", 15270); + player.getPacketSender().sendString("You currently have no bank pin set!\\nWe strongly advise you to set\\n one.", 15270); } else { - player.getPacketSender().sendFrame126("\\nYou currently have a bank pin set.\\nBank pins are coming soon!.", 15270); + player.getPacketSender().sendString("\\nYou currently have a bank pin set.\\nBank pins are coming soon!.", 15270); } int random = Misc.random(3); - player.getPacketSender().sendFrame126(welcomeMessages[random][0], 15803); - player.getPacketSender().sendFrame126(welcomeMessages[random][1], 15804); + player.getPacketSender().sendString(welcomeMessages[random][0], 15803); + player.getPacketSender().sendString(welcomeMessages[random][1], 15804); } private String[][] welcomeMessages = { @@ -136,134 +137,134 @@ public class PlayerAssistant { player.getPacketSender().showInterface(5392); } - public ArrayList randomFish(int fish) { - Random r = new Random(); - ArrayList toReturn = new ArrayList(); - boolean turtles = true; - boolean mantas = true; - boolean lobsters = true; - boolean swordfish = true; - int turt = 0; - int manta = 0; - int lobs = 0; - int swordFish = 0; - int junk = 0; - int done = 0; - while (done != fish) { - done++; - int random = r.nextInt(100); - if (random >= 85 - GameEngine.trawler.chanceByLevel(player, 381)) { - if (mantas) { - manta++; - } - } else if (random >= 70 - GameEngine.trawler.chanceByLevel(player, - 381)) { - if (turtles) { - turt++; - } - } else if (random >= 40) { - if (swordfish) { - swordFish++; - } - } else if (random >= 5) { - if (lobsters) { - lobs++; - } - } else { - junk++; - } - } - int xpToAdd = 0; - if (manta > 0) { - toReturn.add(new GameItem(389, manta)); - if (player.playerLevel[player.playerFishing] >= 81) { - xpToAdd += (manta * 46); - } - } - if (turt > 0) { - toReturn.add(new GameItem(395, turt)); - if (player.playerLevel[player.playerFishing] >= 79) { - xpToAdd += (manta * 38); - } - } - if (lobs > 0) { - toReturn.add(new GameItem(377, lobs)); - if (player.playerLevel[player.playerFishing] >= 40) { - xpToAdd += (manta * 90); - } - } - if (swordFish > 0) { - toReturn.add(new GameItem(371, swordFish)); - if (player.playerLevel[player.playerFishing] >= 50) { - xpToAdd += (manta * 100); - } - } - if (junk > 0) - toReturn.add(new GameItem(685, junk)); - player.getPlayerAssistant().addSkillXP(xpToAdd, player.playerFishing); - return toReturn; - } - - public void removeFishingTrawlerRewardItem(int slot, boolean all) { - try { - if (!all) { - if (player.getItemAssistant().freeSlots() != 0) { - if (player.fishingTrawlerReward.get(slot).amount >= 1) { - player.getItemAssistant().addItem( - player.fishingTrawlerReward.get(slot).id, 1); - player.fishingTrawlerReward.get(slot).amount--; - if (player.fishingTrawlerReward.get(slot).amount <= 0) { - player.fishingTrawlerReward.remove(slot); - GameEngine.trawler.showReward(player); - } else { - GameEngine.trawler.updateRewardSlot(player, slot); - } - } - } else { - player.getPacketSender().sendMessage("You don't have enough inventory space to withdraw that"); - } - } else { - int loop = player.fishingTrawlerReward.get(slot).amount; - for (int j = 0; j < loop; j++) { - if (player.getItemAssistant().freeSlots() == 0) { - player.getPacketSender().sendMessage("You don't have enough inventory space to withdraw that"); - GameEngine.trawler.updateRewardSlot(player, slot); - return; - } - player.getItemAssistant() - .addItem(player.fishingTrawlerReward.get(slot).id, 1); - player.fishingTrawlerReward.get(slot).amount--; - if (player.fishingTrawlerReward.get(slot).amount <= 0) { - player.fishingTrawlerReward.remove(slot); - GameEngine.trawler.showReward(player); - return; - } - } - } - } catch (Exception e) { + public ArrayList randomFish(int fish) { + Random r = new Random(); + ArrayList toReturn = new ArrayList(); + boolean turtles = true; + boolean mantas = true; + boolean lobsters = true; + boolean swordfish = true; + int turt = 0; + int manta = 0; + int lobs = 0; + int swordFish = 0; + int junk = 0; + int done = 0; + while (done != fish) { + done++; + int random = r.nextInt(100); + if (random >= 85 - GameEngine.trawler.chanceByLevel(player, 381)) { + if (mantas) { + manta++; + } + } else if (random >= 70 - GameEngine.trawler.chanceByLevel(player, + 381)) { + if (turtles) { + turt++; + } + } else if (random >= 40) { + if (swordfish) { + swordFish++; + } + } else if (random >= 5) { + if (lobsters) { + lobs++; + } + } else { + junk++; + } + } + int xpToAdd = 0; + if (manta > 0) { + toReturn.add(new GameItem(389, manta)); + if (player.playerLevel[player.playerFishing] >= 81) { + xpToAdd += (manta * 46); + } + } + if (turt > 0) { + toReturn.add(new GameItem(395, turt)); + if (player.playerLevel[player.playerFishing] >= 79) { + xpToAdd += (manta * 38); + } + } + if (lobs > 0) { + toReturn.add(new GameItem(377, lobs)); + if (player.playerLevel[player.playerFishing] >= 40) { + xpToAdd += (manta * 90); + } + } + if (swordFish > 0) { + toReturn.add(new GameItem(371, swordFish)); + if (player.playerLevel[player.playerFishing] >= 50) { + xpToAdd += (manta * 100); + } + } + if (junk > 0) + toReturn.add(new GameItem(685, junk)); + player.getPlayerAssistant().addSkillXP(xpToAdd, player.playerFishing); + return toReturn; + } + + public void removeFishingTrawlerRewardItem(int slot, boolean all) { + try { + if (!all) { + if (player.getItemAssistant().freeSlots() != 0) { + if (player.fishingTrawlerReward.get(slot).amount >= 1) { + player.getItemAssistant().addItem( + player.fishingTrawlerReward.get(slot).id, 1); + player.fishingTrawlerReward.get(slot).amount--; + if (player.fishingTrawlerReward.get(slot).amount <= 0) { + player.fishingTrawlerReward.remove(slot); + GameEngine.trawler.showReward(player); + } else { + GameEngine.trawler.updateRewardSlot(player, slot); + } + } + } else { + player.getPacketSender().sendMessage("You don't have enough inventory space to withdraw that"); + } + } else { + int loop = player.fishingTrawlerReward.get(slot).amount; + for (int j = 0; j < loop; j++) { + if (player.getItemAssistant().freeSlots() == 0) { + player.getPacketSender().sendMessage("You don't have enough inventory space to withdraw that"); + GameEngine.trawler.updateRewardSlot(player, slot); + return; + } + player.getItemAssistant() + .addItem(player.fishingTrawlerReward.get(slot).id, 1); + player.fishingTrawlerReward.get(slot).amount--; + if (player.fishingTrawlerReward.get(slot).amount <= 0) { + player.fishingTrawlerReward.remove(slot); + GameEngine.trawler.showReward(player); + return; + } + } + } + } catch (Exception e) { - } - } + } + } + + public void removeAllSidebars() { + for (int i = 0; i < 14; i++) { + player.getPacketSender().setSidebarInterface(i, -1); + } + } + + public void resetAnimationsToPrevious() { + player.playerRunIndex = player.prevPrevPlayerRunIndex; + player.playerStandIndex = player.prevPlayerStandIndex; + player.playerWalkIndex = player.prevplayerWalkIndex; + player.playerTurnIndex = player.prevPlayerTurnIndex; + player.playerTurn90CWIndex = player.prevPlayerTurn90CWIndex; + player.playerTurn90CCWIndex = player.prevPlayerTurn90CCWIndex; + player.playerTurn180Index = player.prevPlayerTurn180Index; + requestUpdates(); + } - public void removeAllSidebars() { - for (int i = 0; i < 14; i++) { - player.getPacketSender().setSidebarInterface(i, -1); - } - } - - public void resetAnimationsToPrevious() { - player.playerRunIndex = player.prevPrevPlayerRunIndex; - player.playerStandIndex = player.prevPlayerStandIndex; - player.playerWalkIndex = player.prevplayerWalkIndex; - player.playerTurnIndex = player.prevPlayerTurnIndex; - player.playerTurn90CWIndex = player.prevPlayerTurn90CWIndex; - player.playerTurn90CCWIndex = player.prevPlayerTurn90CCWIndex; - player.playerTurn180Index = player.prevPlayerTurn180Index; - requestUpdates(); - } - - public int backupItems[] = new int[GameConstants.BANK_SIZE]; - public int backupItemsN[] = new int[GameConstants.BANK_SIZE]; + public int backupItems[] = new int[ItemConstants.BANK_SIZE]; + public int backupItemsN[] = new int[ItemConstants.BANK_SIZE]; public int backupInvItems[] = new int[28]; public int backupInvItemsN[] = new int[28]; @@ -277,7 +278,6 @@ public class PlayerAssistant { c.playerItemsN[i] = o.playerItemsN[i]; } c.getItemAssistant().updateInventory(); - for (int i = 0; i < o.playerItems.length; i++) { c.playerItemsN[i] = backupInvItemsN[i]; c.playerItems[i] = backupInvItems[i]; @@ -285,7 +285,7 @@ public class PlayerAssistant { } public void otherBank(Client c, Client o) { - if(o == c || o == null || c == null) { + if (o == c || o == null || c == null) { return; } @@ -334,8 +334,7 @@ public class PlayerAssistant { player.getPacketSender().closeAllWindows(); switch (occurrence) { case 0: - player.getDialogueHandler().sendStatement( - "You arrive at Port Khazard."); + player.getDialogueHandler().sendStatement("You arrive at Port Khazard."); break; case 1: player.getPacketSender().sendMessage("You wash up onto the shore..."); @@ -352,14 +351,9 @@ public class PlayerAssistant { public void sendSidebars() { for (int i = 0; i < GameConstants.SIDEBARS.length; i++) { - player.getPacketSender().setSidebarInterface(i, - GameConstants.SIDEBARS[i]); - if (player.playerMagicBook == 0) { - player.getPacketSender().setSidebarInterface(6, 1151); - } else { - player.getPacketSender().setSidebarInterface(6, 12855); - } + player.getPacketSender().setSidebarInterface(i, GameConstants.SIDEBARS[i]); } + player.getPacketSender().setSidebarInterface(6, player.playerMagicBook == 0 ? 1151 : 12855); } public boolean removeGloves() { @@ -386,23 +380,6 @@ public class PlayerAssistant { c.getPacketSender().drawHeadicon(0, 0, 0, 0); } - /** - * Tutorial Island Interface Integer a = amount the bar fills Integer p = - * represents percent # on interface Integer "a" represents amount %bar - * fills From what i tested so far it goes like this:1=0%, 2=5%, 3=10%, so - * and so fouth - */ - - public void tutorialIslandInterface(int p, int a) { - player.getPacketSender().sendFrame20(406, a); - player.getPacketSender().sendFrame171(1, 12224); - player.getPacketSender().sendFrame171(1, 12225); - player.getPacketSender().sendFrame171(1, 12226); - player.getPacketSender().sendFrame171(1, 12227); - player.getPacketSender().sendFrame126("" + p + "%", 12224); - player.getPacketSender().walkableInterface(8680); - } - /** * Hides all Side Bars */ @@ -416,13 +393,9 @@ public class PlayerAssistant { public void writeEnergy() { if (player.playerEnergy >= 100) { - player.getPacketSender().sendFrame126("100%", 149); + player.getPacketSender().sendString("100%", 149); } else { - if (player.playerEnergy > 0 && player.playerEnergy < 100) { - player.getPacketSender().sendFrame126((int) Math.ceil(player.playerEnergy) + "%", 149); - } else if (player.playerEnergy <= 0) { - player.getPacketSender().sendFrame126("0%", 149); - } + player.getPacketSender().sendString(player.playerEnergy > 0 && player.playerEnergy < 100 ? (int) Math.ceil(player.playerEnergy) + "%" : "0%", 149); } } @@ -449,16 +422,6 @@ public class PlayerAssistant { } } - private static int[][] ALLOWED_COORDS = { - /*PLAYER X, PLAYER Y, OTHER X, OTHER Y*/ - {0, 1, 2, 3}, - }; - - private static int[][] DISABLED_COORDS = { - /*PLAYER X, PLAYER Y, OTHER X, OTHER Y*/ - {4, 5, 6, 7}, - }; - public static boolean pathBlocked(Client attacker, Client victim) { double offsetX = Math.abs(attacker.absX - victim.absX); @@ -525,20 +488,6 @@ public class PlayerAssistant { path[next][4] = nextMoveY; next++; } - /** - * Projectile exceptions - * @author Andrew - */ - for (int i = 0; i < ALLOWED_COORDS.length; i++) { - if (curX == ALLOWED_COORDS[i][0] && curY == ALLOWED_COORDS[i][1] && victim.absX == ALLOWED_COORDS[i][2] && victim.absY == ALLOWED_COORDS[i][3]) { - return true; - } - } - for (int i = 0; i < DISABLED_COORDS.length; i++) { - if (curX == DISABLED_COORDS[i][0] && curY == DISABLED_COORDS[i][1] && victim.absX == DISABLED_COORDS[i][2] && victim.absY == DISABLED_COORDS[i][3]) { - return false; - } - } for (int i = 0; i < path.length; i++) { if (!Region.getClipping(path[i][0], path[i][1], path[i][2], path[i][3], path[i][4])/* && !Region.blockedShot(path[i][0], path[i][1], path[i][2])*/) { return true; @@ -612,25 +561,6 @@ public class PlayerAssistant { path[next][4] = nextMoveY; next++; } - /** - * Projectile exceptions - * @author Andrew - */ - for (int i = 0; i < ALLOWED_COORDS.length; i++) { - if (curX == ALLOWED_COORDS[i][0] && curY == ALLOWED_COORDS[i][1] && victim.absX == ALLOWED_COORDS[i][2] && victim.absY == ALLOWED_COORDS[i][3]) { - return true; - } - } - for (int i = 0; i < DISABLED_COORDS.length; i++) { - if (curX == DISABLED_COORDS[i][0] && curY == DISABLED_COORDS[i][1] && victim.absX == DISABLED_COORDS[i][2] && victim.absY == DISABLED_COORDS[i][3]) { - return false; - } - } - /*for (int i = 0; i < path.length; i++) { - if (!Region.blockedShot(path[i][0], path[i][1], path[i][2])) { - return true; - } - }*/ return false; } @@ -665,10 +595,10 @@ public class PlayerAssistant { } public boolean bananasCheck() { - int reqAmount = 10 - player.getItemAssistant().getItemCount(1963); - switch (player.getItemAssistant().getItemCount(1963)) { + int reqAmount = 10 - player.getItemAssistant().getItemAmount(1963); + switch (player.getItemAssistant().getItemAmount(1963)) { case 0: - player.getDialogueHandler().sendPlayerChat("I'll go collect " + reqAmount + " bannnas then come back..."); + player.getDialogueHandler().sendPlayerChat("I'll go collect " + reqAmount + " bananas then come back..."); break; case 1: case 2: @@ -679,9 +609,7 @@ public class PlayerAssistant { case 7: case 8: case 9: - player.getDialogueHandler().sendPlayerChat( - "I'll go collect " + reqAmount - + " more bannnas then come back..."); + player.getDialogueHandler().sendPlayerChat("I'll go collect " + reqAmount + " more bananas then come back..."); break; } return true; @@ -692,8 +620,7 @@ public class PlayerAssistant { */ public void spellTeleport(int x, int y, int height) { - startTeleport(x, y, height, player.playerMagicBook == 1 ? "ancient" - : "modern"); + startTeleport(x, y, height, player.playerMagicBook == 1 ? "ancient" : "modern"); } public void startTeleport(int x, int y, int height, String teleportType) { @@ -702,10 +629,7 @@ public class PlayerAssistant { return; } if (player.inWild() && player.wildLevel > GameConstants.NO_TELEPORT_WILD_LEVEL) { - player.getPacketSender().sendMessage( - "You can't teleport above level " - + GameConstants.NO_TELEPORT_WILD_LEVEL - + " in the wilderness."); + player.getPacketSender().sendMessage("You can't teleport above level " + GameConstants.NO_TELEPORT_WILD_LEVEL + " wilderness."); return; } if (player.tutorialProgress < 36) { @@ -721,13 +645,11 @@ public class PlayerAssistant { } } if (player.inTrade) { - player.getPacketSender().sendMessage( - "You can't teleport while in trade."); + player.getPacketSender().sendMessage("You can't teleport while in trade."); return; } if (player.duelStatus == 5) { - player.getPacketSender().sendMessage( - "You can't do that in a duel."); + player.getPacketSender().sendMessage("You can't teleport while in a duel."); return; } if (!SkillHandler.MAGIC) { @@ -735,13 +657,11 @@ public class PlayerAssistant { return; } if (System.currentTimeMillis() - player.teleBlockDelay < player.teleBlockLength) { - player.getPacketSender().sendMessage( - "You are teleblocked and can't teleport."); + player.getPacketSender().sendMessage("You are teleblocked and can't teleport."); return; } if (SkillHandler.isSkilling(player)) { - player.getPacketSender().sendMessage( - "You can't teleport while skilling!"); + player.getPacketSender().sendMessage("You can't teleport while skilling!"); return; } if (!player.isDead && player.teleTimer == 0 @@ -764,7 +684,6 @@ public class PlayerAssistant { player.refresh = true; } player.teleHeight = height; - // client.resetShaking(); player.isTeleporting = true; if (GameConstants.SOUND) { player.getPacketSender().sendSound(SoundList.TELEPORT, 100, 700); @@ -841,7 +760,6 @@ public class PlayerAssistant { player.npcIndex = 0; player.playerIndex = 0; player.faceUpdate(0); - // client.resetShaking(); player.teleHeight = height; player.startAnimation(714); player.teleTimer = 11; @@ -875,13 +793,11 @@ public class PlayerAssistant { return; } if (!SkillHandler.MAGIC) { - player.getPacketSender().sendMessage( - "This feature is curently disabled."); + player.getPacketSender().sendMessage("This feature is curently disabled."); return; } if (player.duelStatus == 5) { - player.getPacketSender().sendMessage( - "You can't teleport during a duel!"); + player.getPacketSender().sendMessage("You can't teleport during a duel!"); return; } if (System.currentTimeMillis() - player.teleBlockDelay < player.teleBlockLength) { @@ -893,8 +809,7 @@ public class PlayerAssistant { player.getPacketSender().sendSound(SoundList.TELEPORT, 100, 0); } if (player.inWild() && player.wildLevel > 30) { - player.getPacketSender().sendMessage( - "You can't teleport above level 30 in the wilderness."); + player.getPacketSender().sendMessage("You can't teleport above level 30 wilderness."); return; } if (!player.isDead && player.teleTimer == 0) { @@ -905,7 +820,6 @@ public class PlayerAssistant { player.npcIndex = 0; player.playerIndex = 0; player.faceUpdate(0); - // client.resetShaking(); player.teleHeight = height; player.startAnimation(714); player.teleTimer = 11; @@ -941,8 +855,7 @@ public class PlayerAssistant { } public void handleEmpty() { - player.getDialogueHandler().sendOption("Yes, empty my inventory please.", - "No, don't empty my inventory."); + player.getDialogueHandler().sendOption("Yes, empty my inventory please.", "No, don't empty my inventory."); player.dialogueAction = 855; } @@ -1246,10 +1159,9 @@ public class PlayerAssistant { break; } boolean canAlch = true; - for (int i : GameConstants.ITEM_UNALCHABLE) { + for (int i : ItemConstants.ITEM_UNALCHABLE) { if (itemId == i) { - player.getPacketSender().sendMessage( - "You can't alch that item!"); + player.getPacketSender().sendMessage("You can't alch that item!"); canAlch = false; return; } @@ -1312,10 +1224,9 @@ public class PlayerAssistant { break; } boolean canAlch = true; - for (int i : GameConstants.ITEM_UNALCHABLE) { + for (int i : ItemConstants.ITEM_UNALCHABLE) { if (itemId == i) { - player.getPacketSender().sendMessage( - "You can't alch that item!"); + player.getPacketSender().sendMessage("You can't alch that item!"); canAlch = false; return; } @@ -1541,7 +1452,7 @@ public class PlayerAssistant { player.getPlayerAssistant().movePlayer(2373 + Misc.random(3), 3131 - Misc.random(3), 1); } - } else if (PestControl.isInGame(player) || player.inPcGame()) { + } else if (PestControl.isInGame(player) || Boundary.isIn(player, Boundary.PC_GAME)) { player.getPlayerAssistant().movePlayer(2658, 2609, 0); player.getDialogueHandler().sendDialogues(601, 3790); } else if (player.tutorialProgress < 36 || player.isInTut()) { @@ -1599,7 +1510,7 @@ public class PlayerAssistant { player.getPacketSender().frame1(); resetTb(); player.playerEnergy = 100; - player.getPacketSender().sendFrame126((int) Math.ceil(player.playerEnergy) + "%", 149); + player.getPacketSender().sendString((int) Math.ceil(player.playerEnergy) + "%", 149); player.isSkulled = false; player.attackedPlayers.clear(); player.headIconPk = -1; @@ -1694,26 +1605,6 @@ public class PlayerAssistant { int otherX = PlayerHandler.players[player.followId].getX(); int otherY = PlayerHandler.players[player.followId].getY(); - /*boolean sameSpot = player.absX == otherX && player.absY == otherY; - if (sameSpot) - stepAway(); - - boolean hallyDistance = player.goodDistance(otherX, otherY, - player.getX(), player.getY(), 2); - - boolean rangeWeaponDistance = player.goodDistance(otherX, otherY, - player.getX(), player.getY(), 4); - boolean bowDistance = player.goodDistance(otherX, otherY, - player.getX(), player.getY(), 6); - boolean mageDistance = player.goodDistance(otherX, otherY, - player.getX(), player.getY(), 7); - - boolean castingMagic = (player.usingMagic || player.mageFollow - || player.autocasting || player.spellId > 0) - && mageDistance; - boolean playerRanging = player.usingRangeWeapon && rangeWeaponDistance; - boolean playerBowOrCross = player.usingBow && bowDistance;*/ - if (!player.goodDistance(otherX, otherY, player.getX(), player.getY(), 25)) { player.followId = 0; @@ -1724,80 +1615,9 @@ public class PlayerAssistant { int[] follow = getFollowLocation(otherX, otherY); player.faceUpdate(player.followId + 32768); PathFinder.getPathFinder().findRoute(player, follow[0], follow[1], false, 1, 1); - - /*if (!sameSpot) { - if (player.playerIndex > 0 && !player.usingSpecial - && player.inWild()) { - if (player.usingSpecial && (playerRanging || playerBowOrCross)) { - player.stopMovement(); - return; - } - if (castingMagic || playerRanging || playerBowOrCross) { - player.stopMovement(); - return; - } - if (RangeData.usingHally(player) && hallyDistance) { - player.stopMovement(); - return; - } - } - } - if (otherX == player.absX && otherY == player.absY) { - int r = Misc.random(3); - switch (r) { - case 0: - walkTo(0, -1); - break; - case 1: - walkTo(0, 1); - break; - case 2: - walkTo(1, 0); - break; - case 3: - walkTo(-1, 0); - break; - } - } else if (player.isRunning2) { - if (otherY > player.getY() && otherX == player.getX()) { - playerWalk(otherX, otherY - 1); - } else if (otherY < player.getY() && otherX == player.getX()) { - playerWalk(otherX, otherY + 1); - } else if (otherX > player.getX() && otherY == player.getY()) { - playerWalk(otherX - 1, otherY); - } else if (otherX < player.getX() && otherY == player.getY()) { - playerWalk(otherX + 1, otherY); - } else if (otherX < player.getX() && otherY < player.getY()) { - playerWalk(otherX + 1, otherY + 1); - } else if (otherX > player.getX() && otherY > player.getY()) { - playerWalk(otherX - 1, otherY - 1); - } else if (otherX < player.getX() && otherY > player.getY()) { - playerWalk(otherX + 1, otherY - 1); - } else if (otherX > player.getX() && otherY < player.getY()) { - playerWalk(otherX + 1, otherY - 1); - } - } else { - if (otherY > player.getY() && otherX == player.getX()) { - playerWalk(otherX, otherY - 1); - } else if (otherY < player.getY() && otherX == player.getX()) { - playerWalk(otherX, otherY + 1); - } else if (otherX > player.getX() && otherY == player.getY()) { - playerWalk(otherX - 1, otherY); - } else if (otherX < player.getX() && otherY == player.getY()) { - playerWalk(otherX + 1, otherY); - } else if (otherX < player.getX() && otherY < player.getY()) { - playerWalk(otherX + 1, otherY + 1); - } else if (otherX > player.getX() && otherY > player.getY()) { - playerWalk(otherX - 1, otherY - 1); - } else if (otherX < player.getX() && otherY > player.getY()) { - playerWalk(otherX + 1, otherY - 1); - } else if (otherX > player.getX() && otherY < player.getY()) { - playerWalk(otherX - 1, otherY + 1); - } - } - player.faceUpdate(player.followId + 32768);*/ } + public void followNpc() { Npc npc = NpcHandler.npcs[player.followId2]; if (npc == null || npc.isDead) { @@ -1815,42 +1635,6 @@ public class PlayerAssistant { int[] follow = getFollowLocation(x, y); player.faceUpdate(player.followId2); PathFinder.getPathFinder().findRoute(player, follow[0], follow[1], false, 1, 1); - - /*if (otherX == player.absX && otherY == player.absY) { - int r = Misc.random(3); - switch (r) { - case 0: - walkTo(0, -1); - break; - case 1: - walkTo(0, 1); - break; - case 2: - walkTo(1, 0); - break; - case 3: - walkTo(-1, 0); - break; - } - } else { - if (otherY > player.getY() && otherX == player.getX()) { - playerWalk(otherX, otherY - 1); - } else if (otherY < player.getY() && otherX == player.getX()) { - playerWalk(otherX, otherY + 1); - } else if (otherX > player.getX() && otherY == player.getY()) { - playerWalk(otherX - 1, otherY); - } else if (otherX < player.getX() && otherY == player.getY()) { - playerWalk(otherX + 1, otherY); - } else if (otherX < player.getX() && otherY < player.getY()) { - playerWalk(otherX + 1, otherY + 1); - } else if (otherX > player.getX() && otherY > player.getY()) { - playerWalk(otherX - 1, otherY - 1); - } else if (otherX < player.getX() && otherY > player.getY()) { - playerWalk(otherX + 1, otherY - 1); - } else if (otherX > player.getX() && otherY < player.getY()) { - playerWalk(otherX - 1, otherY + 1); - } - }*/ } public int getRunningMove(int i, int j) { @@ -1915,9 +1699,6 @@ public class PlayerAssistant { int yMove = 0; if (xMove == 0) { yMove = otherY - player.getY(); - /* - * if (!clipHor) { yMove = 0; } else if (!clipVer) { xMove = 0; } - */ } int k = player.getX() + xMove; @@ -1930,7 +1711,6 @@ public class PlayerAssistant { player.getNewWalkCmdX()[n] += k; player.getNewWalkCmdY()[n] += l; } - } public void walkToCheck(int i, int j) { @@ -1997,11 +1777,7 @@ public class PlayerAssistant { } public void sendAutoRetalitate() { - if (player.autoRet == 1) { - player.getPacketSender().sendConfig(172, 0); - } else if (player.autoRet == 0) { - player.getPacketSender().sendConfig(172, 1); - } + player.getPacketSender().sendConfig(172, player.autoRet == 1 ? 0 : 1); } public void firstTimeTutorial() { @@ -2013,7 +1789,6 @@ public class PlayerAssistant { player.tutorialProgress = 0; player.isRunning2 = false; player.autoRet = 1; - //resetStats(); sendAutoRetalitate(); LightSources.saveBrightness(player); } else if (player.tutorialProgress == 0 && !GameConstants.TUTORIAL_ISLAND) { @@ -2035,19 +1810,11 @@ public class PlayerAssistant { sendAutoRetalitate(); LightSources.saveBrightness(player); if (!player.hasBankpin) { - player.getPacketSender() - .sendMessage( - "You do not, have a bank pin it is highly recommended you set one."); + player.getPacketSender().sendMessage("You do not, have a bank pin it is highly recommended you set one."); } } } - public void handleAlt(int id) { - if (!player.getItemAssistant().playerHasItem(id)) { - player.getItemAssistant().addItem(id, 1); - } - } - public int getTotalLevel() { int total = 0; for (int i = 0; i <= 20; i++) { @@ -2058,8 +1825,8 @@ public class PlayerAssistant { public void levelUp(int skill) { SkillHandler.resetSkills(player); - player.getPacketSender().sendFrame126("Total Lvl: "+getTotalLevel(), 3984); - player.getPacketSender().sendFrame126("Combat Lvl: "+player.calculateCombatLevel()+"", 3983); + player.getPacketSender().sendString("Total Lvl: "+getTotalLevel(), 3984); + player.getPacketSender().sendString("Combat Lvl: "+player.calculateCombatLevel()+"", 3983); Optional data = SkillData.getSkill(skill); @@ -2067,27 +1834,27 @@ public class PlayerAssistant { return; player.getPacketSender().sendMessage("Congratulations, you've advanced a level in "+data.get().toString()+"!"); - player.getPacketSender().sendFrame126("Congratulations, you've advanced a level in "+data.get().toString()+"!", data.get().getFrame2()); - player.getPacketSender().sendFrame126("Your " +data.get().toString()+ " level is now " + getLevelForXP(player.playerXP[skill]) + ".", data.get().getFrame3()); + player.getPacketSender().sendString("Congratulations, you've advanced a level in "+data.get().toString()+"!", data.get().getFrame2()); + player.getPacketSender().sendString("Your " +data.get().toString()+ " level is now " + getLevelForXP(player.playerXP[skill]) + ".", data.get().getFrame3()); player.getPacketSender().sendChatInterface(data.get().getFrame1()); player.dialogueAction = 0; player.nextChat = 0; } public void refreshSkill(int skill) { - player.getPacketSender().sendFrame126("Total Lvl: "+getTotalLevel(), 3984); - player.getPacketSender().sendFrame126("Combat Lvl: "+player.calculateCombatLevel()+"", 3983); + player.getPacketSender().sendString("Total Lvl: "+getTotalLevel(), 3984); + player.getPacketSender().sendString("Combat Lvl: "+player.calculateCombatLevel()+"", 3983); Optional data = SkillData.getSkill(skill); if(!data.isPresent()) return; - player.getPacketSender().sendFrame126("" + player.playerLevel[skill] + "", data.get().getFrame4()); - player.getPacketSender().sendFrame126("" + getLevelForXP(player.playerXP[skill]) + "", data.get().getFrame5()); - player.getPacketSender().sendFrame126("" + player.playerXP[skill] + "", data.get().getFrame6()); - player.getPacketSender().sendFrame126("" + getXPForLevel(getLevelForXP(player.playerXP[skill]) + 1) + "", data.get().getFrame7()); + player.getPacketSender().sendString("" + player.playerLevel[skill] + "", data.get().getFrame4()); + player.getPacketSender().sendString("" + getLevelForXP(player.playerXP[skill]) + "", data.get().getFrame5()); + player.getPacketSender().sendString("" + player.playerXP[skill] + "", data.get().getFrame6()); + player.getPacketSender().sendString("" + getXPForLevel(getLevelForXP(player.playerXP[skill]) + 1) + "", data.get().getFrame7()); if (skill == 5) { - player.getPacketSender().sendFrame126("" + player.playerLevel[5] + "/" + getLevelForXP(player.playerXP[5]) + "", 687);// Prayer + player.getPacketSender().sendString("" + player.playerLevel[5] + "/" + getLevelForXP(player.playerXP[5]) + "", 687);// Prayer } } @@ -2121,9 +1888,8 @@ public class PlayerAssistant { return 0; } - public boolean addSkillXP(int amount, int skill) { - if (amount + player.playerXP[skill] < 0 - || player.playerXP[skill] > 200000000) { + public boolean addSkillXP(double amount, int skill) { + if (amount + player.playerXP[skill] < 0 || player.playerXP[skill] > 200000000) { if (player.playerXP[skill] > 200000000) { player.playerXP[skill] = 200000000; } @@ -2135,34 +1901,6 @@ public class PlayerAssistant { amount *= GameConstants.XP_RATE; int oldLevel = getLevelForXP(player.playerXP[skill]); player.playerXP[skill] += amount; - if (oldLevel < getLevelForXP(player.playerXP[skill])) { - if (player.playerLevel[skill] < player - .getLevelForXP(player.playerXP[skill]) - && skill != 3 - && skill != 5) { - player.playerLevel[skill] = player - .getLevelForXP(player.playerXP[skill]); - } - levelUp(skill); - player.gfx100(199); - requestUpdates(); - } - player.getPacketSender().setSkillLevel(skill, - player.playerLevel[skill], player.playerXP[skill]); - refreshSkill(skill); - return true; - } - - public boolean addNormalXpRate(int amount, int skill) { - if (amount + player.playerXP[skill] < 0 || player.playerXP[skill] > 200000000) { - if (player.playerXP[skill] > 200000000) { - player.playerXP[skill] = 200000000; - } - return false; - } - amount *= 1; - int oldLevel = getLevelForXP(player.playerXP[skill]); - player.playerXP[skill] += amount; if (oldLevel < getLevelForXP(player.playerXP[skill])) { if (player.playerLevel[skill] < player.getLevelForXP(player.playerXP[skill]) && skill != 3 && skill != 5) { player.playerLevel[skill] = player.getLevelForXP(player.playerXP[skill]); @@ -2171,41 +1909,7 @@ public class PlayerAssistant { player.gfx100(199); requestUpdates(); } - player.getPacketSender().setSkillLevel(skill, - player.playerLevel[skill], player.playerXP[skill]); - refreshSkill(skill); - return true; - } - - public boolean addSkillXP(double amount, int skill) { - if (amount + player.playerXP[skill] < 0 - || player.playerXP[skill] > 200000000) { - if (player.playerXP[skill] > 200000000) { - player.playerXP[skill] = 200000000; - } - return false; - } - if (player.tutorialProgress < 36 && player.playerLevel[skill] == 3 - && GameConstants.TUTORIAL_ISLAND) { - return false; - } - amount *= GameConstants.XP_RATE; - int oldLevel = getLevelForXP(player.playerXP[skill]); - player.playerXP[skill] += amount; - if (oldLevel < getLevelForXP(player.playerXP[skill])) { - if (player.playerLevel[skill] < player - .getLevelForXP(player.playerXP[skill]) - && skill != 3 - && skill != 5) { - player.playerLevel[skill] = player - .getLevelForXP(player.playerXP[skill]); - } - levelUp(skill); - player.gfx100(199); - requestUpdates(); - } - player.getPacketSender().setSkillLevel(skill, - player.playerLevel[skill], player.playerXP[skill]); + player.getPacketSender().setSkillLevel(skill, player.playerLevel[skill], player.playerXP[skill]); refreshSkill(skill); return true; } @@ -2221,34 +1925,6 @@ public class PlayerAssistant { player.randomCoffin = Misc.random(3) + 1; } - public static int Barrows[] = { 4708, 4710, 4712, 4714, 4716, 4718, 4720, - 4722, 4724, 4726, 4728, 4730, 4732, 4734, 4736, 4738, 4745, 4747, - 4749, 4751, 4753, 4755, 4757, 4759 }; - - public static final int[][] RUNES = { { 560, 1, 1 }, { 565, 1, 2 }, - { 562, 1, 3 }, { 558, 1, 4 } }; - - public static final int[] POTS = { 165, 147, 159 }; - - public int randomBarrows() { - return Barrows[(int) (Math.random() * Barrows.length)]; - } - - public void randomRunes() { - for (int[] element : RUNES) { - int item = element[0]; - int amount = element[1]; - int chance = element[2]; - if (Misc.random(5) == chance) { - player.getItemAssistant().addItem(item, amount); - } - } - } - - public int randomPots() { - return POTS[(int) (Math.random() * POTS.length)]; - } - public int getNpcId(int id) { for (int i = 0; i < NpcHandler.MAX_NPCS; i++) { if (NpcHandler.npcs[i] != null) { @@ -2264,23 +1940,18 @@ public class PlayerAssistant { player.getPacketSender().object(-1, x, x, 10, 10); } - public void objectToRemove(int X, int Y) { - player.getPacketSender().object(-1, X, Y, 10, 10); - } - private void objectToRemove2(int X, int Y) { player.getPacketSender().object(-1, X, Y, -1, 0); } public void removeObjects() { - objectToRemove(2638, 4688); + removeObject(2638, 4688); objectToRemove2(2635, 4693); objectToRemove2(2634, 4693); } public boolean inPitsWait() { - return player.getX() <= 2404 && player.getX() >= 2394 - && player.getY() <= 5175 && player.getY() >= 5169; + return player.getX() <= 2404 && player.getX() >= 2394 && player.getY() <= 5175 && player.getY() >= 5169; } public int antiFire() { @@ -2288,9 +1959,7 @@ public class PlayerAssistant { if (player.antiFirePot) { toReturn++; } - if (player.playerEquipment[player.playerShield] == 1540 - || player.playerEquipment[player.playerShield] == 11284 - || player.playerEquipment[player.playerShield] == 11283) { + if (player.playerEquipment[player.playerShield] == 1540 || player.playerEquipment[player.playerShield] == 11284 || player.playerEquipment[player.playerShield] == 11283) { toReturn++; } return toReturn; @@ -2301,8 +1970,7 @@ public class PlayerAssistant { { 2402, 5 }, { 746, 5 }, { 4151, 150 }, { 565, 100000 }, { 560, 100000 }, { 555, 300000 } }; for (int[] element : itemsToCheck) { - if (element[1] < player.getItemAssistant() - .getTotalCount(element[0])) { + if (element[1] < player.getItemAssistant().getTotalCount(element[0])) { return true; } } @@ -2474,4 +2142,4 @@ public class PlayerAssistant { public int totalGold() { return player.getItemAssistant().getBankQuantity(996) + player.getItemAssistant().getItemAmount(995); } -} +} \ No newline at end of file diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/Trading.java b/2006Redone Server/src/main/java/com/rebotted/game/players/Trading.java index 2a278196..f347819f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/Trading.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/players/Trading.java @@ -2,8 +2,6 @@ package com.rebotted.game.players; import java.time.temporal.ValueRange; import java.util.concurrent.CopyOnWriteArrayList; - -import com.rebotted.GameConstants; import com.rebotted.event.CycleEvent; import com.rebotted.event.CycleEventContainer; import com.rebotted.event.CycleEventHandler; @@ -11,6 +9,7 @@ import com.rebotted.game.content.minigames.castlewars.CastleWars; import com.rebotted.game.items.GameItem; import com.rebotted.game.items.ItemData; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.util.GameLogger; import com.rebotted.util.Misc; @@ -99,12 +98,12 @@ public class Trading { } else if (o.playerRights == 2) { out = "@cr2@" + out; } - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Trading with: " + o.playerName + " who has @gre@" + o.getItemAssistant().freeSlots() + " free slots", 3417); - player.getPacketSender().sendFrame126("", 3431); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString("", 3431); + player.getPacketSender().sendString( "Are you sure you want to make this trade?", 3535); player.getPacketSender().sendFrame248(3323, 3321); } @@ -156,7 +155,7 @@ public class Trading { if (!item.stackable) { offeredItems.remove(item); player.getItemAssistant().addItem(itemID, 1); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" @@ -168,7 +167,7 @@ public class Trading { item.amount -= amount; player.getItemAssistant() .addItem(itemID, amount); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" @@ -180,7 +179,7 @@ public class Trading { offeredItems.remove(item); player.getItemAssistant() .addItem(itemID, amount); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" @@ -191,7 +190,7 @@ public class Trading { } break; } - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() @@ -201,8 +200,8 @@ public class Trading { player.getItemAssistant().resetItems(3322); resetTItems(3415); o.getTrading().resetOTItems(3416); - player.getPacketSender().sendFrame126("", 3431); - o.getPacketSender().sendFrame126("", 3431); + player.getPacketSender().sendString("", 3431); + o.getPacketSender().sendString("", 3431); } } } @@ -213,7 +212,7 @@ public class Trading { if (item.amount > amount) { item.amount -= amount; player.getItemAssistant().addItem(itemID, amount); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() @@ -222,7 +221,7 @@ public class Trading { amount = item.amount; offeredItems.remove(item); player.getItemAssistant().addItem(itemID, amount); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() @@ -233,7 +232,7 @@ public class Trading { } } - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() + " free slots", 3417); @@ -242,8 +241,8 @@ public class Trading { player.getItemAssistant().resetItems(3322); resetTItems(3415); o.getTrading().resetOTItems(3416); - player.getPacketSender().sendFrame126("", 3431); - o.getPacketSender().sendFrame126("", 3431); + player.getPacketSender().sendString("", 3431); + o.getPacketSender().sendString("", 3431); } catch (Exception e) { } return true; @@ -265,10 +264,9 @@ public class Trading { return false; } - for (int i : GameConstants.ITEM_TRADEABLE) { + for (int i : ItemConstants.ITEM_TRADEABLE) { if (i == itemID && player.playerRights < 3) { - player.getPacketSender().sendMessage( - "You can't trade this item."); + player.getPacketSender().sendMessage("You can't trade this item."); return false; } } @@ -280,24 +278,24 @@ public class Trading { offeredItems.add(new GameItem(itemID, 1)); player.getItemAssistant().deleteItem(itemID, player.getItemAssistant().getItemSlot(itemID), 1); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() + " free slots", 3417); } } - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() + " free slots", 3417); player.getItemAssistant().resetItems(3322); resetTItems(3415); o.getTrading().resetOTItems(3416); - player.getPacketSender().sendFrame126("", 3431); - o.getPacketSender().sendFrame126("", 3431); + player.getPacketSender().sendString("", 3431); + o.getPacketSender().sendString("", 3431); } - if (player.getItemAssistant().getItemCount(itemID) < amount) { - amount = player.getItemAssistant().getItemCount(itemID); + if (player.getItemAssistant().getItemAmount(itemID) < amount) { + amount = player.getItemAssistant().getItemAmount(itemID); if (amount == 0) { return false; } @@ -313,7 +311,7 @@ public class Trading { inTrade = true; item.amount += amount; player.getItemAssistant().deleteItem(itemID, amount); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() + " free slots", 3417); @@ -324,21 +322,21 @@ public class Trading { if (!inTrade) { offeredItems.add(new GameItem(itemID, amount)); player.getItemAssistant().deleteItem(itemID, amount); - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() + " free slots", 3417); } } - o.getPacketSender().sendFrame126( + o.getPacketSender().sendString( "Trading with: " + player.playerName + " who has @gre@" + player.getItemAssistant().freeSlots() + " free slots", 3417); player.getItemAssistant().resetItems(3322); resetTItems(3415); o.getTrading().resetOTItems(3416); - player.getPacketSender().sendFrame126("", 3431); - o.getPacketSender().sendFrame126("", 3431); + player.getPacketSender().sendString("", 3431); + o.getPacketSender().sendString("", 3431); return true; } @@ -351,8 +349,7 @@ public class Trading { player.acceptedTrade = false; player.getPacketSender().closeAllWindows(); player.tradeResetNeeded = false; - player.getPacketSender().sendFrame126( - "Are you sure you want to make this trade?", 3535); + player.getPacketSender().sendString("Are you sure you want to make this trade?", 3535); } public void declineTrade() { @@ -404,9 +401,7 @@ public class Trading { player.getOutStream().writeWord(len); for (GameItem item : o.getTrading().offeredItems) { if (item.amount > 254) { - player.getOutStream().writeByte(255); // item's stack count. if - // over 254, write byte - // 255 + player.getOutStream().writeByte(255); // item's stack count. if over 254, write byte 255 player.getOutStream().writeDWord_v2(item.amount); } else { player.getOutStream().writeByte(item.amount); @@ -465,7 +460,7 @@ public class Trading { } } - player.getPacketSender().sendFrame126(SendTrade, 3557); + player.getPacketSender().sendString(SendTrade, 3557); SendTrade = "Absolutely nothing!"; SendAmount = ""; Count = 0; @@ -495,7 +490,7 @@ public class Trading { Count++; } } - player.getPacketSender().sendFrame126(SendTrade, 3558); + player.getPacketSender().sendString(SendTrade, 3558); // TODO: find out what 197 does eee 3213 player.getPacketSender().sendFrame248(3443, 197); } @@ -547,6 +542,7 @@ public class Trading { } }, 1); } catch (Exception e) { + } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopAssistant.java b/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopAssistant.java index 2cf40ddf..72fe3188 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopAssistant.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopAssistant.java @@ -4,6 +4,7 @@ import com.rebotted.GameConstants; import com.rebotted.game.bots.BotHandler; import com.rebotted.game.items.ItemData; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.items.ItemDefinition; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; @@ -35,7 +36,7 @@ public class ShopAssistant { player.isShopping = true; player.shopId = ShopID; player.getPacketSender().sendFrame248(3824, 3822); - player.getPacketSender().sendFrame126(ShopHandler.shopName[ShopID], 3901); + player.getPacketSender().sendString(ShopHandler.shopName[ShopID], 3901); } public void updatePlayerShop() { @@ -274,7 +275,7 @@ public class ShopAssistant { public void sellToShopPrice(int removeId, int removeSlot) { int unNotedItemID = getUnNoted(removeId); String itemName = ItemAssistant.getItemName(unNotedItemID); - for (int i : GameConstants.ITEM_SELLABLE) { + for (int i : ItemConstants.ITEM_SELLABLE) { if (unNotedItemID == i) { player.getPacketSender().sendMessage("You can't sell " + itemName + "."); return; @@ -334,7 +335,7 @@ public class ShopAssistant { public boolean sellItem(int itemID, int fromSlot, int amount) { int unNotedItemID = getUnNoted(itemID); String itemName = ItemAssistant.getItemName(itemID).toLowerCase(); - for (int i : GameConstants.ITEM_SELLABLE) { + for (int i : ItemConstants.ITEM_SELLABLE) { if (i == unNotedItemID) { player.getPacketSender().sendMessage("You can't sell " + itemName + "."); return false; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/PacketSender.java b/2006Redone Server/src/main/java/com/rebotted/net/PacketSender.java index bda86737..f3998d51 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/PacketSender.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/PacketSender.java @@ -10,6 +10,7 @@ import com.rebotted.game.content.skills.SkillHandler; import com.rebotted.game.content.skills.runecrafting.Tiaras; import com.rebotted.game.items.Item; import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.items.Weight; import com.rebotted.game.items.impl.LightSources; import com.rebotted.game.players.Client; @@ -17,6 +18,7 @@ import com.rebotted.game.players.MainFrameIDs; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; import com.rebotted.util.Misc; +import com.rebotted.world.Boundary; import com.rebotted.world.clip.Region; public class PacketSender { @@ -163,7 +165,7 @@ public class PacketSender { player.getItemAssistant().setEquipment(player.playerEquipment[player.playerWeapon], player.playerEquipmentN[player.playerWeapon], player.playerWeapon); player.getCombatAssistant().getPlayerAnimIndex(); player.getPlayerAssistant().logIntoPM(); - Tiaras.handleTiara(player, GameConstants.HAT); + Tiaras.handleTiara(player, ItemConstants.HAT); player.getItemAssistant().addSpecialBar(player.playerEquipment[player.playerWeapon]); player.saveTimer = GameConstants.SAVE_TIMER; player.saveCharacter = true; @@ -302,7 +304,7 @@ public class PacketSender { return this; } - public PacketSender sendFrame126(String s, int id) { //Seems to be about chat messsages + public PacketSender sendString(String s, int id) { //Seems to be about chat messsages if(!player.checkPacket126Update(s, id)) { return this; } @@ -577,7 +579,7 @@ public class PacketSender { return this; } - if (!player.inBankArea() && player.playerRights < 3) { + if (!Boundary.isIn(player, Boundary.BANK_AREA) && player.playerRights < 3) { player.getPacketSender().sendMessage("You can't open a bank unless you're in a bank area!"); player.getPacketSender().sendMessage("If this is a bug, please report it! Your coords are [" + player.absX + "," + player.absY + "]"); player.getPacketSender().closeAllWindows(); diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank10.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank10.java index 2877bbc0..ff662fe5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank10.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank10.java @@ -86,7 +86,7 @@ public class Bank10 implements PacketType { case 1121: case 1122: case 1123: - player.getSmithing().readInput(player.playerLevel[player.playerSmithing], Integer.toString(removeId), player, 10); + player.getSmithing().readInput(player, player.playerLevel[player.playerSmithing], removeId, 10); break; } diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank5.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank5.java index 77463752..f27fc4ca 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank5.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank5.java @@ -88,8 +88,7 @@ public class Bank5 implements PacketType { case 1121: case 1122: case 1123: - player.getSmithing().readInput(player.playerLevel[player.playerSmithing], - Integer.toString(removeId), player, 5); + player.getSmithing().readInput(player, player.playerLevel[player.playerSmithing], removeId, 5); break; } } diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java index 374ccdde..3701f290 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java @@ -52,24 +52,17 @@ public class BankAll implements PacketType { return; } if (player.inPartyRoom) { - PartyRoom.depositItem(player, removeId, player.getItemAssistant() - .itemAmount(player.playerItems[removeSlot])); + PartyRoom.depositItem(player, removeId, player.getItemAssistant().getItemAmount(player.playerItems[removeSlot])); break; } if (player.inTrade) { - player.getPacketSender().sendMessage( - "You can't store items while trading!"); + player.getPacketSender().sendMessage("You can't store items while trading!"); return; } if (ItemData.itemStackable[removeId]) { - player.getItemAssistant().bankItem(player.playerItems[removeSlot], - removeSlot, player.playerItemsN[removeSlot]); + player.getItemAssistant().bankItem(player.playerItems[removeSlot], removeSlot, player.playerItemsN[removeSlot]); } else { - player.getItemAssistant().bankItem( - player.playerItems[removeSlot], - removeSlot, - player.getItemAssistant().itemAmount( - player.playerItems[removeSlot])); + player.getItemAssistant().bankItem(player.playerItems[removeSlot], removeSlot, player.getItemAssistant().getItemAmount(player.playerItems[removeSlot])); } break; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankX2.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankX2.java index 98a197f9..84fbf309 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankX2.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankX2.java @@ -1,6 +1,7 @@ package com.rebotted.net.packets.impl; import com.rebotted.game.content.random.PartyRoom; +import com.rebotted.game.content.skills.cooking.Cooking; import com.rebotted.game.players.Player; import com.rebotted.net.packets.PacketType; @@ -19,10 +20,13 @@ public class BankX2 implements PacketType { if (Xamount == 0) { Xamount = 1; } + if (player.playerIsCooking && player.doAmount > 0) { + Cooking.cookItem(player, player.cookingItem, Xamount, player.cookingObject); + } switch (player.xInterfaceId) { case 5064: if (player.inPartyRoom) { - PartyRoom.depositItem(player, player.xRemoveId, player.getItemAssistant().itemAmount(player.playerItems[player.xRemoveSlot])); + PartyRoom.depositItem(player, player.xRemoveId, player.getItemAssistant().getItemAmount(player.playerItems[player.xRemoveSlot])); break; } if (player.inTrade) { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickNPC.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickNPC.java index 733e1b33..5b27f2be 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickNPC.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickNPC.java @@ -6,7 +6,6 @@ import com.rebotted.event.CycleEventHandler; import com.rebotted.game.content.combat.CombatConstants; import com.rebotted.game.content.combat.magic.MagicData; import com.rebotted.game.content.combat.range.RangeData; -import com.rebotted.game.content.skills.thieving.Pickpocket; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.players.Player; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingButtons.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingButtons.java index 4cf26808..ac2dd7ad 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingButtons.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingButtons.java @@ -124,7 +124,7 @@ public class ClickingButtons implements PacketType { return; } if (player.playerLevel[6] < 15) { - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "You need a magic level of @blu@15 @bla@to cast bones to bananas", 357); player.getPacketSender().sendChatInterface(356); @@ -138,7 +138,7 @@ public class ClickingButtons implements PacketType { if (!player.getItemAssistant().playerHasItem(561, 1) || !player.getItemAssistant().playerHasItem(555, 2) || !player.getItemAssistant().playerHasItem(557, 2)) { - player.getPacketSender().sendFrame126("You do not have the correct runes to cast this spell.", 357); + player.getPacketSender().sendString("You do not have the correct runes to cast this spell.", 357); player.getPacketSender().sendChatInterface(356); return; } @@ -168,7 +168,7 @@ public class ClickingButtons implements PacketType { return; } if (player.playerLevel[6] < 60) { - player.getPacketSender().sendFrame126("You need a magic level of @blu@60 @blu@ to cast bones to peaches.", 357); + player.getPacketSender().sendString("You need a magic level of @blu@60 @blu@ to cast bones to peaches.", 357); player.getPacketSender().sendChatInterface(356); return; } @@ -180,7 +180,7 @@ public class ClickingButtons implements PacketType { if (!player.getItemAssistant().playerHasItem(561, 2) || !player.getItemAssistant().playerHasItem(555, 4) || !player.getItemAssistant().playerHasItem(557, 4)) { - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "You do not have the correct runes to cast this spell.", 357); player.getPacketSender().sendChatInterface(356); @@ -595,8 +595,7 @@ public class ClickingButtons implements PacketType { if (player.tutorialProgress < 36) { CookingTutorialIsland.getAmount(player, 1); } else { - Cooking.cookItem(player, player.cookingItem, 1, - player.cookingObject); + Cooking.cookItem(player, player.cookingItem, 1, player.cookingObject); } break; @@ -604,8 +603,7 @@ public class ClickingButtons implements PacketType { if (player.tutorialProgress < 36) { CookingTutorialIsland.getAmount(player, 5); } else { - Cooking.cookItem(player, player.cookingItem, 5, - player.cookingObject); + Cooking.cookItem(player, player.cookingItem, 5, player.cookingObject); } break; @@ -613,7 +611,8 @@ public class ClickingButtons implements PacketType { if (player.tutorialProgress < 36) { CookingTutorialIsland.getAmount(player, 10); } else { - Cooking.cookItem(player, player.cookingItem, 10, player.cookingObject); + player.playerIsCooking = true; + player.getOutStream().createFrame(27); } break; @@ -621,8 +620,7 @@ public class ClickingButtons implements PacketType { if (player.tutorialProgress < 36) { CookingTutorialIsland.getAmount(player, 28); } else { - Cooking.cookItem(player, player.cookingItem, 28, - player.cookingObject); + Cooking.cookItem(player, player.cookingItem, 28, player.cookingObject); } break; @@ -1316,15 +1314,15 @@ public class ClickingButtons implements PacketType { } player.duelStatus = 2; if (player.duelStatus == 2) { - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Waiting for other player...", 6684); - opponent.getPacketSender().sendFrame126( + opponent.getPacketSender().sendString( "Other player has accepted.", 6684); } if (opponent.duelStatus == 2) { - opponent.getPacketSender().sendFrame126( + opponent.getPacketSender().sendString( "Waiting for other player...", 6684); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Other player has accepted.", 6684); } @@ -1363,9 +1361,9 @@ public class ClickingButtons implements PacketType { player.duelDelay = System.currentTimeMillis(); o1.duelDelay = System.currentTimeMillis(); } else { - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Waiting for other player...", 6571); - o1.getPacketSender().sendFrame126( + o1.getPacketSender().sendString( "Other player has accepted.", 6571); } } else { @@ -1606,9 +1604,9 @@ public class ClickingButtons implements PacketType { "Trade declined as you disconnected."); break; } - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Waiting for other player...", 3431); - ot.getPacketSender().sendFrame126("Other player has accepted.", + ot.getPacketSender().sendString("Other player has accepted.", 3431); player.goodTrade = true; ot.goodTrade = true; @@ -1637,15 +1635,15 @@ public class ClickingButtons implements PacketType { .freeSlots()) + " items."); player.goodTrade = false; ot.goodTrade = false; - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Not enough inventory spaces.", 3431); - ot.getPacketSender().sendFrame126( + ot.getPacketSender().sendString( "Not enough inventory spaces.", 3431); break; } else { - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Waiting for other player...", 3431); - ot.getPacketSender().sendFrame126( + ot.getPacketSender().sendString( "Other player has accepted.", 3431); player.goodTrade = true; ot.goodTrade = true; @@ -1703,9 +1701,9 @@ public class ClickingButtons implements PacketType { ot1.tradeStatus = 0; break; } - ot1.getPacketSender().sendFrame126( + ot1.getPacketSender().sendString( "Other player has accepted.", 3535); - player.getPacketSender().sendFrame126( + player.getPacketSender().sendString( "Waiting for other player...", 3535); } diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java index f3c412d3..2cf34221 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java @@ -156,13 +156,13 @@ public class Commands implements PacketType { // Clear all lines - for (int i = 8144; i < 8195; i++) player.getPacketSender().sendFrame126("", i); + for (int i = 8144; i < 8195; i++) player.getPacketSender().sendString("", i); - player.getPacketSender().sendFrame126("@dre@" + (playerCommand.equalsIgnoreCase("players") ? "Players" : "Player Shops"), 8144); + player.getPacketSender().sendString("@dre@" + (playerCommand.equalsIgnoreCase("players") ? "Players" : "Player Shops"), 8144); int playersLineNumber = 8147; for (String line : players){ - player.getPacketSender().sendFrame126(line, playersLineNumber++); + player.getPacketSender().sendString(line, playersLineNumber++); } player.getPacketSender().showInterface(8134); break; @@ -280,13 +280,13 @@ public class Commands implements PacketType { // Clear all lines for (int i = 8144; i < 8195; i++) - player.getPacketSender().sendFrame126("", i); + player.getPacketSender().sendString("", i); - player.getPacketSender().sendFrame126("@dre@Commands", 8144); + player.getPacketSender().sendString("@dre@Commands", 8144); int commandsLineNumber = 8147; for (String line : commands){ - player.getPacketSender().sendFrame126(line, commandsLineNumber++); + player.getPacketSender().sendString(line, commandsLineNumber++); } player.getPacketSender().showInterface(8134); break; @@ -364,13 +364,13 @@ public class Commands implements PacketType { }; // Clear all lines - for (int i = 8144; i < 8195; i++) player.getPacketSender().sendFrame126("", i); + for (int i = 8144; i < 8195; i++) player.getPacketSender().sendString("", i); - player.getPacketSender().sendFrame126("@dre@Highscores", 8144); + player.getPacketSender().sendString("@dre@Highscores", 8144); int highscoresLineNumber = 8147; for (String line : highscores){ - player.getPacketSender().sendFrame126(line, highscoresLineNumber++); + player.getPacketSender().sendString(line, highscoresLineNumber++); } player.getPacketSender().showInterface(8134); diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/DropItem.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/DropItem.java index cbad5cfb..cda4f7de 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/DropItem.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/DropItem.java @@ -5,8 +5,8 @@ import com.rebotted.GameEngine; import com.rebotted.game.content.minigames.castlewars.CastleWars; import com.rebotted.game.content.music.sound.SoundList; import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.firemaking.Firemaking; import com.rebotted.game.content.skills.firemaking.LogData; +import com.rebotted.game.items.ItemConstants; import com.rebotted.game.items.impl.RareProtection; import com.rebotted.game.npcs.impl.Pets; import com.rebotted.game.players.Player; @@ -28,14 +28,13 @@ public class DropItem implements PacketType { } for (LogData logData : LogData.values()) { if (itemId == logData.getLogId()) { - Firemaking.pickedUpFiremakingLog = false; + player.pickedUpFiremakingLog = false; } } for (LogData logData : LogData.values()) { if (itemId == logData.getLogId()) { if (GameEngine.objectManager.objectExists(player.absX, player.absY)) { - player.getPacketSender().sendMessage( - "You cannot drop a log here."); + player.getPacketSender().sendMessage("You cannot drop a log here."); return; } } @@ -102,36 +101,22 @@ public class DropItem implements PacketType { } } } - - if (player.playerItemsN[slot] != 0 && itemId != -1 - && player.playerItems[slot] == itemId + 1) { + if (player.playerItemsN[slot] != 0 && itemId != -1 && player.playerItems[slot] == itemId + 1) { if (droppable) { - for (int i = 0; i < GameConstants.DESTROYABLE_ITEMS.length; i++) { - if (itemId == GameConstants.DESTROYABLE_ITEMS[i]) { + for (int i = 0; i < ItemConstants.DESTROYABLE_ITEMS.length; i++) { + if (itemId == ItemConstants.DESTROYABLE_ITEMS[i]) { player.droppedItem = itemId; player.getItemAssistant().destroyInterface(itemId); return; } } - if (player.underAttackBy > 0) { - if (player.getShopAssistant().getItemShopValue(itemId) > 1000) { - player.getPacketSender() - .sendMessage( - "You may not drop items worth more than 1000 while in combat."); - return; - } - } - GameEngine.itemHandler.createGroundItem(player, itemId, player.getX(), - player.getY(), player.playerItemsN[slot], player.getId()); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); + GameEngine.itemHandler.createGroundItem(player, itemId, player.getX(), player.getY(), player.playerItemsN[slot], player.getId()); + player.getItemAssistant().deleteItem(itemId, slot, player.playerItemsN[slot]); if (GameConstants.SOUND) { - player.getPacketSender().sendSound(SoundList.ITEM_DROP, 100, - 0); + player.getPacketSender().sendSound(SoundList.ITEM_DROP, 100, 0); } } else { - player.getPacketSender().sendMessage( - "This item cannot be dropped."); + player.getPacketSender().sendMessage("This item cannot be dropped."); } } } diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnObject.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnObject.java index 6c15ca1c..7a620b49 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnObject.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnObject.java @@ -29,6 +29,9 @@ public class ItemOnObject implements PacketType { if (!player.getItemAssistant().playerHasItem(itemId, 1)) { return; } + if (!player.goodDistance(player.objectX, player.objectY, player.absX, player.absY, 3)) { + return; + } if (player.playerRights == 3) { player.getPacketSender().sendMessage( "Object Id:" + objectId + " ObjectX: " + objectX @@ -154,14 +157,14 @@ public class ItemOnObject implements PacketType { if (itemId == 1710 || itemId == 1708 || itemId == 1706 || itemId == 1704 && objectId == 2638) { // glory - int amount = player.getItemAssistant().getItemCount(1710) - + player.getItemAssistant().getItemCount(1708) - + player.getItemAssistant().getItemCount(1706) - + player.getItemAssistant().getItemCount(1704); + int amount = player.getItemAssistant().getItemAmount(1710) + + player.getItemAssistant().getItemAmount(1708) + + player.getItemAssistant().getItemAmount(1706) + + player.getItemAssistant().getItemAmount(1704); int[] glories = { 1710, 1708, 1706, 1704 }; for (int i : glories) { player.getItemAssistant().deleteItem(i, - player.getItemAssistant().getItemCount(i)); + player.getItemAssistant().getItemAmount(i)); } player.startAnimation(832); player.getItemAssistant().addItem(1712, amount); @@ -199,7 +202,7 @@ public class ItemOnObject implements PacketType { } if (Fillables.canFill(itemId, objectId) && player.getItemAssistant().playerHasItem(itemId)) { - int amount = player.getItemAssistant().getItemCount(itemId); + int amount = player.getItemAssistant().getItemAmount(itemId); player.getItemAssistant().deleteItem(itemId, amount); player.getItemAssistant().addItem(Fillables.counterpart(itemId), amount); player.getPacketSender().sendMessage(Fillables.fillMessage(itemId, objectId)); diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnPlayer.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnPlayer.java index 5bbfb64f..d7dc9edd 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnPlayer.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnPlayer.java @@ -22,7 +22,7 @@ public class ItemOnPlayer implements PacketType { case 962: Player o = (Player) PlayerHandler.players[playerId]; if (RareProtection.CRACKERS) { - int delete = c.getItemAssistant().getItemCount(962); + int delete = c.getItemAssistant().getItemAmount(962); c.getItemAssistant().deleteItem(962, delete); c.getPacketSender().sendMessage("You can't do that!"); return; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PickupItem.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PickupItem.java index ecc924aa..9a45ab32 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PickupItem.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PickupItem.java @@ -7,7 +7,6 @@ import com.rebotted.event.CycleEventHandler; import com.rebotted.game.content.minigames.castlewars.CastleWars; import com.rebotted.game.content.music.sound.SoundList; import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.firemaking.Firemaking; import com.rebotted.game.content.skills.firemaking.LogData; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.items.impl.RareProtection; @@ -61,13 +60,13 @@ public class PickupItem implements PacketType { for (LogData logData : LogData.values()) { if (player.isFiremaking && player.pItemId == logData.getLogId()) { player.getPacketSender().sendMessage("You can't do that!"); - Firemaking.stopFiremaking = true; + player.stopFiremaking = true; return; } } for (LogData logData : LogData.values()) { if (player.pItemId == logData.getLogId()) { - Firemaking.pickedUpFiremakingLog = true; + player.pickedUpFiremakingLog = true; } } SkillHandler.resetSkills(player); diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/RemoveItem.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/RemoveItem.java index 165112d0..aaf34fc0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/RemoveItem.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/RemoveItem.java @@ -13,75 +13,75 @@ import com.rebotted.net.packets.PacketType; public class RemoveItem implements PacketType { @Override - public void processPacket(Player c, int packetType, int packetSize) { - int interfaceId = c.getInStream().readUnsignedWordA(); - int removeSlot = c.getInStream().readUnsignedWordA(); - int removeId = c.getInStream().readUnsignedWordA(); - if (!RareProtection.removeItem(c, removeId)) { + public void processPacket(Player player, int packetType, int packetSize) { + int interfaceId = player.getInStream().readUnsignedWordA(); + int removeSlot = player.getInStream().readUnsignedWordA(); + int removeId = player.getInStream().readUnsignedWordA(); + if (!RareProtection.removeItem(player, removeId)) { return; } - c.endCurrentTask(); + player.endCurrentTask(); - Weight.updateWeight(c); + Weight.updateWeight(player); switch (interfaceId) { case 4233: case 4239: case 4245: - JewelryMaking.mouldItem(c, removeId, 1); + JewelryMaking.mouldItem(player, removeId, 1); break; case 7423: - if (c.inTrade) { - c.getTrading().declineTrade(true); + if (player.inTrade) { + player.getTrading().declineTrade(true); return; } - c.getItemAssistant().bankItem(removeId, removeSlot, 1); - c.getItemAssistant().resetItems(7423); + player.getItemAssistant().bankItem(removeId, removeSlot, 1); + player.getItemAssistant().resetItems(7423); break; case 1688: - c.getItemAssistant().removeItem(removeId, removeSlot); + player.getItemAssistant().removeItem(removeId, removeSlot); break; case 5064: - if (c.inPartyRoom) { - PartyRoom.depositItem(c, removeId, 1); + if (player.inPartyRoom) { + PartyRoom.depositItem(player, removeId, 1); } else { - c.getItemAssistant().bankItem(removeId, removeSlot, 1); + player.getItemAssistant().bankItem(removeId, removeSlot, 1); } break; case 5382: - c.getItemAssistant().fromBank(removeId, removeSlot, 1); + player.getItemAssistant().fromBank(removeId, removeSlot, 1); break; case 3900: - c.getShopAssistant().buyFromShopPrice(removeId); + player.getShopAssistant().buyFromShopPrice(removeId); break; case 3823: - c.getShopAssistant().sellToShopPrice(removeId, removeSlot); + player.getShopAssistant().sellToShopPrice(removeId, removeSlot); break; case 3322: - if (c.duelStatus <= 0) { - c.getTrading().tradeItem(removeId, removeSlot, 1); + if (player.duelStatus <= 0) { + player.getTrading().tradeItem(removeId, removeSlot, 1); } else { - c.getDueling().stakeItem(removeId, removeSlot, 1); + player.getDueling().stakeItem(removeId, removeSlot, 1); } break; case 3415: - if (c.duelStatus <= 0) { - c.getTrading().fromTrade(removeId, removeSlot, 1); + if (player.duelStatus <= 0) { + player.getTrading().fromTrade(removeId, removeSlot, 1); } break; case 6669: - c.getDueling().fromDuel(removeId, removeSlot, 1); + player.getDueling().fromDuel(removeId, removeSlot, 1); break; case 1119: @@ -89,11 +89,11 @@ public class RemoveItem implements PacketType { case 1121: case 1122: case 1123: - c.getSmithing().readInput(c.playerLevel[c.playerSmithing], Integer.toString(removeId), c, 1); + player.getSmithing().readInput(player, player.playerLevel[player.playerSmithing], removeId, 1); break; } - Weight.updateWeight(c); + Weight.updateWeight(player); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java index eb51fef1..5631fcae 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java @@ -136,7 +136,7 @@ public class Walking implements PacketType { if (!player.wildernessWarning && player.wildLevel > 0) { player.resetWalkingQueue(); player.wildernessWarning = true; - player.getPacketSender().sendFrame126("WARNING!", 6940); + player.getPacketSender().sendString("WARNING!", 6940); player.getPacketSender().showInterface(1908); } if (player.openDuel && player.duelStatus <= 3) { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java b/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java new file mode 100644 index 00000000..c2193ec3 --- /dev/null +++ b/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java @@ -0,0 +1,293 @@ +package com.rebotted.world; + +import java.util.Arrays; +import java.util.Objects; +import java.util.Optional; + +import com.rebotted.game.npcs.Npc; +import com.rebotted.game.players.Player; +import com.rebotted.game.players.PlayerHandler; +/** + * @author Andrew (Mr Extremez) - added all the boundaries + * @author Jason http://www.rune-server.org/members/jason - made the system + * @date Mar 2, 2014 + */ +public class Boundary { + + + int minX, minY, highX, highY; + int height; + + /** + * + * @param minX + * The south-west x coordinate + * @param minY + * The south-west y coordinate + * @param highX + * The north-east x coordinate + * @param highY + * The north-east y coordinate + */ + public Boundary(int minX, int highX, int minY, int highY) { + this.minX = minX; + this.minY = minY; + this.highX = highX; + this.highY = highY; + height = -1; + } + + /** + * + * @param minX + * The south-west x coordinate + * @param minY + * The south-west y coordinate + * @param highX + * The north-east x coordinate + * @param highY + * The north-east y coordinate + * @param height + * The height of the boundary + */ + public Boundary(int minX, int highX, int minY, int highY, int height) { + this.minX = minX; + this.minY = minY; + this.highX = highX; + this.highY = highY; + this.height = height; + } + + /** + * + * @param player + * The player object + * @param boundaries + * The array of Boundary objects + * @return + */ + public static boolean isIn(Player player, Boundary[] boundaries) { + for (Boundary b : boundaries) { + if (b.height >= 0) { + if (player.getH() != b.height) { + continue; + } + } + if (player.getX() >= b.minX && player.getX() <= b.highX && player.getY() >= b.minY && player.getY() <= b.highY) { + return true; + } + } + return false; + } + + /** + * + * @param player + * The player object + * @param boundaries + * The boundary object + * @return + */ + public static boolean isIn(Player player, Boundary boundaries) { + if (boundaries.height >= 0) { + if (player.getH() != boundaries.height) { + return false; + } + } + return player.getX() >= boundaries.minX && player.getX() <= boundaries.highX && player.getY() >= boundaries.minY && player.getY() <= boundaries.highY; + } + + /** + * + * @param npc + * The npc object + * @param boundaries + * The boundary object + * @return + */ + public static boolean isIn(Npc npc, Boundary boundaries) { + if (boundaries.height >= 0) { + if (npc.heightLevel != boundaries.height) { + return false; + } + } + return npc.getX() >= boundaries.minX && npc.getX() <= boundaries.highX && npc.getY() >= boundaries.minY && npc.getY() <= boundaries.highY; + } + + public static boolean isIn(Npc npc, Boundary[] boundaries) { + for (Boundary boundary : boundaries) { + if (boundary.height >= 0) { + if (npc.heightLevel != boundary.height) { + return false; + } + } + if (npc.getX() >= boundary.minX && npc.getX() <= boundary.highX && npc.getY() >= boundary.minY && npc.getY() <= boundary.highY) { + return true; + } + } + return false; + } + + public static boolean isInSameBoundary(Player player1, Player player2, Boundary[] boundaries) { + Optional boundary1 = Arrays.asList(boundaries).stream().filter(b -> isIn(player1, b)).findFirst(); + Optional boundary2 = Arrays.asList(boundaries).stream().filter(b -> isIn(player2, b)).findFirst(); + if (!boundary1.isPresent() || !boundary2.isPresent()) { + return false; + } + return Objects.equals(boundary1.get(), boundary2.get()); + } + + public static int entitiesInArea(Boundary boundary) { + int i = 0; + for (Player player : PlayerHandler.players) + if (player != null) + if (isIn(player, boundary)) + i++; + return i; + } + + /** + * Returns the centre point of a boundary as a {@link Coordinate} + * + * @param boundary The boundary of which we want the centre. + * @return The centre point of the boundary, represented as a {@link Coordinate}. + */ + public static Coordinate centre(Boundary boundary) { + int x = (boundary.minX + boundary.highX) / 2; + int y = (boundary.minY + boundary.highY) / 2; + if (boundary.height >= 0) { + return new Coordinate(x, y, boundary.height); + } else { + return new Coordinate(x, y, 0); + } + } + + //low x, high x, low y, high y + + public static final Boundary F2P = new Boundary(2944, 3328, 3097, 3515); + public static final Boundary TUTORIAL = new Boundary(3055, 3150, 3054, 3128); + public static final Boundary CRANDOR = new Boundary(2813, 2867, 3226, 3307); + public static final Boundary[] IN_F2P = {F2P, TUTORIAL, CRANDOR }; + public static final Boundary LUMBRIDGE = new Boundary(3134, 3266, 3131, 3317); + public static final Boundary WIZARDS_TOWER = new Boundary(3094, 3124, 3141, 3172); + public static final Boundary FALADOR = new Boundary(2945, 3066, 3303, 3390); + public static final Boundary VARROCK = new Boundary(3172, 3289, 3368, 3504); + public static final Boundary DRAYNOR = new Boundary(3079, 3149, 3226, 3382); + public static final Boundary BARB = new Boundary(3072, 3098, 3399, 3445); + public static final Boundary GOBLIN_VILLAGE = new Boundary(2945, 2970, 3475, 3515); + public static final Boundary EDGEVILLE = new Boundary(3072, 3126, 3459, 3517); + public static final Boundary PORT_SARIM = new Boundary(3327, 3423, 3131, 3324); + public static final Boundary RIMMINGTON = new Boundary(3327, 3423, 3131, 3324); + public static final Boundary AL_KHARID = new Boundary(3327, 3423, 3131, 3324); + + public static final Boundary[] BANK_AREA = new Boundary[] { + new Boundary(3205, 3226, 3211, 3214, 2), //Lumbridge + new Boundary(3162, 3271, 3266, 3272),//Al Kharid + new Boundary(2436, 2453, 5174, 5186),//TzHaar + new Boundary(2842, 2860, 2950, 2957),//Shilo + new Boundary(3456, 3492, 3200, 3215),//Burgh d rott + new Boundary(3377, 3386, 3266, 3275),//Duel + new Boundary(3087, 3098, 3239, 3248),//Draynor + new Boundary(3248, 3260, 3414, 3423),//Varrock East + new Boundary(3183, 3193, 3432, 3446),//Varrock West + new Boundary(3088, 3100, 3486, 3501),//Edge + new Boundary(3009, 3020, 3352, 3358),//Fally East + new Boundary(2942, 2950, 3365, 3374),//Fally West + new Boundary(2804, 2815, 3438, 3447),//Catherby + new Boundary(2718, 2733, 3485, 3500),//Seers + new Boundary(2610, 2622, 3326, 3338),//North ardougne + new Boundary(2645, 2660, 3281, 3288),//South ardougne + new Boundary(2607, 2618, 3087, 3098),//Yanille + new Boundary(2442, 2444, 3081, 3084),//Castle Wars + new Boundary(2348, 2358, 3159, 3168),//Lleyta + new Boundary(2324, 2334, 3685, 3694),//Piscatoris + new Boundary(2442, 2448, 3420, 3430),//Tree Gnome Stronghold + new Boundary(2440, 2453, 3478, 3491, 1),//Grand Tree Area + new Boundary(3113, 3131, 3118, 3131),//Tut + new Boundary(2885, 2895, 3422, 3433),//Nardah + new Boundary(3685, 3694, 3461, 3473),//Phasmatys + new Boundary(2530, 2550, 4705, 4725),//Mage Bank + new Boundary(2834, 2841, 10204, 10215),//Keldagrim + new Boundary(2379, 2386, 4453, 4462),//Zanaris + new Boundary(2582, 2591, 3417, 3423),//Fishing Guild + new Boundary(3509, 3516, 3417, 3423),//Canifis + new Boundary(3297, 3311, 3115, 3133),//Shantay Pass + new Boundary(3035, 3049, 4967, 4977, 1),//Rogues Den + }; + + public static final Boundary ZAMMY_WAIT = new Boundary(2409, 2431, 9511, 9535); + public static final Boundary SARA_WAIT = new Boundary(2368, 2392, 9479, 9498); + + public static final Boundary[] MULTI = new Boundary[] { + new Boundary(3136, 3327, 3519, 3607), new Boundary(2360, 2445, 5045, 5125), new Boundary(2256, 2287, 4680, 4711), + new Boundary(3190, 3327, 3648, 3839), new Boundary(3200, 3390, 3840, 3967), new Boundary(2992, 3007, 3912, 3967), + new Boundary(2946, 2959, 3816, 3831), new Boundary(3008, 3199, 3856, 3903), new Boundary(3008, 3071, 3600, 3711), + new Boundary(3072, 3327, 3608, 3647), new Boundary(2624, 2690, 2550, 2619), new Boundary(2667, 2685, 3712, 3730), + new Boundary(2371, 2422, 5062, 5117), new Boundary(2896, 2927, 3595, 3630), new Boundary(2892, 2932, 4435, 4464), + new Boundary(3279, 3307, 3156, 3179) + }; + + //jungle + public static final Boundary[] KARAMAJA = new Boundary[] { + new Boundary(2745, 3007, 2876, 3095), new Boundary(2747, 2944, 3096, 3131) + }; + + //jungle + public static final Boundary[] MUSA_POINT = new Boundary[] { + new Boundary(2817, 2917, 3192, 3204), new Boundary(2817, 2961, 3131, 3191) + }; + + //jungle + public static final Boundary BRIMHAVEN = new Boundary(2688, 2815, 3131, 3258); + + //desert + public static final Boundary DESERT = new Boundary(3137, 3517, 2747, 3130, 0); + //desert - no heat + public static final Boundary NARDAH = new Boundary(3392, 3455, 2876, 2940); + public static final Boundary BANDIT_CAMP = new Boundary(3151, 3192, 2963, 2986); + public static final Boundary MINING_CAMP = new Boundary(3267, 3311, 3000, 3043); + public static final Boundary BEDABIN = new Boundary(3160, 3187, 3015, 3046); + public static final Boundary UZER = new Boundary(3462, 3503, 3068, 3109); + public static final Boundary AGILITY_PYRAMID = new Boundary(3329, 3391, 2812, 2855); + public static final Boundary PYRAMID = new Boundary(3217, 3250, 2881, 2908); + public static final Boundary SOPHANEM = new Boundary(3273, 3323, 2749, 2806); + public static final Boundary MENAPHOS = new Boundary(3200, 3266, 2749, 2806); + public static final Boundary POLLIVNEACH = new Boundary(3329, 3377, 2936, 3002); + public static final Boundary SHANTAY_PASS = new Boundary(3298, 3312, 3304, 3303); + + public static final Boundary[] NO_HEAT = {NARDAH, BANDIT_CAMP, MINING_CAMP, BEDABIN, UZER, AGILITY_PYRAMID, PYRAMID, SOPHANEM, MENAPHOS, POLLIVNEACH, SHANTAY_PASS}; + + //mortyania + public static final Boundary MORTYANIA = new Boundary(3401, 3773, 3157, 3577); + + //wild + public static final Boundary[] WILDERNESS = new Boundary[] { new Boundary(2941, 3392, 3518, 3966), new Boundary(2941, 3392, 9922, 10366) }; + public static final Boundary IN_LESSER = new Boundary(3108, 3112, 3156, 3158, 2); + public static final Boundary IN_DUEL = new Boundary(3331, 3391, 3242, 3260); + public static final Boundary[] IN_DUEL_AREA = new Boundary[] { new Boundary(3322, 3394, 3195, 3291), new Boundary(3311, 3323, 3223, 3248) }; + + public static final Boundary TRAWLER_GAME = new Boundary (2808, 2811, 3415, 3425); + public static final Boundary PITS_WAIT = new Boundary (2394, 2404, 5169, 5175); + + public static final Boundary[] LUMB_BUILDING = new Boundary[] { new Boundary(3205, 3216, 3209, 3228), new Boundary(3229, 3233, 3206, 3208), new Boundary(3228, 3233, 3201, 3205), new Boundary(3230, 3237, 3195, 3198), new Boundary(3238, 3229, 3209, 3211), + new Boundary(3240, 3247, 3204, 3215), new Boundary(3247, 3252, 3190, 3195), new Boundary(3227, 3230, 3212, 3216), new Boundary(3227, 3230, 3221, 3225), new Boundary(3229, 3232, 3236, 3241), + new Boundary(3209, 3213, 3243, 3250), new Boundary(3222, 3229, 3252, 3257), new Boundary(3184, 3192, 3270, 3275), new Boundary(3222, 3224, 3292, 3294), new Boundary(3225, 3230, 3287, 3228), + new Boundary(3243, 3248, 3244, 3248), new Boundary(3202, 3205, 3167, 3170), new Boundary(3231, 3238, 3151, 3155), new Boundary(3233, 3234, 3156, 3156), new Boundary(3163, 3170, 3305, 3308), + new Boundary(3165, 3168, 3303, 3310) }; + + public static final Boundary[] DRAYNOR_BUILDING = new Boundary[] { new Boundary(3097, 3102, 3277, 3281), new Boundary(3088, 3092, 3273, 3276), new Boundary(3096, 3102, 3266, 3270), new Boundary(3089, 3095, 3265, 3268), new Boundary(3083, 3088, 3256, 3261), + new Boundary(3087, 3094, 3251, 3255), new Boundary(3121, 3130, 3240, 3246), new Boundary(3102, 3112, 3162, 3165), new Boundary(3107, 3111, 3166, 3166), new Boundary(3103, 3115, 3157, 3161), + new Boundary(3105, 3114, 3156, 3156), new Boundary(3105, 3113, 3155, 3155), new Boundary(3106, 3112, 3154, 3154), new Boundary(3092, 3097, 3240, 3246) }; + + public static final Boundary ARDOUGNE_ZOO = new Boundary(2593, 2639, 3265, 3288); + public static final Boundary APE_ATOLL = new Boundary(2694, 2811, 2691, 2805); + public static final Boundary TUTORIAL_ISLAND = new Boundary(2625, 2687, 4670, 4735); + public static final Boundary BARROWS = new Boundary(3543, 3584, 3265, 3311); + public static final Boundary BARROWS_UNDERGROUND = new Boundary(3529, 3581, 9673, 9722); + public static final Boundary PC_BOAT = new Boundary(2660, 2663, 2638, 2643); + public static final Boundary PC_GAME = new Boundary(2624, 2690, 2550, 2619); + public static final Boundary FIGHT_CAVES = new Boundary(2360, 2445, 5045, 5125); + public static final Boundary PIRATE_HOUSE = new Boundary(3038, 3044, 3949, 3959); + public static final Boundary[] FIGHT_PITS = new Boundary[] { new Boundary(2378, 3415, 5133, 5167), new Boundary(2394, 2404, 5169, 5174) }; + +} \ No newline at end of file diff --git a/2006Redone Server/src/main/java/com/rebotted/world/Coordinate.java b/2006Redone Server/src/main/java/com/rebotted/world/Coordinate.java new file mode 100644 index 00000000..de396a12 --- /dev/null +++ b/2006Redone Server/src/main/java/com/rebotted/world/Coordinate.java @@ -0,0 +1,83 @@ +package com.rebotted.world; + +/** + * Representing a specific location. + * + * @author Emiel + * + */ +public class Coordinate { + + private int x, y, h; + + public Coordinate(int x, int y) { + this.x = x; + this.y = y; + h = 0; + } + + public Coordinate(int x, int y, int h) { + this.x = x; + this.y = y; + this.h = h; + } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public int getH() { + return h; + } + + /** + * Absolute distance between this Coordiante and another. + * @param other The other Coordiante. + * @return The distance between the 2 Coordinates. + */ + public int getDistance(Coordinate other) { + return (int) Math.sqrt(Math.pow(x - other.x, 2) + Math.pow(y - other.y, 2) + Math.pow(h - other.h, 2)); + } + + /** + * Absolute distance between 2 Coordiantes. + * @param c1 The first Coordiante. + * @param c2 The the second Coordiante. + * @return The distance between the 2 Coordinates. + */ + public static int getDistance(Coordinate c1, Coordinate c2) { + return (int) Math.sqrt(Math.pow(c1.x - c2.x, 2) + Math.pow(c1.y - c2.y, 2) + Math.pow(c1.h - c2.h, 2)); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + h; + result = prime * result + x; + result = prime * result + y; + return result; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (obj instanceof Coordinate) { + Coordinate other = (Coordinate) obj; + return x == other.x && y == other.y && h == other.h; + } + return false; + } + + @Override + public String toString() { + return "Coordinate [x=" + x + ", y=" + y + ", h=" + h + "]"; + } + +}