diff --git a/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class b/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class index 17a216faf..ae482412a 100644 Binary files a/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class and b/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class differ diff --git a/Server/server.sql b/Server/server.sql index 32584d2fa..8671d96a9 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -277,10 +277,10 @@ CREATE TABLE `configs` ( INSERT INTO `configs` (`key_`, `value`, `dataType`) VALUES ('messageInterface', '18', 'int'), -('weeklyMessage', 'Welcome to Arios, please report all bugs and feedback on our website.', NULL), +('weeklyMessage', 'Welcome to 2009Scape, please report all bugs and feedback on our website.', NULL), ('dxp', '2015-12-28 04:00:00', 'date'), ('messageInterface', '18', 'int'), -('weeklyMessage', 'Welcome to Arios, please report all bugs and feedback on our website.', NULL), +('weeklyMessage', 'Welcome to 2009Scape, please report all bugs and feedback on our website.', NULL), ('dxp', '2015-12-28 04:00:00', 'date'); -- -------------------------------------------------------- @@ -13180,10 +13180,10 @@ INSERT INTO `item_configs` (`id`, `name`, `examine`, `tradeable`, `lendable`, `l (14755, 'Extended antifire (3)', '3 doses of an extended antifire potion.', 1, NULL, 170, 450, NULL, NULL, 9800, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL), (14757, 'Extended antifire (2)', '2 doses of an extended antifire potion.', 1, NULL, 170, 450, NULL, NULL, 9800, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL), (14759, 'Extended antifire (1)', '1 dose of an extended antifire potion.', 1, NULL, 170, 450, NULL, NULL, 9800, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL), -(14761, 'Ironman helm', 'For just a rather very independent Arioser.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, '0,0,0,-6,-2,6,7,5,-1,6,0,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 2, 100, NULL, NULL, NULL, NULL, NULL), +(14761, 'Ironman helm', 'For just a rather very independent 2009Scapeer.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, '0,0,0,-6,-2,6,7,5,-1,6,0,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 2, 100, NULL, NULL, NULL, NULL, NULL), (14762, 'Ironman platebody', 'Take it off and what are you?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 4, NULL, NULL, '0,0,0,-30,-10,21,20,12,-6,20,5,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 9, 500, NULL, NULL, NULL, NULL, NULL), (14763, 'Ironman platelegs', 'Take it off and what are you?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 7, NULL, NULL, '0,0,0,-21,-7,11,10,10,-4,10,0,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 9, 100, NULL, NULL, NULL, NULL, NULL), -(14764, 'Ultimate Ironman helm', 'For just a rather very independent Arioser.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, '0,0,0,-6,-2,6,7,5,-1,6,0,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 2, 100, NULL, NULL, NULL, NULL, NULL), +(14764, 'Ultimate Ironman helm', 'For just a rather very independent 2009Scapeer.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, '0,0,0,-6,-2,6,7,5,-1,6,0,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 2, 100, NULL, NULL, NULL, NULL, NULL), (14765, 'Ultimate Ironman platebody', 'Take it off and what are you?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 4, NULL, NULL, '0,0,0,-30,-10,21,20,12,-6,20,5,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 9, 500, NULL, NULL, NULL, NULL, NULL), (14766, 'Ultimate Ironman platelegs', 'Take it off and what are you?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 7, NULL, NULL, '0,0,0,-21,-7,11,10,10,-4,10,0,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 9, 100, NULL, NULL, NULL, NULL, NULL), (14767, 'Dragon defender', 'A defensive weapon.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, '25,24,23,-3,-2,25,24,23,-3,-2,10,6,0,0,0', NULL, NULL, NULL, NULL, 4177, NULL, '{0,60}-{1,60}', 0.4, NULL, NULL, NULL, NULL, NULL, NULL), @@ -13214,7 +13214,7 @@ INSERT INTO `item_configs` (`id`, `name`, `examine`, `tradeable`, `lendable`, `l INSERT INTO `item_configs` (`id`, `name`, `examine`, `tradeable`, `lendable`, `low_alchemy`, `high_alchemy`, `destroy`, `destroy_message`, `shop_price`, `grand_exchange_price`, `remove_head`, `remove_beard`, `remove_sleeves`, `stand_anim`, `stand_turn_anim`, `walk_anim`, `run_anim`, `turn180_anim`, `turn90cw_anim`, `turn90ccw_anim`, `render_anim`, `equipment_slot`, `attack_speed`, `absorb`, `bonuses`, `weapon_interface`, `has_special`, `two_handed`, `attack_anims`, `defence_anim`, `attack_audios`, `requirements`, `weight`, `ge_buy_limit`, `bankable`, `rare_item`, `tokkul_price`, `point_price`, `fun_weapon`) VALUES (14805, 'Dark bow', 'A bow from a darker dimension.', NULL, NULL, 48000, 72001, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 808, 823, 819, 824, 820, 821, 822, 1, 3, 9, NULL, '0,0,0,0,95,0,0,0,0,0,0,0,0,0,0', 16, 1, 1, '426,426,426,426', 424, '3731,0,0,0', '{4,60}', 1.9, 10, NULL, 1, NULL, NULL, NULL), (14806, 'Dark bow', 'A bow from a darker dimension.', NULL, NULL, 48000, 72001, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 808, 823, 819, 824, 820, 821, 822, 1, 3, 9, NULL, '0,0,0,0,95,0,0,0,0,0,0,0,0,0,0', 16, 1, 1, '426,426,426,426', 424, '3731,0,0,0', '{4,60}', 1.9, 10, NULL, 1, NULL, NULL, NULL), -(14807, 'Arios voting bond', 'Redeem various voting rewards.', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL), +(14807, '2009Scape voting bond', 'Redeem various voting rewards.', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL), (14810, 'Herb box', 'Contains ten random herbs.', NULL, NULL, 40, 60, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL), (14813, 'Seers ring (i)', 'A mysterious ring that can fill the wearer with magical power...', NULL, NULL, 4000, 6000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, '0,0,0,8,0,0,0,0,8,0,0,0,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, 35, NULL), (14816, 'Berserker ring (i)', 'A legendary ring reputed to bring out a berserk fury in the wearer.', NULL, NULL, 4000, 6000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, '0,0,0,0,0,0,0,8,0,0,0,8,0,0,0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, 35, NULL), @@ -13670,11 +13670,11 @@ CREATE TABLE `npc_configs` ( INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES (0, 'Hans', 'An expert on axes.', 12, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0), -(1, 'Man', 'One of Arios\' citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, 18, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,513,512', NULL, NULL, NULL), -(2, 'Man', 'One of Arios\' many citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,513,512', NULL, NULL, NULL), -(3, 'Man', 'One of Arios\' citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,513,512', NULL, NULL, NULL), -(4, 'Woman', 'One of Arios\' citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,506,505', NULL, NULL, NULL), -(5, 'Woman', 'One of Arios\' citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,506,505', NULL, NULL, NULL), +(1, 'Man', 'One of 2009Scape citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, 18, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,513,512', NULL, NULL, NULL), +(2, 'Man', 'One of 2009Scape many citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,513,512', NULL, NULL, NULL), +(3, 'Man', 'One of 2009Scape citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,513,512', NULL, NULL, NULL), +(4, 'Woman', 'One of 2009Scape citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,506,505', NULL, NULL, NULL), +(5, 'Woman', 'One of 2009Scape citizens.', 10, 3, 1, 3, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 422, 404, 9055, NULL, 422, 422, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,506,505', NULL, NULL, NULL), (6, 'Woman', 'One of RuneScape\'s many citizens.', 4, 3, 1, 3, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 422, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '511,506,505', NULL, NULL, NULL), (7, 'Farmer', 'He grows the crops in this area.', 7, 5, 5, 5, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 422, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (8, 'Thief', 'Known for his light-fingered qualities.', 14, 10, 10, 10, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 422, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), @@ -19717,7 +19717,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (61, '{3321,3145,0,1,3}-{3327,3131,0,1,5}-{3322,3143,0,1,3}-{3182,3878,0,1,6}-{3182,3886,0,1,7}-{3182,3888,0,1,5}-{3175,3888,0,1,4}-{3175,3879,0,1,7}-{3174,3879,0,1,3}-{3174,3882,0,1,0}-{3175,3885,0,1,3}-{3172,3876,0,1,2}-{3172,3894,0,1,1}-{3172,3885,0,1,3}-{3165,3886,0,1,3}-{3165,3896,0,1,1}-{3166,3886,0,1,1}-{3164,3893,0,1,4}-{3163,3881,0,1,4}-{3159,3889,0,1,0}-{3213,9890,0,1,5}-{3210,9886,0,1,4}-{3213,9887,0,1,1}-{3207,9880,0,1,0}-{3255,9870,0,1,4}-{3258,9872,0,1,3}-{3261,9870,0,1,4}-{3156,3248,0,1,4}-{3143,3241,0,1,4}-{3156,3249,0,1,4}-{3175,3248,0,1,7}-{3169,3260,0,1,4}-{3171,3254,0,1,5}-{3162,3246,0,1,6}-{3179,3262,0,1,1}-{3162,3226,0,1,1}-{3166,3222,0,1,1}-{3157,3229,0,1,5}-{3168,3222,0,1,4}-{3211,9622,0,1,2}-{3215,9620,0,1,4}-{3212,9618,0,1,3}-{3217,9617,0,1,3}-{3214,9620,0,1,7}-{2541,3189,0,1,3}-{2542,3187,0,1,6}-{2543,3186,0,1,4}-{2545,3183,0,1,3}-{2545,3183,0,1,3}-{2545,3182,0,1,3}-{2543,3183,0,1,0}-{2543,3182,0,1,3}-{2539,3182,0,1,0}'), (60, '{3189,3883,0,1,5}-{3182,3882,0,1,5}-{3177,3871,0,1,0}-{3176,3878,0,1,0}-{3173,3892,0,1,6}-{3171,3884,0,1,4}-{3166,3874,0,1,1}-{3169,3900,0,1,1}-{3165,3881,0,1,3}-{3164,3888,0,1,6}-{3163,3894,0,1,7}-{3162,3894,0,1,4}-{2547,2982,0,1,6}-{2477,2866,0,1,5}-{2484,2897,0,1,3}-{2455,2857,0,1,6}-{2434,2845,0,1,4}-{2544,2904,0,1,2}-{2548,2981,0,1,1}-{2448,2784,0,1,7}-{2460,2869,0,1,3}-{2471,2890,0,1,6}-{2491,2906,0,1,0}-{2523,2975,0,1,1}'), (68, '{2518,3209,0,1,3}-{2533,3209,0,1,5}-{2530,3212,0,1,1}'), -(8273, '{2931,3536,0,1,5}-{166,54,0,1,6}-{3178,3482,0,1,0}'), +(8273, '{2931,3536,0,1,5}-{166,54,0,1,6}'), (64, '{2684,9798,0,1,2}-{2691,9814,0,1,5}-{2694,9819,0,1,6}-{2696,9831,0,1,3}-{2702,9837,0,1,6}-{2709,9844,0,1,3}-{2720,9847,0,1,4}-{2724,9843,0,1,6}-{2733,9846,0,1,4}-{2740,9841,0,1,3}-{2745,9836,0,1,4}-{2745,9828,0,1,5}-{2747,9826,0,1,1}'), (66, '{2507,3204,0,1,5}-{2506,3205,0,1,6}-{2526,3169,0,1,6}-{2540,3226,0,1,6}-{2528,3164,0,1,6}-{2529,3169,0,1,1}-{2537,3170,0,1,1}'), (67, '{2507,3200,0,1,6}-{2516,3212,0,1,1}'), @@ -20161,7 +20161,6 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (543, '{3272,3182,0,1,6}'), (542, '{3316,3175,0,1,3}'), (537, '{3192,3355,1,1,6}'), -(4905, '{3156,3486,0,0,0}'), (4904, '{3228,3254,0,1,3}'), (536, '{3192,3359,1,1,3}'), (4907, '{3208,3222,2,0,6}'), @@ -20445,7 +20444,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (948, '{3084,9506,0,0,0}'), (949, '{3086,3122,0,0,0}'), (944, '{3107,9511,0,1,5}'), -(945, '{3093,3107,0,0,0}-{3168,3481,0,0,0}'), +(945, '{3093,3107,0,0,0}'), (946, '{3141,3090,0,0,6}'), (947, '{3127,3124,0,0,3}'), (941, '{2974,3620,0,1,3}-{2975,3609,0,1,3}-{2983,3614,0,1,3}-{3340,3678,0,1,1}-{3339,3695,0,1,6}-{3344,3705,0,1,3}-{3307,5462,0,1,0}-{3121,10085,0,1,0}'), @@ -21692,7 +21691,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (2679, '{3000,3222,0,1,1}'), (2678, '{2988,3210,0,1,7}'), (2677, '{2945,3307,0,0,0}'), -(2676, '{2914,3322,0,0,0}-{2852,5071,0,0,0}-{3171,3487,0,1,2}'), +(2676, '{2914,3322,0,0,0}'), (2683, '{2967,3212,1,0,7}'), (2682, '{1866,4237,0,1,0}-{1866,4240,0,1,0}-{1867,4243,0,1,0}-{2950,3204,0,1,5}-{2971,3212,0,1,4}-{2960,3201,0,1,1}-{2959,3202,0,1,4}-{2904,3208,0,1,0}-{2956,3203,0,1,1}-{2969,3204,0,1,4}'), (2681, '{2991,3199,0,1,3}'), @@ -21756,7 +21755,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (3038, '{3406,2924,0,1,3}'), (3039, '{3414,2907,0,1,3}'), (3036, '{3424,2900,0,1,3}'), -(3037, '{3424,2906,0,0,1}-{3163,3484,0,1,3}'), +(3037, '{3424,2906,0,0,1}'), (6893, '{2926,3435,0,1,2}'), (3030, '{3421,2912,0,0,1}'), (3031, '{3439,2890,0,0,3}'), @@ -21810,7 +21809,6 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (3272, '{3042,3468,0,1,1}'), (3318, '{2401,4378,0,0,0}'), (3325, '{3161,3432,1,0,4}'), -(3322, '{3173,3493,0,0,0}'), (7639, '{3592,9766,0,0,0}-{3603,9770,0,0,0}-{3605,9757,0,0,0}-{3611,9749,0,0,0}-{3611,9766,0,0,0}-{3616,9737,0,0,0}-{3616,9756,0,0,0}-{3616,9762,0,0,0}-{3617,9779,0,0,0}-{3621,9754,0,0,0}'), (3302, '{2453,4449,0,1,2}'), (7637, '{3588,9768,0,0,0}-{3600,9768,0,0,0}-{3606,9780,0,0,0}-{3612,9729,0,0,0}-{3613,9764,0,0,0}-{3614,9740,0,0,0}-{3614,9750,0,0,0}-{3621,9748,0,0,0}-{3629,9737,0,0,0}'), @@ -22036,14 +22034,8 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES (8151, '{3241,9998,0,1,6}-{3223,10010,0,1,6}-{3208,10012,0,1,6}-{3209,10026,0,1,6}-{3214,10038,0,1,6}-{3211,10035,0,1,6}-{3214,10037,0,1,6}-{3240,9991,0,1,6}-{3231,10010,0,1,6}-{3210,10007,0,1,6}-{3222,10010,0,1,6}'), (2725, '{2500,3488,0,1,2}'), (8629, '{3216,3821,0,1,6}-{3212,3818,0,1,6}-{3190,3832,0,1,5}-{3183,3851,0,1,4}-{3183,3817,0,1,4}-{3190,3808,0,1,3}-{3201,3818,0,1,4}'), -(8631, '{3162,3492,0,1,1}'), (1631, '{2800,10017,0,1,1}-{2796,10021,0,1,1}-{2805,10021,0,1,1}-{2803,10013,0,1,1}-{3160,9589,0,1,3}-{3167,9589,0,1,6}-{3179,9585,0,1,1}-{3188,9572,0,1,7}-{3190,9580,0,1,3}-{3206,9586,0,1,3}-{3221,9586,0,1,7}-{3226,9573,0,1,5}-{3223,9569,0,1,1}'), (1632, '{2798,10019,0,1,1}-{2800,10015,0,1,1}-{2797,10018,0,1,1}'), -(8029, '{3173,3486,0,0,0}'), -(8174, '{3161,3499,0,0,0}'), -(7967, '{3168, 3499, 0, 0, 0}'), -(2138, '{3155, 3493, 0, 0, 0}'), -(8139, '{3160,3481,0,0,0}'), (6731, '{2655,5615,0,1,4}'), (8536, '{2654,5600,0,1,3}-{2650,5600,0,0,3}-{2662,5593,0,0,3}-{2653,5590,0,0,3}-{2644,5592,0,0,3-{2644,5601,0,0,3}-{2654,5604,0,0,3}-{2663,5606,0,0,3}-{2670,5597,0,0,3}-{2657,5589,0,0,3}-'), (2021, '{3222,9525,2,1,3}-{3216,9522,2,1,3}-{3219,9518,2,1,3}-{3224,9521,2,1,3}-{3218,9523,2,1,3}-{3215,9521,2,1,3}-{3213,9522,2,1,3}-{3227,9517,2,1,3}'), @@ -23593,11 +23585,11 @@ INSERT INTO `shops` (`id`, `title`, `general_store`, `stock`, `npcs`, `currency` (200, 'The Teleporter\'s Tabs', 0, '{8007,100}-{8008,100}-{8009,100}-{8010,100}-{8011,100}-{8012,100}', '', 995, 0), (201, 'The Fairy\'s Culinary Goods', 0, '{330, 10000000}-{6706, 10000000}-{380, 10000000}-{7219, 10000000}-{2290, 10000000}-{2302, 10000000}-{1892, 10000000}-{229, 10000000}', '3322', 995, 0), (202, 'The Wizard\'s Goods', 0, '{554,10000000}-{555,10000000}-{556,10000000}-{557,10000000}-{558,10000000}-{559,10000000}-{562,10000000}-{560,10000000}-{563,10000000}-{14730,10000000}-{14732,10000000}-{14734,10000000}-{14736,10000000}-{14738,10000000}-{14740,10000000}-{11872,10}-{11960,10}-{11962,10}-{579,10}-{577,10}-{1011,10}-{1389,10}-{1381,10}-{1381,10}-{1383,10}-{1385,10}-{1387,10}-{4675,10}-{2890,10}-{9731,10}-{3755,10}-{1727,10}-{656, 10}-{658,10}-{660,10}-{662, 10}-{664,10}-{3839, 10}-{3841, 10}-{3843,10}', '8029', 995, 0), -(203, 'Arios Protective Goods', 0, '{11814,10}-{11816,10}-{11818,10}-{11820,10}-{11822,10}-{11824, 10}-{11826,10}-{11828,10}-{11830,10}-{11832,10}-{11834,10}-{11836,10}-{11838,10}-{11840,10}-{3105,10}-{4119,10}-{4121,10}-{4123,10}-{4125,10}-{4127,10}-{4129,10}-{1725,10}-{1729,10}-{3751,10}-{3753,10}-{1149,10}-{542,10}-{544,10}-{5574,10}-{5575,10}-{5576,10}-{6106,10}-{6107,10}-{6108,10}-{6109,10}-{6110,10}-{6111,10}-{4502,10}-{7458,10}', '4905', 995, 0), -(204, 'Arios Weapon Store (Bronze - Mithril)', 0, '{1205,10}-{1237,10}-{1265,10}-{1277,10}-{1291,10}-{1307,10}-{1321,10}-{1337,10}-{1351,10}-{1375,10}-{1203,10}-{1239,10}-{1267,10}-{1279,10}-{1293,10}-{1309,10}-{1323,10}-{1335,10}-{1349,10}-{1363,10}-{1207,10}-{1241,10}-{1269,10}-{1281,10}-{1295,10}-{1311,10}-{1325,10}-{1339,10}-{1353,10}-{1365,10}-{1209,10}-{1243,10}-{1273,10}-{1285,10}-{1299,10}-{1315,10}-{1329,10}-{1343,10}-{1355,10}-{1369,10}', '', 995, 0), -(205, 'Arios Weapon Store (Adamant - Dragon)', 0, '{1211,10}-{1245,10}-{1271,10}-{1287,10}-{1301,10}-{1317,10}-{1331,10}-{1345,10}-{1357,10}-{1371,10}-{1213,10}-{1247,10}-{1275,10}-{1289,10}-{1303,10}-{1319,10}-{1333,10}-{1347,10}-{1359,10}-{1373,10}-{1215,10}-{4587,10}', '', 995, 0), -(206, 'Arios Tool Store', 0, '{1925,10}-{2347,10}-{590,10}-{946,10}-{952,10}-{301,10}-{305,10}-{307,10}-{309,10}-{311,10}-{313,1000}-{1734,10}-{233,10}-{1349,10}-{1353,10}-{1355,10}-{1267,10}-{1269,10}-{1271,10}-{1273,10}-{1734,100}-{1733,100}-{1779,1000}-{526, 500}-{532,500}', '8174', 995, 0), -(207, 'Arios General Store', 1, '{1931,30}-{1935,30}-{1735,10}-{1925,10}-{1923,10}-{1887,10}-{590,10}-{1755,10}-{2347,10}-{550,10}-{9003,10}-{14775,10}', '7967', 995, 0), +(203, '2009Scape Protective Goods', 0, '{11814,10}-{11816,10}-{11818,10}-{11820,10}-{11822,10}-{11824, 10}-{11826,10}-{11828,10}-{11830,10}-{11832,10}-{11834,10}-{11836,10}-{11838,10}-{11840,10}-{3105,10}-{4119,10}-{4121,10}-{4123,10}-{4125,10}-{4127,10}-{4129,10}-{1725,10}-{1729,10}-{3751,10}-{3753,10}-{1149,10}-{542,10}-{544,10}-{5574,10}-{5575,10}-{5576,10}-{6106,10}-{6107,10}-{6108,10}-{6109,10}-{6110,10}-{6111,10}-{4502,10}-{7458,10}', '4905', 995, 0), +(204, '2009Scape Weapon Store (Bronze - Mithril)', 0, '{1205,10}-{1237,10}-{1265,10}-{1277,10}-{1291,10}-{1307,10}-{1321,10}-{1337,10}-{1351,10}-{1375,10}-{1203,10}-{1239,10}-{1267,10}-{1279,10}-{1293,10}-{1309,10}-{1323,10}-{1335,10}-{1349,10}-{1363,10}-{1207,10}-{1241,10}-{1269,10}-{1281,10}-{1295,10}-{1311,10}-{1325,10}-{1339,10}-{1353,10}-{1365,10}-{1209,10}-{1243,10}-{1273,10}-{1285,10}-{1299,10}-{1315,10}-{1329,10}-{1343,10}-{1355,10}-{1369,10}', '', 995, 0), +(205, '2009Scape Weapon Store (Adamant - Dragon)', 0, '{1211,10}-{1245,10}-{1271,10}-{1287,10}-{1301,10}-{1317,10}-{1331,10}-{1345,10}-{1357,10}-{1371,10}-{1213,10}-{1247,10}-{1275,10}-{1289,10}-{1303,10}-{1319,10}-{1333,10}-{1347,10}-{1359,10}-{1373,10}-{1215,10}-{4587,10}', '', 995, 0), +(206, '2009Scape Tool Store', 0, '{1925,10}-{2347,10}-{590,10}-{946,10}-{952,10}-{301,10}-{305,10}-{307,10}-{309,10}-{311,10}-{313,1000}-{1734,10}-{233,10}-{1349,10}-{1353,10}-{1355,10}-{1267,10}-{1269,10}-{1271,10}-{1273,10}-{1734,100}-{1733,100}-{1779,1000}-{526, 500}-{532,500}', '8174', 995, 0), +(207, '2009Scape General Store', 1, '{1931,30}-{1935,30}-{1735,10}-{1925,10}-{1923,10}-{1887,10}-{590,10}-{1755,10}-{2347,10}-{550,10}-{9003,10}', '7967', 995, 0), (208, 'Hartwin\'s Longrange Tools', 0, '{882,10000000}-{884,10000000}-{886,10000000}-{888,10000000}-{890,10000000}-{877,10000000}-{9140,10000000}-{9141,10000000}-{841,10}-{843,10}-{849,10}-{853,10}-{857,10}-{861,10}-{837,10}-{9177,10}-{9179,10}-{9181,10}-{9183,10}-{11864,10}-{11866,10}-{11868,10}-{11870,10}-{1063,10}-{1095,10}-{1129,10}-{1129,10}-{1131,10}-{1167,10}-{1133,10}-{1097,10}-{6328,10}-{3749,10}-{1478,10}-{8880,10}-{8882,10000000}-{863,10000000}', '8139', 995, 0), (209, 'Holy Wares', 0, '{6746, 20}-{732, 100000}', '1369', 995, 0); diff --git a/Server/src/plugin/tutorial/TutorialCompletionDialogue.java b/Server/src/plugin/tutorial/TutorialCompletionDialogue.java index 4e08b19f0..ca2e41285 100644 --- a/Server/src/plugin/tutorial/TutorialCompletionDialogue.java +++ b/Server/src/plugin/tutorial/TutorialCompletionDialogue.java @@ -244,7 +244,6 @@ public class TutorialCompletionDialogue extends DialoguePlugin { player.getInterfaceManager().setViewedTab(3); player.removeAttribute("tut-island:hi_slot"); HintIconManager.removeHintIcon(player, slot); - HintIconManager.registerHintIcon(player, Repository.findNPC(Location.create(3168, 3481, 0))); end(); break; case 7: