diff --git a/2006Redone Client/bin/ClientSettings.class b/2006Redone Client/bin/ClientSettings.class index b7237263..24a1439a 100644 Binary files a/2006Redone Client/bin/ClientSettings.class and b/2006Redone Client/bin/ClientSettings.class differ diff --git a/2006Redone Client/bin/Main.class b/2006Redone Client/bin/Main.class index b7753883..11c20515 100644 Binary files a/2006Redone Client/bin/Main.class and b/2006Redone Client/bin/Main.class differ diff --git a/2006Redone Client/src/ClientSettings.java b/2006Redone Client/src/ClientSettings.java index ac6a894d..cfac44a6 100644 --- a/2006Redone Client/src/ClientSettings.java +++ b/2006Redone Client/src/ClientSettings.java @@ -23,7 +23,7 @@ public class ClientSettings { * on localhost (Assuming you're running Client and LocalGame respectively) * */ - public static String SERVER_IP = "2006rebotted.hopto.org"; + public static String SERVER_IP = "127.0.0.1"; /** * The Npc Bits for the Server */ diff --git a/2006Redone Client/src/Main.java b/2006Redone Client/src/Main.java index 25c337af..b31ecb61 100644 --- a/2006Redone Client/src/Main.java +++ b/2006Redone Client/src/Main.java @@ -16,7 +16,7 @@ public final class Main { */ public static void main(String[] args) { - ClientSettings.SERVER_IP = "2006rebotted.hopto.org"; + ClientSettings.SERVER_IP = "127.0.0.1"; if (args.length > 1) { System.out.println("Running local"); diff --git a/2006Redone Server/data/cfg/npc.cfg b/2006Redone Server/data/cfg/npc.cfg index b2506851..4f7a21b2 100644 --- a/2006Redone Server/data/cfg/npc.cfg +++ b/2006Redone Server/data/cfg/npc.cfg @@ -8,8 +8,8 @@ npc = 5 Woman 2 7 npc = 6 Woman 2 7 npc = 7 Farmer 7 12 npc = 8 Thief 16 17 -npc = 9 Gaurd 21 22 -npc = 10 Gaurd 22 22 +npc = 9 Guard 21 22 +npc = 10 Guard 22 22 npc = 11 Tramp 2 7 npc = 12 Barbarian 7 14 npc = 13 Wizard 9 14 @@ -31,7 +31,7 @@ npc = 28 Zoo_keeper 0 0 npc = 29 Chuck 0 0 npc = 30 Barman 0 0 npc = 31 Priest 0 0 -npc = 32 Gaurd 20 22 +npc = 32 Guard 20 22 npc = 33 Door_man 0 0 npc = 34 Watchman 33 22 npc = 35 Soldier 28 22 @@ -114,7 +114,7 @@ npc = 95 Wolf 64 70 npc = 96 White_wolf 25 34 npc = 97 White_wolf 25 34 npc = 98 Dog 0 0 -npc = 99 Gaurd_dog 44 49 +npc = 99 Guard_dog 44 49 npc = 100 Goblin 2 5 npc = 101 Goblin 5 14 npc = 102 Goblin 13 16 @@ -186,8 +186,8 @@ npc = 159 Gnome_child 1 2 npc = 160 Gnome_child 1 2 npc = 161 Gnome_child 1 2 npc = 162 Gnome_trainer 0 0 -npc = 163 Gnome_Gaurd 23 33 -npc = 164 Gnome_Gaurd 23 33 +npc = 163 Gnome_Guard 23 33 +npc = 164 Gnome_Guard 23 33 npc = 165 Gnome_shop_keeper 0 0 npc = 166 Gnome_banker 0 0 npc = 167 Gnome_baller 0 0 @@ -218,11 +218,11 @@ npc = 191 Tribesman 32 33 npc = 192 Dark_warrior 8 18 npc = 193 Chaos_druid_warrior 37 40 npc = 194 Necromancer 26 44 -npc = 195 Gaurd_Bandit 21 28 -npc = 196 Gaurd_Bandit 21 28 +npc = 195 Guard_Bandit 21 28 +npc = 196 Guard_Bandit 21 28 //------------------------Not In DB------------------------ -npc = 197 Barbarian_Gaurd 8 0 +npc = 197 Barbarian_Guard 8 0 //------------------------Not In DB------------------------ npc = 198 Guild_master 0 0 @@ -284,11 +284,11 @@ npc = 249 Merlin 0 0 npc = 250 The_Lady_of_the_Lake 0 0 npc = 251 King_Arthur 0 0 npc = 252 Beggar 0 0 -npc = 253 Khazard_Gaurd 23 22 -npc = 254 Khazard_Gaurd 23 22 -npc = 255 Khazard_Gaurd 23 22 -npc = 256 Khazard_Gaurd 23 22 -npc = 257 Khazard_Gaurd 23 22 +npc = 253 Khazard_Guard 23 22 +npc = 254 Khazard_Guard 23 22 +npc = 255 Khazard_Guard 23 22 +npc = 256 Khazard_Guard 23 22 +npc = 257 Khazard_Guard 23 22 npc = 258 General_Khazard 112 170 npc = 259 Khazard_barman 0 0 npc = 260 Kelvin 0 0 @@ -307,8 +307,8 @@ npc = 272 Lucien 0 0 npc = 273 Lucien 0 0 //------------------------Not In DB------------------------ -npc = 274 Gaurdian_of_Armadyl 45 0 -npc = 275 Gaurdian_of_Armadyl 43 0 +npc = 274 Guardian_of_Armadyl 45 0 +npc = 275 Guardian_of_Armadyl 43 0 //------------------------Not In DB------------------------ npc = 276 Winelda 0 0 @@ -379,9 +379,9 @@ npc = 340 Hops 0 0 npc = 341 Hops 0 0 npc = 342 Guidor's_wife 0 0 npc = 343 Guidor 0 0 -npc = 344 Gaurd 0 0 -npc = 345 Gaurd 0 0 -npc = 346 Gaurd 0 0 +npc = 344 Guard 0 0 +npc = 345 Guard 0 0 +npc = 346 Guard 0 0 npc = 347 Mourner 11 19 npc = 348 Mourner 24 25 npc = 349 Kilron 0 0 @@ -403,7 +403,7 @@ npc = 364 King_Lathas 0 0 npc = 365 Paladin 62 57 npc = 366 Jerico 0 0 npc = 367 Chemist 0 0 -npc = 368 Gaurd 0 0 +npc = 368 Guard 0 0 npc = 369 Mourner 24 25 npc = 370 Mourner 11 19 npc = 371 Mourner 11 19 @@ -419,7 +419,7 @@ npc = 380 Customs_officer 0 0 npc = 381 Captain_Barnaby 0 0 npc = 382 Dwarf 0 0 npc = 383 Stankers 0 0 -npc = 384 Barbarian_Gaurd 0 0 +npc = 384 Barbarian_Guard 0 0 npc = 385 Kharid_Scorpion 0 0 npc = 386 Kharid_Scorpion 0 0 npc = 387 Kharid_Scorpion 0 0 @@ -433,8 +433,8 @@ npc = 394 River_troll 79 90 npc = 395 River_troll 120 130 npc = 396 River_troll 159 160 npc = 397 Cow 2 8 -npc = 398 Legends_Gaurd 0 0 -npc = 399 Legends_Gaurd 0 0 +npc = 398 Legends_Guard 0 0 +npc = 399 Legends_Guard 0 0 npc = 400 Radimus_Erkle 0 0 npc = 401 Jungle_Forester 0 0 npc = 402 Jungle_Forester 0 0 @@ -482,9 +482,9 @@ npc = 443 Tree_spirit 159 160 npc = 444 Goblin 5 13 npc = 445 Goblin 5 13 npc = 446 Giant_rat 3 5 -npc = 447 Jail_Gaurd 26 29 -npc = 448 Jail_Gaurd 26 29 -npc = 449 Jail_Gaurd 26 29 +npc = 447 Jail_Guard 26 29 +npc = 448 Jail_Guard 26 29 +npc = 449 Jail_Guard 26 29 npc = 450 Gull 0 0 npc = 451 Gull 0 0 npc = 452 Seth_Groats 0 0 @@ -524,7 +524,7 @@ npc = 485 Local_Gnome 0 0 npc = 486 Kalron 0 0 npc = 487 Observatory_assistant 0 0 npc = 488 Observatory_professor 0 0 -npc = 489 Goblin_Gaurd 26 26 +npc = 489 Goblin_Guard 26 26 npc = 490 Observatory_professor 0 0 npc = 491 Ghost 19 25 npc = 492 Spirit_of_Scorpius 0 0 @@ -648,7 +648,7 @@ npc = 605 Sir_Vyvin 0 0 npc = 606 Squire 0 0 npc = 607 Gunnjorn 0 0 npc = 608 Sir_Amik_Varze 0 0 -npc = 609 Fortress_Gaurd 20 22 +npc = 609 Fortress_Guard 20 22 npc = 610 Black_Knight 33 42 npc = 611 Witch 25 10 npc = 612 Greldo 0 0 @@ -723,7 +723,7 @@ npc = 674 Foreman 23 20 npc = 675 Shipyard_worker 0 0 npc = 676 Femi 0 0 npc = 677 Black_Demon 172 157 -npc = 678 Gaurd 37 40 +npc = 678 Guard 37 40 npc = 679 Ranging_Guild_Doorman 0 0 npc = 680 Leatherworker 0 0 npc = 681 Weapon_poison_salesman 0 0 @@ -848,7 +848,7 @@ npc = 795 Ice_Queen 111 105 npc = 796 Achietties 0 0 npc = 797 Helemos 0 0 npc = 798 Velrak the explorer 0 0 -npc = 799 Pirate_Gaurd 19 25 +npc = 799 Pirate_Guard 19 25 npc = 800 Fishing_spot 0 0 npc = 801 Abbot_Langley 0 0 npc = 802 Brother_Jered 0 0 @@ -861,7 +861,7 @@ npc = 808 Hobbes 0 0 npc = 809 Louisa 0 0 npc = 810 Mary 0 0 npc = 811 Stanford 0 0 -npc = 812 Gaurd 0 0 +npc = 812 Guard 0 0 npc = 813 Gossip 0 0 npc = 814 Anna 0 0 npc = 815 Bob 0 0 @@ -870,7 +870,7 @@ npc = 817 David 0 0 npc = 818 Elizabeth 0 0 npc = 819 Frank 0 0 npc = 820 Poison_Salesman 0 0 -npc = 821 Sinclair_Gaurd_dog 1 0 +npc = 821 Sinclair_Guard_dog 1 0 npc = 822 Ana 0 0 npc = 823 anabarrel 0 0 npc = 824 Female_slave 0 0 @@ -883,15 +883,15 @@ npc = 830 Mercenary_Captain 47 68 npc = 831 Captain_Siad 0 0 npc = 832 Al_Shabim 0 0 npc = 833 Bedabin_Nomad 0 0 -npc = 834 Bedabin_Nomad_Gaurd 0 0 +npc = 834 Bedabin_Nomad_Guard 0 0 npc = 835 Irena 0 0 npc = 836 Shantay 0 0 -npc = 837 Shantay_Gaurd 22 32 -npc = 838 Shantay_Gaurd 22 32 +npc = 837 Shantay_Guard 22 32 +npc = 838 Shantay_Guard 22 32 npc = 839 Desert_Wolf 27 34 npc = 840 Ugthanki 42 45 npc = 841 Mine_cart_driver 0 0 -npc = 842 Rowdy_Gaurd 43 60 +npc = 842 Rowdy_Guard 43 60 npc = 843 RPDT_employee 0 0 npc = 844 Wizard Cromperty 0 0 npc = 845 Horacio 0 0 @@ -906,14 +906,14 @@ npc = 853 Og 0 0 npc = 854 Grew 0 0 npc = 855 Toban 0 0 npc = 856 Gorad 68 81 -npc = 857 Ogre_Gaurd 83 80 -npc = 858 Ogre_Gaurd 83 80 -npc = 859 Ogre_Gaurd 83 80 -npc = 860 Ogre_Gaurd 83 80 -npc = 861 Ogre_Gaurd 83 80 +npc = 857 Ogre_Guard 83 80 +npc = 858 Ogre_Guard 83 80 +npc = 859 Ogre_Guard 83 80 +npc = 860 Ogre_Guard 83 80 +npc = 861 Ogre_Guard 83 80 //------------------------Not In DB------------------------ -npc = 862 City_Gaurd 83 0 +npc = 862 City_Guard 83 0 //------------------------Not In DB------------------------ npc = 863 Scared_skavid 0 0 @@ -923,14 +923,14 @@ npc = 866 Skavid 0 0 npc = 867 Skavid 0 0 npc = 868 Skavid 0 0 npc = 869 Skavid 0 0 -npc = 870 Enclave_Gaurd 83 80 +npc = 870 Enclave_Guard 83 80 npc = 871 Ogre_shaman 113 110 npc = 872 Watchtower_wizard 0 0 npc = 873 Ogre_trader 70 60 npc = 874 Ogre_merchant 60 60 npc = 875 Ogre_trader 70 60 npc = 876 Ogre_trader 70 60 -npc = 877 Tower_Gaurd 25 22 +npc = 877 Tower_Guard 25 22 npc = 878 Colonel_Radick 37 65 npc = 879 Delrith 27 7 npc = 880 Weakened_Delrith 2 1 @@ -940,7 +940,7 @@ npc = 883 Sir_Prysin 0 0 npc = 884 Captain_Rovin 0 0 npc = 885 Ceril_Carnillean 0 0 npc = 886 Claus_the_chef 0 0 -npc = 887 Gaurd 0 0 +npc = 887 Guard 0 0 npc = 888 Philipe_Carnillean 0 0 npc = 889 Henryeta_Carnillean 0 0 npc = 890 Butler_Jones 0 0 @@ -957,7 +957,7 @@ npc = 900 Witches_experiment_fourth_form 53 55 npc = 901 Mouse 0 0 npc = 902 Gundai 0 0 npc = 903 Lundail 0 0 -npc = 904 Chamber_Gaurdian 0 0 +npc = 904 Chamber_Guardian 0 0 npc = 905 Kolodion 0 0 npc = 906 Kolodion 0 0 npc = 907 Kolodion 0 0 @@ -970,7 +970,7 @@ npc = 913 Battle_mage 54 127 npc = 914 Battle_mage 54 127 npc = 915 Leela 0 0 npc = 916 Joe 0 0 -npc = 917 Jail_Gaurd 26 26 +npc = 917 Jail_Guard 26 26 npc = 918 Ned 0 0 npc = 919 Lady_Keli 0 0 npc = 920 Prince_Ali 0 0 @@ -978,8 +978,8 @@ npc = 921 Prince_Ali 0 0 npc = 922 Aggie 0 0 npc = 923 Hassan 0 0 npc = 924 Osman 0 0 -npc = 925 Border_Gaurd 0 0 -npc = 926 Border_Gaurd 0 0 +npc = 925 Border_Guard 0 0 +npc = 926 Border_Guard 0 0 npc = 927 Fishing_spot 0 0 npc = 928 Gujuo 0 0 npc = 929 Ungadulu 70 70 @@ -1112,7 +1112,7 @@ npc = 1043 Will_o'_the_wisp 0 0 npc = 1044 Monk_of_Zamorak 22 23 npc = 1045 Monk_of_Zamorak 17 11 npc = 1046 Monk_of_Zamorak 45 42 -npc = 1047 Temple_Gaurdian 30 30 +npc = 1047 Temple_Guardian 30 30 npc = 1048 Drezel 0 0 npc = 1049 Drezel 0 0 npc = 1050 Filliman_Tarlock 0 0 @@ -1141,8 +1141,8 @@ npc = 1072 Eadburg 4 10 npc = 1073 Archer 42 50 npc = 1074 Archer 42 50 npc = 1075 Archer 42 50 -npc = 1076 Gaurd 37 40 -npc = 1077 Gaurd 37 40 +npc = 1076 Guard 37 40 +npc = 1077 Guard 37 40 npc = 1078 Harold 0 0 npc = 1079 Tostig 0 0 npc = 1080 Eohric 0 0 @@ -1207,22 +1207,22 @@ npc = 1138 Mountain_Troll 71 71 npc = 1139 Mushroom 0 0 npc = 1140 Mountain_Goat 0 0 npc = 1141 Mountain_Goat 0 0 -npc = 1142 Gaurd 0 0 -npc = 1143 Gaurd 0 0 -npc = 1144 Gaurd 0 0 -npc = 1145 Gaurd 0 0 -npc = 1146 Gaurd 0 0 -npc = 1147 Gaurd 0 0 -npc = 1148 Gaurd 0 0 -npc = 1149 Gaurd 0 0 -npc = 1150 Gaurd 0 0 +npc = 1142 Guard 0 0 +npc = 1143 Guard 0 0 +npc = 1144 Guard 0 0 +npc = 1145 Guard 0 0 +npc = 1146 Guard 0 0 +npc = 1147 Guard 0 0 +npc = 1148 Guard 0 0 +npc = 1149 Guard 0 0 +npc = 1150 Guard 0 0 npc = 1151 Burntmeat 0 0 npc = 1152 Weird_Old_Man 0 0 npc = 1153 Kalphite_Worker 28 40 npc = 1154 Kalphite_Soldier 85 90 -npc = 1155 Kalphite_Gaurdian 141 171 +npc = 1155 Kalphite_Guardian 141 171 npc = 1156 Kalphite_Worker 28 40 -npc = 1157 Kalphite_Gaurdian 141 171 +npc = 1157 Kalphite_Guardian 141 171 npc = 1158 Kalphite_Queen 333 267 npc = 1159 Kalphite_Queen 333 267 npc = 1160 Kalphite_Queen 333 267 @@ -1250,7 +1250,7 @@ npc = 1181 Albatross 0 0 npc = 1182 Lord_Iorwerth 0 0 npc = 1183 Elf_warrior 90 110 npc = 1184 Elf_warrior 108 110 -npc = 1185 Elven_city_Gaurd 0 0 +npc = 1185 Elven_city_Guard 0 0 npc = 1186 Idris 0 0 npc = 1187 Essyllt 0 0 npc = 1188 Morvran 0 0 @@ -1265,13 +1265,13 @@ npc = 1196 Grizzly_bear_cub 19 20 npc = 1197 Grizzly_bear_cub 19 20 npc = 1198 Dire_Wolf 88 86 npc = 1199 Elf_Tracker 0 0 -npc = 1200 Tyras_Gaurd 110 112 +npc = 1200 Tyras_Guard 110 112 npc = 1201 Elf_warrior 0 0 npc = 1202 Arianwyn 0 0 -npc = 1203 Tyras_Gaurd 110 112 -npc = 1204 Tyras_Gaurd 110 112 -npc = 1205 Tyras_Gaurd 0 0 -npc = 1206 Tyras_Gaurd 0 0 +npc = 1203 Tyras_Guard 110 112 +npc = 1204 Tyras_Guard 110 112 +npc = 1205 Tyras_Guard 0 0 +npc = 1206 Tyras_Guard 0 0 npc = 1207 General_Hining 0 0 npc = 1208 Quartermaster 0 0 npc = 1209 Koftik 0 0 @@ -1365,10 +1365,10 @@ npc = 1292 Koschei_the_deathless 0 0 npc = 1293 Koschei_the_deathless 0 0 npc = 1294 Brundt_the_Chieftain 0 0 npc = 1295 Askeladden 0 0 -npc = 1296 Gaurd 0 0 -npc = 1297 Gaurd 0 0 -npc = 1298 Town_Gaurd 0 0 -npc = 1299 Town_Gaurd 0 0 +npc = 1296 Guard 0 0 +npc = 1297 Guard 0 0 +npc = 1298 Town_Guard 0 0 +npc = 1299 Town_Guard 0 0 npc = 1300 Thora_the_Barkeep 0 0 npc = 1301 Yrsa 0 0 npc = 1302 Fisherman 0 0 @@ -1386,7 +1386,7 @@ npc = 1313 Sassilik 48 50 npc = 1314 Inga 48 50 npc = 1315 Fish_monger 0 0 npc = 1316 Fur_trader 0 0 -npc = 1317 Market_Gaurd 48 50 +npc = 1317 Market_Guard 48 50 npc = 1318 Warrior 48 50 npc = 1319 Fox 0 0 npc = 1320 Bunny 2 5 @@ -1443,7 +1443,7 @@ npc = 1370 Greengrocer 0 0 npc = 1371 Prince_Brand 0 0 npc = 1372 Princess_Astrid 0 0 npc = 1373 King_Vargas 0 0 -npc = 1374 Gaurd 0 0 +npc = 1374 Guard 0 0 npc = 1375 Advisor_Ghrim 0 0 npc = 1376 Derrik 0 0 npc = 1377 Farmer 0 0 @@ -1524,14 +1524,14 @@ npc = 1451 Sleeping_Monkey 0 0 npc = 1452 Monkey_Child 0 0 npc = 1453 The_Monkey's_Uncle 0 0 npc = 1454 The_Monkey's_Aunt 0 0 -npc = 1455 Monkey_Gaurd 167 120 +npc = 1455 Monkey_Guard 167 120 npc = 1456 Monkey_Archer 86 50 npc = 1457 Monkey_Archer 86 50 npc = 1458 Monkey_Archer 86 50 -npc = 1459 Monkey_Gaurd 167 120 -npc = 1460 Monkey_Gaurd 167 120 -npc = 1461 Elder_Gaurd 0 0 -npc = 1462 Elder_Gaurd 0 0 +npc = 1459 Monkey_Guard 167 120 +npc = 1460 Monkey_Guard 167 120 +npc = 1461 Elder_Guard 0 0 +npc = 1462 Elder_Guard 0 0 npc = 1463 Monkey 3 6 npc = 1464 Monkey 3 6 npc = 1465 Monkey_Zombie 98 80 @@ -1570,17 +1570,17 @@ npc = 1495 toms_zombie_monkey_small 0 0 npc = 1496 toms_female_monkey 0 0 npc = 1497 toms_uncle_monkey 0 0 npc = 1498 toms_caretaker 0 0 -npc = 1499 toms_jail_Gaurd 0 0 +npc = 1499 toms_jail_Guard 0 0 npc = 1500 toms_adviser 0 0 npc = 1501 toms_child 0 0 -npc = 1502 toms_ninja_Gaurd 35 0 +npc = 1502 toms_ninja_Guard 35 0 npc = 1503 toms_monkey_archer 61 0 -npc = 1504 toms_ninja_Gaurd_captin 35 0 +npc = 1504 toms_ninja_Guard_captin 35 0 npc = 1505 toms_gorilla 35 0 npc = 1506 toms_gorilla_pound 35 0 npc = 1507 toms_gorilla_beard 35 0 npc = 1508 toms_gorilla_priest 35 0 -npc = 1509 toms_gorilla_Gaurd 35 0 +npc = 1509 toms_gorilla_Guard 35 0 npc = 1510 toms_acolyte 0 0 npc = 1511 toms_gnome_assassin 0 0 npc = 1512 toms_gnome_sapper 0 0 @@ -1783,13 +1783,13 @@ npc = 1702 Ghost_Banker 0 0 npc = 1703 Ghost_Sailor 0 0 npc = 1704 Ghost_Captain 0 0 npc = 1705 Ghost_Captain 0 0 -npc = 1706 Ghost_Gaurd 0 0 +npc = 1706 Ghost_Guard 0 0 npc = 1707 Ghost_(?) 0 0 npc = 1708 Ghost_(?) 0 0 npc = 1709 Johanhus_Ulsbrecht 0 0 -npc = 1710 H.A.M._Gaurd 12 15 -npc = 1711 H.A.M._Gaurd 18 20 -npc = 1712 H.A.M._Gaurd 22 31 +npc = 1710 H.A.M._Guard 12 15 +npc = 1711 H.A.M._Guard 18 20 +npc = 1712 H.A.M._Guard 22 31 npc = 1713 H.A.M._Deacon 0 0 npc = 1714 H.A.M._Member 0 0 npc = 1715 H.A.M._Member 0 0 @@ -1886,8 +1886,8 @@ npc = 1802 Slagilith 92 0 npc = 1803 Rock_pile 0 0 npc = 1804 Slagilith 0 0 -npc = 1805 Gaurd 0 0 -npc = 1806 Gaurd 0 0 +npc = 1805 Guard 0 0 +npc = 1806 Guard 0 0 npc = 1807 Hamal_the_Chieftain 0 0 npc = 1808 Ragnar 0 0 npc = 1809 Svidi 0 0 @@ -1972,10 +1972,10 @@ npc = 1875 Snake 0 0 npc = 1876 Blackjack_seller 0 0 npc = 1877 feud_bandit_boss 0 0 npc = 1878 Bandit_Leader 0 0 -npc = 1879 feud_arabian_Gaurd_multi 0 0 +npc = 1879 feud_arabian_Guard_multi 0 0 npc = 1880 Bandit 56 30 npc = 1881 Bandit 56 30 -npc = 1882 feud_arabian_Gaurd2_multi 0 0 +npc = 1882 feud_arabian_Guard2_multi 0 0 npc = 1883 Bandit 41 30 npc = 1884 Bandit 41 30 npc = 1885 Bandit_champion 70 50 @@ -2159,8 +2159,8 @@ npc = 2038 Grish 0 0 npc = 2039 Uglug_Nar 0 0 npc = 2040 Pilg 0 0 npc = 2041 Grug 0 0 -npc = 2042 Ogre_Gaurd 0 0 -npc = 2043 Ogre_Gaurd 83 80 +npc = 2042 Ogre_Guard 0 0 +npc = 2043 Ogre_Guard 83 80 npc = 2044 Zogre 44 72 npc = 2045 Zogre 44 72 npc = 2046 Zogre 44 72 @@ -2194,8 +2194,8 @@ npc = 2069 Cave_goblin_miner 11 10 npc = 2070 Cave_goblin_miner 11 10 npc = 2071 Cave_goblin_miner 11 10 npc = 2072 Cave_goblin_miner 11 10 -npc = 2073 Cave_goblin_Gaurd 26 26 -npc = 2074 Cave_goblin_Gaurd 24 26 +npc = 2073 Cave_goblin_Guard 26 26 +npc = 2074 Cave_goblin_Guard 24 26 npc = 2075 Cave_goblin_miner 11 10 npc = 2076 Cave_goblin_miner 11 10 npc = 2077 Cave_goblin_miner 11 10 @@ -2251,13 +2251,13 @@ npc = 2126 Trader 0 0 npc = 2127 Trade_Referee 0 0 npc = 2128 Supreme_Commander 0 0 npc = 2129 Commander_Veldaban 0 0 -npc = 2130 Black_Gaurd 48 40 -npc = 2131 Black_Gaurd 48 40 -npc = 2132 Black_Gaurd 48 40 -npc = 2133 Black_Gaurd 48 40 -npc = 2134 Black_Gaurd_Berserker 66 51 -npc = 2135 Black_Gaurd_Berserker 66 51 -npc = 2136 Black_Gaurd_Berserker 66 51 +npc = 2130 Black_Guard 48 40 +npc = 2131 Black_Guard 48 40 +npc = 2132 Black_Guard 48 40 +npc = 2133 Black_Guard 48 40 +npc = 2134 Black_Guard_Berserker 66 51 +npc = 2135 Black_Guard_Berserker 66 51 +npc = 2136 Black_Guard_Berserker 66 51 npc = 2137 Gnome_emissary 0 0 npc = 2138 Gnome_traveller 0 0 npc = 2139 Gnome_traveller 0 0 @@ -2352,12 +2352,12 @@ npc = 2227 Red_Axe_Director 0 0 npc = 2228 Commander_Veldaban 0 0 npc = 2229 Red_Axe_Cat 0 0 npc = 2230 Red_Axe_Cat 0 0 -npc = 2231 Black_Gaurd_Berserker 0 0 -npc = 2232 Black_Gaurd_Berserker 0 0 +npc = 2231 Black_Guard_Berserker 0 0 +npc = 2232 Black_Guard_Berserker 0 0 npc = 2233 Olivia 0 0 npc = 2234 Master Farmer 0 0 npc = 2235 Master Farmer 0 0 -npc = 2236 Market_Gaurd 20 22 +npc = 2236 Market_Guard 20 22 npc = 2237 Gee 0 0 npc = 2238 Donie 0 0 npc = 2239 Pig 0 0 @@ -2385,12 +2385,12 @@ npc = 2260 rcu_zammy_mage1_edge 0 0 npc = 2261 Mage_of_Zamorak 0 0 npc = 2262 Dark_mage 0 0 npc = 2263 Abyssal_leech 41 10 -npc = 2264 Abyssal_Gaurdian 59 50 +npc = 2264 Abyssal_Guardian 59 50 npc = 2265 Abyssal_walker 81 95 npc = 2266 Brian_O'Richard 0 0 -npc = 2267 Rogue_Gaurd 0 0 -npc = 2268 Rogue_Gaurd 0 0 -npc = 2269 Rogue_Gaurd 0 0 +npc = 2267 Rogue_Guard 0 0 +npc = 2268 Rogue_Guard 0 0 +npc = 2269 Rogue_Guard 0 0 npc = 2270 Martin_Thwait 0 0 npc = 2271 Emerald_Benedict 0 0 npc = 2272 Spin_Blades 0 0 @@ -2700,12 +2700,12 @@ npc = 2567 Wise_Old_Man 0 0 npc = 2568 Banker 0 0 npc = 2569 Banker 0 0 npc = 2570 Banker 0 0 -npc = 2571 Market_Gaurd 20 22 +npc = 2571 Market_Guard 20 22 npc = 2572 Olivia 0 0 //------------------------Custom------------------------ npc = 2573 Watchman 253 0 -npc = 2574 Bank_Gaurd 0 0 +npc = 2574 Bank_Guard 0 0 npc = 2575 Purepker895 52 0 npc = 2576 Qutiedoll 16 0 npc = 2577 1337sp34kr 63 0 @@ -2717,8 +2717,8 @@ npc = 2582 Trolley 0 0 npc = 2583 Trolley 0 0 npc = 2584 Trolley 0 0 npc = 2585 garden_trolley 1 0 -npc = 2586 Billy,_a_Gaurd_of_Falador 0 0 -npc = 2587 Bob,_another_Gaurd_of_Falador 0 0 +npc = 2586 Billy,_a_Guard_of_Falador 0 0 +npc = 2587 Bob,_another_Guard_of_Falador 0 0 npc = 2588 Brother_Althric 0 0 npc = 2589 PKMaster0036 87 0 npc = 2590 King_Roald 0 0 @@ -2835,7 +2835,7 @@ npc = 2894 Spinolyp 76 100 npc = 2950 The_Face 0 0 npc = 3021 Tool_Leprechaun 0 0 npc = 3108 Bert 0 0 -npc = 3109 Gaurd_Captain 0 0 +npc = 3109 Guard_Captain 0 0 npc = 3200 Chaos_Elemental 305 250 npc = 3217 Kaylee 0 0 npc = 3218 Tina 0 0 diff --git a/2006Redone Server/data/logs/commands/andrew55.txt b/2006Redone Server/data/logs/commands/andrew55.txt new file mode 100644 index 00000000..dfd4e8b8 --- /dev/null +++ b/2006Redone Server/data/logs/commands/andrew55.txt @@ -0,0 +1,2 @@ +[2020/02/09] 23:17 andrew55 used command: bank +[2020/02/09] 23:19 andrew55 used command: bank diff --git a/2006Redone Server/src/main/java/com/rebotted/GameConstants.java b/2006Redone Server/src/main/java/com/rebotted/GameConstants.java index 0cc1e833..d9aa1d8d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/GameConstants.java +++ b/2006Redone Server/src/main/java/com/rebotted/GameConstants.java @@ -5,7 +5,7 @@ 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.00; + 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, 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 588add4e..8da1d8b3 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 @@ -30,33 +30,29 @@ import com.rebotted.util.Misc; import com.rebotted.world.clip.PathFinder; /** - * Rewritten Combat (somewhat) + * @author whoever contributed * @author Andrew (Mr Extremez) - */ public class CombatAssistant { - private final Player c; + private final Player player; - public CombatAssistant(Player player) { - c = player; + public CombatAssistant(Player player2) { + player = player2; } public static boolean inCombat(Client c) { - if (c.underAttackBy > 0 || c.underAttackBy2 > 0) { - return true; - } - return false; + return (c.underAttackBy > 0 || c.underAttackBy2 > 0); } public void delayedHit(int i) { // npc hit delay if (NpcHandler.npcs[i] != null) { if (NpcHandler.npcs[i].isDead) { - c.npcIndex = 0; + player.npcIndex = 0; return; } - if (NpcHandler.npcs[i].attackTimer <= 3 || NpcHandler.npcs[i].attackTimer == 0 && NpcHandler.npcs[i].hitDelayTimer > 0 && !c.castingMagic) { // block animation + if (NpcHandler.npcs[i].attackTimer <= 3 || NpcHandler.npcs[i].attackTimer == 0 && NpcHandler.npcs[i].hitDelayTimer > 0 && !player.castingMagic) { // block animation NpcHandler.npcs[i].animNumber = NpcEmotes.getBlockEmote(i); // block emote NpcHandler.npcs[i].animUpdateRequired = true; NpcHandler.npcs[i].updateRequired = true; @@ -65,56 +61,49 @@ public class CombatAssistant { if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) { return; } - c.getPacketSender().sendSound(CombatSounds.getNpcBlockSound(NpcHandler.npcs[c.oldNpcIndex].npcType), 100, 0); + player.getPacketSender().sendSound(CombatSounds.getNpcBlockSound(NpcHandler.npcs[player.oldNpcIndex].npcType), 100, 0); } - NpcHandler.npcs[i].facePlayer(c.playerId); - if (NpcHandler.npcs[i].underAttackBy > 0 && GameEngine.npcHandler.getsPulled(c, i)) { - NpcHandler.npcs[i].killerId = c.playerId; - } else if (NpcHandler.npcs[i].underAttackBy < 0 && !GameEngine.npcHandler.getsPulled(c, i)) { - NpcHandler.npcs[i].killerId = c.playerId; + NpcHandler.npcs[i].facePlayer(player.playerId); + if (NpcHandler.npcs[i].underAttackBy > 0 && GameEngine.npcHandler.getsPulled(player, i)) { + NpcHandler.npcs[i].killerId = player.playerId; + } else if (NpcHandler.npcs[i].underAttackBy < 0 && !GameEngine.npcHandler.getsPulled(player, i)) { + NpcHandler.npcs[i].killerId = player.playerId; } - c.lastNpcAttacked = i; - if (c.projectileStage == 0) { // melee hit damage + player.lastNpcAttacked = i; + if (player.projectileStage == 0) { // melee hit damage applyNpcMeleeDamage(i, 1); - if (c.doubleHit) { + if (player.doubleHit) { applyNpcMeleeDamage(i, 2); } } - if (!c.castingMagic && c.projectileStage > 0) { // range hit - // damage + if (!player.castingMagic && player.projectileStage > 0) { // range hit damage int damage = Misc.random(rangeMaxHit()); int damage2 = -1; - if (c.lastWeaponUsed == 11235 || c.bowSpecShot == 1) { + if (player.lastWeaponUsed == 11235 || player.bowSpecShot == 1) { damage2 = Misc.random(rangeMaxHit()); } boolean ignoreDef = false; - if (Misc.random(5) == 1 && c.lastArrowUsed == 9243) { + if (Misc.random(5) == 1 && player.lastArrowUsed == 9243) { ignoreDef = true; NpcHandler.npcs[i].gfx0(758); } - - if (Misc.random(NpcHandler.npcs[i].defence) > Misc - .random(10 + calculateRangeAttack()) && !ignoreDef) { - damage = 0; - } else if (NpcHandler.npcs[i].npcType == 2881 - || NpcHandler.npcs[i].npcType == 2883 && !ignoreDef) { + if (Misc.random(NpcHandler.npcs[i].defence) > Misc.random(10 + calculateRangeAttack()) && !ignoreDef + || (NpcHandler.npcs[i].npcType == 2881 || NpcHandler.npcs[i].npcType == 2883 && !ignoreDef)) { damage = 0; } - - if (Misc.random(4) == 1 && c.lastArrowUsed == 9242 && damage > 0) { + if (Misc.random(4) == 1 && player.lastArrowUsed == 9242 && damage > 0) { NpcHandler.npcs[i].gfx0(754); damage = NpcHandler.npcs[i].HP / 5; - c.handleHitMask(c.playerLevel[3] / 10); - c.dealDamage(c.playerLevel[3] / 10); - c.gfx0(754); + player.handleHitMask(player.playerLevel[3] / 10); + player.dealDamage(player.playerLevel[3] / 10); + player.gfx0(754); } - - if (c.lastWeaponUsed == 11235 || c.bowSpecShot == 1) { + if (player.lastWeaponUsed == 11235 || player.bowSpecShot == 1) { if (Misc.random(NpcHandler.npcs[i].defence) > Misc.random(10 + calculateRangeAttack())) { damage2 = 0; } } - if (c.dbowSpec) { + if (player.dbowSpec) { NpcHandler.npcs[i].gfx100(1100); if (damage < 8) { damage = 8; @@ -122,268 +111,245 @@ public class CombatAssistant { if (damage2 < 8) { damage2 = 8; } - c.dbowSpec = false; + player.dbowSpec = false; } - if (damage > 0 && Misc.random(5) == 1 - && c.lastArrowUsed == 9244) { + if (damage > 0 && Misc.random(5) == 1 && player.lastArrowUsed == 9244) { damage *= 1.45; NpcHandler.npcs[i].gfx0(756); } - if (NpcHandler.npcs[i].HP - damage < 0) { damage = NpcHandler.npcs[i].HP; } if (NpcHandler.npcs[i].HP - damage <= 0 && damage2 > 0) { damage2 = 0; } - c.globalDamageDealt += damage; - if (damage2 > 0) - { - c.globalDamageDealt += damage2; + player.globalDamageDealt += damage; + if (damage2 > 0) { + player.globalDamageDealt += damage2; } - if (c.fightMode == 3) {//range shared - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE / 3, 4); - c.getPlayerAssistant().addSkillXP(damage / 3, 1); - c.getPlayerAssistant().addSkillXP(damage / 3, 3); - c.getPlayerAssistant().refreshSkill(1); - c.getPlayerAssistant().refreshSkill(3); - c.getPlayerAssistant().refreshSkill(4); + if (player.fightMode == 3) {//range shared [long] + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE / 2, 4); + player.getPlayerAssistant().addSkillXP(damage / 2, 1); + player.getPlayerAssistant().addSkillXP(damage / 3, 3); + player.getPlayerAssistant().refreshSkill(1);//defense + player.getPlayerAssistant().refreshSkill(3);//hp + player.getPlayerAssistant().refreshSkill(4);//range } else { - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, 4); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE /3, 3); - c.getPlayerAssistant().refreshSkill(3); - c.getPlayerAssistant().refreshSkill(4); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, 4); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE /3, 3); + player.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(4); } if (damage > 0) { if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) { - c.pcDamage += damage; + player.pcDamage += damage; } } boolean dropArrows = true; - for (int noArrowId : RangeData.NO_ARROW_DROP) { - if (c.lastWeaponUsed == noArrowId) { + if (player.lastWeaponUsed == noArrowId) { dropArrows = false; break; } } if (dropArrows) { - c.getItemAssistant().dropArrowNpc(); + player.getItemAssistant().dropArrowNpc(); + } + if (NpcHandler.npcs[i].npcType == FightCaves.TZTOK_JAD && NpcHandler.npcs[i].spawnedBy == player.getId() && ((NpcHandler.npcs[i].HP < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)) && + (NpcHandler.npcs[i].HP-damage+(damage2 > -1 ? damage2 : 0) < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)))) { + if (player.canHealersRespawn) { + FightCaves.spawnHealers(player, i, 4-player.spawnedHealers); + } } - if (NpcHandler.npcs[i].npcType == FightCaves.TZTOK_JAD && NpcHandler.npcs[i].spawnedBy == c.getId() && ((NpcHandler.npcs[i].HP < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)) && - (NpcHandler.npcs[i].HP-damage+(damage2 > -1 ? damage2 : 0) < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)))) { - if (c.canHealersRespawn) { - FightCaves.spawnHealers(c, i, 4-c.spawnedHealers); - } - } NpcHandler.npcs[i].underAttack = true; NpcHandler.npcs[i].hitDiff = damage; NpcHandler.npcs[i].HP -= damage; if (damage2 > -1) { NpcHandler.npcs[i].hitDiff2 = damage2; NpcHandler.npcs[i].HP -= damage2; - c.totalDamageDealt += damage2; + player.totalDamageDealt += damage2; } - if (c.killingNpcIndex != c.oldNpcIndex) { - c.totalDamageDealt = 0; + if (player.killingNpcIndex != player.oldNpcIndex) { + player.totalDamageDealt = 0; } - c.killingNpcIndex = c.oldNpcIndex; - c.totalDamageDealt += damage; + player.killingNpcIndex = player.oldNpcIndex; + player.totalDamageDealt += damage; NpcHandler.npcs[i].hitUpdateRequired = true; if (damage2 > -1) { NpcHandler.npcs[i].hitUpdateRequired2 = true; } NpcHandler.npcs[i].updateRequired = true; - - } else if (c.projectileStage > 0) { // magic hit damage - int damage = Misc - .random(MagicData.MAGIC_SPELLS[c.oldSpellId][6]); - if (MagicSpells.godSpells(c)) { - if (System.currentTimeMillis() - c.godSpellDelay < CombatConstants.GOD_SPELL_CHARGE) { + } else if (player.projectileStage > 0) { // magic hit damage + int damage = Misc.random(MagicData.MAGIC_SPELLS[player.oldSpellId][6]); + if (MagicSpells.godSpells(player)) { + if (System.currentTimeMillis() - player.godSpellDelay < CombatConstants.GOD_SPELL_CHARGE) { damage += Misc.random(10); } } boolean magicFailed = false; - // c.npcIndex = 0; int bonusAttack = getBonusAttack(i); - if (Misc.random(NpcHandler.npcs[i].defence) > 10 - + Misc.random(mageAtk()) + bonusAttack) { + if (Misc.random(NpcHandler.npcs[i].defence) > 10 + Misc.random(mageAtk()) + bonusAttack) { damage = 0; magicFailed = true; - } else if (NpcHandler.npcs[i].npcType == 2881 - || NpcHandler.npcs[i].npcType == 2882) { + } else if (NpcHandler.npcs[i].npcType == 2881 || NpcHandler.npcs[i].npcType == 2882) { damage = 0; magicFailed = true; } - - if (NpcHandler.npcs[i].npcType == FightCaves.TZTOK_JAD && NpcHandler.npcs[i].spawnedBy == c.getId() && ((NpcHandler.npcs[i].HP > (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)) && - (NpcHandler.npcs[i].HP-damage < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)))) { - if (c.canHealersRespawn) - FightCaves.spawnHealers(c, i, 4-c.spawnedHealers); - } - + if (NpcHandler.npcs[i].npcType == FightCaves.TZTOK_JAD && NpcHandler.npcs[i].spawnedBy == player.getId() && ((NpcHandler.npcs[i].HP > (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)) && + (NpcHandler.npcs[i].HP-damage < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)))) { + if (player.canHealersRespawn) { + FightCaves.spawnHealers(player, i, 4-player.spawnedHealers); + } + } if (NpcHandler.npcs[i].HP - damage < 0) { damage = NpcHandler.npcs[i].HP; } //magic - c.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[c.oldSpellId][7] + damage * CombatConstants.MAGIC_EXP_RATE, 6); - c.totalDamageDealt += damage; - if (MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1161 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1153 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1157 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1542 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1543 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1562) { - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MAGIC_EXP_RATE / 3, 3); + player.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[player.oldSpellId][7] + damage * CombatConstants.MAGIC_EXP_RATE, 6); + player.totalDamageDealt += damage; + if (MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1161 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1153 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1157 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1542 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1543 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1562) { + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MAGIC_EXP_RATE / 3, 3); } - c.getPlayerAssistant().refreshSkill(3); - c.getPlayerAssistant().refreshSkill(6); - + player.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(6); if (damage > 0) { if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) { - c.pcDamage += damage; + player.pcDamage += damage; } } - if (MagicSpells.getEndGfxHeight(c) == 100 && !magicFailed) { // end GFX - NpcHandler.npcs[i] - .gfx100(MagicData.MAGIC_SPELLS[c.oldSpellId][5]); + if (MagicSpells.getEndGfxHeight(player) == 100 && !magicFailed) { // end GFX + NpcHandler.npcs[i].gfx100(MagicData.MAGIC_SPELLS[player.oldSpellId][5]); } else if (!magicFailed) { - NpcHandler.npcs[i] - .gfx0(MagicData.MAGIC_SPELLS[c.oldSpellId][5]); + NpcHandler.npcs[i].gfx0(MagicData.MAGIC_SPELLS[player.oldSpellId][5]); } - if (magicFailed) { NpcHandler.npcs[i].gfx100(85); } if (!magicFailed) { - int freezeDelay = MagicSpells.getFreezeTime(c);// freeze + int freezeDelay = MagicSpells.getFreezeTime(player);// freeze if (freezeDelay > 0 && NpcHandler.npcs[i].freezeTimer == 0) { NpcHandler.npcs[i].freezeTimer = freezeDelay; } - switch (MagicData.MAGIC_SPELLS[c.oldSpellId][0]) { + switch (MagicData.MAGIC_SPELLS[player.oldSpellId][0]) { case 12901: case 12919: // blood spells case 12911: case 12929: int heal = Misc.random(damage / 2); - if (c.playerLevel[3] + heal >= c.getPlayerAssistant() - .getLevelForXP(c.playerXP[3])) { - c.playerLevel[3] = c.getPlayerAssistant() - .getLevelForXP(c.playerXP[3]); + if (player.playerLevel[3] + heal >= player.getPlayerAssistant().getLevelForXP(player.playerXP[3])) { + player.playerLevel[3] = player.getPlayerAssistant().getLevelForXP(player.playerXP[3]); } else { - c.playerLevel[3] += heal; + player.playerLevel[3] += heal; } - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(3); break; } - } NpcHandler.npcs[i].underAttack = true; - if (MagicData.MAGIC_SPELLS[c.oldSpellId][6] != 0) { + if (MagicData.MAGIC_SPELLS[player.oldSpellId][6] != 0) { NpcHandler.npcs[i].hitDiff = damage; NpcHandler.npcs[i].HP -= damage; NpcHandler.npcs[i].hitUpdateRequired = true; - c.totalDamageDealt += damage; + player.totalDamageDealt += damage; } - c.killingNpcIndex = c.oldNpcIndex; + player.killingNpcIndex = player.oldNpcIndex; NpcHandler.npcs[i].updateRequired = true; - c.usingMagic = false; - c.castingMagic = false; - c.oldSpellId = 0; + player.usingMagic = false; + player.castingMagic = false; + player.oldSpellId = 0; } } - if (c.bowSpecShot <= 0) { - c.oldNpcIndex = 0; - c.projectileStage = 0; - c.doubleHit = false; - c.lastWeaponUsed = 0; - c.bowSpecShot = 0; + if (player.bowSpecShot <= 0) { + player.oldNpcIndex = 0; + player.projectileStage = 0; + player.doubleHit = false; + player.lastWeaponUsed = 0; + player.bowSpecShot = 0; } - if (c.bowSpecShot >= 2) { - c.bowSpecShot = 0; - // c.attackTimer = - // getAttackDelay(c.getItems().getItemName(c.playerEquipment[c.playerWeapon]).toLowerCase()); + if (player.bowSpecShot >= 2) { + player.bowSpecShot = 0; } - if (c.bowSpecShot == 1) { + if (player.bowSpecShot == 1) { fireProjectileNpc(); - c.hitDelay = 2; - c.bowSpecShot = 0; + player.hitDelay = 2; + player.bowSpecShot = 0; } } public void applyNpcMeleeDamage(int i, int damageMask) { int damage = Misc.random(meleeMaxHit()); - boolean fullVeracsEffect = c.getPlayerAssistant().fullVeracs() - && Misc.random(3) == 1; + boolean fullVeracsEffect = player.getPlayerAssistant().fullVeracs() && Misc.random(3) == 1; if (NpcHandler.npcs[i].HP - damage < 0) { damage = NpcHandler.npcs[i].HP; } if (!fullVeracsEffect) { - if (Misc.random(NpcHandler.npcs[i].defence) > 10 + Misc - .random(calcAtt())) { + if (Misc.random(NpcHandler.npcs[i].defence) > 10 + Misc.random(calcAtt())) { damage = 0; - } else if (NpcHandler.npcs[i].npcType == 2882 - || NpcHandler.npcs[i].npcType == 2883) { + } else if (NpcHandler.npcs[i].npcType == 2882 || NpcHandler.npcs[i].npcType == 2883) { damage = 0; } } - c.globalDamageDealt += damage; + player.globalDamageDealt += damage; if (NpcHandler.npcs[i].HP - damage > 0) { - if (NpcHandler.npcs[i].npcType == FightCaves.TZTOK_JAD && NpcHandler.npcs[i].spawnedBy == c.getId() && ((NpcHandler.npcs[i].HP > (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)) && - (NpcHandler.npcs[i].HP-damage < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)))) { - if (c.canHealersRespawn) - FightCaves.spawnHealers(c, i, 4-c.spawnedHealers); + if (NpcHandler.npcs[i].npcType == FightCaves.TZTOK_JAD && NpcHandler.npcs[i].spawnedBy == player.getId() && ((NpcHandler.npcs[i].HP > (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)) && + (NpcHandler.npcs[i].HP-damage < (FightCaves.getHp(FightCaves.TZTOK_JAD)/2)))) { + if (player.canHealersRespawn) + FightCaves.spawnHealers(player, i, 4-player.spawnedHealers); } } boolean guthansEffect = false; - if (c.getPlayerAssistant().fullGuthans()) { + if (player.getPlayerAssistant().fullGuthans()) { if (Misc.random(3) == 1) { guthansEffect = true; } } - if (c.fightMode == 3 && NpcHandler.npcs[i].npcType != 2459 && NpcHandler.npcs[i].npcType != 2460 && NpcHandler.npcs[i].npcType != 2461 && NpcHandler.npcs[i].npcType != 2462) { - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 0); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 1); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 2); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 3); - c.getPlayerAssistant().refreshSkill(0); - c.getPlayerAssistant().refreshSkill(1); - c.getPlayerAssistant().refreshSkill(2); - c.getPlayerAssistant().refreshSkill(3); + if (player.fightMode == 3 && NpcHandler.npcs[i].npcType != 2459 && NpcHandler.npcs[i].npcType != 2460 && NpcHandler.npcs[i].npcType != 2461 && NpcHandler.npcs[i].npcType != 2462) { + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 0); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 1); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 2); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 3); + player.getPlayerAssistant().refreshSkill(0); + player.getPlayerAssistant().refreshSkill(1); + player.getPlayerAssistant().refreshSkill(2); + player.getPlayerAssistant().refreshSkill(3); } else { if (NpcHandler.npcs[i].npcType != 2459 && NpcHandler.npcs[i].npcType != 2460 && NpcHandler.npcs[i].npcType != 2461 && NpcHandler.npcs[i].npcType != 2462) { - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE, c.fightMode); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 3); - c.getPlayerAssistant().refreshSkill(c.fightMode); - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE, player.fightMode); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 3); + player.getPlayerAssistant().refreshSkill(player.fightMode); + player.getPlayerAssistant().refreshSkill(3); } } if (damage > 0) { if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) { - c.pcDamage += damage; + player.pcDamage += damage; } } if (damage > 0 && guthansEffect) { - c.playerLevel[3] += damage; - if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3])) { - c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]); + player.playerLevel[3] += damage; + if (player.playerLevel[3] > player.getLevelForXP(player.playerXP[3])) { + player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]); } - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(3); NpcHandler.npcs[i].gfx0(398); } NpcHandler.npcs[i].underAttack = true; - c.killingNpcIndex = c.npcIndex; - c.lastNpcAttacked = i; - switch (c.specEffect) { + player.killingNpcIndex = player.npcIndex; + player.lastNpcAttacked = i; + switch (player.specEffect) { case 4: if (damage > 0) { - if (c.playerLevel[3] + damage > c.getLevelForXP(c.playerXP[3])) { - if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3])) { - ; + if (player.playerLevel[3] + damage > player.getLevelForXP(player.playerXP[3])) { + if (player.playerLevel[3] > player.getLevelForXP(player.playerXP[3])) { } else { - c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]); + player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]); } } else { - c.playerLevel[3] += damage; + player.playerLevel[3] += damage; } - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(3); } break; @@ -392,7 +358,7 @@ public class CombatAssistant { case 1: NpcHandler.npcs[i].hitDiff = damage; NpcHandler.npcs[i].HP -= damage; - c.totalDamageDealt += damage; + player.totalDamageDealt += damage; NpcHandler.npcs[i].hitUpdateRequired = true; NpcHandler.npcs[i].updateRequired = true; break; @@ -400,108 +366,94 @@ public class CombatAssistant { case 2: NpcHandler.npcs[i].hitDiff2 = damage; NpcHandler.npcs[i].HP -= damage; - c.totalDamageDealt += damage; + player.totalDamageDealt += damage; NpcHandler.npcs[i].hitUpdateRequired2 = true; NpcHandler.npcs[i].updateRequired = true; - c.doubleHit = false; + player.doubleHit = false; break; - } } public void fireProjectileNpc() { - if (c.oldNpcIndex > 0) { - if (NpcHandler.npcs[c.oldNpcIndex] != null) { - c.projectileStage = 2; - int pX = c.getX(); - int pY = c.getY(); - int nX = NpcHandler.npcs[c.oldNpcIndex].getX(); - int nY = NpcHandler.npcs[c.oldNpcIndex].getY(); + if (player.oldNpcIndex > 0) { + if (NpcHandler.npcs[player.oldNpcIndex] != null) { + player.projectileStage = 2; + int pX = player.getX(); + int pY = player.getY(); + int nX = NpcHandler.npcs[player.oldNpcIndex].getX(); + int nY = NpcHandler.npcs[player.oldNpcIndex].getY(); int offX = (pY - nY) * -1; int offY = (pX - nX) * -1; - c.getPlayerAssistant().createPlayersProjectile(pX, pY, offX, - offY, 50, RangeData.getProjectileSpeed(c), - RangeData.getRangeProjectileGFX(c), 43, 31, c.oldNpcIndex + 1, - MagicSpells.getStartDelay(c)); - if (RangeData.usingDbow(c)) { - c.getPlayerAssistant().createPlayersProjectile2(pX, pY, - offX, offY, 50, RangeData.getProjectileSpeed(c), - RangeData.getRangeProjectileGFX(c), 60, 31, c.oldNpcIndex + 1, - MagicSpells.getStartDelay(c), 35); - } + player.getPlayerAssistant().createPlayersProjectile(pX, pY, offX, offY, 50, RangeData.getProjectileSpeed(player), RangeData.getRangeProjectileGFX(player), 43, 31, player.oldNpcIndex + 1, MagicSpells.getStartDelay(player)); } } } public void attackingNpcTick() { - int i = c.npcIndex; + int i = player.npcIndex; if (i > 0 && NpcHandler.npcs[i] != null) { if (NpcHandler.npcs[i].isDead) { - c.npcIndex = 0; - c.followId2 = 0; - c.faceNpc(0); + player.npcIndex = 0; + player.followId2 = 0; + player.faceNpc(0); return; } - boolean projectile = c.usingBow || c.usingMagic || c.usingRangeWeapon; - if (projectile && !PathFinder.isProjectilePathClear(c.absX, c.absY, c.heightLevel, NpcHandler.npcs[i].absX, NpcHandler.npcs[i].absY)) { + boolean projectile = player.usingBow || player.usingMagic || player.usingRangeWeapon; + if (projectile && !PathFinder.isProjectilePathClear(player.getX(), player.getY(), player.heightLevel, NpcHandler.npcs[i].absX, NpcHandler.npcs[i].absY)) { return; } - if (!c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(c) && !c.usingRangeWeapon && !c.usingBow && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 4) && c.usingRangeWeapon&& !c.usingBow && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 1)&& !c.usingRangeWeapon && !RangeData.usingHally(c) && !c.usingBow && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 8) && (c.usingBow || c.usingMagic)) { + /** + * Processing the npc attack distances + */ + //distance 1 = melee [good] + //distance 2 = hally [good] + //distance 3 = darts, long range = 5 [good] + //distance 4 = knifes, axes, long range = 6 [good] + //distance 7 = shortbow, mode = normal, long range = 9 [good] + //distance 9 = longbow, long range = 10 [good] + //distance = 10 = crystal bow, both modes [good] + if (!player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(player) && !player.usingRangeWeapon && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 4) && player.usingRangeWeapon && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 1) && !player.usingRangeWeapon && !RangeData.usingHally(player) && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 7) && (player.usingBow || player.usingMagic)) { return; } else { - c.stopMovement(); + player.stopMovement(); } } } public void attackingPlayerTick() { - int i = c.playerIndex; + int i = player.playerIndex; if (i > 0 && PlayerHandler.players[i] != null) { if (PlayerHandler.players[i].isDead) { - c.playerIndex = 0; - c.followId = 0; - c.faceNpc(0); + player.playerIndex = 0; + player.followId = 0; + player.faceNpc(0); + return; + } + + if (!checkReqs()) { return; } - boolean projectile = c.usingBow || c.usingMagic || c.usingRangeWeapon; - if (projectile && !PathFinder.isProjectilePathClear(c.absX, c.absY, c.heightLevel, PlayerHandler.players[i].absX, PlayerHandler.players[i].absY)) { + boolean projectile = player.usingBow || player.usingMagic || player.usingRangeWeapon; + if (projectile && !PathFinder.isProjectilePathClear(player.getX(), player.getY(), player.heightLevel, PlayerHandler.players[i].absX, PlayerHandler.players[i].absY)) { return; } - if (!c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), 4) - && c.usingRangeWeapon - && !c.usingBow - && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), 2) - && !c.usingRangeWeapon - && RangeData.usingHally(c) - && !c.usingBow - && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), - getRequiredDistance()) - && !c.usingRangeWeapon - && !RangeData.usingHally(c) - && !c.usingBow - && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), 10) - && (c.usingBow || c.usingMagic)) { + /** + * Processing the player attacking distances + */ + if (!player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), 4) && player.usingRangeWeapon && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), 2) && !player.usingRangeWeapon && RangeData.usingHally(player) && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), getRequiredDistance()) && !player.usingRangeWeapon && !RangeData.usingHally(player) && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), 10) && (player.usingBow || player.usingMagic)) { return; } else { - c.stopMovement(); + player.stopMovement(); } } } @@ -512,123 +464,123 @@ public class CombatAssistant { if (NpcHandler.npcs[i] != null) { Npc npc = NpcHandler.npcs[i]; if (NpcHandler.npcs[i].isDead || NpcHandler.npcs[i].MaxHP <= 0) { - c.usingMagic = false; - c.faceUpdate(0); - c.npcIndex = 0; + player.usingMagic = false; + player.faceUpdate(0); + player.npcIndex = 0; return; } - /*if (c.absY == 3224 && NpcHandler.npcs[i].absY == 3225) { + /*if (c.getY() == 3224 && NpcHandler.npcs[i].absY == 3225) { resetPlayerAttack(); return; } - if (c.absY == 3226 && NpcHandler.npcs[i].absY == 3227) { + if (c.getY() == 3226 && NpcHandler.npcs[i].absY == 3227) { resetPlayerAttack(); return; } - if (c.absY == 3228 && NpcHandler.npcs[i].absY == 3227) { + if (c.getY() == 3228 && NpcHandler.npcs[i].absY == 3227) { resetPlayerAttack(); return; } - if (c.absX == 3252 && c.absY > 3254 && c.absY < 3272 || c.absY == 3254 && c.absX > 3252 && c.absX < 3265) { + if (c.getX() == 3252 && c.getY() > 3254 && c.getY() < 3272 || c.getY() == 3254 && c.getX() > 3252 && c.getX() < 3265) { resetPlayerAttack(); return; }*/ - if (c.usingMagic && MagicData.MAGIC_SPELLS[c.spellId][0] == 1171) { + if (player.usingMagic && MagicData.MAGIC_SPELLS[player.spellId][0] == 1171) { if (!NpcHandler.isUndead(i)) { - c.getPacketSender().sendMessage("This spell only affects skeletons, zombies, ghosts and shades."); + player.getPacketSender().sendMessage("This spell only affects skeletons, zombies, ghosts and shades."); resetPlayerAttack(); - c.stopMovement(); - c.npcIndex = 0; + player.stopMovement(); + player.npcIndex = 0; return; } } - if (c.respawnTimer > 0) { - c.npcIndex = 0; + if (player.respawnTimer > 0) { + player.npcIndex = 0; return; } - if (!SlayerRequirements.itemNeededSlayer(c, i) || !c.getSlayer().canAttackNpc(i)) { + if (!SlayerRequirements.itemNeededSlayer(player, i) || !player.getSlayer().canAttackNpc(i)) { return; } if (NpcHandler.npcs[i].npcType == 9) { - if (c.absX == 3225 && c.absY > 3459 && c.absY < 3465 || c.absX > 3222 && c.absX < 3226 && c.absY > 3456 && c.absY < 3460 - || c.absX > 3213 && c.absX < 3223 && c.absY == 3457 || c.absX > 3202 && c.absX < 3212 && c.absY == 3457 - || c.absX > 3199 && c.absX < 3203 && c.absY > 3456 && c.absY < 3460 || c.absX == 3200 && c.absY > 3459 && c.absY < 3467) { + if (player.getX() == 3225 && player.getY() > 3459 && player.getY() < 3465 || player.getX() > 3222 && player.getX() < 3226 && player.getY() > 3456 && player.getY() < 3460 + || player.getX() > 3213 && player.getX() < 3223 && player.getY() == 3457 || player.getX() > 3202 && player.getX() < 3212 && player.getY() == 3457 + || player.getX() > 3199 && player.getX() < 3203 && player.getY() > 3456 && player.getY() < 3460 || player.getX() == 3200 && player.getY() > 3459 && player.getY() < 3467) { resetPlayerAttack(); return; } } - if (c.absX == 3180 && c.absY > 3433 && c.absY < 3447) { + if (player.getX() == 3180 && player.getY() > 3433 && player.getY() < 3447) { resetPlayerAttack(); return; } - if (c.absX > 2837 && c.absX < 2840 && c.absY == 9772) { + if (player.getX() > 2837 && player.getX() < 2840 && player.getY() == 9772) { resetPlayerAttack(); return; } - if (NpcHandler.npcs[i].npcType == 757 && c.vampSlayer > 2) { - if (!c.getItemAssistant().playerHasItem(1549, 1) || !c.getItemAssistant().playerHasItem(2347, 1)) { - c.getPacketSender().sendMessage("You need a stake and hammer to attack count draynor."); + if (NpcHandler.npcs[i].npcType == 757 && player.vampSlayer > 2) { + if (!player.getItemAssistant().playerHasItem(1549, 1) || !player.getItemAssistant().playerHasItem(2347, 1)) { + player.getPacketSender().sendMessage("You need a stake and hammer to attack count draynor."); resetPlayerAttack(); return; } } - if (c.isWoodcutting) { - c.getPacketSender().sendMessage("You can't attack an npc while woodcutting."); + if (player.isWoodcutting) { + player.getPacketSender().sendMessage("You can't attack an npc while woodcutting."); resetPlayerAttack(); return; } if (NpcHandler.npcs[i].npcType == 1676) { - c.getPacketSender().sendMessage("You don't have the heart to kill the poor creature again."); + player.getPacketSender().sendMessage("You don't have the heart to kill the poor creature again."); resetPlayerAttack(); return; } if (NpcHandler.npcs[i].npcType == 411) { - c.getPacketSender().sendMessage("You can't attack a swarm!"); + player.getPacketSender().sendMessage("You can't attack a swarm!"); resetPlayerAttack(); return; } - if (NpcHandler.npcs[i].underAttackBy > 0 && NpcHandler.npcs[i].underAttackBy != c.playerId && !NpcHandler.npcs[i].inMulti()) { - c.npcIndex = 0; - c.getPacketSender().sendMessage("This monster is already in combat."); + if (NpcHandler.npcs[i].underAttackBy > 0 && NpcHandler.npcs[i].underAttackBy != player.playerId && !NpcHandler.npcs[i].inMulti()) { + player.npcIndex = 0; + player.getPacketSender().sendMessage("This monster is already in combat."); return; } - if ((c.underAttackBy > 0 || c.underAttackBy2 > 0) && c.underAttackBy2 != i && !c.inMulti()) { + if ((player.underAttackBy > 0 || player.underAttackBy2 > 0) && player.underAttackBy2 != i && !player.inMulti()) { resetPlayerAttack(); - c.getPacketSender().sendMessage("I am already under attack."); + player.getPacketSender().sendMessage("I am already under attack."); return; } - if (NpcHandler.npcs[i].spawnedBy != c.playerId && NpcHandler.npcs[i].spawnedBy > 0) { + if (NpcHandler.npcs[i].spawnedBy != player.playerId && NpcHandler.npcs[i].spawnedBy > 0) { resetPlayerAttack(); - c.getPacketSender().sendMessage("This monster was not spawned for you."); + player.getPacketSender().sendMessage("This monster was not spawned for you."); return; } - c.followId2 = i; - c.followId = 0; - if (c.attackTimer <= 0) { - c.usingBow = false; - c.usingRangeWeapon = false; + player.followId2 = i; + player.followId = 0; + if (player.attackTimer <= 0) { + player.usingBow = false; + player.usingRangeWeapon = false; boolean usingArrows = false; - boolean usingCross = c.playerEquipment[c.playerWeapon] == 9185; - c.bonusAttack = 0; - c.rangeItemUsed = 0; - c.projectileStage = 0; - if (c.autocasting) { - c.spellId = c.autocastId; - c.usingMagic = true; + boolean usingCross = player.playerEquipment[player.playerWeapon] == 9185; + player.bonusAttack = 0; + player.rangeItemUsed = 0; + player.projectileStage = 0; + if (player.autocasting) { + player.spellId = player.autocastId; + player.usingMagic = true; } - if (c.spellId > 0) { - c.usingMagic = true; + if (player.spellId > 0) { + player.usingMagic = true; } - c.specAccuracy = 1.0; - c.specDamage = 1.0; - if (!c.usingMagic) { + player.specAccuracy = 1.0; + player.specDamage = 1.0; + if (!player.usingMagic) { for (int bowId : RangeData.BOWS) { - if (c.playerEquipment[c.playerWeapon] == bowId) { - c.usingBow = true; + if (player.playerEquipment[player.playerWeapon] == bowId) { + player.usingBow = true; for (int arrowId : RangeData.ARROWS) { - if (c.playerEquipment[c.playerArrows] == arrowId) { + if (player.playerEquipment[player.playerArrows] == arrowId) { usingArrows = true; } } @@ -636,257 +588,193 @@ public class CombatAssistant { } for (int otherRangeId : RangeData.OTHER_RANGE_WEAPONS) { - if (c.playerEquipment[c.playerWeapon] == otherRangeId) { - c.usingRangeWeapon = true; + if (player.playerEquipment[player.playerWeapon] == otherRangeId) { + player.usingRangeWeapon = true; } } } - if (armaNpc(i) && !usingCross && !c.usingBow && !c.usingMagic - && !RangeData.usingCrystalBow(c) && !c.usingRangeWeapon) { - resetPlayerAttack(); - return; - } - if (c.usingRangeWeapon || c.usingBow - && CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender().sendSound(SoundList.SHOOT_ARROW, - 100, 0); + if (player.usingRangeWeapon || player.usingBow && CombatConstants.COMBAT_SOUNDS) { + player.getPacketSender().sendSound(SoundList.SHOOT_ARROW, 100, 0); } - boolean projectile = c.usingBow || c.usingMagic || c.usingRangeWeapon; - - if (projectile && !PathFinder.isProjectilePathClear(c.absX, c.absY, c.heightLevel, npc.absX, npc.absY)) { + boolean projectile = player.usingBow || player.usingMagic || player.usingRangeWeapon; + if (projectile && !PathFinder.isProjectilePathClear(player.getX(), player.getY(), player.heightLevel, npc.getX(), npc.getY())) { return; } - if (!c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(c) && !c.usingRangeWeapon && !c.usingBow && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 4) && c.usingRangeWeapon && !c.usingBow && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 1) && !c.usingRangeWeapon && !RangeData.usingHally(c) && !c.usingBow && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 8) && (c.usingBow || c.usingMagic)) { + /** + * Distances for attacking npcs + */ + if (!player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(player) && !player.usingRangeWeapon && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 4) && player.usingRangeWeapon && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 1) && !player.usingRangeWeapon && !RangeData.usingHally(player) && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 8) && (player.usingBow || player.usingMagic)) { return; } else { - c.stopMovement(); + player.stopMovement(); } if (!usingCross && !usingArrows - && c.usingBow - && (c.playerEquipment[c.playerWeapon] < 4212 || c.playerEquipment[c.playerWeapon] > 4223)) { - c.getPacketSender().sendMessage( + && player.usingBow + && (player.playerEquipment[player.playerWeapon] < 4212 || player.playerEquipment[player.playerWeapon] > 4223)) { + player.getPacketSender().sendMessage( "There is no ammo left in your quiver."); - c.stopMovement(); - c.npcIndex = 0; + player.stopMovement(); + player.npcIndex = 0; return; } - if (RangeData.correctBowAndArrows(c) < c.playerEquipment[c.playerArrows] - && CombatConstants.CORRECT_ARROWS && c.usingBow - && !RangeData.usingCrystalBow(c) - && c.playerEquipment[c.playerWeapon] != 9185) { - c.getItemAssistant(); - c.getItemAssistant(); - c.getPacketSender().sendMessage( - "You can't use " - + ItemAssistant.getItemName( - c.playerEquipment[c.playerArrows]) - .toLowerCase() - + "s with a " - + ItemAssistant.getItemName( - c.playerEquipment[c.playerWeapon]) - .toLowerCase() + "."); - c.stopMovement(); - c.npcIndex = 0; + if (RangeData.correctBowAndArrows(player) < player.playerEquipment[player.playerArrows] && CombatConstants.CORRECT_ARROWS && player.usingBow && !RangeData.usingCrystalBow(player) && player.playerEquipment[player.playerWeapon] != 9185) { + player.getItemAssistant(); + player.getItemAssistant(); + player.getPacketSender().sendMessage("You can't use " + ItemAssistant.getItemName(player.playerEquipment[player.playerArrows]).toLowerCase() + "s with a " + ItemAssistant.getItemName(player.playerEquipment[player.playerWeapon]).toLowerCase() + "."); + player.stopMovement(); + player.npcIndex = 0; return; } - - if (c.playerEquipment[c.playerWeapon] == 9185 && !properBolts()) { - c.getPacketSender().sendMessage( - "You must use bolts with a crossbow."); - c.stopMovement(); + if (player.playerEquipment[player.playerWeapon] == 9185 && !properBolts()) { + player.getPacketSender().sendMessage("You must use bolts with a crossbow."); + player.stopMovement(); resetPlayerAttack(); return; } - - if (c.usingBow - || c.usingMagic - || c.usingRangeWeapon - || c.goodDistance(c.getX(), c.getY(), - NpcHandler.npcs[i].getX(), - NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(c)) { - c.stopMovement(); + /** + * Don't run up to player if using hally, set distance to 2 + */ + if (player.usingBow || player.usingMagic || player.usingRangeWeapon || player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(player)) { + player.stopMovement(); } - - if (!checkMagicReqs(c.spellId)) { - c.stopMovement(); - c.npcIndex = 0; + if (!checkMagicReqs(player.spellId)) { + player.stopMovement(); + player.npcIndex = 0; return; } - - c.faceUpdate(i); - c.attackTimer = getAttackDelay(); - NpcHandler.npcs[i].underAttackBy = c.playerId; + player.faceUpdate(i); + player.attackTimer = getAttackDelay(); + NpcHandler.npcs[i].underAttackBy = player.playerId; NpcHandler.npcs[i].lastDamageTaken = System.currentTimeMillis(); - if (c.usingSpecial && !c.usingMagic) { - if (c.getCombatAssistant().checkSpecAmount( - c.playerEquipment[c.playerWeapon])) { - c.lastWeaponUsed = c.playerEquipment[c.playerWeapon]; - c.lastArrowUsed = c.playerEquipment[c.playerArrows]; - c.getSpecials().activateSpecial( - c.playerEquipment[c.playerWeapon], null, i); + if (player.usingSpecial && !player.usingMagic) { + if (player.getCombatAssistant().checkSpecAmount(player.playerEquipment[player.playerWeapon])) { + player.lastWeaponUsed = player.playerEquipment[player.playerWeapon]; + player.lastArrowUsed = player.playerEquipment[player.playerArrows]; + player.getSpecials().activateSpecial(player.playerEquipment[player.playerWeapon], null, i); return; } else { - c.getPacketSender() - .sendMessage( - "You don't have the required special energy to use this attack."); - c.usingSpecial = false; - c.getItemAssistant().updateSpecialBar(); + player.getPacketSender().sendMessage("You don't have the required special energy to use this attack."); + player.usingSpecial = false; + player.getItemAssistant().updateSpecialBar(); if (CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender() - .sendSound( - CombatSounds - .specialSounds(c.playerEquipment[c.playerWeapon]), - 100, 0); + player.getPacketSender().sendSound(CombatSounds.specialSounds(player.playerEquipment[player.playerWeapon]), 100, 0); } - c.npcIndex = 0; + player.npcIndex = 0; return; } } - c.specMaxHitIncrease = 0; - if (!c.usingMagic) { + player.specMaxHitIncrease = 0; + if (!player.usingMagic) { if (CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender().sendSound( - CombatSounds.getWeaponSounds(c), 100, 0); + player.getPacketSender().sendSound( + CombatSounds.getWeaponSounds(player), 100, 0); } - c.startAnimation(getWepAnim()); + player.startAnimation(getWepAnim()); } else { if (CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender().sendSound( - CombatSounds.getMagicSound(c, c.spellId), 100, - 0); + player.getPacketSender().sendSound(CombatSounds.getMagicSound(player, player.spellId), 100, 0); } - c.startAnimation(MagicData.MAGIC_SPELLS[c.spellId][2]); + player.startAnimation(MagicData.MAGIC_SPELLS[player.spellId][2]); } - c.lastWeaponUsed = c.playerEquipment[c.playerWeapon]; - c.lastArrowUsed = c.playerEquipment[c.playerArrows]; - if (!c.usingBow && !c.usingMagic && !c.usingRangeWeapon) { // melee - // hit - // delay - c.hitDelay = getHitDelay(); - c.projectileStage = 0; - c.oldNpcIndex = i; + player.lastWeaponUsed = player.playerEquipment[player.playerWeapon]; + player.lastArrowUsed = player.playerEquipment[player.playerArrows]; + if (!player.usingBow && !player.usingMagic && !player.usingRangeWeapon) { // melee hit delay + player.hitDelay = getHitDelay(); + player.projectileStage = 0; + player.oldNpcIndex = i; } - - if (c.usingBow && !c.usingRangeWeapon && !c.usingMagic - || usingCross) { // range hit delay + if (player.usingBow && !player.usingRangeWeapon && !player.usingMagic || usingCross) { // range hit delay if (usingCross) { - c.usingBow = true; + player.usingBow = true; } - if (c.fightMode == 2) { - c.attackTimer--; + if (player.fightMode == 2) { + player.attackTimer--; } - c.lastArrowUsed = c.playerEquipment[c.playerArrows]; - c.lastWeaponUsed = c.playerEquipment[c.playerWeapon]; - c.gfx100(RangeData.getRangeStartGFX(c)); - c.hitDelay = getHitDelay(); - c.projectileStage = 1; - c.oldNpcIndex = i; - if (c.playerEquipment[c.playerWeapon] >= 4212 - && c.playerEquipment[c.playerWeapon] <= 4223) { - c.rangeItemUsed = c.playerEquipment[c.playerWeapon]; - c.crystalBowArrowCount++; - c.lastArrowUsed = 0; + player.lastArrowUsed = player.playerEquipment[player.playerArrows]; + player.lastWeaponUsed = player.playerEquipment[player.playerWeapon]; + player.gfx100(RangeData.getRangeStartGFX(player)); + player.hitDelay = getHitDelay(); + player.projectileStage = 1; + player.oldNpcIndex = i; + if (player.playerEquipment[player.playerWeapon] >= 4212 && player.playerEquipment[player.playerWeapon] <= 4223) { + player.rangeItemUsed = player.playerEquipment[player.playerWeapon]; + player.crystalBowArrowCount++; + player.lastArrowUsed = 0; } else { - c.rangeItemUsed = c.playerEquipment[c.playerArrows]; - c.getItemAssistant().deleteArrow(); + player.rangeItemUsed = player.playerEquipment[player.playerArrows]; + player.getItemAssistant().deleteArrow(); } fireProjectileNpc(); } - if (c.usingRangeWeapon && !c.usingMagic && !c.usingBow) { // knives, - // darts, - // etc - // hit - // delay - c.lastWeaponUsed = c.playerEquipment[c.playerWeapon]; - c.rangeItemUsed = c.playerEquipment[c.playerWeapon]; - c.getItemAssistant().deleteEquipment(); - c.gfx100(RangeData.getRangeStartGFX(c)); - c.lastArrowUsed = 0; - c.hitDelay = getHitDelay(); - c.projectileStage = 1; - c.oldNpcIndex = i; - if (c.fightMode == 2) { - c.attackTimer--; + if (player.usingRangeWeapon && !player.usingMagic && !player.usingBow) { // knives, darts, etc hit delay + player.lastWeaponUsed = player.playerEquipment[player.playerWeapon]; + player.rangeItemUsed = player.playerEquipment[player.playerWeapon]; + player.getItemAssistant().deleteEquipment(); + player.gfx100(RangeData.getRangeStartGFX(player)); + player.lastArrowUsed = 0; + player.hitDelay = getHitDelay(); + player.projectileStage = 1; + player.oldNpcIndex = i; + if (player.fightMode == 2) { + player.attackTimer--; } fireProjectileNpc(); } - - if (c.usingMagic) { // magic hit delay - int pX = c.getX(); - int pY = c.getY(); + if (player.usingMagic) { // magic hit delay + int pX = player.getX(); + int pY = player.getY(); int nX = NpcHandler.npcs[i].getX(); int nY = NpcHandler.npcs[i].getY(); int offX = (pY - nY) * -1; int offY = (pX - nX) * -1; - c.castingMagic = true; - c.projectileStage = 2; - if (MagicData.MAGIC_SPELLS[c.spellId][3] > 0) { - if (MagicSpells.getStartGfxHeight(c) == 100) { - c.gfx100(MagicData.MAGIC_SPELLS[c.spellId][3]); + player.castingMagic = true; + player.projectileStage = 2; + if (MagicData.MAGIC_SPELLS[player.spellId][3] > 0) { + if (MagicSpells.getStartGfxHeight(player) == 100) { + player.gfx100(MagicData.MAGIC_SPELLS[player.spellId][3]); } else { - c.gfx0(MagicData.MAGIC_SPELLS[c.spellId][3]); + player.gfx0(MagicData.MAGIC_SPELLS[player.spellId][3]); } } - if (MagicData.MAGIC_SPELLS[c.spellId][4] > 0) { - c.getPlayerAssistant().createPlayersProjectile(pX, pY, - offX, offY, 50, 78, - MagicData.MAGIC_SPELLS[c.spellId][4], - MagicSpells.getStartHeight(c), MagicSpells.getEndHeight(c), i + 1, 50); + if (MagicData.MAGIC_SPELLS[player.spellId][4] > 0) { + player.getPlayerAssistant().createPlayersProjectile(pX, pY, offX, offY, 50, 78, MagicData.MAGIC_SPELLS[player.spellId][4], MagicSpells.getStartHeight(player), MagicSpells.getEndHeight(player), i + 1, 50); } - c.hitDelay = getHitDelay(); - c.oldNpcIndex = i; - c.oldSpellId = c.spellId; - c.spellId = 0; - if (!c.autocasting) { - c.npcIndex = 0; + player.hitDelay = getHitDelay(); + player.oldNpcIndex = i; + player.oldSpellId = player.spellId; + player.spellId = 0; + if (!player.autocasting) { + player.npcIndex = 0; } } - - if (c.usingBow && CombatConstants.CRYSTAL_BOW_DEGRADES) { // crystal - // bow - // degrading - if (c.playerEquipment[c.playerWeapon] == 4212) { // new - // crystal - // bow - // becomes - // full - // bow - // on - // the - // first - // shot - c.getItemAssistant().wearItem(4214, 1, 3); + if (player.usingBow && CombatConstants.CRYSTAL_BOW_DEGRADES) { // crystal bow degrading + if (player.playerEquipment[player.playerWeapon] == 4212) { // new crystal bow + player.getItemAssistant().wearItem(4214, 1, 3); } - if (c.crystalBowArrowCount >= 250) { - switch (c.playerEquipment[c.playerWeapon]) { - + if (player.crystalBowArrowCount >= 250) { + switch (player.playerEquipment[player.playerWeapon]) { case 4223: // 1/10 bow - c.getItemAssistant().wearItem(-1, 1, 3); - c.getPacketSender().sendMessage( - "Your crystal bow has fully degraded."); - if (!c.getItemAssistant().addItem(4207, 1)) { - GameEngine.itemHandler.createGroundItem(c, 4207, - c.getX(), c.getY(), 1, c.getId()); + player.getItemAssistant().wearItem(-1, 1, 3); + player.getPacketSender().sendMessage("Your crystal bow has fully degraded."); + if (!player.getItemAssistant().addItem(4207, 1)) { + GameEngine.itemHandler.createGroundItem(player, 4207, player.getX(), player.getY(), 1, player.getId()); } - c.crystalBowArrowCount = 0; + player.crystalBowArrowCount = 0; break; default: - c.getItemAssistant().wearItem( - ++c.playerEquipment[c.playerWeapon], 1, 3); - c.getPacketSender().sendMessage( - "Your crystal bow degrades."); - c.crystalBowArrowCount = 0; + player.getItemAssistant().wearItem(++player.playerEquipment[player.playerWeapon], 1, 3); + player.getPacketSender().sendMessage("Your crystal bow degrades."); + player.crystalBowArrowCount = 0; break; - } } } @@ -894,103 +782,73 @@ public class CombatAssistant { } } - /** - * Attack Players, same as npc tbh xD - **/ - public void attackPlayer(int i) { Client o = (Client) PlayerHandler.players[i]; - /*if (c.connectedFrom.equals(o.connectedFrom)) { - c.getActionSender().sendMessage("You cannot attack your self."); - resetPlayerAttack(); - return; - }*/ - int equippedWeapon = c.playerEquipment[c.playerWeapon]; - + int equippedWeapon = player.playerEquipment[player.playerWeapon]; if (PlayerHandler.players[i] != null) { - - if (c.usingMagic && MagicData.MAGIC_SPELLS[c.spellId][0] == 1171) { - c.getPacketSender().sendMessage("This spell only affects skeletons, zombies, ghosts and shades, not humans."); + if (player.usingMagic && MagicData.MAGIC_SPELLS[player.spellId][0] == 1171) { + player.getPacketSender().sendMessage("This spell only affects skeletons, zombies, ghosts and shades, not humans."); resetPlayerAttack(); - c.stopMovement(); + player.stopMovement(); return; } - - if (CastleWars.isInCw(PlayerHandler.players[i]) - && CastleWars.isInCw(c)) { - if (CastleWars.getTeamNumber(c) == CastleWars.getTeamNumber((Client) PlayerHandler.players[i])) { - c.getPacketSender().sendMessage("You cannot attack your own teammate."); + if (CastleWars.isInCw(PlayerHandler.players[i]) && CastleWars.isInCw(player)) { + if (CastleWars.getTeamNumber(player) == CastleWars.getTeamNumber((Client) PlayerHandler.players[i])) { + player.getPacketSender().sendMessage("You cannot attack your own teammate."); resetPlayerAttack(); return; } } - - if (!CastleWars.isInCw(PlayerHandler.players[i]) - && CastleWars.isInCw(c)) { - c.getPacketSender().sendMessage( - "You cannot attack people outside castle wars."); + if (!CastleWars.isInCw(PlayerHandler.players[i]) && CastleWars.isInCw(player)) { + player.getPacketSender().sendMessage("You cannot attack people outside castle wars."); resetPlayerAttack(); return; } - if (PlayerHandler.players[i].isDead) { resetPlayerAttack(); return; } - - if (c.respawnTimer > 0 || PlayerHandler.players[i].respawnTimer > 0) { + if (player.respawnTimer > 0 || PlayerHandler.players[i].respawnTimer > 0) { resetPlayerAttack(); return; } - - /* - * if( c.getPlayerAssistant().getWearingAmount() < 4 && c.duelStatus - * < 1 && ! c.inCw() && c.inPits == false ) { - * c.getPacketDispatcher().sendMessage( - * "You must be wearing at least 4 items to attack someone." ); - * resetPlayerAttack(); return; } - */ - boolean sameSpot = c.absX == PlayerHandler.players[i].getX() - && c.absY == PlayerHandler.players[i].getY(); - if (!c.goodDistance(PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), c.getX(), c.getY(), 25) && !sameSpot) { + boolean sameSpot = player.getX() == PlayerHandler.players[i].getX() && player.getY() == PlayerHandler.players[i].getY(); + if (!player.goodDistance(PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), player.getX(), player.getY(), 25) && !sameSpot) { resetPlayerAttack(); return; } - if (PlayerHandler.players[i].respawnTimer > 0) { PlayerHandler.players[i].playerIndex = 0; resetPlayerAttack(); return; } - - if (PlayerHandler.players[i].heightLevel != c.heightLevel) { + if (PlayerHandler.players[i].heightLevel != player.heightLevel) { resetPlayerAttack(); return; } - if (c.attackTimer <= 0) { - c.usingBow = false; - c.specEffect = 0; - c.usingRangeWeapon = false; - c.rangeItemUsed = 0; + if (player.attackTimer <= 0) { + player.usingBow = false; + player.specEffect = 0; + player.usingRangeWeapon = false; + player.rangeItemUsed = 0; boolean usingArrows = false; - boolean usingCross = c.playerEquipment[c.playerWeapon] == 9185; - c.projectileStage = 0; - if (c.absX == PlayerHandler.players[i].absX - && c.absY == PlayerHandler.players[i].absY) { - if (c.freezeTimer > 0) { + boolean usingCross = player.playerEquipment[player.playerWeapon] == 9185; + player.projectileStage = 0; + if (player.getX() == PlayerHandler.players[i].absX && player.getY() == PlayerHandler.players[i].absY) { + if (player.freezeTimer > 0) { resetPlayerAttack(); return; } - c.followId = i; - c.attackTimer = 0; + player.followId = i; + player.attackTimer = 0; return; } - if (!c.usingMagic) { + if (!player.usingMagic) { for (int bowId : RangeData.BOWS) { - if (c.playerEquipment[c.playerWeapon] == bowId) { - c.usingBow = true; + if (player.playerEquipment[player.playerWeapon] == bowId) { + player.usingBow = true; for (int arrowId : RangeData.ARROWS) { - if (c.playerEquipment[c.playerArrows] == arrowId) { + if (player.playerEquipment[player.playerArrows] == arrowId) { usingArrows = true; } } @@ -998,89 +856,58 @@ public class CombatAssistant { } for (int otherRangeId : RangeData.OTHER_RANGE_WEAPONS) { - if (c.playerEquipment[c.playerWeapon] == otherRangeId) { - c.usingRangeWeapon = true; + if (player.playerEquipment[player.playerWeapon] == otherRangeId) { + player.usingRangeWeapon = true; } } } - if (c.autocasting) { - c.spellId = c.autocastId; - c.usingMagic = true; + if (player.autocasting) { + player.spellId = player.autocastId; + player.usingMagic = true; } - if (c.spellId > 0) { - c.usingMagic = true; + if (player.spellId > 0) { + player.usingMagic = true; } - - - if (c.duelRule[9]) { + if (player.duelRule[9]) { boolean canUseWeapon = false; for (int funWeapon : GameConstants.FUN_WEAPONS) { - if (c.playerEquipment[c.playerWeapon] == funWeapon) { + if (player.playerEquipment[player.playerWeapon] == funWeapon) { canUseWeapon = true; } } if (!canUseWeapon) { - c.getPacketSender().sendMessage( - "You can only use fun weapons in this duel!"); + player.getPacketSender().sendMessage("You can only use fun weapons for this duel!"); resetPlayerAttack(); return; } } - - if (c.duelRule[2] && (c.usingBow || c.usingRangeWeapon)) { - c.getPacketSender().sendMessage( - "Range has been disabled in this duel!"); + if (player.duelRule[2] && (player.usingBow || player.usingRangeWeapon)) { + player.getPacketSender().sendMessage("Range has been disabled for this duel!"); return; } - if (c.duelRule[3] && !c.usingBow && !c.usingRangeWeapon - && !c.usingMagic) { - c.getPacketSender().sendMessage( - "Melee has been disabled in this duel!"); + if (player.duelRule[3] && !player.usingBow && !player.usingRangeWeapon && !player.usingMagic) { + player.getPacketSender().sendMessage("Melee has been disabled for this duel!"); return; } - - if (c.duelRule[4] && c.usingMagic) { - c.getPacketSender().sendMessage( - "Magic has been disabled in this duel!"); + if (player.duelRule[4] && player.usingMagic) { + player.getPacketSender().sendMessage("Magic has been disabled for this duel!"); resetPlayerAttack(); return; } - boolean projectile = c.usingBow || c.usingMagic || c.usingRangeWeapon; - - if (projectile && !PathFinder.isProjectilePathClear(c.absX, c.absY, c.heightLevel, PlayerHandler.players[i].absX, PlayerHandler.players[i].absY)) { + boolean projectile = player.usingBow || player.usingMagic || player.usingRangeWeapon; + if (projectile && !PathFinder.isProjectilePathClear(player.getX(), player.getY(), player.heightLevel, PlayerHandler.players[i].absX, PlayerHandler.players[i].absY)) { return; } - if (!c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), 4) - && c.usingRangeWeapon - && !c.usingBow - && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), 2) - && !c.usingRangeWeapon - && RangeData.usingHally(c) - && !c.usingBow - && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), - getRequiredDistance()) - && !c.usingRangeWeapon - && !RangeData.usingHally(c) - && !c.usingBow - && !c.usingMagic - || !c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[i].getX(), - PlayerHandler.players[i].getY(), 10) - && (c.usingBow || c.usingMagic)) { - // c.getPacketDispatcher().sendMessage("Setting attack timer to 1"); - //c.attackTimer = 1; - if (!c.usingBow && !c.usingMagic && !c.usingRangeWeapon - && c.freezeTimer > 0) { + /** + * Attacking player distances + */ + if (!player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), 4) && player.usingRangeWeapon && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), 2) && !player.usingRangeWeapon && RangeData.usingHally(player) && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), getRequiredDistance()) && !player.usingRangeWeapon && !RangeData.usingHally(player) && !player.usingBow && !player.usingMagic + || !player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), 10) && (player.usingBow || player.usingMagic)) { + if (!player.usingBow && !player.usingMagic && !player.usingRangeWeapon && player.freezeTimer > 0) { resetPlayerAttack(); } return; @@ -1088,291 +915,226 @@ public class CombatAssistant { if (!usingCross && !usingArrows - && c.usingBow - && (c.playerEquipment[c.playerWeapon] < 4212 || c.playerEquipment[c.playerWeapon] > 4223) - && !c.usingMagic) { - c.getPacketSender().sendMessage( - "There is no ammo left in your quiver."); - c.stopMovement(); + && player.usingBow + && (player.playerEquipment[player.playerWeapon] < 4212 || player.playerEquipment[player.playerWeapon] > 4223) + && !player.usingMagic) { + player.getPacketSender().sendMessage("There is no ammo left in your quiver."); + player.stopMovement(); resetPlayerAttack(); return; } - if (RangeData.correctBowAndArrows(c) < c.playerEquipment[c.playerArrows] - && CombatConstants.CORRECT_ARROWS && c.usingBow - && !RangeData.usingCrystalBow(c) - && c.playerEquipment[c.playerWeapon] != 9185 - && !c.usingMagic) { - c.getItemAssistant(); - c.getItemAssistant(); - c.getPacketSender().sendMessage( - "You can't use " - + ItemAssistant.getItemName( - c.playerEquipment[c.playerArrows]) - .toLowerCase() - + "s with a " - + ItemAssistant.getItemName( - c.playerEquipment[c.playerWeapon]) - .toLowerCase() + "."); - c.stopMovement(); + if (RangeData.correctBowAndArrows(player) < player.playerEquipment[player.playerArrows] + && CombatConstants.CORRECT_ARROWS && player.usingBow + && !RangeData.usingCrystalBow(player) + && player.playerEquipment[player.playerWeapon] != 9185 + && !player.usingMagic) { + player.getItemAssistant(); + player.getItemAssistant(); + player.getPacketSender().sendMessage("You can't use " + ItemAssistant.getItemName(player.playerEquipment[player.playerArrows]).toLowerCase() + "s with a " + ItemAssistant.getItemName(player.playerEquipment[player.playerWeapon]).toLowerCase() + "."); + player.stopMovement(); resetPlayerAttack(); return; } - if (c.playerEquipment[c.playerWeapon] == 9185 && !properBolts() - && !c.usingMagic) { - c.getPacketSender().sendMessage( - "You must use bolts with a crossbow."); - c.stopMovement(); + if (player.playerEquipment[player.playerWeapon] == 9185 && !properBolts() && !player.usingMagic) { + player.getPacketSender().sendMessage("You must use bolts with a crossbow."); + player.stopMovement(); resetPlayerAttack(); return; } - if (c.usingBow || c.usingMagic || c.usingRangeWeapon - || RangeData.usingHally(c)) { - c.stopMovement(); + /** + * Ensuring the player doesnt run up to the player when ranging/maging + */ + if (player.usingBow || player.usingMagic || player.usingRangeWeapon || RangeData.usingHally(player)) { + player.stopMovement(); } - if (!checkMagicReqs(c.spellId)) { - c.stopMovement(); + if (!checkMagicReqs(player.spellId)) { + player.stopMovement(); resetPlayerAttack(); return; } - c.faceUpdate(i + 32768); + player.faceUpdate(i + 32768); - if (c.duelStatus != 5 - && !PlayerHandler.players[c.playerIndex].inCwGame() - && FightPits.getState(c) == null) { - if (!c.attackedPlayers.contains(c.playerIndex) - && !PlayerHandler.players[c.playerIndex].attackedPlayers - .contains(c.playerId)) { - c.attackedPlayers.add(c.playerIndex); - c.isSkulled = true; - c.skullTimer = CombatConstants.SKULL_TIMER; - c.headIconPk = 0; - c.getPlayerAssistant().requestUpdates(); + if (player.duelStatus != 5 && !PlayerHandler.players[player.playerIndex].inCwGame() && FightPits.getState(player) == null) { + if (!player.attackedPlayers.contains(player.playerIndex) && !PlayerHandler.players[player.playerIndex].attackedPlayers.contains(player.playerId)) { + player.attackedPlayers.add(player.playerIndex); + player.isSkulled = true; + player.skullTimer = CombatConstants.SKULL_TIMER; + player.headIconPk = 0; + player.getPlayerAssistant().requestUpdates(); } } - c.specAccuracy = 1.0; - c.specDamage = 1.0; - c.delayedDamage = c.delayedDamage2 = 0; - if (c.usingSpecial && !c.usingMagic) { - if (c.duelRule[10] && c.duelStatus == 5) { - c.getPacketSender() - .sendMessage( - "Special attacks have been disabled during this duel!"); - c.usingSpecial = false; - c.getItemAssistant().updateSpecialBar(); + player.specAccuracy = 1.0; + player.specDamage = 1.0; + player.delayedDamage = player.delayedDamage2 = 0; + if (player.usingSpecial && !player.usingMagic) { + if (player.duelRule[10] && player.duelStatus == 5) { + player.getPacketSender().sendMessage("Special attacks have been disabled during this duel!"); + player.usingSpecial = false; + player.getItemAssistant().updateSpecialBar(); if (CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender() - .sendSound( - CombatSounds - .specialSounds(c.playerEquipment[c.playerWeapon]), - 100, 0); + player.getPacketSender().sendSound(CombatSounds.specialSounds(player.playerEquipment[player.playerWeapon]), 100, 0); } resetPlayerAttack(); return; } if (checkSpecAmount(equippedWeapon)) { - c.lastArrowUsed = c.playerEquipment[c.playerArrows]; - c.getSpecials().activateSpecial( - c.playerEquipment[c.playerWeapon], o, i); - c.followId = c.playerIndex; + player.lastArrowUsed = player.playerEquipment[player.playerArrows]; + player.getSpecials().activateSpecial(player.playerEquipment[player.playerWeapon], o, i); + player.followId = player.playerIndex; return; } else { - c.getPacketSender() - .sendMessage( - "You don't have the required special energy to use this attack."); - c.usingSpecial = false; - c.getItemAssistant().updateSpecialBar(); + player.getPacketSender().sendMessage("You don't have the required special energy to use this attack."); + player.usingSpecial = false; + player.getItemAssistant().updateSpecialBar(); if (CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender() - .sendSound( - CombatSounds - .specialSounds(c.playerEquipment[c.playerWeapon]), - 100, 0); + player.getPacketSender().sendSound(CombatSounds.specialSounds(player.playerEquipment[player.playerWeapon]), 100, 0); } - c.playerIndex = 0; + player.playerIndex = 0; return; } } - if (!c.usingMagic) { + if (!player.usingMagic) { if (CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender().sendSound( - CombatSounds.getWeaponSounds(c), 100, 0); + player.getPacketSender().sendSound(CombatSounds.getWeaponSounds(player), 100, 0); } - c.startAnimation(getWepAnim()); - c.mageFollow = false; + player.startAnimation(getWepAnim()); + player.mageFollow = false; } else { - c.startAnimation(MagicData.MAGIC_SPELLS[c.spellId][2]); + player.startAnimation(MagicData.MAGIC_SPELLS[player.spellId][2]); if (CombatConstants.COMBAT_SOUNDS) { - c.getPacketSender().sendSound( - CombatSounds.getMagicSound(c, c.spellId), 100, - 0); + player.getPacketSender().sendSound(CombatSounds.getMagicSound(player, player.spellId), 100, 0); } } - c.attackTimer = getAttackDelay(); - PlayerHandler.players[i].underAttackBy = c.playerId; + player.attackTimer = getAttackDelay(); + PlayerHandler.players[i].underAttackBy = player.playerId; PlayerHandler.players[i].logoutDelay = System.currentTimeMillis(); PlayerHandler.players[i].singleCombatDelay = System.currentTimeMillis(); - PlayerHandler.players[i].killerId = c.playerId; - c.lastArrowUsed = 0; - c.rangeItemUsed = 0; - if (!c.usingBow && !c.usingMagic && !c.usingRangeWeapon) { // melee - // hit - // delay; - c.followId = PlayerHandler.players[c.playerIndex].playerId; - //c.getPlayerAssistant().followPlayer(); - c.hitDelay = getHitDelay(); - c.delayedDamage = Misc.random(meleeMaxHit()); - c.projectileStage = 0; - c.oldPlayerIndex = i; + PlayerHandler.players[i].killerId = player.playerId; + player.lastArrowUsed = 0; + player.rangeItemUsed = 0; + if (!player.usingBow && !player.usingMagic && !player.usingRangeWeapon) { // melee hit delay + player.followId = PlayerHandler.players[player.playerIndex].playerId; + player.hitDelay = getHitDelay(); + player.delayedDamage = Misc.random(meleeMaxHit()); + player.projectileStage = 0; + player.oldPlayerIndex = i; } - - if (c.usingBow && !c.usingRangeWeapon && !c.usingMagic - || usingCross) { // range hit delay - if (c.playerEquipment[c.playerWeapon] >= 4212 - && c.playerEquipment[c.playerWeapon] <= 4223) { - c.rangeItemUsed = c.playerEquipment[c.playerWeapon]; - c.crystalBowArrowCount++; + if (player.usingBow && !player.usingRangeWeapon && !player.usingMagic || usingCross) { // range hit delay + if (player.playerEquipment[player.playerWeapon] >= 4212&& player.playerEquipment[player.playerWeapon] <= 4223) { + player.rangeItemUsed = player.playerEquipment[player.playerWeapon]; + player.crystalBowArrowCount++; } else { - c.rangeItemUsed = c.playerEquipment[c.playerArrows]; - c.getItemAssistant().deleteArrow(); + player.rangeItemUsed = player.playerEquipment[player.playerArrows]; + player.getItemAssistant().deleteArrow(); } - if (c.fightMode == 2) { - c.attackTimer--; + if (player.fightMode == 2) { + player.attackTimer--; } if (usingCross) { - c.usingBow = true; + player.usingBow = true; } - - c.usingBow = true; - c.followId = PlayerHandler.players[c.playerIndex].playerId; - //c.getPlayerAssistant().followPlayer(); - c.lastWeaponUsed = c.playerEquipment[c.playerWeapon]; - c.lastArrowUsed = c.playerEquipment[c.playerArrows]; - c.gfx100(RangeData.getRangeStartGFX(c)); - c.hitDelay = getHitDelay(); - c.projectileStage = 1; - c.oldPlayerIndex = i; + player.usingBow = true; + player.followId = PlayerHandler.players[player.playerIndex].playerId; + player.lastWeaponUsed = player.playerEquipment[player.playerWeapon]; + player.lastArrowUsed = player.playerEquipment[player.playerArrows]; + player.gfx100(RangeData.getRangeStartGFX(player)); + player.hitDelay = getHitDelay(); + player.projectileStage = 1; + player.oldPlayerIndex = i; fireProjectilePlayer(); } - - if (c.usingRangeWeapon) { // knives, darts, etc hit delay - c.rangeItemUsed = c.playerEquipment[c.playerWeapon]; - c.getItemAssistant().deleteEquipment(); - c.usingRangeWeapon = true; - c.followId = PlayerHandler.players[c.playerIndex].playerId; - //c.getPlayerAssistant().followPlayer(); - c.gfx100(RangeData.getRangeStartGFX(c)); - if (c.fightMode == 2) { - c.attackTimer--; + if (player.usingRangeWeapon) { // knives, darts, etc hit delay + player.rangeItemUsed = player.playerEquipment[player.playerWeapon]; + player.getItemAssistant().deleteEquipment(); + player.usingRangeWeapon = true; + player.followId = PlayerHandler.players[player.playerIndex].playerId; + player.gfx100(RangeData.getRangeStartGFX(player)); + if (player.fightMode == 2) { + player.attackTimer--; } - c.hitDelay = getHitDelay(); - c.projectileStage = 1; - c.oldPlayerIndex = i; + player.hitDelay = getHitDelay(); + player.projectileStage = 1; + player.oldPlayerIndex = i; fireProjectilePlayer(); } - - if (c.usingMagic) { // magic hit delay - int pX = c.getX(); - int pY = c.getY(); + if (player.usingMagic) { // magic hit delay + int pX = player.getX(); + int pY = player.getY(); int nX = PlayerHandler.players[i].getX(); int nY = PlayerHandler.players[i].getY(); int offX = (pY - nY) * -1; int offY = (pX - nX) * -1; - c.castingMagic = true; - c.projectileStage = 2; - if (MagicData.MAGIC_SPELLS[c.spellId][3] > 0) { - if (MagicSpells.getStartGfxHeight(c) == 100) { - c.gfx100(MagicData.MAGIC_SPELLS[c.spellId][3]); + player.castingMagic = true; + player.projectileStage = 2; + if (MagicData.MAGIC_SPELLS[player.spellId][3] > 0) { + if (MagicSpells.getStartGfxHeight(player) == 100) { + player.gfx100(MagicData.MAGIC_SPELLS[player.spellId][3]); } else { - c.gfx0(MagicData.MAGIC_SPELLS[c.spellId][3]); + player.gfx0(MagicData.MAGIC_SPELLS[player.spellId][3]); } } - if (MagicData.MAGIC_SPELLS[c.spellId][4] > 0) { - c.getPlayerAssistant().createPlayersProjectile(pX, pY, + if (MagicData.MAGIC_SPELLS[player.spellId][4] > 0) { + player.getPlayerAssistant().createPlayersProjectile(pX, pY, offX, offY, 50, 78, - MagicData.MAGIC_SPELLS[c.spellId][4], - MagicSpells.getStartHeight(c), MagicSpells.getEndHeight(c), -i - 1, - MagicSpells.getStartDelay(c)); + MagicData.MAGIC_SPELLS[player.spellId][4], + MagicSpells.getStartHeight(player), MagicSpells.getEndHeight(player), -i - 1, + MagicSpells.getStartDelay(player)); } - if (c.autocastId > 0) { - c.followId = c.playerIndex; - c.followDistance = 5; + if (player.autocastId > 0) { + player.followId = player.playerIndex; + player.followDistance = 5; } - c.hitDelay = getHitDelay(); - c.oldPlayerIndex = i; - c.oldSpellId = c.spellId; - c.spellId = 0; - if (MagicData.MAGIC_SPELLS[c.oldSpellId][0] == 12891 - && o.isMoving) { - // c.getPacketDispatcher().sendMessage("Barrage projectile.."); - c.getPlayerAssistant().createPlayersProjectile(pX, pY, - offX, offY, 50, 85, 368, 25, 25, -i - 1, - MagicSpells.getStartDelay(c)); + player.hitDelay = getHitDelay(); + player.oldPlayerIndex = i; + player.oldSpellId = player.spellId; + player.spellId = 0; + if (MagicData.MAGIC_SPELLS[player.oldSpellId][0] == 12891 && o.isMoving) { + player.getPlayerAssistant().createPlayersProjectile(pX, pY, offX, offY, 50, 85, 368, 25, 25, -i - 1, MagicSpells.getStartDelay(player)); } - if (Misc.random(o.getCombatAssistant().mageDef()) > Misc - .random(mageAtk())) { - c.magicFailed = true; + if (Misc.random(o.getCombatAssistant().mageDef()) > Misc.random(mageAtk())) { + player.magicFailed = true; } else { - c.magicFailed = false; + player.magicFailed = false; } - int freezeDelay = MagicSpells.getFreezeTime(c);// freeze time - if (freezeDelay > 0 - && PlayerHandler.players[i].freezeTimer <= -3 - && !c.magicFailed) { + int freezeDelay = MagicSpells.getFreezeTime(player);// freeze time + if (freezeDelay > 0 && PlayerHandler.players[i].freezeTimer <= -3 && !player.magicFailed) { PlayerHandler.players[i].freezeTimer = freezeDelay; o.resetWalkingQueue(); - o.getPacketSender().sendMessage( - "You have been frozen."); - o.frozenBy = c.playerId; + o.getPacketSender().sendMessage("You have been frozen."); + o.frozenBy = player.playerId; } if (!checkReqs()) { return; } - if (!c.autocasting && c.spellId <= 0) { - c.playerIndex = 0; + if (!player.autocasting && player.spellId <= 0) { + player.playerIndex = 0; } } - - if (c.usingBow && CombatConstants.CRYSTAL_BOW_DEGRADES) { // crystal - // bow - // degrading - if (c.playerEquipment[c.playerWeapon] == 4212) { // new - // crystal - // bow - // becomes - // full - // bow - // on - // the - // first - // shot - c.getItemAssistant().wearItem(4214, 1, 3); + if (player.usingBow && CombatConstants.CRYSTAL_BOW_DEGRADES) { // crystal bow degrading + if (player.playerEquipment[player.playerWeapon] == 4212) { // new crystal bow becomes full + player.getItemAssistant().wearItem(4214, 1, 3); } - if (c.crystalBowArrowCount >= 250) { - switch (c.playerEquipment[c.playerWeapon]) { + if (player.crystalBowArrowCount >= 250) { + switch (player.playerEquipment[player.playerWeapon]) { + case 4223: // 1/10 bow + player.getItemAssistant().wearItem(-1, 1, 3); + player.getPacketSender().sendMessage("Your crystal bow has fully degraded."); + if (!player.getItemAssistant().addItem(4207, 1)) { + GameEngine.itemHandler.createGroundItem(player, 4207, player.getX(), player.getY(), 1, player.getId()); + } + player.crystalBowArrowCount = 0; + break; - case 4223: // 1/10 bow - c.getItemAssistant().wearItem(-1, 1, 3); - c.getPacketSender().sendMessage( - "Your crystal bow has fully degraded."); - if (!c.getItemAssistant().addItem(4207, 1)) { - GameEngine.itemHandler.createGroundItem(c, 4207, - c.getX(), c.getY(), 1, c.getId()); - } - c.crystalBowArrowCount = 0; - break; - - default: - c.getItemAssistant().wearItem( - ++c.playerEquipment[c.playerWeapon], 1, 3); - c.getPacketSender().sendMessage( - "Your crystal bow degrades."); - c.crystalBowArrowCount = 0; - break; + default: + player.getItemAssistant().wearItem(++player.playerEquipment[player.playerWeapon], 1, 3); + player.getPacketSender().sendMessage("Your crystal bow degrades."); + player.crystalBowArrowCount = 0; + break; } } } @@ -1382,77 +1144,64 @@ public class CombatAssistant { public void playerDelayedHit(int i) { if (PlayerHandler.players[i] != null) { - if (PlayerHandler.players[i].isDead || c.isDead - || PlayerHandler.players[i].playerLevel[3] <= 0 - || c.playerLevel[3] <= 0) { - c.playerIndex = 0; + if (PlayerHandler.players[i].isDead || player.isDead || PlayerHandler.players[i].playerLevel[3] <= 0 || player.playerLevel[3] <= 0) { + player.playerIndex = 0; return; } if (PlayerHandler.players[i].respawnTimer > 0) { - c.faceUpdate(0); - c.playerIndex = 0; + player.faceUpdate(0); + player.playerIndex = 0; return; } Client o = (Client) PlayerHandler.players[i]; o.getPacketSender().closeAllWindows(); if (o.playerIndex <= 0 && o.npcIndex <= 0) { if (o.autoRet == 1) { - o.playerIndex = c.playerId; + o.playerIndex = player.playerId; } } - if (o.attackTimer <= 3 || o.attackTimer == 0 && o.playerIndex == 0 - && !c.castingMagic) { // block animation + if (o.attackTimer <= 3 || o.attackTimer == 0 && o.playerIndex == 0 && !player.castingMagic) { // block animation o.startAnimation(o.getCombatAssistant().getBlockEmote()); if (CombatConstants.COMBAT_SOUNDS) { - o.getPacketSender().sendSound( - CombatSounds.getPlayerBlockSounds(o), 100, 0); + o.getPacketSender().sendSound(CombatSounds.getPlayerBlockSounds(o), 100, 0); } } if (o.inTrade) { o.getTrading().declineTrade(); } - if (c.projectileStage == 0) { // melee hit damage + if (player.projectileStage == 0) { // melee hit damage applyPlayerMeleeDamage(i, 1); - if (c.doubleHit) { + if (player.doubleHit) { applyPlayerMeleeDamage(i, 2); } } - if (!c.castingMagic && c.projectileStage > 0) { // range hit - // damage + if (!player.castingMagic && player.projectileStage > 0) { // range hit damage int damage = Misc.random(rangeMaxHit()); int damage2 = -1; - if (c.lastWeaponUsed == 11235 || c.bowSpecShot == 1) { + if (player.lastWeaponUsed == 11235 || player.bowSpecShot == 1) { damage2 = Misc.random(rangeMaxHit()); } boolean ignoreDef = false; - if (Misc.random(4) == 1 && c.lastArrowUsed == 9243) { + if (Misc.random(4) == 1 && player.lastArrowUsed == 9243) { ignoreDef = true; o.gfx0(758); } - if (Misc.random(10 + o.getCombatAssistant() - .calculateRangeDefence()) > Misc - .random(10 + calculateRangeAttack()) - && !ignoreDef) { + if (Misc.random(10 + o.getCombatAssistant().calculateRangeDefence()) > Misc.random(10 + calculateRangeAttack()) && !ignoreDef) { damage = 0; } - if (Misc.random(4) == 1 && c.lastArrowUsed == 9242 - && damage > 0) { + if (Misc.random(4) == 1 && player.lastArrowUsed == 9242 && damage > 0) { PlayerHandler.players[i].gfx0(754); damage = NpcHandler.npcs[i].HP / 5; - c.handleHitMask(c.playerLevel[3] / 10); - c.dealDamage(c.playerLevel[3] / 10); - c.gfx0(754); + player.handleHitMask(player.playerLevel[3] / 10); + player.dealDamage(player.playerLevel[3] / 10); + player.gfx0(754); } - - if (c.lastWeaponUsed == 11235 || c.bowSpecShot == 1) { - if (Misc.random(10 + o.getCombatAssistant() - .calculateRangeDefence()) > Misc - .random(10 + calculateRangeAttack())) { + if (player.lastWeaponUsed == 11235 || player.bowSpecShot == 1) { + if (Misc.random(10 + o.getCombatAssistant().calculateRangeDefence()) > Misc.random(10 + calculateRangeAttack())) { damage2 = 0; } } - - if (c.dbowSpec) { + if (player.dbowSpec) { o.gfx100(1100); if (damage < 8) { damage = 8; @@ -1460,23 +1209,15 @@ public class CombatAssistant { if (damage2 < 8) { damage2 = 8; } - c.dbowSpec = false; + player.dbowSpec = false; } - if (damage > 0 && Misc.random(5) == 1 - && c.lastArrowUsed == 9244) { + if (damage > 0 && Misc.random(5) == 1 && player.lastArrowUsed == 9244) { damage *= 1.45; o.gfx0(756); } - if (o.getPrayer().prayerActive[17] - && System.currentTimeMillis() - o.protRangeDelay > 1500) { // if - // prayer - // active - // reduce - // damage - // by - // half + if (o.getPrayer().prayerActive[17]&& System.currentTimeMillis() - o.protRangeDelay > 1500) { //if pray reduce damage damage = damage * 60 / 100; - if (c.lastWeaponUsed == 11235 || c.bowSpecShot == 1) { + if (player.lastWeaponUsed == 11235 || player.bowSpecShot == 1) { damage2 = damage2 * 60 / 100; } } @@ -1493,139 +1234,109 @@ public class CombatAssistant { damage2 = 0; } if (damage > 0) { - applyRecoil(c, damage, i); + applyRecoil(player, damage, i); } if (damage2 > 0) { - applyRecoil(c, damage2, i); + applyRecoil(player, damage2, i); } - if (c.fightMode == 3) { - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE / 3, 4); - c.getPlayerAssistant().addSkillXP(damage / 3, 1); - c.getPlayerAssistant().addSkillXP(damage / 3, 3); - c.getPlayerAssistant().refreshSkill(1); - c.getPlayerAssistant().refreshSkill(3); - c.getPlayerAssistant().refreshSkill(4); + if (player.fightMode == 3) { + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE / 3, 4); + player.getPlayerAssistant().addSkillXP(damage / 3, 1); + player.getPlayerAssistant().addSkillXP(damage / 3, 3); + player.getPlayerAssistant().refreshSkill(1); + player.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(4); } else { - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, 4); - c.getPlayerAssistant().addSkillXP(damage / 3, 3); - c.getPlayerAssistant().refreshSkill(3); - c.getPlayerAssistant().refreshSkill(4); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, 4); + player.getPlayerAssistant().addSkillXP(damage / 3, 3); + player.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(4); } boolean dropArrows = true; - for (int noArrowId : RangeData.NO_ARROW_DROP) { - if (c.lastWeaponUsed == noArrowId) { + if (player.lastWeaponUsed == noArrowId) { dropArrows = false; break; } } if (dropArrows) { - c.getItemAssistant().dropArrowPlayer(); + player.getItemAssistant().dropArrowPlayer(); } - PlayerHandler.players[i].underAttackBy = c.playerId; + PlayerHandler.players[i].underAttackBy = player.playerId; PlayerHandler.players[i].logoutDelay = System.currentTimeMillis(); PlayerHandler.players[i].singleCombatDelay = System.currentTimeMillis(); - PlayerHandler.players[i].killerId = c.playerId; - // Server.playerHandler.players[i].setHitDiff(damage); - // Server.playerHandler.players[i].playerLevel[3] -= damage; + PlayerHandler.players[i].killerId = player.playerId; PlayerHandler.players[i].dealDamage(damage); - PlayerHandler.players[i].damageTaken[c.playerId] += damage; - c.killedBy = PlayerHandler.players[i].playerId; + PlayerHandler.players[i].damageTaken[player.playerId] += damage; + player.killedBy = PlayerHandler.players[i].playerId; PlayerHandler.players[i].handleHitMask(damage); if (damage2 != -1) { - // Server.playerHandler.players[i].playerLevel[3] -= - // damage2; PlayerHandler.players[i].dealDamage(damage2); - PlayerHandler.players[i].damageTaken[c.playerId] += damage2; + PlayerHandler.players[i].damageTaken[player.playerId] += damage2; PlayerHandler.players[i].handleHitMask(damage2); } o.getPlayerAssistant().refreshSkill(3); - - // Server.playerHandler.players[i].setHitUpdateRequired(true); PlayerHandler.players[i].updateRequired = true; applySmite(i, damage); if (damage2 != -1) { applySmite(i, damage2); } - - } else if (c.projectileStage > 0) { // magic hit damage - int damage = Misc - .random(MagicData.MAGIC_SPELLS[c.oldSpellId][6]); - if (MagicSpells.godSpells(c)) { - if (System.currentTimeMillis() - c.godSpellDelay < CombatConstants.GOD_SPELL_CHARGE) { + } else if (player.projectileStage > 0) { // magic hit damage + int damage = Misc.random(MagicData.MAGIC_SPELLS[player.oldSpellId][6]); + if (MagicSpells.godSpells(player)) { + if (System.currentTimeMillis() - player.godSpellDelay < CombatConstants.GOD_SPELL_CHARGE) { damage += 10; } } - // c.playerIndex = 0; - if (c.magicFailed) { + if (player.magicFailed) { damage = 0; } - - if (o.getPrayer().prayerActive[16] - && System.currentTimeMillis() - o.protMageDelay > 1500) { // if - // prayer - // active - // reduce - // damage - // by - // half + if (o.getPrayer().prayerActive[16] && System.currentTimeMillis() - o.protMageDelay > 1500) { // if prayer active reduce damage damage = damage * 60 / 100; } if (PlayerHandler.players[i].playerLevel[3] - damage < 0) { damage = PlayerHandler.players[i].playerLevel[3]; } if (damage > 0) { - applyRecoil(c, damage, i); + applyRecoil(player, damage, i); } - c.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[c.oldSpellId][7] + damage * CombatConstants.MAGIC_EXP_RATE, 6); - if (MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1161 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1153 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1157 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1542 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1543 && MagicData.MAGIC_SPELLS[c.oldSpellId][0] != 1562) { - c.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[c.oldSpellId][7] + damage / 3, 3); + player.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[player.oldSpellId][7] + damage * CombatConstants.MAGIC_EXP_RATE, 6); + if (MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1161 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1153 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1157 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1542 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1543 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1562) { + player.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[player.oldSpellId][7] + damage / 3, 3); } - c.getPlayerAssistant().refreshSkill(3); - c.getPlayerAssistant().refreshSkill(6); + player.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(6); - if (MagicSpells.getEndGfxHeight(c) == 100 && !c.magicFailed) { // end GFX - PlayerHandler.players[i] - .gfx100(MagicData.MAGIC_SPELLS[c.oldSpellId][5]); - } else if (!c.magicFailed) { - PlayerHandler.players[i] - .gfx0(MagicData.MAGIC_SPELLS[c.oldSpellId][5]); - } else if (c.magicFailed) { + if (MagicSpells.getEndGfxHeight(player) == 100 && !player.magicFailed) { // end GFX + PlayerHandler.players[i].gfx100(MagicData.MAGIC_SPELLS[player.oldSpellId][5]); + } else if (!player.magicFailed) { + PlayerHandler.players[i].gfx0(MagicData.MAGIC_SPELLS[player.oldSpellId][5]); + } else if (player.magicFailed) { PlayerHandler.players[i].gfx100(85); - c.getPacketSender().sendSound(SoundList.MAGE_FAIL, 100, - 0); + player.getPacketSender().sendSound(SoundList.MAGE_FAIL, 100, 0); } - if (!c.magicFailed) { - if (System.currentTimeMillis() - - PlayerHandler.players[i].reduceStat > 35000) { - PlayerHandler.players[i].reduceStat = System - .currentTimeMillis(); - switch (MagicData.MAGIC_SPELLS[c.oldSpellId][0]) { + if (!player.magicFailed) { + if (System.currentTimeMillis() - PlayerHandler.players[i].reduceStat > 35000) { + PlayerHandler.players[i].reduceStat = System.currentTimeMillis(); + switch (MagicData.MAGIC_SPELLS[player.oldSpellId][0]) { case 12987: case 13011: case 12999: case 13023: - PlayerHandler.players[i].playerLevel[0] -= o - .getPlayerAssistant() - .getLevelForXP( - PlayerHandler.players[i].playerXP[0]) * 10 / 100; + PlayerHandler.players[i].playerLevel[0] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[0]) * 10 / 100; break; } } - switch (MagicData.MAGIC_SPELLS[c.oldSpellId][0]) { + switch (MagicData.MAGIC_SPELLS[player.oldSpellId][0]) { case 12445: // teleblock if (System.currentTimeMillis() - o.teleBlockDelay > o.teleBlockLength) { o.teleBlockDelay = System.currentTimeMillis(); - o.getPacketSender().sendMessage( - "You have been teleblocked."); - o.getPacketSender().sendSound( - SoundList.TELEBLOCK_HIT, 100, 0); - if (o.getPrayer().prayerActive[16] - && System.currentTimeMillis() - - o.protMageDelay > 1500) { + o.getPacketSender().sendMessage("You have been teleblocked."); + o.getPacketSender().sendSound(SoundList.TELEBLOCK_HIT, 100, 0); + if (o.getPrayer().prayerActive[16] && System.currentTimeMillis() - o.protMageDelay > 1500) { o.teleBlockLength = 150000; } else { o.teleBlockLength = 300000; @@ -1638,139 +1349,106 @@ public class CombatAssistant { case 12911: case 12929: int heal = damage / 4; - if (c.playerLevel[3] + heal > c.getPlayerAssistant() - .getLevelForXP(c.playerXP[3])) { - c.playerLevel[3] = c.getPlayerAssistant() - .getLevelForXP(c.playerXP[3]); + if (player.playerLevel[3] + heal > player.getPlayerAssistant().getLevelForXP(player.playerXP[3])) { + player.playerLevel[3] = player.getPlayerAssistant().getLevelForXP(player.playerXP[3]); } else { - c.playerLevel[3] += heal; + player.playerLevel[3] += heal; } - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(3); break; case 1153: - PlayerHandler.players[i].playerLevel[0] -= o - .getPlayerAssistant().getLevelForXP( - PlayerHandler.players[i].playerXP[0]) * 5 / 100; - o.getPacketSender().sendMessage( - "Your attack level has been reduced!"); - PlayerHandler.players[i].reduceSpellDelay[c.reduceSpellId] = System - .currentTimeMillis(); + PlayerHandler.players[i].playerLevel[0] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[0]) * 5 / 100; + o.getPacketSender().sendMessage("Your attack level has been reduced!"); + PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis(); o.getPlayerAssistant().refreshSkill(0); break; case 1157: - PlayerHandler.players[i].playerLevel[2] -= o - .getPlayerAssistant().getLevelForXP( - PlayerHandler.players[i].playerXP[2]) * 5 / 100; - o.getPacketSender().sendMessage( - "Your strength level has been reduced!"); - PlayerHandler.players[i].reduceSpellDelay[c.reduceSpellId] = System - .currentTimeMillis(); + PlayerHandler.players[i].playerLevel[2] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[2]) * 5 / 100; + o.getPacketSender().sendMessage("Your strength level has been reduced!"); + PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis(); o.getPlayerAssistant().refreshSkill(2); break; case 1161: - PlayerHandler.players[i].playerLevel[1] -= o - .getPlayerAssistant().getLevelForXP( - PlayerHandler.players[i].playerXP[1]) * 5 / 100; - o.getPacketSender().sendMessage( - "Your defence level has been reduced!"); - PlayerHandler.players[i].reduceSpellDelay[c.reduceSpellId] = System - .currentTimeMillis(); + PlayerHandler.players[i].playerLevel[1] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[1]) * 5 / 100; + o.getPacketSender().sendMessage("Your defence level has been reduced!"); + PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis(); o.getPlayerAssistant().refreshSkill(1); break; case 1542: - PlayerHandler.players[i].playerLevel[1] -= o - .getPlayerAssistant().getLevelForXP( - PlayerHandler.players[i].playerXP[1]) * 10 / 100; - o.getPacketSender().sendMessage( - "Your defence level has been reduced!"); - PlayerHandler.players[i].reduceSpellDelay[c.reduceSpellId] = System - .currentTimeMillis(); + PlayerHandler.players[i].playerLevel[1] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[1]) * 10 / 100; + o.getPacketSender().sendMessage("Your defence level has been reduced!"); + PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis(); o.getPlayerAssistant().refreshSkill(1); break; case 1543: - PlayerHandler.players[i].playerLevel[2] -= o - .getPlayerAssistant().getLevelForXP( - PlayerHandler.players[i].playerXP[2]) * 10 / 100; - o.getPacketSender().sendMessage( - "Your strength level has been reduced!"); - PlayerHandler.players[i].reduceSpellDelay[c.reduceSpellId] = System - .currentTimeMillis(); + PlayerHandler.players[i].playerLevel[2] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[2]) * 10 / 100; + o.getPacketSender().sendMessage("Your strength level has been reduced!"); + PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis(); o.getPlayerAssistant().refreshSkill(2); break; case 1562: - PlayerHandler.players[i].playerLevel[0] -= o - .getPlayerAssistant().getLevelForXP( - PlayerHandler.players[i].playerXP[0]) * 10 / 100; - o.getPacketSender().sendMessage( - "Your attack level has been reduced!"); - PlayerHandler.players[i].reduceSpellDelay[c.reduceSpellId] = System - .currentTimeMillis(); + PlayerHandler.players[i].playerLevel[0] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[0]) * 10 / 100; + o.getPacketSender().sendMessage("Your attack level has been reduced!"); + PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis(); o.getPlayerAssistant().refreshSkill(0); break; } } - PlayerHandler.players[i].logoutDelay = System.currentTimeMillis(); - PlayerHandler.players[i].underAttackBy = c.playerId; - PlayerHandler.players[i].killerId = c.playerId; - PlayerHandler.players[i].singleCombatDelay = System - .currentTimeMillis(); - if (MagicData.MAGIC_SPELLS[c.oldSpellId][6] != 0) { - // Server.playerHandler.players[i].playerLevel[3] -= damage; + PlayerHandler.players[i].underAttackBy = player.playerId; + PlayerHandler.players[i].killerId = player.playerId; + PlayerHandler.players[i].singleCombatDelay = System.currentTimeMillis(); + if (MagicData.MAGIC_SPELLS[player.oldSpellId][6] != 0) { PlayerHandler.players[i].dealDamage(damage); - PlayerHandler.players[i].damageTaken[c.playerId] += damage; - c.totalPlayerDamageDealt += damage; - if (!c.magicFailed) { - // Server.playerHandler.players[i].setHitDiff(damage); - // Server.playerHandler.players[i].setHitUpdateRequired(true); + PlayerHandler.players[i].damageTaken[player.playerId] += damage; + player.totalPlayerDamageDealt += damage; + if (!player.magicFailed) { PlayerHandler.players[i].handleHitMask(damage); } } applySmite(i, damage); - c.killedBy = PlayerHandler.players[i].playerId; + player.killedBy = PlayerHandler.players[i].playerId; o.getPlayerAssistant().refreshSkill(3); PlayerHandler.players[i].updateRequired = true; - c.usingMagic = false; - c.castingMagic = false; - if (o.inMulti() && MagicSpells.multis(c)) { - c.barrageCount = 0; + player.usingMagic = false; + player.castingMagic = false; + if (o.inMulti() && MagicSpells.multis(player)) { + player.barrageCount = 0; for (int j = 0; j < PlayerHandler.players.length; j++) { if (PlayerHandler.players[j] != null) { if (j == o.playerId) { continue; } - if (c.barrageCount >= 9) { + if (player.barrageCount >= 9) { break; } - if (o.goodDistance(o.getX(), o.getY(), - PlayerHandler.players[j].getX(), - PlayerHandler.players[j].getY(), 1)) { - MagicSpells.appendMultiBarrage(c, j, c.magicFailed); + if (o.goodDistance(o.getX(), o.getY(), PlayerHandler.players[j].getX(), PlayerHandler.players[j].getY(), 1)) { + MagicSpells.appendMultiBarrage(player, j, player.magicFailed); } } } } - c.getPlayerAssistant().refreshSkill(3); - c.getPlayerAssistant().refreshSkill(6); - c.oldSpellId = 0; + player.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(6); + player.oldSpellId = 0; } } - c.getPlayerAssistant().requestUpdates(); - if (c.bowSpecShot <= 0) { - c.oldPlayerIndex = 0; - c.projectileStage = 0; - c.lastWeaponUsed = 0; - c.doubleHit = false; - c.bowSpecShot = 0; + player.getPlayerAssistant().requestUpdates(); + if (player.bowSpecShot <= 0) { + player.oldPlayerIndex = 0; + player.projectileStage = 0; + player.lastWeaponUsed = 0; + player.doubleHit = false; + player.bowSpecShot = 0; } - if (c.bowSpecShot != 0) { - c.bowSpecShot = 0; + if (player.bowSpecShot != 0) { + player.bowSpecShot = 0; } } @@ -1782,66 +1460,57 @@ public class CombatAssistant { int damage = 0; boolean veracsEffect = false; boolean guthansEffect = false; - if (c.getPlayerAssistant().fullVeracs()) { + if (player.getPlayerAssistant().fullVeracs()) { if (Misc.random(4) == 1) { veracsEffect = true; } } - if (c.getPlayerAssistant().fullGuthans()) { + if (player.getPlayerAssistant().fullGuthans()) { if (Misc.random(4) == 1) { guthansEffect = true; } } if (damageMask == 1) { - damage = c.delayedDamage; - c.delayedDamage = 0; + damage = player.delayedDamage; + player.delayedDamage = 0; } else { - damage = c.delayedDamage2; - c.delayedDamage2 = 0; + damage = player.delayedDamage2; + player.delayedDamage2 = 0; } - if (Misc.random(o.getCombatAssistant().calcDef()) > Misc - .random(calcAtt()) && !veracsEffect) { + if (Misc.random(o.getCombatAssistant().calcDef()) > Misc.random(calcAtt()) && !veracsEffect) { damage = 0; - c.bonusAttack = 0; - } else if (c.playerEquipment[c.playerWeapon] == 5698 - && o.poisonDamage <= 0 && Misc.random(3) == 1) { + player.bonusAttack = 0; + } else if (player.playerEquipment[player.playerWeapon] == 5698 && o.poisonDamage <= 0 && Misc.random(3) == 1) { o.getPlayerAssistant().appendPoison(13); - c.bonusAttack += damage / 3; + player.bonusAttack += damage / 3; } else { - c.bonusAttack += damage / 3; + player.bonusAttack += damage / 3; } - if (o.getPrayer().prayerActive[18] - && System.currentTimeMillis() - o.protMeleeDelay > 1500 - && !veracsEffect) { // if prayer active reduce damage by 40% + if (o.getPrayer().prayerActive[18] && System.currentTimeMillis() - o.protMeleeDelay > 1500 && !veracsEffect) { // if prayer active reduce damage by 40% damage = damage * 60 / 100; } if (damage > 0 && guthansEffect) { - c.playerLevel[3] += damage; - if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3])) { - c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]); + player.playerLevel[3] += damage; + if (player.playerLevel[3] > player.getLevelForXP(player.playerXP[3])) { + player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]); } - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(3); o.gfx0(398); } if (PlayerHandler.players[i].playerLevel[3] - damage < 0) { damage = PlayerHandler.players[i].playerLevel[3]; } if (damage > 0) { - applyRecoil(c, damage, i); + applyRecoil(player, damage, i); } - switch (c.specEffect) { + switch (player.specEffect) { case 1: // dragon scimmy special if (damage > 0) { - if (o.getPrayer().prayerActive[16] - || o.getPrayer().prayerActive[17] - || o.getPrayer().prayerActive[18]) { + if (o.getPrayer().prayerActive[16] || o.getPrayer().prayerActive[17] || o.getPrayer().prayerActive[18]) { o.headIcon = -1; - o.getPacketSender().sendConfig( - c.getPrayer().PRAYER_GLOW[16], 0); - o.getPacketSender().sendConfig( - c.getPrayer().PRAYER_GLOW[17], 0); - o.getPacketSender().sendConfig( - c.getPrayer().PRAYER_GLOW[18], 0); + o.getPacketSender().sendConfig(player.getPrayer().PRAYER_GLOW[16], 0); + o.getPacketSender().sendConfig(player.getPrayer().PRAYER_GLOW[17], 0); + o.getPacketSender().sendConfig(player.getPrayer().PRAYER_GLOW[18], 0); } o.getPacketSender().sendMessage("You have been injured!"); o.getPrayer().stopPrayerDelay = System.currentTimeMillis(); @@ -1858,9 +1527,9 @@ public class CombatAssistant { } o.gfx0(369); o.getPacketSender().sendMessage("You have been frozen."); - o.frozenBy = c.playerId; + o.frozenBy = player.playerId; o.stopMovement(); - c.getPacketSender().sendMessage("You freeze your enemy."); + player.getPacketSender().sendMessage("You freeze your enemy."); } break; case 3: @@ -1875,59 +1544,57 @@ public class CombatAssistant { break; case 4: if (damage > 0) { - if (c.playerLevel[3] + damage > c.getLevelForXP(c.playerXP[3])) { - if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3])) { - ; - } else { - c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]); + if (player.playerLevel[3] + damage > player.getLevelForXP(player.playerXP[3])) { + if (player.playerLevel[3] < player.getLevelForXP(player.playerXP[3])) { + player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]); } } else { - c.playerLevel[3] += damage; + player.playerLevel[3] += damage; } - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().refreshSkill(3); } break; } - c.specEffect = 0; - if (c.fightMode == 3) {//melee shared - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 0); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 1); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 2); - c.getPlayerAssistant().addSkillXP(damage / 3, 3); - c.getPlayerAssistant().refreshSkill(0); - c.getPlayerAssistant().refreshSkill(1); - c.getPlayerAssistant().refreshSkill(2); - c.getPlayerAssistant().refreshSkill(3); + player.specEffect = 0; + if (player.fightMode == 3) {//melee shared + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 0); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 1); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 2); + player.getPlayerAssistant().addSkillXP(damage / 3, 3); + player.getPlayerAssistant().refreshSkill(0); + player.getPlayerAssistant().refreshSkill(1); + player.getPlayerAssistant().refreshSkill(2); + player.getPlayerAssistant().refreshSkill(3); } else { - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE, c.fightMode); - c.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE/3, 3); - c.getPlayerAssistant().refreshSkill(c.fightMode); - c.getPlayerAssistant().refreshSkill(3); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE, player.fightMode); + player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE/3, 3); + player.getPlayerAssistant().refreshSkill(player.fightMode); + player.getPlayerAssistant().refreshSkill(3); } PlayerHandler.players[i].logoutDelay = System.currentTimeMillis(); - PlayerHandler.players[i].underAttackBy = c.playerId; - PlayerHandler.players[i].killerId = c.playerId; + PlayerHandler.players[i].underAttackBy = player.playerId; + PlayerHandler.players[i].killerId = player.playerId; PlayerHandler.players[i].singleCombatDelay = System.currentTimeMillis(); - if (c.killedBy != PlayerHandler.players[i].playerId) { - c.totalPlayerDamageDealt = 0; + if (player.killedBy != PlayerHandler.players[i].playerId) { + player.totalPlayerDamageDealt = 0; } - c.killedBy = PlayerHandler.players[i].playerId; + player.killedBy = PlayerHandler.players[i].playerId; applySmite(i, damage); switch (damageMask) { case 1: PlayerHandler.players[i].dealDamage(damage); - PlayerHandler.players[i].damageTaken[c.playerId] += damage; - c.totalPlayerDamageDealt += damage; + PlayerHandler.players[i].damageTaken[player.playerId] += damage; + player.totalPlayerDamageDealt += damage; PlayerHandler.players[i].updateRequired = true; o.getPlayerAssistant().refreshSkill(3); break; case 2: PlayerHandler.players[i].dealDamage(damage); - PlayerHandler.players[i].damageTaken[c.playerId] += damage; - c.totalPlayerDamageDealt += damage; + PlayerHandler.players[i].damageTaken[player.playerId] += damage; + player.totalPlayerDamageDealt += damage; PlayerHandler.players[i].updateRequired = true; - c.doubleHit = false; + player.doubleHit = false; o.getPlayerAssistant().refreshSkill(3); break; } @@ -1935,7 +1602,7 @@ public class CombatAssistant { } public void applySmite(int index, int damage) { - if (!c.getPrayer().prayerActive[23]) { + if (!player.getPrayer().prayerActive[23]) { return; } if (damage <= 0) { @@ -1954,44 +1621,31 @@ public class CombatAssistant { } public void fireProjectilePlayer() { - if (c.oldPlayerIndex > 0) { - if (PlayerHandler.players[c.oldPlayerIndex] != null) { - c.projectileStage = 2; - int pX = c.getX(); - int pY = c.getY(); - int oX = PlayerHandler.players[c.oldPlayerIndex].getX(); - int oY = PlayerHandler.players[c.oldPlayerIndex].getY(); + if (player.oldPlayerIndex > 0) { + if (PlayerHandler.players[player.oldPlayerIndex] != null) { + player.projectileStage = 2; + int pX = player.getX(); + int pY = player.getY(); + int oX = PlayerHandler.players[player.oldPlayerIndex].getX(); + int oY = PlayerHandler.players[player.oldPlayerIndex].getY(); int offX = (pY - oY) * -1; int offY = (pX - oX) * -1; - if (!c.msbSpec) { - c.getPlayerAssistant().createPlayersProjectile(pX, pY, - offX, offY, 50, RangeData.getProjectileSpeed(c), - RangeData.getRangeProjectileGFX(c), 43, 31, - -c.oldPlayerIndex - 1, MagicSpells.getStartDelay(c)); - } else if (c.msbSpec) { - c.getPlayerAssistant().createPlayersProjectile2(pX, pY, - offX, offY, 50, RangeData.getProjectileSpeed(c), - RangeData.getRangeProjectileGFX(c), 43, 31, - -c.oldPlayerIndex - 1, MagicSpells.getStartDelay(c), 10); - c.msbSpec = false; - } - if (RangeData.usingDbow(c)) { - c.getPlayerAssistant().createPlayersProjectile2(pX, pY, - offX, offY, 50, RangeData.getProjectileSpeed(c), - RangeData.getRangeProjectileGFX(c), 60, 31, - -c.oldPlayerIndex - 1, MagicSpells.getStartDelay(c), 35); + if (!player.msbSpec) { + player.getPlayerAssistant().createPlayersProjectile(pX, pY, offX, offY, 50, RangeData.getProjectileSpeed(player), RangeData.getRangeProjectileGFX(player), 43, 31, -player.oldPlayerIndex - 1, MagicSpells.getStartDelay(player)); + } else if (player.msbSpec) { + player.getPlayerAssistant().createPlayersProjectile2(pX, pY, offX, offY, 50, RangeData.getProjectileSpeed(player), RangeData.getRangeProjectileGFX(player), 43, 31, -player.oldPlayerIndex - 1, MagicSpells.getStartDelay(player), 10); + player.msbSpec = false; } } } } public void resetPlayerAttack() { - c.usingMagic = false; - c.npcIndex = 0; - c.faceUpdate(0); - c.playerIndex = 0; - c.getPlayerAssistant().resetFollow(); - // c.getPacketDispatcher().sendMessage("Reset attack."); + player.usingMagic = false; + player.npcIndex = 0; + player.faceUpdate(0); + player.playerIndex = 0; + player.getPlayerAssistant().resetFollow(); } public int getCombatDifference(int combat1, int combat2) { @@ -2009,88 +1663,70 @@ public class CombatAssistant { **/ public boolean checkReqs() { - if (PlayerHandler.players[c.playerIndex] == null) { + if (PlayerHandler.players[player.playerIndex] == null) { return false; } - if (c.inCw()) { + if (player.inCw()) { return true; } - if (c.playerIndex == c.playerId) { + if (player.playerIndex == player.playerId) { return false; } - if (c.inPits && PlayerHandler.players[c.playerIndex].inPits) { + if (player.inPits && PlayerHandler.players[player.playerIndex].inPits) { return true; } - if (PlayerHandler.players[c.playerIndex].inDuelArena() && c.duelStatus != 5 && !c.usingMagic) { - if (c.duelingArena() || c.duelStatus == 5) { - c.getPacketSender().sendMessage("You can't challenge inside the arena!"); + if (PlayerHandler.players[player.playerIndex].inDuelArena() && player.duelStatus != 5 && !player.usingMagic) { + if (player.duelingArena() || player.duelStatus == 5) { + player.getPacketSender().sendMessage("You can't challenge inside the arena!"); resetPlayerAttack(); return false; } - c.getDueling().requestDuel(c.playerIndex); + player.getDueling().requestDuel(player.playerIndex); return false; } - if (c.duelStatus == 5 - && PlayerHandler.players[c.playerIndex].duelStatus == 5) { - if (PlayerHandler.players[c.playerIndex].duelingWith == c.getId()) { + if (player.duelStatus == 5 && PlayerHandler.players[player.playerIndex].duelStatus == 5) { + if (PlayerHandler.players[player.playerIndex].duelingWith == player.getId()) { return true; } else { - c.getPacketSender() - .sendMessage("This isn't your opponent!"); + player.getPacketSender().sendMessage("This isn't your opponent!"); return false; } } - if (CastOnOther.castOnOtherSpells(c.castingSpellId)) { + if (CastOnOther.castOnOtherSpells(player.castingSpellId)) { return true; } - if (!PlayerHandler.players[c.playerIndex].inWild() - && !PlayerHandler.players[c.playerIndex].inCwGame() - && !CastOnOther.castOnOtherSpells(c.castingSpellId)) { - c.getPacketSender().sendMessage( - "That player is not in the wilderness." + c.castingSpellId); - c.stopMovement(); + if (!PlayerHandler.players[player.playerIndex].inWild() && !PlayerHandler.players[player.playerIndex].inCwGame() && !CastOnOther.castOnOtherSpells(player.castingSpellId)) { + player.getPacketSender().sendMessage("That player is not in the wilderness."); + player.stopMovement(); resetPlayerAttack(); return false; } - if (!c.inWild() && !PlayerHandler.players[c.playerIndex].inCwGame() - && !CastOnOther.castOnOtherSpells(c.castingSpellId)) { - c.getPacketSender().sendMessage( - "You are not in the wilderness."); - c.stopMovement(); + if (!player.inWild() && !PlayerHandler.players[player.playerIndex].inCwGame() && !CastOnOther.castOnOtherSpells(player.castingSpellId)) { + player.getPacketSender().sendMessage("You are not in the wilderness."); + player.stopMovement(); resetPlayerAttack(); return false; } - if (CombatConstants.COMBAT_LEVEL_DIFFERENCE && !c.inCw()) { - int combatDif1 = getCombatDifference(c.combatLevel, - PlayerHandler.players[c.playerIndex].combatLevel); - if (combatDif1 > c.wildLevel - || combatDif1 > PlayerHandler.players[c.playerIndex].wildLevel) { - c.getPacketSender() - .sendMessage( - "Your combat level difference is too great to attack that player here."); - c.stopMovement(); + if (CombatConstants.COMBAT_LEVEL_DIFFERENCE && !player.inCw()) { + int combatDif1 = getCombatDifference(player.combatLevel, PlayerHandler.players[player.playerIndex].combatLevel); + if (combatDif1 > player.wildLevel || combatDif1 > PlayerHandler.players[player.playerIndex].wildLevel) { + player.getPacketSender().sendMessage("Your combat level difference is too great to attack that player here."); + player.stopMovement(); resetPlayerAttack(); return false; } } - if (CombatConstants.SINGLE_AND_MULTI_ZONES) { - if (!PlayerHandler.players[c.playerIndex].inMulti()) { // single - // combat - // zones - if (PlayerHandler.players[c.playerIndex].underAttackBy != c.playerId - && PlayerHandler.players[c.playerIndex].underAttackBy != 0) { - c.getPacketSender().sendMessage( - "That player is already in combat."); - c.stopMovement(); + if (!PlayerHandler.players[player.playerIndex].inMulti()) { // 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(); resetPlayerAttack(); return false; } - if (PlayerHandler.players[c.playerIndex].playerId != c.underAttackBy - && c.underAttackBy != 0 || c.underAttackBy2 > 0) { - c.getPacketSender().sendMessage( - "You are already in combat."); - c.stopMovement(); + if (PlayerHandler.players[player.playerIndex].playerId != player.underAttackBy && player.underAttackBy != 0 || player.underAttackBy2 > 0) { + player.getPacketSender().sendMessage("You are already in combat."); + player.stopMovement(); resetPlayerAttack(); return false; } @@ -2100,59 +1736,13 @@ public class CombatAssistant { } public int getRequiredDistance() { - if (c.followId > 0 && c.freezeTimer <= 0 && !c.isMoving) { - return 2; - } else if (c.followId > 0 && c.freezeTimer <= 0 && c.isMoving) { - return 3; - } else { - return 1; + if (player.followId > 0 && player.freezeTimer <= 0) { + return player.isMoving ? 3 : 2; } + return 1; } - public void handleDfs() { - if (System.currentTimeMillis() - c.dfsDelay > 30000) { - if (c.playerIndex > 0 - && PlayerHandler.players[c.playerIndex] != null) { - int damage = Misc.random(15) + 5; - c.startAnimation(2836); - c.gfx0(600); - PlayerHandler.players[c.playerIndex].playerLevel[3] -= damage; - PlayerHandler.players[c.playerIndex].hitDiff2 = damage; - PlayerHandler.players[c.playerIndex].hitUpdateRequired2 = true; - PlayerHandler.players[c.playerIndex].updateRequired = true; - c.dfsDelay = System.currentTimeMillis(); - } else { - c.getPacketSender().sendMessage( - "I should be in combat before using this."); - } - } else { - c.getPacketSender().sendMessage( - "My shield hasn't finished recharging yet."); - } - } - - public void handleDfsNPC() { - if (System.currentTimeMillis() - c.dfsDelay > 30000) { - if (c.npcIndex > 0 && NpcHandler.npcs[c.npcIndex] != null) { - int damage = Misc.random(15) + 5; - c.startAnimation(2836); - c.gfx0(600); - NpcHandler.npcs[c.npcIndex].HP -= damage; - NpcHandler.npcs[c.npcIndex].hitDiff2 = damage; - NpcHandler.npcs[c.npcIndex].hitUpdateRequired2 = true; - NpcHandler.npcs[c.npcIndex].updateRequired = true; - c.dfsDelay = System.currentTimeMillis(); - } else { - c.getPacketSender().sendMessage( - "I should be in combat before using this."); - } - } else { - c.getPacketSender().sendMessage( - "My shield hasn't finished recharging yet."); - } - } - - public static void applyRecoilNPC(Client c, int damage, int i) { + public void applyRecoilNPC(Player c, int damage, int i) { if (c == null || c.npcIndex == 0) { return; } @@ -2165,9 +1755,8 @@ public class CombatAssistant { } } - public static void applyRecoil(Player c2, int damage, int i) { - if (damage > 0 - && PlayerHandler.players[i].playerEquipment[c2.playerRing] == 2550) { + public void applyRecoil(Player c2, int damage, int i) { + if (damage > 0 && PlayerHandler.players[i].playerEquipment[c2.playerRing] == 2550) { int recDamage = damage / 10 + 1; if (!c2.getHitUpdateRequired()) { c2.setHitDiff(recDamage); @@ -2183,11 +1772,10 @@ public class CombatAssistant { } } - public static void removeRecoil(Player c2) { + public void removeRecoil(Player c2) { if (c2.recoilHits >= 400) { c2.getItemAssistant().removeItem(2550, c2.playerRing); - c2.getItemAssistant().deleteItem(2550, - c2.getItemAssistant().getItemSlot(2550), 1); + c2.getItemAssistant().deleteItem(2550, c2.getItemAssistant().getItemSlot(2550), 1); c2.getPacketSender().sendMessage("Your ring of recoil shaters!"); c2.recoilHits = 0; } else { @@ -2208,117 +1796,77 @@ public class CombatAssistant { return 0; } - public void handleGmaulPlayer() { - int equippedWeapon = c.playerEquipment[c.playerWeapon]; - if (c.playerIndex > 0) { - Client o = (Client) PlayerHandler.players[c.playerIndex]; - if (c.goodDistance(c.getX(), c.getY(), o.getX(), o.getY(), - getRequiredDistance())) { - if (checkReqs()) { - if (checkSpecAmount(equippedWeapon)) { - boolean hit = Misc.random(calcAtt()) > Misc.random(o - .getCombatAssistant().calcDef()); - int damage = 0; - if (hit) { - damage = Misc.random(meleeMaxHit()); - } - if (o.getPrayer().prayerActive[18] - && System.currentTimeMillis() - - o.protMeleeDelay > 1500) { - damage *= .6; - } - o.handleHitMask(damage); - c.startAnimation(1667); - c.gfx100(337); - o.dealDamage(damage); - } - } - } - } - } - - public boolean armaNpc(int i) { - switch (NpcHandler.npcs[i].npcType) { - case 2558: - case 2559: - case 2560: - case 2561: - return true; - } - return false; - } - public boolean checkSpecAmount(int weapon) { - if (c.specAmount >= c.getSpecials().specAmount()) { - c.specAmount -= c.getSpecials().specAmount(); - c.getItemAssistant().addSpecialBar(weapon); + if (player.specAmount >= player.getSpecials().specAmount()) { + player.specAmount -= player.getSpecials().specAmount(); + player.getItemAssistant().addSpecialBar(weapon); return true; } return false; } public int meleeMaxHit() { - return MeleeMaxHit.calculateMeleeMaxHit(c); + return MeleeMaxHit.calculateMeleeMaxHit(player); } public int calcDef() { - return MeleeData.calculateMeleeDefence(c); + return MeleeData.calculateMeleeDefence(player); } public int calcAtt() { - return MeleeData.calculateMeleeAttack(c); + return MeleeData.calculateMeleeAttack(player); } public void getPlayerAnimIndex() { - MeleeData.getPlayerAnimIndex(c); + MeleeData.getPlayerAnimIndex(player); } public int getHitDelay() { - return MeleeData.getHitDelay(c); + return MeleeData.getHitDelay(player); } public int getAttackDelay() { - return MeleeData.getAttackDelay(c); + return MeleeData.getAttackDelay(player); } public int getWepAnim() { - return MeleeData.getWeaponAnimation(c); + return MeleeData.getWeaponAnimation(player); } public int getBlockEmote() { - return MeleeData.getBlockEmote(c); + return MeleeData.getBlockEmote(player); } public int rangeMaxHit() { - return RangeMaxHit.rangeMaxHit(c); + return RangeMaxHit.rangeMaxHit(player); } public boolean checkMagicReqs(int spell) { - return MagicRequirements.checkMagicReqs(c, spell); + return MagicRequirements.checkMagicReqs(player, spell); } public int calculateRangeDefence() { - return RangeMaxHit.calculateRangeDefence(c); + return RangeMaxHit.calculateRangeDefence(player); } public int calculateRangeAttack() { - return RangeMaxHit.calculateRangeAttack(c); + return RangeMaxHit.calculateRangeAttack(player); } public boolean usingBolts() { - return RangeData.usingBolts(c); + return RangeData.usingBolts(player); } public boolean properBolts() { - return RangeData.properBolts(c); + return RangeData.properBolts(player); } public int mageDef() { - return MagicMaxHit.mageDefenceBonus(c); + return MagicMaxHit.mageDefenceBonus(player); } public int mageAtk() { - return MagicMaxHit.mageAttackBonus(c); + return MagicMaxHit.mageAttackBonus(player); } } diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java index 6feae94a..e9f9fe24 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java @@ -93,10 +93,7 @@ public class Specials { public static HashMap specialAttack = new HashMap(); - @SuppressWarnings("unused") - public static specialAttack getWeapon(int weapon) { - return specialAttack.get(weapon); - } + static { for (specialAttack SA : specialAttack.values()) { @@ -105,9 +102,9 @@ public class Specials { } } - public void activateSpecial(int weapon, Client o, int i) { + public void activateSpecial(int weapon, Client other, int i) { int equippedWeapon = player.playerEquipment[player.playerWeapon]; - if (NpcHandler.npcs[i] == null && player.npcIndex > 0 || PlayerHandler.players[player.playerIndex] == null && player.playerIndex > 0) { + if ((NpcHandler.npcs[i] == null && player.npcIndex > 0) || (PlayerHandler.players[player.playerIndex] == null && player.playerIndex > 0)) { return; } player.doubleHit = false; @@ -129,8 +126,7 @@ public class Specials { if (NpcHandler.npcs[player.npcIndex] == null && player.npcIndex > 0) { return; } - if (PlayerHandler.players[player.playerIndex] == null - && player.playerIndex > 0) { + if (PlayerHandler.players[player.playerIndex] == null && player.playerIndex > 0) { return; } if (equippedWeapon == SA.getWeapon()) { @@ -218,8 +214,10 @@ public class Specials { player.hitDelay = player.getCombatAssistant().getHitDelay(); player.doubleHit = SA.getDoubleHit(); } else { - if (o != null) { - o.gfx0(SA.getGfx1()); + if (other != null) { + other.gfx0(SA.getGfx1()); + } else if (NpcHandler.npcs[player.npcIndex] != null) { + NpcHandler.npcs[i].gfx0(SA.getGfx1()); } player.startAnimation(SA.getAnim()); player.specDamage = SA.getSpecDamage(); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java index 91371443..2ea6cd5b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java @@ -1,7 +1,6 @@ package com.rebotted.game.content.combat.npcs; import com.rebotted.GameConstants; -import com.rebotted.game.content.combat.CombatAssistant; import com.rebotted.game.content.combat.CombatConstants; import com.rebotted.game.content.combat.melee.MeleeData; import com.rebotted.game.content.minigames.FightCaves; @@ -97,30 +96,31 @@ public class NpcCombat { public static void attackPlayer(Player c, int i) { if (NpcHandler.npcs[i] != null) { - if (NpcHandler.npcs[i].isDead) { + if (NpcHandler.npcs[i].absY == 3228 && c.absY == 3227 + || NpcHandler.npcs[i].absY == 3224 && c.absY == 3225 + || NpcHandler.npcs[i].absY == 3226 && c.absY == 3227 + || c.inDraynorBuilding() && (NpcHandler.npcs[i].npcType == 172 || NpcHandler.npcs[i].npcType == 174) + || NpcHandler.npcs[i].inLesserNpc() + || !c.npcCanAttack + || NpcHandler.npcs[i].isDead) { return; } - if (c.npcCanAttack == false) { + if (NpcHandler.npcs[i].npcType == 1532 + || NpcHandler.npcs[i].npcType == 1534 + || NpcHandler.npcs[i].npcType == 6145 + || NpcHandler.npcs[i].npcType == 6144 + || NpcHandler.npcs[i].npcType == 6143 + || NpcHandler.npcs[i].npcType == 6142 + || NpcHandler.npcs[i].npcType == 752) { return; } - if (NpcHandler.npcs[i].inLesserNpc()) { + if (NpcHandler.npcs[i].npcType == 1401 && c.isInTut() || c.tutorialProgress < 36) { return; } - if (c.inDraynorBuilding()) { - if (NpcHandler.npcs[i].npcType == 172 || NpcHandler.npcs[i].npcType == 174) { - return; - } - } - if (NpcHandler.npcs[i].absY == 3228 && c.absY == 3227) { + if (NpcHandler.npcs[i].npcType == 9 && c.absX == 3180 && c.absY > 3433 && c.absY < 3447) { return; } - if (NpcHandler.npcs[i].absY == 3224 && c.absY == 3225) { - return; - } - if (NpcHandler.npcs[i].absY == 3226 && c.absY == 3227) { - return; - } - if (NpcHandler.npcs[i].absY == 3228 && c.absY == 3227) { + if (NpcHandler.npcs[i].npcType == 374 && c.absY == 3372 && c.absX > 2522 && c.absX < 2532) { return; } if (NpcHandler.npcs[i].npcType > 2462 && NpcHandler.npcs[i].npcType < 2468) { @@ -138,33 +138,11 @@ public class NpcCombat { NpcHandler.npcs[i].forceChat("Bwaaaaaaauk bwuk bwuk"); } } - if (NpcHandler.npcs[i].npcType == 1532 - || NpcHandler.npcs[i].npcType == 1534 - || NpcHandler.npcs[i].npcType == 6145 - || NpcHandler.npcs[i].npcType == 6144 - || NpcHandler.npcs[i].npcType == 6143 - || NpcHandler.npcs[i].npcType == 6142 - || NpcHandler.npcs[i].npcType == 752) { - return; - } - if (NpcHandler.npcs[i].npcType == 1401 && c.isInTut() - || c.tutorialProgress < 36) { - return; - } - if (NpcHandler.npcs[i].npcType == 9 && c.absX == 3180 - && c.absY > 3433 && c.absY < 3447) { - return; - } - if (NpcHandler.npcs[i].npcType == 374 && c.absY == 3372 && c.absX > 2522 && c.absX < 2532) { - return; - } if (!NpcHandler.npcs[i].inMulti() && NpcHandler.npcs[i].underAttackBy > 0 && NpcHandler.npcs[i].underAttackBy != c.playerId) { NpcHandler.npcs[i].killerId = 0; return; } - if (!NpcHandler.npcs[i].inMulti() - && (c.underAttackBy > 0 || c.underAttackBy2 > 0 - && c.underAttackBy2 != i)) { + if (!NpcHandler.npcs[i].inMulti() && (c.underAttackBy > 0 || c.underAttackBy2 > 0 && c.underAttackBy2 != i)) { NpcHandler.npcs[i].killerId = 0; return; } @@ -210,19 +188,13 @@ public class NpcCombat { return; } if (NpcHandler.npcs[i].projectileId > 0) { - int nX = NpcHandler.npcs[i].getX() - + NpcHandler.offset(i); - int nY = NpcHandler.npcs[i].getY() - + NpcHandler.offset(i); + int nX = NpcHandler.npcs[i].getX() + NpcHandler.offset(i); + int nY = NpcHandler.npcs[i].getY() + NpcHandler.offset(i); int pX = c.getX(); int pY = c.getY(); int offX = (nY - pY) * -1; int offY = (nX - pX) * -1; - c.getPlayerAssistant().createPlayersProjectile(nX, nY, - offX, offY, 50, - NpcHandler.getProjectileSpeed(i), - NpcHandler.npcs[i].projectileId, 43, 31, - -c.getId() - 1, 65); + c.getPlayerAssistant().createPlayersProjectile(nX, nY, offX, offY, 50, NpcHandler.getProjectileSpeed(i), NpcHandler.npcs[i].projectileId, 43, 31, -c.getId() - 1, 65); } int random = Misc.random(10); if (NpcHandler.npcs[i].npcType == 222 && (NpcHandler.npcs[i].killerId > 0 && NpcHandler.npcs[i].underAttack) && !NpcHandler.npcs[i].isDead && (NpcHandler.npcs[i].HP < NpcHandler.npcs[i].MaxHP + 1)) { @@ -671,7 +643,7 @@ public class NpcCombat { } } if (damage > 0) { - CombatAssistant.applyRecoilNPC(c, damage, i); + c.getCombatAssistant().applyRecoilNPC(c, damage, i); } if (c.playerLevel[3] - damage < 0) { damage = c.playerLevel[3]; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java index 665cc32c..cfb51dfa 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java @@ -16,10 +16,6 @@ public class RangeData { 868, 869, 806, 807, 808, 809, 810, 811, 825, 826, 827, 828, 829, 830, 800, 801, 802, 803, 804, 805, 6522 }; - public static boolean usingDbow(Player c) { - return c.playerEquipment[c.playerWeapon] == 11235; - } - public static boolean usingCrystalBow(Player c) { return c.playerEquipment[c.playerWeapon] >= 4212 && c.playerEquipment[c.playerWeapon] <= 4223; @@ -53,34 +49,63 @@ public class RangeData { } return false; } + + public static boolean usingDart(Player player) { + switch (player.playerEquipment[player.playerWeapon]) { + case 806: + case 807: + case 808: + case 809: + case 810: + case 811: + return true; + } + return false; + } + + public static boolean usingLongbow(Player player) { + if (usingCrystalBow(player)) { + return true; + } + switch (player.playerEquipment[player.playerWeapon]) { + case 839: + case 845: + case 847: + case 851: + case 855: + case 859: + return true; + } + return false; + } + public static int correctBowAndArrows(Player c) { if (usingBolts(c)) { return -1; } switch (c.playerEquipment[c.playerWeapon]) { - - case 839: + case 839://longbow case 841: return 882; case 843: - case 845: + case 845://longbow return 884; - case 847: + case 847://longbow case 849: return 886; - case 851: + case 851://longbow case 853: return 888; - case 855: + case 855://longbow case 857: return 890; - case 859: + case 859://longbow case 861: if (c.playerEquipment[c.playerArrows] == 892) { return 892; @@ -88,14 +113,12 @@ public class RangeData { return 4172; } + //karils case 4734: case 4935: case 4936: case 4937: return 4740; - - case 11235: - return 11212; } return -1; } 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 23c05646..4fef6c09 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 @@ -49,7 +49,7 @@ public class SkillHandler { } else if (player.playerIsFletching) {// fletching player.playerIsFletching = false; } else if (player.playerIsCooking) {// cooking - Cooking.resetCooking(player); + Cooking.setCooking(player, false); } else if (player.isSmithing) {// smithing player.isSmithing = false; } else if (isSkilling[12]) {// crafting @@ -67,7 +67,7 @@ public class SkillHandler { } else if (player.isPotCrafting) {// pot crafting player.isPotCrafting = false; } else if (player.playerIsCooking) {// cooking - Cooking.resetCooking(player); + Cooking.setCooking(player, false); } else if (player.playerSkilling[13]) {// smelting Smelting.resetSmelting(player); } @@ -82,7 +82,7 @@ public class SkillHandler { } else if (player.playerIsFletching) {// fletching player.playerIsFletching = false; } else if (player.playerIsCooking) {// cooking - Cooking.resetCooking(player); + Cooking.setCooking(player, false); } else if (player.isSmithing) {// smithing player.isSmithing = false; } else if (isSkilling[12]) {// crafting 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 f30f7038..e42dd096 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 @@ -14,18 +14,17 @@ import com.rebotted.util.Misc; public class Cooking extends SkillHandler { - private static SecureRandom cookingRandom = new SecureRandom(); // The - // random - // factor + private static SecureRandom cookingRandom = new SecureRandom(); // The random factor private static enum CookingItems { //raw, cooked, burnt, levelreq, exp, stopburn, stopburn w/gloves, name - SHRIMP(317, 315, 7954, 1, 30, 34, 30, "shrimp"), SARDINE(327, 325, 369, - 1, 40, 38, 38, "sardine"), HERRING(345, 347, 357, 5, 50, 41, - 41, "herring"), TROUT(335, 333, 343, 15, 70, 50, 50, "trout"), TUNA( - 359, 361, 367, 30, 100, 64, 63, "tuna"), ANCHOVIES(321, 319, - 323, 5, 45, 34, 34, "anchovies"), RAW_BEEF(2132, 2142, 2146, 1, - 30, 33, 33, "raw beef"), + SHRIMP(317, 315, 7954, 1, 30, 34, 30, "shrimp"), + SARDINE(327, 325, 369, 1, 40, 38, 38, "sardine"), + HERRING(345, 347, 357, 5, 50, 41, 41, "herring"), + TROUT(335, 333, 343, 15, 70, 50, 50, "trout"), + TUNA(359, 361, 367, 30, 100, 64, 63, "tuna"), + ANCHOVIES(321, 319, 323, 5, 45, 34, 34, "anchovies"), + RAW_BEEF(2132, 2142, 2146, 1, 30, 33, 33, "raw beef"), RAW_RAT(2134, 2142, 2146, 1, 30, 33, 33, "raw rat meat"), BURNT_MEAT(2142, 2146, 2146, 1, 1, 100, 100, "cooked meat"), RAW_CHICKEN(2138, 2140, 2144, 1, 30, 33, 33, "raw chicken"), @@ -33,23 +32,20 @@ public class Cooking extends SkillHandler { MACKERAL(353, 355, 357, 10, 60, 45, 45, "mackeral"), SALMON(331, 329, 343, 25, 90, 58, 55, "salmon"), UNCOOKED_BERRY_PIE(2321, 2325, 2329, 10, 78, 50, 50, "uncooked pie"), - PIKE( - 349, 351, 343, 20, 80, 59, 59, "pike"), KARAMBWAN(3142, 3144, - 3146, 1, 80, 20, 20, "karambwan"), LOBSTER(377, 379, 381, 40, - 120, 74, 68, "lobster"), SWORDFISH(371, 373, 375, 50, 140, 86, - 81, "swordfish"), MONKFISH(7944, 7946, 7948, 62, 150, 92, 90, - "monkfish"), SHARK(383, 385, 387, 76, 210, 100, 94, "shark"), MANTA_RAY( - 389, 391, 393, 91, 169, 100, 100, "manta ray"), + PIKE(349, 351, 343, 20, 80, 59, 59, "pike"), + KARAMBWAN(3142, 3144, 3146, 1, 80, 20, 20, "karambwan"), + LOBSTER(377, 379, 381, 40, 120, 74, 68, "lobster"), + SWORDFISH(371, 373, 375, 50, 140, 86, 81, "swordfish"), + MONKFISH(7944, 7946, 7948, 62, 150, 92, 90, "monkfish"), + SHARK(383, 385, 387, 76, 210, 100, 94, "shark"), + MANTA_RAY(389, 391, 393, 91, 169, 100, 100, "manta ray"), SEAWEED(401, 1781, 1781, 1, 1, 1, 1, "sea weed"), CURRY(2009, 2011, 2013, 60, 280, 74, 74, "curry"); - int rawItem, cookedItem, burntItem, levelReq, xp, stopBurn, - stopBurnGloves; + int rawItem, cookedItem, burntItem, levelReq, xp, stopBurn, stopBurnGloves; String name; - private CookingItems(int rawItem, int cookedItem, int burntItem, - int levelReq, int xp, int stopBurn, int stopBurnGloves, - String name) { + private CookingItems(int rawItem, int cookedItem, int burntItem, int levelReq, int xp, int stopBurn, int stopBurnGloves, String name) { this.rawItem = rawItem; this.cookedItem = cookedItem; this.burntItem = burntItem; @@ -102,86 +98,61 @@ public class Cooking extends SkillHandler { } public static void makeBreadOptions(Player c, int item) { - if (c.getItemAssistant().playerHasItem(1929) - && c.getItemAssistant().playerHasItem(1933) - && item == c.breadID) { + if (c.getItemAssistant().playerHasItem(1929) && c.getItemAssistant().playerHasItem(1933) && item == c.breadID) { c.getItemAssistant().deleteItem(1929, 1); c.getItemAssistant().deleteItem(1933, 1); c.getItemAssistant().addItem(1925, 1); c.getItemAssistant().addItem(1931, 1); c.getItemAssistant().addItem(item, 1); - c.getPacketSender().sendMessage( - "You make the water and flour to make some " - + ItemAssistant.getItemName(item) + "."); + c.getPacketSender().sendMessage("You mix the water and flour to make some " + ItemAssistant.getItemName(item) + "."); } c.getPacketSender().closeAllWindows(); } - public static void pastryCreation(Player c, int itemID1, int itemID2, - int giveItem, String message) { - if (c.getItemAssistant().playerHasItem(itemID1) - && c.getItemAssistant().playerHasItem(itemID2)) { + public static void pastryCreation(Player c, int itemID1, int itemID2, int giveItem, String message) { + if (c.getItemAssistant().playerHasItem(itemID1) && c.getItemAssistant().playerHasItem(itemID2)) { c.getItemAssistant().deleteItem(itemID1, 1); c.getItemAssistant().deleteItem(itemID2, 1); c.getItemAssistant().addItem(giveItem, 1); if (message.equalsIgnoreCase("")) { - c.getPacketSender().sendMessage( - "You mix the two ingredients and get an " - + ItemAssistant.getItemName(giveItem) + "."); + c.getPacketSender().sendMessage("You mix the two ingredients and get an " + ItemAssistant.getItemName(giveItem) + "."); } else { c.getPacketSender().sendMessage(message); } } } - public static void cookingAddon(Player c, int itemID1, int itemID2, - int giveItem, int requiredLevel, int expGained) { + public static void cookingAddon(Player c, int itemID1, int itemID2, int giveItem, int requiredLevel, int expGained) { if (c.playerLevel[7] >= requiredLevel) { - if (c.getItemAssistant().playerHasItem(itemID1) - && c.getItemAssistant().playerHasItem(itemID2)) { + if (c.getItemAssistant().playerHasItem(itemID1) && c.getItemAssistant().playerHasItem(itemID2)) { c.getItemAssistant().deleteItem(itemID1, 1); c.getItemAssistant().deleteItem(itemID2, 1); c.getItemAssistant().addItem(giveItem, 1); c.getPlayerAssistant().addSkillXP(expGained, 7); - c.getPacketSender().sendMessage( - "You create a " + ItemAssistant.getItemName(giveItem) - + "."); + c.getPacketSender().sendMessage("You create a " + ItemAssistant.getItemName(giveItem) + "."); } } else { - c.getPacketSender().sendMessage( - "You don't have the required level to make an " - + ItemAssistant.getItemName(giveItem)); + c.getPacketSender().sendMessage("You don't have the required level to make an " + ItemAssistant.getItemName(giveItem)); } } - private static void setCooking(Player player) { - player.playerIsCooking = true; - player.stopPlayerSkill = true; + public static void setCooking(Player player, boolean isCooking) { + player.playerIsCooking = isCooking; + player.stopPlayerSkill = isCooking; } - - public static void resetCooking(Player player) { - player.playerIsCooking = false; - player.stopPlayerSkill = false; - } - + 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); } - public static String getLine(Player c) { - return c.below459 ? "\\n\\n\\n\\n" : "\\n\\n\\n\\n\\n"; - } - public static boolean startCooking(Player c, int itemId, int objectId) { CookingItems item = forId(itemId); if (item != null) { if (c.playerLevel[c.playerCooking] < item.getLevelReq()) { c.getPacketSender().closeAllWindows(); - c.getDialogueHandler().sendStatement( - "You need a Cooking level of " + item.getLevelReq() - + " to cook this."); + c.getDialogueHandler().sendStatement("You need a Cooking level of " + item.getLevelReq() + " to cook this."); c.nextChat = 0; return false; } @@ -190,8 +161,7 @@ public class Cooking extends SkillHandler { return false; } if (!COOKING) { - c.getPacketSender().sendMessage( - "This skill is currently disabled."); + c.getPacketSender().sendMessage("This skill is currently disabled."); return false; } // save the id of the item and object for the cooking interface. @@ -203,8 +173,7 @@ public class Cooking extends SkillHandler { return false; } - private static boolean getSuccess(Player c, int burnBonus, int levelReq, - int stopBurn) { + private static boolean getSuccess(Player c, int burnBonus, int levelReq, int stopBurn) { if (c.playerLevel[c.playerCooking] >= stopBurn) { return true; } @@ -224,7 +193,7 @@ public class Cooking extends SkillHandler { CycleEventHandler.getSingleton().stopEvents(player, "cookingEvent".hashCode()); final CookingItems item = forId(itemId); if (item != null) { - setCooking(player); + setCooking(player, true); RandomEventHandler.addRandom(player); player.getPacketSender().closeAllWindows(); player.doAmount = amount; @@ -238,16 +207,13 @@ public class Cooking extends SkillHandler { @Override public void execute(CycleEventContainer container) { if (!player.playerIsCooking) { - resetCooking(player); + setCooking(player, false); container.stop(); return; } - if (!player.getItemAssistant().playerHasItem(item.getRawItem(), - 1)) { - player.getPacketSender().sendMessage( - "You have run out of " + item.getName() - + " to cook."); - resetCooking(player); + if (!player.getItemAssistant().playerHasItem(item.getRawItem(), 1)) { + player.getPacketSender().sendMessage("You have run out of " + item.getName() + " to cook."); + setCooking(player, false); container.stop(); return; } @@ -260,15 +226,11 @@ public class Cooking extends SkillHandler { player.getItemAssistant().deleteItem(item.getRawItem(), player.getItemAssistant().getItemSlot(itemId), 1); if (!burn) { - player.getPacketSender().sendMessage( - "You successfully cook the " - + item.getName().toLowerCase() + "."); + player.getPacketSender().sendMessage("You successfully cook the " + item.getName().toLowerCase() + "."); if (GameConstants.SOUND) { - player.getPacketSender().sendSound( - SoundList.COOK_ITEM, 100, 0); + player.getPacketSender().sendSound(SoundList.COOK_ITEM, 100, 0); } - player.getPlayerAssistant().addSkillXP(item.getXp(), - player.playerCooking); + player.getPlayerAssistant().addSkillXP(item.getXp(), player.playerCooking); player.getItemAssistant().addItem(item.getCookedItem(), 1); } else { player.getPacketSender().sendMessage( @@ -294,7 +256,7 @@ public class Cooking extends SkillHandler { player.startAnimation(objectId == 2732 ? 897 : 896); } } else if (player.doAmount == 0) { - resetCooking(player); + setCooking(player, false); container.stop(); } } 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 c7aa9b97..7e37d874 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 @@ -21,7 +21,7 @@ public class Firemaking { c.startAnimation(65535); SkillHandler.lastSkillingAction = System.currentTimeMillis(); c.isFiremaking = false; - Cooking.resetCooking(c); + Cooking.setCooking(c, false); logLit = false; } @@ -145,7 +145,7 @@ public class Firemaking { @Override public void execute(CycleEventContainer container) { if (c.playerIsCooking) { - Cooking.resetCooking(c); + Cooking.setCooking(c, false); } GameEngine.objectHandler.createAnObject(c, -1, x, y); GameEngine.itemHandler.createGroundItem(c, 592, x, y, 1, c.getId()); 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 ad7f267c..9d298b6c 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,8 +6,6 @@ import com.rebotted.event.CycleEventHandler; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.players.Player; -import java.lang.reflect.Array; - /** * Cleaned by Andrew * @author Andrew (Mr Extremez) @@ -15,7 +13,7 @@ import java.lang.reflect.Array; public class Smithing { - private int addItem, XP, removeItem, removeAmount, makeTimes; + private int addItem, xpRecieved, removeItem, removeAmount, makeTimes; public void readInput(int levelReq, String type, Player player, int amountToMake) { if (ItemAssistant.getItemName(Integer.parseInt(type)).contains("Bronze")) { @@ -43,139 +41,139 @@ public class Smithing { return; } if (type.equalsIgnoreCase("1351") && levelReq >= 1) { - XP = 13; + xpRecieved = 13; addItem = 1351; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equalsIgnoreCase("1205") && levelReq >= 1 && player.tutorialProgress > 20) { - XP = 13; + xpRecieved = 13; addItem = 1205; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equalsIgnoreCase("1205") && levelReq >= 1 && player.tutorialProgress == 20) { - XP = 13; + xpRecieved = 13; addItem = 1205; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; player.getDialogueHandler().sendDialogues(3066, -1); } else if (type.equals("1422") && levelReq >= 2) { - XP = 13; + xpRecieved = 13; addItem = 1422; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1139") && levelReq >= 3) { - XP = 13; + xpRecieved = 13; addItem = 1139; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("819") && levelReq >= 4) { - XP = 13; + xpRecieved = 13; addItem = 819; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1277") && levelReq >= 4) { - XP = 13; + xpRecieved = 13; addItem = 1277; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("4819") && levelReq >= 4) { - XP = 13; + xpRecieved = 13; addItem = 4819; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("39") && levelReq >= 5) { - XP = 13; + xpRecieved = 13; addItem = 39; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1321") && levelReq >= 5) { - XP = 25; + xpRecieved = 25; addItem = 1321; removeItem = 2349; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1291") && levelReq >= 6) { - XP = 25; + xpRecieved = 25; addItem = 1291; removeItem = 2349; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("864") && levelReq >= 7) { - XP = 25; + xpRecieved = 25; addItem = 864; removeItem = 2349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1155") && levelReq >= 7) { - XP = 25; + xpRecieved = 25; addItem = 1155; removeItem = 2349; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1173") && levelReq >= 8) { - XP = 25; + xpRecieved = 25; addItem = 1173; removeItem = 2349; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("3095") && levelReq >= 8) { // claws - XP = 25; + xpRecieved = 25; addItem = 3095; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1337") && levelReq >= 9) { - XP = 38; + xpRecieved = 38; addItem = 1337; removeItem = 2349; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1375") && levelReq >= 10) { - XP = 38; + xpRecieved = 38; addItem = 1375; removeItem = 2349; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1103") && levelReq >= 11) { - XP = 38; + xpRecieved = 38; addItem = 1103; removeItem = 2349; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1189") && levelReq >= 12) { - XP = 38; + xpRecieved = 38; addItem = 1189; removeItem = 2349; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1307") && levelReq >= 14) { - XP = 38; + xpRecieved = 38; addItem = 1307; removeItem = 2349; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1075") && levelReq >= 16) { - XP = 38; + xpRecieved = 38; addItem = 1075; removeItem = 2349; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1087") && levelReq >= 16) { - XP = 38; + xpRecieved = 38; addItem = 1087; removeItem = 2349; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1117") && levelReq >= 18) { - XP = 63; + xpRecieved = 63; addItem = 1117; removeItem = 2349; removeAmount = 5; @@ -184,123 +182,123 @@ public class Smithing { player.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); return; } - smithItem(player, addItem, removeItem, removeAmount, makeTimes, XP); + 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 - XP = 25; + xpRecieved = 25; addItem = 1349; removeAmount = 1; makeTimes = amountToMake; } else if (type.equalsIgnoreCase("1203") && levelReq >= 15) { // Dagger - XP = 25; + xpRecieved = 25; addItem = 1203; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1420") && levelReq >= 17) { // Mace - XP = 25; + xpRecieved = 25; addItem = 1420; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1137") && levelReq >= 18) { // Med helm - XP = 25; + xpRecieved = 25; addItem = 1137; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("820") && levelReq >= 19) { // Dart tips - XP = 25; + xpRecieved = 25; addItem = 820; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1279") && levelReq >= 19) { // Sword (s) - XP = 25; + xpRecieved = 25; addItem = 1279; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("4820") && levelReq >= 19) { // Nails - XP = 25; + xpRecieved = 25; addItem = 4820; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("40") && levelReq >= 20) { // Arrow tips - XP = 25; + xpRecieved = 25; addItem = 40; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1323") && levelReq >= 20) {// Scim - XP = 50; + xpRecieved = 50; addItem = 1323; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1293") && levelReq >= 21) { // Longsword - XP = 50; + xpRecieved = 50; addItem = 1293; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("863") && levelReq >= 22) { // Knives - XP = 25; + xpRecieved = 25; addItem = 863; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1153") && levelReq >= 22) { // Full Helm - XP = 50; + xpRecieved = 50; addItem = 1153; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1175") && levelReq >= 23) { // Square shield - XP = 50; + xpRecieved = 50; addItem = 1175; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1335") && levelReq >= 24) { // Warhammer - XP = 38; + xpRecieved = 38; addItem = 1335; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1363") && levelReq >= 25) { // Battle axe - XP = 75; + xpRecieved = 75; addItem = 1363; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1101") && levelReq >= 26) { // Chain - XP = 75; + xpRecieved = 75; addItem = 1101; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("4540") && levelReq >= 26) { // lantern - XP = 25; + xpRecieved = 25; addItem = 4540; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1191") && levelReq >= 27) { // Kite - XP = 75; + xpRecieved = 75; addItem = 1191; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("3096") && levelReq >= 28) { // claws - XP = 50; + xpRecieved = 50; addItem = 3096; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1309") && levelReq >= 29) { // 2h Sword - XP = 75; + xpRecieved = 75; addItem = 1309; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1067") && levelReq >= 31) { // Platelegs - XP = 75; + xpRecieved = 75; addItem = 1067; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1081") && levelReq >= 31) { // PlateSkirt - XP = 75; + xpRecieved = 75; addItem = 1081; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1115") && levelReq >= 33) { // Platebody - XP = 125; + xpRecieved = 125; addItem = 1115; removeAmount = 5; makeTimes = amountToMake; @@ -309,129 +307,129 @@ public class Smithing { return; } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, XP); + 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 - XP = 38; + xpRecieved = 38; addItem = 1353; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("2") && levelReq >= 35) { // Cannonball - XP = 26; + xpRecieved = 26; addItem = 2; removeAmount = 1; makeTimes = amountToMake; } else if (type.equalsIgnoreCase("1207") && levelReq >= 30) { // Dagger - XP = 50; + xpRecieved = 50; addItem = 1207; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1424") && levelReq >= 32) { // Mace - XP = 50; + xpRecieved = 50; addItem = 1424; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1141") && levelReq >= 33) { // Med helm - XP = 50; + xpRecieved = 50; addItem = 1141; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("821") && levelReq >= 34) { // Dart tips - XP = 50; + xpRecieved = 50; addItem = 821; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1281") && levelReq >= 34) { // Sword (s) - XP = 50; + xpRecieved = 50; addItem = 1281; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1539") && levelReq >= 34) { // Nails - XP = 50; + xpRecieved = 50; addItem = 1539; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("41") && levelReq >= 35) { // Arrow tips - XP = 50; + xpRecieved = 50; addItem = 41; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1325") && levelReq >= 35) {// Scim - XP = 75; + xpRecieved = 75; addItem = 1325; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("2370") && levelReq >= 36) {// Studs - XP = 37; + xpRecieved = 37; addItem = 2370; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1295") && levelReq >= 36) { // Longsword - XP = 75; + xpRecieved = 75; addItem = 1295; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("865") && levelReq >= 37) { // Knives - XP = 50; + xpRecieved = 50; addItem = 865; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1157") && levelReq >= 37) { // Full Helm - XP = 75; + xpRecieved = 75; addItem = 1157; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1177") && levelReq >= 38) { // Square shield - XP = 75; + xpRecieved = 75; addItem = 1177; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1339") && levelReq >= 39) { // Warhammer - XP = 113; + xpRecieved = 113; addItem = 1339; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1365") && levelReq >= 40) { // Battle axe - XP = 113; + xpRecieved = 113; addItem = 1365; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1105") && levelReq >= 41) { // Chain - XP = 113; + xpRecieved = 113; addItem = 1105; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1193") && levelReq >= 42) { // Kite - XP = 113; + xpRecieved = 113; addItem = 1193; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("3097") && levelReq >= 43) { // claws - XP = 75; + xpRecieved = 75; addItem = 3097; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1311") && levelReq >= 44) { // 2h Sword - XP = 113; + xpRecieved = 113; addItem = 1311; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1069") && levelReq >= 46) { // Platelegs - XP = 113; + xpRecieved = 113; addItem = 1069; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1083") && levelReq >= 46) { // PlateSkirt - XP = 113; + xpRecieved = 113; addItem = 1083; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1119") && levelReq >= 48) { // Platebody - XP = 188; + xpRecieved = 188; addItem = 1119; removeAmount = 5; makeTimes = amountToMake; @@ -440,118 +438,118 @@ public class Smithing { "You need " + levelReq + " smithing to do this!"); return; } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, XP); + 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 - XP = 50; + xpRecieved = 50; addItem = 1355; removeAmount = 1; makeTimes = amountToMake; } else if (type.equalsIgnoreCase("1209") && levelReq >= 50) { // Dagger - XP = 50; + xpRecieved = 50; addItem = 1209; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1428") && levelReq >= 52) { // Mace - XP = 50; + xpRecieved = 50; addItem = 1428; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1143") && levelReq >= 53) {// Med helm - XP = 50; + xpRecieved = 50; addItem = 1143; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("822") && levelReq >= 54) { // Dart tips - XP = 50; + xpRecieved = 50; addItem = 822; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1285") && levelReq >= 54) { // Sword (s) - XP = 50; + xpRecieved = 50; addItem = 1285; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("4822") && levelReq >= 54) { // Nails - XP = 50; + xpRecieved = 50; addItem = 4822; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("42") && levelReq >= 55) { // Arrow tips - XP = 50; + xpRecieved = 50; addItem = 42; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1329") && levelReq >= 55) {// Scim - XP = 100; + xpRecieved = 100; addItem = 1329; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1299") && levelReq >= 56) { // Longsword - XP = 100; + xpRecieved = 100; addItem = 1299; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("866") && levelReq >= 57) { // Knives - XP = 50; + xpRecieved = 50; addItem = 866; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1159") && levelReq >= 57) { // Full Helm - XP = 100; + xpRecieved = 100; addItem = 1159; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1181") && levelReq >= 58) { // Square shield - XP = 100; + xpRecieved = 100; addItem = 1181; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1343") && levelReq >= 59) { // Warhammer - XP = 150; + xpRecieved = 150; addItem = 1343; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1369") && levelReq >= 60) { // Battle axe - XP = 150; + xpRecieved = 150; addItem = 1369; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1109") && levelReq >= 61) { // Chain - XP = 150; + xpRecieved = 150; addItem = 1109; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1197") && levelReq >= 62) { // Kite - XP = 150; + xpRecieved = 150; addItem = 1197; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("3099") && levelReq >= 63) { // claws - XP = 100; + xpRecieved = 100; addItem = 3099; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1315") && levelReq >= 64) { // 2h Sword - XP = 150; + xpRecieved = 150; addItem = 1315; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1071") && levelReq >= 66) { // Platelegs - XP = 150; + xpRecieved = 150; addItem = 1071; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1085") && levelReq >= 66) { // PlateSkirt - XP = 150; + xpRecieved = 150; addItem = 1085; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1121") && levelReq >= 68) { // Platebody - XP = 250; + xpRecieved = 250; addItem = 1121; removeAmount = 5; makeTimes = amountToMake; @@ -559,118 +557,118 @@ public class Smithing { c.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); return; } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, XP); + 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 - XP = 63; + xpRecieved = 63; addItem = 1357; removeAmount = 1; makeTimes = amountToMake; } else if (type.equalsIgnoreCase("1211") && levelReq >= 70) { // Dagger - XP = 63; + xpRecieved = 63; addItem = 1211; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1430") && levelReq >= 72) { // Mace - XP = 63; + xpRecieved = 63; addItem = 1430; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1145") && levelReq >= 73) { // Med helm - XP = 63; + xpRecieved = 63; addItem = 1145; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("823") && levelReq >= 74) { // Dart tips - XP = 63; + xpRecieved = 63; addItem = 823; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1287") && levelReq >= 74) { // Sword (s) - XP = 63; + xpRecieved = 63; addItem = 1287; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("4823") && levelReq >= 74) { // Nails - XP = 63; + xpRecieved = 63; addItem = 4823; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("43") && levelReq >= 75) { // Arrow tips - XP = 63; + xpRecieved = 63; addItem = 43; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1331") && levelReq >= 75) {// Scim - XP = 125; + xpRecieved = 125; addItem = 1331; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1301") && levelReq >= 76) { // Longsword - XP = 125; + xpRecieved = 125; addItem = 1301; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("867") && levelReq >= 77) { // Knives - XP = 63; + xpRecieved = 63; addItem = 867; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1161") && levelReq >= 77) { // Full Helm - XP = 125; + xpRecieved = 125; addItem = 1161; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1183") && levelReq >= 78) { // Square shield - XP = 125; + xpRecieved = 125; addItem = 1183; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1345") && levelReq >= 79) { // Warhammer - XP = 188; + xpRecieved = 188; addItem = 1345; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1371") && levelReq >= 80) { // Battle axe - XP = 188; + xpRecieved = 188; addItem = 1371; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1111") && levelReq >= 81) { // Chain - XP = 188; + xpRecieved = 188; addItem = 1111; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1199") && levelReq >= 82) { // Kite - XP = 188; + xpRecieved = 188; addItem = 1199; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("3100") && levelReq >= 83) { // claws - XP = 125; + xpRecieved = 125; addItem = 3100; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1317") && levelReq >= 84) { // 2h Sword - XP = 188; + xpRecieved = 188; addItem = 1317; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1073") && levelReq >= 86) { // Platelegs - XP = 188; + xpRecieved = 188; addItem = 1073; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1091") && levelReq >= 86) { // PlateSkirt - XP = 188; + xpRecieved = 188; addItem = 1091; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1123") && levelReq >= 88) { // Platebody - XP = 313; + xpRecieved = 313; addItem = 1123; removeAmount = 5; makeTimes = amountToMake; @@ -678,118 +676,118 @@ public class Smithing { c.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); return; } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, XP); + 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 - XP = 75; + xpRecieved = 75; addItem = 1359; removeAmount = 1; makeTimes = amountToMake; } else if (type.equalsIgnoreCase("1213") && levelReq >= 85) { // Dagger - XP = 75; + xpRecieved = 75; addItem = 1213; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1432") && levelReq >= 87) { // Mace - XP = 75; + xpRecieved = 75; addItem = 1432; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1147") && levelReq >= 88) { // Med helm - XP = 75; + xpRecieved = 75; addItem = 1147; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("824") && levelReq >= 89) { // Dart tips - XP = 75; + xpRecieved = 75; addItem = 824; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1289") && levelReq >= 89) { // Sword (s) - XP = 75; + xpRecieved = 75; addItem = 1289; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("4824") && levelReq >= 89) { // Nails - XP = 75; + xpRecieved = 75; addItem = 4824; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("44") && levelReq >= 90) { // Arrow tips - XP = 75; + xpRecieved = 75; addItem = 44; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1333") && levelReq >= 90) {// Scim - XP = 150; + xpRecieved = 150; addItem = 1333; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1303") && levelReq >= 91) { // Longsword - XP = 150; + xpRecieved = 150; addItem = 1303; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("868") && levelReq >= 92) { // Knives - XP = 75; + xpRecieved = 75; addItem = 868; removeAmount = 1; makeTimes = amountToMake; } else if (type.equals("1163") && levelReq >= 92) { // Full Helm - XP = 150; + xpRecieved = 150; addItem = 1163; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1185") && levelReq >= 93) { // Square shield - XP = 150; + xpRecieved = 150; addItem = 1185; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1347") && levelReq >= 94) { // Warhammer - XP = 225; + xpRecieved = 225; addItem = 1347; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1373") && levelReq >= 95) { // Battle axe - XP = 225; + xpRecieved = 225; addItem = 1373; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1113") && levelReq >= 96) { // Chain - XP = 225; + xpRecieved = 225; addItem = 1113; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1201") && levelReq >= 97) { // Kite - XP = 225; + xpRecieved = 225; addItem = 1201; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1319") && levelReq >= 99) { // 2h Sword - XP = 225; + xpRecieved = 225; addItem = 1319; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1079") && levelReq >= 99) { // Platelegs - XP = 225; + xpRecieved = 225; addItem = 1079; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("3101") && levelReq >= 98) { // claws - XP = 150; + xpRecieved = 150; addItem = 3101; removeAmount = 2; makeTimes = amountToMake; } else if (type.equals("1093") && levelReq >= 99) { // PlateSkirt - XP = 225; + xpRecieved = 225; addItem = 1093; removeAmount = 3; makeTimes = amountToMake; } else if (type.equals("1127") && levelReq >= 99) { // Platebody - XP = 313; + xpRecieved = 313; addItem = 1127; removeAmount = 5; makeTimes = amountToMake; @@ -797,18 +795,15 @@ public class Smithing { c.getPacketSender().sendMessage("You need " + levelReq + " smithing to do this!"); return; } - smithItem(c, addItem, removeItem, removeAmount, makeTimes, XP); + 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); if (player.getItemAssistant().playerHasItem(removeItem, removeItem2)) { - if (!player.isSmithing) - { + if (!player.isSmithing) { player.isSmithing = true; player.startAnimation(898); CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { @@ -816,24 +811,17 @@ public class Smithing { 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) { container.stop(); - } - else - { + } else { player.startAnimation(898); player.getPacketSender().sendSound(468, 100, 0); - if (name.contains("ball")) - { + if (name.contains("ball")) { player.getPacketSender().sendMessage("You make some " + name.toLowerCase() + "s."); - } - else if (name.charAt(name.length() -1) == 's') { + } else if (name.charAt(name.length() -1) == 's') { player.getPacketSender().sendMessage("You make some " + name.toLowerCase() + "."); } else { - if (name.charAt(1) == 'a' || name.charAt(1) == 'e' || name.toLowerCase().charAt(1) == 'i' || name.charAt(1) == 'o' || name.charAt(1) == 'u') - { + if (name.charAt(1) == 'a' || name.charAt(1) == 'e' || name.toLowerCase().charAt(1) == 'i' || name.charAt(1) == 'o' || name.charAt(1) == 'u') { player.getPacketSender().sendMessage("You make an " + name.toLowerCase() + "."); - } - else - { + } else { player.getPacketSender().sendMessage("You make a " + name.toLowerCase() + "."); } } @@ -841,13 +829,9 @@ public class Smithing { player.getPacketSender().sendMessage(ItemAssistant.getItemName(addItem)); if (name.contains("bolt")) { player.getItemAssistant().addItem(addItem, 10); - } else if (name.contains("tip") && !name.contains("dart tip")) { - player.getItemAssistant().addItem(addItem, 15); } else if (name.contains("dart tip")) { player.getItemAssistant().addItem(addItem, 10); - } else if (name.contains("nail")) { - player.getItemAssistant().addItem(addItem, 15); - } else if (name.contains("arrow")) { + } else if (name.contains("arrow") || name.contains("nail") || (name.contains("tip") && !name.contains("dart tip"))) { player.getItemAssistant().addItem(addItem, 15); } else if (name.contains("knife")) { player.getItemAssistant().addItem(addItem, 5); @@ -872,4 +856,5 @@ public class Smithing { player.isSmithing = false; } } -} + +} \ No newline at end of file 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 d10dd01c..b9a83cb8 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 @@ -22,6 +22,7 @@ import com.rebotted.game.content.combat.magic.Enchanting; import com.rebotted.game.content.combat.prayer.PrayerData; import com.rebotted.game.content.combat.prayer.PrayerDrain; import com.rebotted.game.content.combat.range.DwarfCannon; +import com.rebotted.game.content.combat.range.RangeData; import com.rebotted.game.content.consumables.Food; import com.rebotted.game.content.consumables.Potions; import com.rebotted.game.content.guilds.impl.RangersGuild; @@ -745,7 +746,6 @@ public abstract class Player { if (inDesert() && heightLevel == 0) { DesertHeat.callHeat(this); } - if (playerEnergy < 100 && System.currentTimeMillis() - lastIncrease >= getPlayerAssistant().raiseTimer()) { playerEnergy += 1; lastIncrease = System.currentTimeMillis(); @@ -756,7 +756,6 @@ public abstract class Player { getPacketSender().sendConfig(173, 0); } getPlayerAssistant().writeEnergy(); - if (System.currentTimeMillis() - specDelay > CombatConstants.INCREASE_SPECIAL_AMOUNT) { specDelay = System.currentTimeMillis(); if (specAmount < 10) { @@ -793,21 +792,19 @@ public abstract class Player { if (System.currentTimeMillis() - singleCombatDelay2 > 3300) { underAttackBy2 = 0; } - + if (System.currentTimeMillis() - restoreStatsDelay > 60000) { restoreStatsDelay = System.currentTimeMillis(); for (int level = 0; level < playerLevel.length; level++) { if (playerLevel[level] < getLevelForXP(playerXP[level])) { if (level != 5) { // prayer doesn't restore playerLevel[level] += 1; - getPacketSender().setSkillLevel(level, - playerLevel[level], playerXP[level]); + getPacketSender().setSkillLevel(level, playerLevel[level], playerXP[level]); getPlayerAssistant().refreshSkill(level); } } else if (playerLevel[level] > getLevelForXP(playerXP[level])) { playerLevel[level] -= 1; - getPacketSender().setSkillLevel(level, - playerLevel[level], playerXP[level]); + getPacketSender().setSkillLevel(level, playerLevel[level], playerXP[level]); getPlayerAssistant().refreshSkill(level); } } @@ -857,9 +854,7 @@ public abstract class Player { if (PlayerHandler.players[frozenBy] == null) { freezeTimer = -1; frozenBy = -1; - } else if (!goodDistance(absX, absY, - PlayerHandler.players[frozenBy].absX, - PlayerHandler.players[frozenBy].absY, 20)) { + } else if (!goodDistance(absX, absY, PlayerHandler.players[frozenBy].absX, PlayerHandler.players[frozenBy].absY, 20)) { freezeTimer = -1; frozenBy = -1; } @@ -932,12 +927,7 @@ public abstract class Player { } public void queueMessage(Packet arg1) { - // synchronized(queuedPackets) { - // if (arg1.getId() != 41) queuedPackets.add(arg1); - // else - // processPacket(arg1); - // } } public synchronized boolean processQueuedPackets() { @@ -953,7 +943,6 @@ public abstract class Player { packetSize = p.getLength(); inStream.buffer = p.getData(); if (packetType > 0) { - // getPacketDispatcher().sendMessage("PacketType: " + packetType); PacketHandler.processPacket(this, packetType, packetSize); } timeOutCounter = 0; @@ -970,8 +959,6 @@ public abstract class Player { packetSize = p.getLength(); inStream.buffer = p.getData(); if (packetType > 0) { - // getPacketDispatcher().sendMessage("PacketType: " + - // packetType); PacketHandler.processPacket(this, packetType, packetSize); } timeOutCounter = 0; @@ -1095,38 +1082,38 @@ public abstract class Player { } public void trawlerFade(final int x, final int y, final int height) { - if (System.currentTimeMillis() - lastAction > 5000) { - lastAction = System.currentTimeMillis(); - resetWalkingQueue(); - CycleEventHandler.getSingleton().addEvent(this, new CycleEvent() { - int tStage = 5; - public void execute(CycleEventContainer container) { - if (tStage == 5) { - getPacketSender().showInterface(18460); - } - if (tStage == 4) { - getPlayerAssistant().movePlayer(x, y, height); - getPlayerAssistant().resetAnimationsToPrevious(); - appearanceUpdateRequired = true; - } - if (tStage == 3) { - getPacketSender().showInterface(18452); - } - if (tStage == 1) { - container.stop(); - return; - } - if (tStage > 0) { - tStage--; - } - } - public void stop() { - getPacketSender().closeAllWindows(); - tStage = 0; - } - }, 1); - } - } + if (System.currentTimeMillis() - lastAction > 5000) { + lastAction = System.currentTimeMillis(); + resetWalkingQueue(); + CycleEventHandler.getSingleton().addEvent(this, new CycleEvent() { + int tStage = 5; + public void execute(CycleEventContainer container) { + if (tStage == 5) { + getPacketSender().showInterface(18460); + } + if (tStage == 4) { + getPlayerAssistant().movePlayer(x, y, height); + getPlayerAssistant().resetAnimationsToPrevious(); + appearanceUpdateRequired = true; + } + if (tStage == 3) { + getPacketSender().showInterface(18452); + } + if (tStage == 1) { + container.stop(); + return; + } + if (tStage > 0) { + tStage--; + } + } + public void stop() { + getPacketSender().closeAllWindows(); + tStage = 0; + } + }, 1); + } + } public void fade(final int x, final int y, final int height) { if (System.currentTimeMillis() - lastAction > 5000) { @@ -1135,24 +1122,24 @@ public abstract class Player { CycleEventHandler.getSingleton().addEvent(this, new CycleEvent() { int tStage = 6; public void execute(CycleEventContainer container) { - if (tStage == 6) { - getPacketSender().showInterface(18460); - } - if (tStage == 5) { - getPlayerAssistant().movePlayer(x, y, height); - updateRequired = true; - appearanceUpdateRequired = true; - } - if (tStage == 4) { - getPacketSender().showInterface(18452); - } - if (tStage == 1) { - container.stop(); - return; - } - if (tStage > 0) { - tStage--; - } + if (tStage == 6) { + getPacketSender().showInterface(18460); + } + if (tStage == 5) { + getPlayerAssistant().movePlayer(x, y, height); + updateRequired = true; + appearanceUpdateRequired = true; + } + if (tStage == 4) { + getPacketSender().showInterface(18452); + } + if (tStage == 1) { + container.stop(); + return; + } + if (tStage > 0) { + tStage--; + } } public void stop() { getPacketSender().closeAllWindows(); @@ -1227,12 +1214,14 @@ public abstract class Player { private Npc specialTarget = null; + public void setSpecialTarget(Npc target) { - this.specialTarget = target; - } - public Npc getSpecialTarget() { - return specialTarget; - } + this.specialTarget = target; + } + + public Npc getSpecialTarget() { + return specialTarget; + } public int miningAxe = -1, woodcuttingAxe = -1; @@ -1568,18 +1557,27 @@ public abstract class Player { 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 2097152, 8388608, 16777216, 67108864, 134217728 }; + + /** + * Combat variables + */ public boolean doubleHit, usingSpecial, usingRangeWeapon, usingBow, usingMagic, castingMagic; - public int npcIndex, npcClickIndex, npcType, castingSpellId, oldSpellId, + public int castingSpellId, oldSpellId, spellId, hitDelay; public int specMaxHitIncrease, freezeDelay, freezeTimer = -6, killerId, playerIndex, oldPlayerIndex, lastWeaponUsed, projectileStage, crystalBowArrowCount, playerMagicBook, teleGfx, teleEndAnimation, teleHeight, teleX, teleY, rangeItemUsed, killingNpcIndex, - totalDamageDealt, globalDamageDealt, oldNpcIndex, fightMode, attackTimer; + totalDamageDealt, globalDamageDealt, oldNpcIndex, fightMode, attackTimer, + bowSpecShot; public boolean magicFailed, oldMagicFailed; - public int bowSpecShot, clickNpcType, clickObjectType, objectId, objectX, - objectY; + /** + * End + */ + + public int clickNpcType, clickObjectType, objectId, objectX, + objectY, npcIndex, npcClickIndex, npcType; public int pItemX, pItemY, pItemId; public boolean isMoving, walkingToItem; public boolean isShopping, updateShop; @@ -2157,8 +2155,35 @@ public abstract class Player { walkingQueueY[wQueueWritePtr] = y; wQueueWritePtr = next; } + + public boolean checkRangeDistance() { + return (usingRangeWeapon || usingBow); + } + + public int gatherRangeDistance(int distance) { + //dart (non long range) + if (usingRangeWeapon && RangeData.usingDart(this) && fightMode != 3) { + distance = 3; + //longbow (long range) + } else if (usingBow && fightMode == 3 && RangeData.usingLongbow(this)) { + distance = 10; + //longbow (non long range) + } else if (usingBow && fightMode != 3 && RangeData.usingLongbow(this)) { + distance = RangeData.usingCrystalBow(this) ? 10 : 8; + //dart, knife, throwing axe (long range) + } else if (usingRangeWeapon && fightMode == 3) { + distance = RangeData.usingDart(this) ? 5 : 6; + //short bow + } else if (usingBow && !RangeData.usingLongbow(this)) { + distance = fightMode == 3 ? 7 : 9; + } + return distance; + } public boolean goodDistance(int objectX, int objectY, int playerX, int playerY, int distance) { + if (checkRangeDistance()) { + distance = gatherRangeDistance(distance); + } return ((objectX-playerX <= distance && objectX-playerX >= -distance) && (objectY-playerY <= distance && objectY-playerY >= -distance)); } @@ -2168,8 +2193,7 @@ public abstract class Player { } int dir; do { - dir = Misc.direction(currentX, currentY, - walkingQueueX[wQueueReadPtr], walkingQueueY[wQueueReadPtr]); + dir = Misc.direction(currentX, currentY, walkingQueueX[wQueueReadPtr], walkingQueueY[wQueueReadPtr]); if (dir == -1) { wQueueReadPtr = (wQueueReadPtr + 1) % walkingQueueSize; } else if ((dir & 1) != 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 646d0dc6..8103a976 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 @@ -2319,19 +2319,6 @@ public class PlayerAssistant { return count; } - public void useOperate(int itemId) { - switch (itemId) { - case 11283: - case 11284: - if (player.playerIndex > 0) { - player.getCombatAssistant().handleDfs(); - } else if (player.npcIndex > 0) { - player.getCombatAssistant().handleDfsNPC(); - } - break; - } - } - public void getSpeared(int otherX, int otherY) { int x = player.absX - otherX; int y = player.absY - otherY; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/AttackPlayer.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/AttackPlayer.java index da42e920..a3391b13 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/AttackPlayer.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/AttackPlayer.java @@ -10,77 +10,73 @@ import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; import com.rebotted.net.packets.PacketType; -/** - * Attack Player - **/ public class AttackPlayer implements PacketType { public static final int ATTACK_PLAYER = 73, MAGE_PLAYER = 249; @Override - public void processPacket(Player c, int packetType, int packetSize) { - c.endCurrentTask(); - c.playerIndex = 0; - c.npcIndex = 0; + public void processPacket(Player player, int packetType, int packetSize) { + player.endCurrentTask(); + player.playerIndex = 0; + player.npcIndex = 0; switch (packetType) { /** * Attack player **/ case ATTACK_PLAYER: - c.playerIndex = c.getInStream().readSignedWordBigEndian(); - if (PlayerHandler.players[c.playerIndex] == null) { + player.playerIndex = player.getInStream().readSignedWordBigEndian(); + if (PlayerHandler.players[player.playerIndex] == null) { break; } - if (c.inDuelArena() && !c.duelingArena()) { - c.getChallengePlayer().processPacket(c, packetType, packetSize); + if (player.inDuelArena() && !player.duelingArena()) { + player.getChallengePlayer().processPacket(player, packetType, packetSize); } - if (c.respawnTimer > 0) { + if (player.respawnTimer > 0) { break; } - if (c.autocastId > 0) { - c.autocasting = true; + if (player.autocastId > 0) { + player.autocasting = true; } - if (!c.autocasting && c.spellId > 0) { - c.spellId = 0; + if (!player.autocasting && player.spellId > 0) { + player.spellId = 0; } - c.mageFollow = false; - c.spellId = 0; - c.usingMagic = false; + player.mageFollow = false; + player.spellId = 0; + player.usingMagic = false; boolean usingBow = false; boolean usingOtherRangeWeapons = false; boolean usingArrows = false; - boolean usingCross = c.playerEquipment[c.playerWeapon] == 9185; + boolean usingCross = player.playerEquipment[player.playerWeapon] == 9185; for (int bowId : RangeData.BOWS) { - if (c.playerEquipment[c.playerWeapon] == bowId) { + if (player.playerEquipment[player.playerWeapon] == bowId) { usingBow = true; for (int arrowId : RangeData.ARROWS) { - if (c.playerEquipment[c.playerArrows] == arrowId) { + if (player.playerEquipment[player.playerArrows] == arrowId) { usingArrows = true; } } } } for (int otherRangeId : RangeData.OTHER_RANGE_WEAPONS) { - if (c.playerEquipment[c.playerWeapon] == otherRangeId) { + if (player.playerEquipment[player.playerWeapon] == otherRangeId) { usingOtherRangeWeapons = true; } } - if (c.duelStatus == 5) { - if (c.duelCount > 0) { - c.getPacketSender().sendMessage( - "The duel hasn't started yet!"); - c.playerIndex = 0; + if (player.duelStatus == 5) { + if (player.duelCount > 0) { + player.getPacketSender().sendMessage("The duel hasn't started yet!"); + player.playerIndex = 0; return; } - if (c.duelRule[9]) { + if (player.duelRule[9]) { boolean canUseWeapon = false; for (int funWeapon : GameConstants.FUN_WEAPONS) { - if (c.playerEquipment[c.playerWeapon] == funWeapon) { + if (player.playerEquipment[player.playerWeapon] == funWeapon) { canUseWeapon = true; } } @@ -89,83 +85,57 @@ public class AttackPlayer implements PacketType { } } - if (c.duelRule[2] && (usingBow || usingOtherRangeWeapons)) { - c.getPacketSender().sendMessage( - "Range has been disabled in this duel!"); + if (player.duelRule[2] && (usingBow || usingOtherRangeWeapons)) { + player.getPacketSender().sendMessage("Range has been disabled for this duel!"); return; } - if (c.duelRule[3] && !usingBow && !usingOtherRangeWeapons) { - c.getPacketSender().sendMessage( - "Melee has been disabled in this duel!"); + if (player.duelRule[3] && !usingBow && !usingOtherRangeWeapons) { + player.getPacketSender().sendMessage("Melee has been disabled for this duel!"); return; } } - if ((usingBow || c.autocasting) - && c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[c.playerIndex].getX(), - PlayerHandler.players[c.playerIndex].getY(), 6)) { - c.usingBow = true; - c.stopMovement(); + if ((usingBow || player.autocasting) && player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[player.playerIndex].getX(), PlayerHandler.players[player.playerIndex].getY(), 6)) { + player.usingBow = true; + player.stopMovement(); } - if (usingOtherRangeWeapons - && c.goodDistance(c.getX(), c.getY(), - PlayerHandler.players[c.playerIndex].getX(), - PlayerHandler.players[c.playerIndex].getY(), 3)) { - c.usingRangeWeapon = true; - c.stopMovement(); + if (usingOtherRangeWeapons && player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[player.playerIndex].getX(), PlayerHandler.players[player.playerIndex].getY(), 3)) { + player.usingRangeWeapon = true; + player.stopMovement(); } if (!usingBow) { - c.usingBow = false; + player.usingBow = false; } if (!usingOtherRangeWeapons) { - c.usingRangeWeapon = false; + player.usingRangeWeapon = false; } - if (!usingCross && !usingArrows && usingBow - && c.playerEquipment[c.playerWeapon] < 4212 - && c.playerEquipment[c.playerWeapon] > 4223) { - c.getPacketSender().sendMessage( - "You have run out of arrows!"); + if (!usingCross && !usingArrows && usingBow && player.playerEquipment[player.playerWeapon] < 4212 && player.playerEquipment[player.playerWeapon] > 4223) { + player.getPacketSender().sendMessage("You have run out of arrows!"); return; } - if (RangeData.correctBowAndArrows(c) < c.playerEquipment[c.playerArrows] + if (RangeData.correctBowAndArrows(player) < player.playerEquipment[player.playerArrows] && CombatConstants.CORRECT_ARROWS && usingBow - && !RangeData.usingCrystalBow(c) - && c.playerEquipment[c.playerWeapon] != 9185) { - c.getPacketSender().sendMessage( - "You can't use " - + ItemAssistant.getItemName( - c.playerEquipment[c.playerArrows]) - .toLowerCase() - + "s with a " - + ItemAssistant.getItemName( - c.playerEquipment[c.playerWeapon]) - .toLowerCase() + "."); - c.stopMovement(); - c.getCombatAssistant().resetPlayerAttack(); + && !RangeData.usingCrystalBow(player) + && player.playerEquipment[player.playerWeapon] != 9185) { + player.getPacketSender().sendMessage("You can't use " + ItemAssistant.getItemName(player.playerEquipment[player.playerArrows]).toLowerCase() + "s with a " + ItemAssistant.getItemName(player.playerEquipment[player.playerWeapon]).toLowerCase() + "."); + player.stopMovement(); + player.getCombatAssistant().resetPlayerAttack(); return; } - if (c.playerEquipment[c.playerWeapon] == 9185 - && !c.getCombatAssistant().properBolts()) { - c.getPacketSender().sendMessage( - "You must use bolts with a crossbow."); - c.stopMovement(); - c.getCombatAssistant().resetPlayerAttack(); + if (player.playerEquipment[player.playerWeapon] == 9185 && !player.getCombatAssistant().properBolts()) { + player.getPacketSender().sendMessage("You must use bolts with a crossbow."); + player.stopMovement(); + player.getCombatAssistant().resetPlayerAttack(); return; } - if (c.getCombatAssistant().checkReqs()) { - c.followId = c.playerIndex; - if (!c.usingMagic && !usingBow && !usingOtherRangeWeapons) { - c.followDistance = 1; - c.getPlayerAssistant().followPlayer(); - } - if (c.attackTimer <= 0) { - // c.getPacketDispatcher().sendMessage("Tried to attack..."); - // c.getCombat().attackPlayer(c.playerIndex); - // c.attackTimer++; + if (player.getCombatAssistant().checkReqs()) { + player.followId = player.playerIndex; + if (!player.usingMagic && !usingBow && !usingOtherRangeWeapons) { + player.followDistance = 1; + player.getPlayerAssistant().followPlayer(); } } break; @@ -174,135 +144,135 @@ public class AttackPlayer implements PacketType { * Attack player with magic **/ case MAGE_PLAYER: - if (!c.mageAllowed) { - c.mageAllowed = true; + if (!player.mageAllowed) { + player.mageAllowed = true; break; } - c.playerIndex = c.getInStream().readSignedWordA(); - int castingSpellId = c.getInStream().readSignedWordBigEndian(); - c.castingSpellId = castingSpellId; - c.usingMagic = false; + player.playerIndex = player.getInStream().readSignedWordA(); + int castingSpellId = player.getInStream().readSignedWordBigEndian(); + player.castingSpellId = castingSpellId; + player.usingMagic = false; boolean teleother = CastOnOther.castOnOtherSpells(castingSpellId); - if (PlayerHandler.players[c.playerIndex] == null) { + if (PlayerHandler.players[player.playerIndex] == null) { break; } - if (c.respawnTimer > 0) { + if (player.respawnTimer > 0) { break; } - if (c.playerRights == 3) { - c.getPacketSender().sendMessage( + if (player.playerRights == 3) { + player.getPacketSender().sendMessage( "Casting Spell id: " + castingSpellId + "."); } if (teleother) { - if (c.inTrade) { - c.getTrading().declineTrade(true); + if (player.inTrade) { + player.getTrading().declineTrade(true); } - if (c.inWild() - && c.wildLevel > GameConstants.NO_TELEPORT_WILD_LEVEL) { - c.getPacketSender().sendMessage( + 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."); break; } - if (c.duelStatus == 5) { - c.getPacketSender().sendMessage("You can't do that in a duel."); - c.usingMagic = false; - c.stopMovement(); - c.getCombatAssistant().resetPlayerAttack(); + if (player.duelStatus == 5) { + player.getPacketSender().sendMessage("You can't do that in a duel."); + player.usingMagic = false; + player.stopMovement(); + player.getCombatAssistant().resetPlayerAttack(); return; } } - switch (c.castingSpellId) { + switch (player.castingSpellId) { case 12425: - CastOnOther.teleOtherDistance(c, 0, c.playerIndex); + CastOnOther.teleOtherDistance(player, 0, player.playerIndex); break; case 12435: - CastOnOther.teleOtherDistance(c, 1, c.playerIndex); + CastOnOther.teleOtherDistance(player, 1, player.playerIndex); break; case 12455: - CastOnOther.teleOtherDistance(c, 2, c.playerIndex); + CastOnOther.teleOtherDistance(player, 2, player.playerIndex); break; } if (teleother) { - c.stopMovement(); - c.getCombatAssistant().resetPlayerAttack(); + player.stopMovement(); + player.getCombatAssistant().resetPlayerAttack(); } for (int i = 0; i < MagicData.MAGIC_SPELLS.length; i++) { if (castingSpellId == MagicData.MAGIC_SPELLS[i][0]) { - c.spellId = i; - c.usingMagic = true; + player.spellId = i; + player.usingMagic = true; break; } } - if (c.autocasting) { - c.autocasting = false; + if (player.autocasting) { + player.autocasting = false; } if (!teleother) { - if (!c.getCombatAssistant().checkReqs()) { + if (!player.getCombatAssistant().checkReqs()) { break; } - if (c.duelStatus == 5) { - if (c.duelCount > 0) { - c.getPacketSender().sendMessage( + if (player.duelStatus == 5) { + if (player.duelCount > 0) { + player.getPacketSender().sendMessage( "The duel hasn't started yet!"); - c.playerIndex = 0; + player.playerIndex = 0; return; } - if (c.duelRule[4]) { - c.getPacketSender().sendMessage( + if (player.duelRule[4]) { + player.getPacketSender().sendMessage( "Magic has been disabled in this duel!"); return; } - if (MagicData.MAGIC_SPELLS[c.spellId][0] == 12445) + if (MagicData.MAGIC_SPELLS[player.spellId][0] == 12445) { - c.getPacketSender().sendMessage( + player.getPacketSender().sendMessage( "You can't do that in a duel."); - c.usingMagic = false; - c.stopMovement(); - c.getCombatAssistant().resetPlayerAttack(); + player.usingMagic = false; + player.stopMovement(); + player.getCombatAssistant().resetPlayerAttack(); return; } } - for (int r = 0; r < c.REDUCE_SPELLS.length; r++) { // reducing + for (int r = 0; r < player.REDUCE_SPELLS.length; r++) { // reducing // spells, // confuse // etc - if (PlayerHandler.players[c.playerIndex].REDUCE_SPELLS[r] == MagicData.MAGIC_SPELLS[c.spellId][0]) { + if (PlayerHandler.players[player.playerIndex].REDUCE_SPELLS[r] == MagicData.MAGIC_SPELLS[player.spellId][0]) { if (System.currentTimeMillis() - - PlayerHandler.players[c.playerIndex].reduceSpellDelay[r] < PlayerHandler.players[c.playerIndex].REDUCE_SPELL_TIME[r]) { - c.getPacketSender() + - PlayerHandler.players[player.playerIndex].reduceSpellDelay[r] < PlayerHandler.players[player.playerIndex].REDUCE_SPELL_TIME[r]) { + player.getPacketSender() .sendMessage( "That player is currently immune to this spell."); - c.usingMagic = false; - c.stopMovement(); - c.getCombatAssistant().resetPlayerAttack(); + player.usingMagic = false; + player.stopMovement(); + player.getCombatAssistant().resetPlayerAttack(); } break; } } if (System.currentTimeMillis() - - PlayerHandler.players[c.playerIndex].teleBlockDelay < PlayerHandler.players[c.playerIndex].teleBlockLength - && MagicData.MAGIC_SPELLS[c.spellId][0] == 12445) { - c.getPacketSender().sendMessage( + - PlayerHandler.players[player.playerIndex].teleBlockDelay < PlayerHandler.players[player.playerIndex].teleBlockLength + && MagicData.MAGIC_SPELLS[player.spellId][0] == 12445) { + player.getPacketSender().sendMessage( "That player is already affected by this spell."); - c.usingMagic = false; - c.stopMovement(); - c.getCombatAssistant().resetPlayerAttack(); + player.usingMagic = false; + player.stopMovement(); + player.getCombatAssistant().resetPlayerAttack(); } } break; 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 429da66f..2877bbc0 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 @@ -24,9 +24,6 @@ public class Bank10 implements PacketType { JewelryMaking.mouldItem(player, removeId, 10); break; - case 1688: - player.getPlayerAssistant().useOperate(removeId); - break; case 3900: player.getShopAssistant().buyItem(removeId, removeSlot, 10); break; 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 9f80e917..bfd26b40 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 @@ -278,9 +278,9 @@ public class Commands implements PacketType { "Add some snow in your mainscreen(works only in december)", }; - // Clear all lines - for (int i = 8144; i < 8195; i++) player.getPacketSender().sendFrame126("", i); + for (int i = 8144; i < 8195; i++) + player.getPacketSender().sendFrame126("", i); player.getPacketSender().sendFrame126("@dre@Commands", 8144); @@ -292,7 +292,8 @@ public class Commands implements PacketType { break; case "stuck": player.getPlayerAssistant().startTeleport(SpellTeleport.LUMBRIDGE.getDestX(), SpellTeleport.LUMBRIDGE.getDestY(), 0, "modern"); - player.getPacketSender().sendMessage("How did you manage that one... If it's bug related, please report on Github/Discord!"); + player.getPacketSender().sendMessage("How did you manage that one..."); + player.getPacketSender().sendMessage("If it's bug related, please report on Github/Discord!"); player.gfx100(80); player.startAnimation(404); break; @@ -500,8 +501,9 @@ public class Commands implements PacketType { String a[] = playerCommand.split(" "); String itemName = ""; int itemCount = 0; - for (int i = 1; i < a.length; i++) - itemName = itemName + a[i]+ " "; + for (int i = 1; i < a.length; i++) { + itemName = itemName + a[i]+ " "; + } itemName = itemName.substring(0, itemName.length()-1); player.getPacketSender().sendMessage("Searching: " + itemName); for (int j = 0; j < GameEngine.itemHandler.ItemList.length; j++) { 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 914d9a2d..eb51fef1 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 @@ -34,7 +34,7 @@ public class Walking implements PacketType { Fishing.resetFishing(player); } if (player.playerIsCooking) {// cooking - Cooking.resetCooking(player); + Cooking.setCooking(player, false); } if (player.playerSkilling[13]) {// smelting Smelting.resetSmelting(player);