diff --git a/game/data/configs/account_limit_exceptions.conf b/game/data/configs/account_limit_exceptions.conf new file mode 100644 index 0000000..c412ca2 --- /dev/null +++ b/game/data/configs/account_limit_exceptions.conf @@ -0,0 +1,2 @@ +[exceptions] +"127.0.0.1" = 5 \ No newline at end of file diff --git a/game/data/configs/door_configs.json b/game/data/configs/door_configs.json index 21568f8..37011ac 100644 --- a/game/data/configs/door_configs.json +++ b/game/data/configs/door_configs.json @@ -979,19 +979,19 @@ }, { "id": "4423", - "replaceId": "4429", + "replaceId": "4425", "fence": "false", "metal": "false" }, { "id": "4424", - "replaceId": "11382", + "replaceId": "4426", "fence": "false", "metal": "false" }, { "id": "4427", - "replaceId": "11380", + "replaceId": "4429", "fence": "false", "metal": "false" }, diff --git a/game/data/configs/drop_tables.json b/game/data/configs/drop_tables.json index 327dd82..ce2da38 100644 --- a/game/data/configs/drop_tables.json +++ b/game/data/configs/drop_tables.json @@ -1759,50 +1759,7 @@ "charm": [], "ids": "21", "description": "", - "main": [ - { - "minAmount": "200", - "weight": "105.0", - "id": "995", - "maxAmount": "300" - }, - { - "minAmount": "2", - "weight": "8.0", - "id": "560", - "maxAmount": "2" - }, - { - "minAmount": "1", - "weight": "6.0", - "id": "565", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5.0", - "id": "1993", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "2.0", - "id": "569", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "1.0", - "id": "1601", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "1.0", - "id": "444", - "maxAmount": "1" - } - ] + "main": [] }, { "default": [ @@ -3291,7 +3248,7 @@ } ], "charm": [], - "ids": "73,74,75,76,419,420,421,422,423,424,1826,2714,2863,2866,2869,2878,3622,4392,4393,4394,5293,5294,5295,5296,5297,5298,5299,5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331,5375,5376,5377,5378,5379,5380,5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,6099,6100,6131", + "ids": "73,74,75,419,420,421,422,423,424,1826,2714,2863,2866,2869,2878,3622,4392,4393,4394,5293,5294,5295,5296,5297,5298,5299,5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331,5375,5376,5377,5378,5379,5380,5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,6099,6100,6131", "description": "", "main": [ { @@ -22812,7 +22769,7 @@ { "minAmount": "1", "weight": "2.0", - "id": "4150", + "id": "4160", "maxAmount": "10" }, { @@ -27939,7 +27896,7 @@ "maxAmount": "1" } ], - "ids": "1832,5750", + "ids": "5750", "description": "", "main": [ { @@ -38439,7 +38396,7 @@ { "minAmount": "4", "weight": "25.0", - "id": "4150", + "id": "4160", "maxAmount": "5" }, { @@ -59901,5 +59858,350 @@ "ids": "1235", "description": "Pointed", "main": [] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "1019", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "180", + "description": "Old-Highwayman", + "main": [] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "837", + "description": "Shantay Guard", + "main": [] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "1019", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "2677", + "description": "New-Highwayman", + "main": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "995", + "maxAmount": "25" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "9141", + "maxAmount": "15" + }, + { + "minAmount": "1", + "weight": "23.0", + "id": "0", + "maxAmount": "1" + } + ] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "447,448,449,917", + "description": "Jail Guard", + "main": [] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "2337", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "48", + "description": "", + "main": [] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "76", + "description": "Entrana Zombie", + "main": [ + { + "minAmount": "1", + "weight": "4.0", + "id": "1139", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "1291", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "50.0", + "id": "1351", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "1349", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "4.0", + "id": "556", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "4.0", + "id": "882", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "561", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "14424", + "maxAmount": "1" + }, + { + "minAmount": "5", + "weight": "50.0", + "id": "313", + "maxAmount": "5" + }, + { + "minAmount": "18", + "weight": "3.0", + "id": "995", + "maxAmount": "18" + }, + { + "minAmount": "28", + "weight": "2.0", + "id": "995", + "maxAmount": "28" + }, + { + "minAmount": "1", + "weight": "7.0", + "id": "0", + "maxAmount": "1" + } + ] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "1993", + "description": "", + "main": [] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "532", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "6779", + "description": "", + "main": [ + { + "minAmount": "1", + "weight": "0.25", + "id": "10976", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "0.02", + "id": "10977", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "99.73", + "id": "0", + "maxAmount": "1" + } + ] + }, + { + "default": [], + "charm": [], + "ids": "1832", + "description": "Cave Bug (Level 6)", + "main": [ + { + "minAmount": "8", + "weight": "5.0", + "id": "555", + "maxAmount": "8" + }, + { + "minAmount": "1", + "weight": "5.0", + "id": "561", + "maxAmount": "1" + }, + { + "minAmount": "6", + "weight": "2.0", + "id": "557", + "maxAmount": "6" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "561", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "23.0", + "id": "14424", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "2.0", + "id": "235", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "2.0", + "id": "221", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "2.0", + "id": "223", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "225", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "231", + "maxAmount": "1" + }, + { + "minAmount": "3", + "weight": "8.0", + "id": "995", + "maxAmount": "3" + }, + { + "minAmount": "1", + "weight": "64.0", + "id": "0", + "maxAmount": "1" + }, + { + "minAmount": "8", + "weight": "3.0", + "id": "995", + "maxAmount": "8" + }, + { + "minAmount": "1", + "weight": "5.0", + "id": "36", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "3.0", + "id": "590", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "4527", + "maxAmount": "1" + } + ] } -] +] \ No newline at end of file diff --git a/game/data/configs/ground_spawns.json b/game/data/configs/ground_spawns.json index 2e765ce..bf5cde7 100644 --- a/game/data/configs/ground_spawns.json +++ b/game/data/configs/ground_spawns.json @@ -169,7 +169,7 @@ }, { "item_id": "590", - "loc_data": "{1,3112,3369,2,10485900}-{1,3209,3734,0,13107300}" + "loc_data": "{1,2368,3135,0,10485900}-{1,2431,3072,0,10485900}-{1,3112,3369,2,10485900}-{1,3209,3734,0,13107300}" }, { "item_id": "687", @@ -385,7 +385,11 @@ }, { "item_id": "1925", - "loc_data": "{1,3225,3294,0,6553680}-{1,3121,3359,0,6553660}-{1,3216,9625,0,6553680}-{1,3026,3289,0,6553680}-{1,2958,3510,0,6553680}-{1,3221,3497,1,6553680}-{1,2958,3510,0,6553680}-{1,3222,3491,1,6553680}-{1,3307,3195,0,5898270}-{1,1941,4956,0,5898270}" + "loc_data": "{1,2428,3079,0,6553680}-{1,2428,3080,0,6553680}-{1,2371,3128,0,6553680}-{1,2371,3127,0,6553680}-{1,3225,3294,0,6553680}-{1,3121,3359,0,6553660}-{1,3216,9625,0,6553680}-{1,3026,3289,0,6553680}-{1,2958,3510,0,6553680}-{1,3221,3497,1,6553680}-{1,2958,3510,0,6553680}-{1,3222,3491,1,6553680}-{1,3307,3195,0,5898270}-{1,1941,4956,0,5898270}" + }, + { + "item_id": "1927", + "loc_data": "{1,2685,3683,0,1966}" }, { "item_id": "1929", diff --git a/game/data/configs/interface_configs.json b/game/data/configs/interface_configs.json index bb3d221..e255f71 100644 --- a/game/data/configs/interface_configs.json +++ b/game/data/configs/interface_configs.json @@ -197,6 +197,12 @@ "walkable": "true", "tabIndex": "6" }, + { + "id": "195", + "interfaceType": "1", + "walkable": "true", + "tabIndex": "-1" + }, { "id": "198", "interfaceType": "1", diff --git a/game/data/configs/item_configs.json b/game/data/configs/item_configs.json index dbd54a1..97c1b7d 100644 --- a/game/data/configs/item_configs.json +++ b/game/data/configs/item_configs.json @@ -702,29 +702,33 @@ }, { "remove_head": "true", - "destroy_message": "I can borrow another from the armoury near the Fight Arena.", "shop_price": "10", "examine": "A helmet, as worn by the minions of General Khazard.", "durability": null, - "name": "Khazard helmet", "weight": "2.7", + "destroy": "true", + "equipment_slot": "0", + "destroy_message": "I can borrow another from the armoury near the Fight Arena.", + "name": "Khazard helmet", + "tradeable": "false", "archery_ticket_price": "0", "id": "74", - "bonuses": "0,0,0,0,0,4,5,3,0,0,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,0,0,4,5,3,0,0,0,0,0,0,0" }, { - "destroy_message": "I can borrow another from the armoury near the Fight Arena.", - "remove_sleeves": "true", "shop_price": "12", "examine": "Armour, as worn by the minions of General Khazard.", "durability": null, - "name": "Khazard armour", "weight": "0.5", + "destroy": "true", + "equipment_slot": "4", + "destroy_message": "I can borrow another from the armoury near the Fight Arena.", + "remove_sleeves": "true", + "name": "Khazard armour", + "tradeable": "false", "archery_ticket_price": "0", "id": "75", - "bonuses": "0,0,0,0,0,9,11,10,0,0,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,0,0,9,11,10,0,0,0,0,0,0,0" }, { "destroy_message": "The lazy guard probably has a spare set...", @@ -14113,6 +14117,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "8", + "attack_audios": "2498,2498,2497,2498", "name": "Iron axe", "tradeable": "true", "archery_ticket_price": "0", @@ -14141,6 +14146,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "44", + "attack_audios": "2498,2498,2497,2498", "name": "Bronze axe", "tradeable": "true", "archery_ticket_price": "0", @@ -14170,6 +14176,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "36", + "attack_audios": "2498,2498,2497,2498", "name": "Steel axe", "tradeable": "true", "archery_ticket_price": "0", @@ -14199,6 +14206,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "141", + "attack_audios": "2498,2498,2497,2498", "name": "Mithril axe", "tradeable": "true", "archery_ticket_price": "0", @@ -14228,6 +14236,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "592", + "attack_audios": "2498,2498,2497,2498", "name": "Adamant axe", "tradeable": "true", "archery_ticket_price": "0", @@ -14254,6 +14263,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "7495", + "attack_audios": "2498,2498,2497,2498", "name": "Rune axe", "tradeable": "true", "archery_ticket_price": "0", @@ -14282,6 +14292,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "335", + "attack_audios": "2498,2498,2497,2498", "name": "Black axe", "tradeable": "true", "archery_ticket_price": "0", @@ -14310,6 +14321,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "21", + "attack_audios": "2498,2498,2497,2498", "name": "Iron battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -14339,6 +14351,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "208", + "attack_audios": "2498,2498,2497,2498", "name": "Steel battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -14368,6 +14381,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "556", + "attack_audios": "2498,2498,2497,2498", "name": "Black battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -14397,6 +14411,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "809", + "attack_audios": "2498,2498,2497,2498", "name": "Mithril battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -14426,6 +14441,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "2311", + "attack_audios": "2498,2498,2497,2498", "name": "Adamant battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -14455,6 +14471,7 @@ "attack_anims": "395,395,401,395", "lendable": "true", "grand_exchange_price": "24800", + "attack_audios": "2498,2498,2497,2498", "name": "Rune battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -14483,6 +14500,7 @@ "equipment_slot": "3", "attack_anims": "395,395,401,395", "grand_exchange_price": "15", + "attack_audios": "2498,2498,2497,2498", "name": "Bronze battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -14514,6 +14532,7 @@ "attack_anims": "395,395,401,395", "lendable": "true", "grand_exchange_price": "123200", + "attack_audios": "2498,2498,2497,2498", "name": "Dragon battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -34888,7 +34907,7 @@ "equipment_slot": "3" }, { - "examine": "This will teleport me to Rellekka when I play it. A musical intrument that I can magically play.", + "examine": "A musical intrument that I can magically play.", "durability": null, "name": "Lyre", "weight": "1.8", @@ -34897,7 +34916,7 @@ "equipment_slot": "3" }, { - "examine": "This will teleport me to Rellekka when I play it. A musical intrument that I can magically play.", + "examine": "This will teleport me to Rellekka when I play it.", "durability": null, "name": "Enchanted lyre", "weight": "1.8", @@ -34906,7 +34925,7 @@ "equipment_slot": "3" }, { - "examine": "This will teleport me to Rellekka when I play it. A musical intrument that I can magically play.", + "examine": "This will teleport me to Rellekka when I play it.", "durability": null, "name": "Enchanted lyre(1)", "weight": "1.8", @@ -36878,7 +36897,8 @@ "archery_ticket_price": "0", "id": "4068", "stand_turn_anim": "823", - "bonuses": "13,18,-2,0,0,0,3,2,0,0,0,16,0,0,0" + "bonuses": "13,18,-2,0,0,0,3,2,0,0,0,16,0,0,0", + "castle_wars_ticket_price": "5" }, { "remove_sleeves": "true", @@ -36888,7 +36908,8 @@ "archery_ticket_price": "0", "id": "4069", "bonuses": "0,0,0,-30,-10,32,31,24,-6,31,5,0,0,0,0", - "equipment_slot": "4" + "equipment_slot": "4", + "castle_wars_ticket_price": "8" }, { "requirements": "{1,5}", @@ -36897,7 +36918,8 @@ "archery_ticket_price": "0", "id": "4070", "bonuses": "0,0,0,-21,-7,17,16,15,-4,16,2,0,0,0,0", - "equipment_slot": "7" + "equipment_slot": "7", + "castle_wars_ticket_price": "6" }, { "remove_head": "true", @@ -36910,7 +36932,8 @@ "archery_ticket_price": "0", "id": "4071", "bonuses": "0,0,0,-3,-1,7,8,6,-1,7,3,0,0,0,0", - "equipment_slot": "0" + "equipment_slot": "0", + "castle_wars_ticket_price": "4" }, { "requirements": "{1,5}", @@ -36921,7 +36944,8 @@ "archery_ticket_price": "0", "id": "4072", "bonuses": "0,0,0,-8,-2,13,15,14,-1,14,5,0,0,0,0", - "equipment_slot": "5" + "equipment_slot": "5", + "castle_wars_ticket_price": "6" }, { "examine": "Not so useful for lighting a fire.", @@ -41170,7 +41194,8 @@ "archery_ticket_price": "0", "id": "4503", "stand_turn_anim": "823", - "bonuses": "15,20,-2,0,0,0,3,2,0,0,0,22,0,0,0" + "bonuses": "15,20,-2,0,0,0,3,2,0,0,0,22,0,0,0", + "castle_wars_ticket_price": "50" }, { "remove_sleeves": "true", @@ -41180,7 +41205,8 @@ "archery_ticket_price": "0", "id": "4504", "bonuses": "0,0,0,-30,-10,46,44,38,-6,44,20,0,0,0,0", - "equipment_slot": "4" + "equipment_slot": "4", + "castle_wars_ticket_price": "80" }, { "requirements": "{1,20}", @@ -41189,7 +41215,8 @@ "archery_ticket_price": "0", "id": "4505", "bonuses": "0,0,0,-21,-7,24,22,20,-4,22,5,0,0,0,0", - "equipment_slot": "7" + "equipment_slot": "7", + "castle_wars_ticket_price": "60" }, { "remove_head": "true", @@ -41202,7 +41229,8 @@ "archery_ticket_price": "0", "id": "4506", "bonuses": "0,0,0,-3,-1,10,11,9,-1,10,5,0,0,0,0", - "equipment_slot": "0" + "equipment_slot": "0", + "castle_wars_ticket_price": "40" }, { "requirements": "{1,20}", @@ -41213,7 +41241,8 @@ "archery_ticket_price": "0", "id": "4507", "bonuses": "0,0,0,-8,-2,18,22,20,-1,20,20,0,0,0,0", - "equipment_slot": "5" + "equipment_slot": "5", + "castle_wars_ticket_price": "60" }, { "requirements": "{0,30}", @@ -41236,7 +41265,8 @@ "archery_ticket_price": "0", "id": "4508", "stand_turn_anim": "823", - "bonuses": "20,29,-2,0,0,0,3,2,0,0,0,31,0,0,0" + "bonuses": "20,29,-2,0,0,0,3,2,0,0,0,31,0,0,0", + "castle_wars_ticket_price": "500" }, { "remove_sleeves": "true", @@ -41246,7 +41276,8 @@ "archery_ticket_price": "0", "id": "4509", "bonuses": "0,0,0,-30,-10,65,63,55,-6,63,30,0,0,0,0", - "equipment_slot": "4" + "equipment_slot": "4", + "castle_wars_ticket_price": "800" }, { "requirements": "{1,30}", @@ -41255,7 +41286,8 @@ "archery_ticket_price": "0", "id": "4510", "bonuses": "0,0,0,-21,-7,33,31,29,-4,31,10,0,0,0,0", - "equipment_slot": "7" + "equipment_slot": "7", + "castle_wars_ticket_price": "600" }, { "remove_head": "true", @@ -41268,7 +41300,8 @@ "archery_ticket_price": "0", "id": "4511", "bonuses": "0,0,0,-3,-1,14,15,13,-1,14,6,0,0,0,0", - "equipment_slot": "0" + "equipment_slot": "0", + "castle_wars_ticket_price": "400" }, { "requirements": "{1,30}", @@ -41279,7 +41312,8 @@ "archery_ticket_price": "0", "id": "4512", "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,30,0,0,0,0", - "equipment_slot": "5" + "equipment_slot": "5", + "castle_wars_ticket_price": "600" }, { "remove_head": "true", @@ -41288,7 +41322,8 @@ "archery_ticket_price": "0", "id": "4513", "bonuses": "0,0,0,0,0,0,1,2,0,1,0,0,0,0,0", - "equipment_slot": "0" + "equipment_slot": "0", + "castle_wars_ticket_price": "10" }, { "durability": null, @@ -41296,7 +41331,8 @@ "archery_ticket_price": "0", "id": "4514", "bonuses": "0,0,0,0,0,0,1,1,0,2,0,0,0,0,0", - "equipment_slot": "1" + "equipment_slot": "1", + "castle_wars_ticket_price": "10" }, { "remove_head": "true", @@ -41305,7 +41341,8 @@ "archery_ticket_price": "0", "id": "4515", "bonuses": "0,0,0,0,0,0,1,2,0,1,0,0,0,0,0", - "equipment_slot": "0" + "equipment_slot": "0", + "castle_wars_ticket_price": "10" }, { "durability": null, @@ -41313,7 +41350,8 @@ "archery_ticket_price": "0", "id": "4516", "bonuses": "0,0,0,0,0,0,1,1,0,2,0,0,0,0,0", - "equipment_slot": "1" + "equipment_slot": "1", + "castle_wars_ticket_price": "10" }, { "ge_buy_limit": "1000", @@ -55462,7 +55500,7 @@ "id": "6124" }, { - "examine": "This will teleport me to Rellekka when I play it. A musical intrument that I can magically play.", + "examine": "This will teleport me to Rellekka when I play it.", "durability": null, "name": "Enchanted lyre(2)", "weight": "1.8", @@ -55471,7 +55509,7 @@ "equipment_slot": "3" }, { - "examine": "This will teleport me to Rellekka when I play it. A musical intrument that I can magically play.", + "examine": "This will teleport me to Rellekka when I play it.", "durability": null, "name": "Enchanted lyre(3)", "weight": "1.8", @@ -55480,7 +55518,7 @@ "equipment_slot": "3" }, { - "examine": "This will teleport me to Rellekka when I play it. A musical intrument that I can magically play.", + "examine": "This will teleport me to Rellekka when I play it.", "durability": null, "name": "Enchanted lyre(4)", "weight": "1.8", @@ -59554,8 +59592,9 @@ "render_anim": "2586", "defence_anim": "397", "equipment_slot": "3", - "attack_anims": "395,395,395,395", + "attack_anims": "395,395,401,395", "grand_exchange_price": "1459", + "attack_audios": "2498,2498,2497,2498", "name": "White battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -61131,6 +61170,7 @@ "equipment_slot": "3", "attack_anims": "395,395,395,395", "grand_exchange_price": "813100", + "attack_audios": "2498,2498,2497,2498", "name": "Dragon axe", "tradeable": "true", "archery_ticket_price": "0", @@ -66679,7 +66719,7 @@ "bonuses": "0,0,0,15,0,0,0,0,15,0,15,0,0,0,0" }, { - "requirements": "{1,40}-{6,20}", + "requirements": "{1,20}-{6,40}", "ge_buy_limit": "2", "examine": "Enchanted Wizards robes.", "durability": null, @@ -70342,9 +70382,10 @@ "equipment_slot": "3" }, { - "attack_anims": "395,395,395,395", + "attack_anims": "395,395,401,395", "examine": "A heavy duty axe.", "durability": null, + "attack_audios": "2498,2498,2497,2498", "name": "Anger battleaxe", "archery_ticket_price": "0", "id": "7807", @@ -81503,6 +81544,7 @@ "defence_anim": "397", "equipment_slot": "3", "attack_anims": "381,390,390,390", + "attack_audios": "2500,2500,2517,2500", "name": "Training sword", "archery_ticket_price": "0", "id": "9703", @@ -85597,7 +85639,9 @@ "destroy": "true", "weight": "4", "weapon_interface": "21", + "equip_audio": "732", "render_anim": "1277", + "attack_audios": "740,735,736,0", "name": "Orange salamander" }, { @@ -85624,60 +85668,66 @@ "destroy": "true", "weight": "4", "weapon_interface": "21", + "equip_audio": "732", "render_anim": "1277", + "attack_audios": "740,735,736,0", "name": "Red salamander" }, { - "requirements": "{0,70}-{4,70}-{6,70}", "ge_buy_limit": "1000", "turn90cw_anim": "5245", "examine": "Slightly slimy and somewhat menacing.", "walk_anim": "5245", - "durability": null, - "destroy": "true", - "weight": "4", "turn90ccw_anim": "5245", "attack_speed": "5", "two_handed": "true", - "weapon_interface": "21", "turn180_anim": "5245", - "render_anim": "1277", "equipment_slot": "3", "grand_exchange_price": "124", "stand_anim": "5246", "tradeable": "true", - "name": "Black salamander", "run_anim": "824", "archery_ticket_price": "0", "id": "10148", "stand_turn_anim": "823", - "bonuses": "0,59,0,0,69,0,0,0,0,0,0,71,0,0,0" + "bonuses": "0,59,0,0,69,0,0,0,0,0,0,71,0,0,0", + "requirements": "{0,70}-{4,70}-{6,70}", + "durability": null, + "destroy": "true", + "weight": "4", + "weapon_interface": "21", + "equip_audio": "732", + "render_anim": "1277", + "attack_audios": "740,735,736,0", + "name": "Black salamander" }, { - "requirements": "{0,30}-{4,30}-{6,30}", "ge_buy_limit": "2000", "turn90cw_anim": "5245", "examine": "A very slimy and generally disgusting green lizard.", "walk_anim": "5245", - "durability": null, - "destroy": "true", - "weight": "4", "turn90ccw_anim": "5245", "attack_speed": "5", "two_handed": "true", - "weapon_interface": "21", "turn180_anim": "5245", - "render_anim": "1277", "equipment_slot": "3", "grand_exchange_price": "1802", "stand_anim": "5246", "tradeable": "true", - "name": "Swamp lizard", "run_anim": "824", "archery_ticket_price": "0", "id": "10149", "stand_turn_anim": "823", - "bonuses": "0,10,0,0,20,0,0,0,0,0,0,22,0,0,0" + "bonuses": "0,10,0,0,20,0,0,0,0,0,0,22,0,0,0", + "requirements": "{0,30}-{4,30}-{6,30}", + "durability": null, + "destroy": "true", + "weight": "4", + "weapon_interface": "21", + "equip_audio": "732", + "render_anim": "1277", + "attack_audios": "740,735,736,0", + "name": "Swamp lizard" }, { "shop_price": "4", @@ -88707,28 +88757,31 @@ "id": "10439" }, { - "requirements": "{5,60}", "ge_buy_limit": "2", "turn90cw_anim": "1207", "examine": "A Saradomin crozier.", "walk_anim": "1205", - "durability": null, - "weight": "2", "turn90ccw_anim": "1208", "attack_speed": "5", - "weapon_interface": "1", "turn180_anim": "1206", - "render_anim": "28", + "defence_anim": "420", "equipment_slot": "3", + "attack_anims": "419,419,419,419", "grand_exchange_price": "8611", "stand_anim": "813", - "name": "Saradomin crozier", "tradeable": "true", "run_anim": "1210", "archery_ticket_price": "0", "id": "10440", "stand_turn_anim": "1209", - "bonuses": "7,-1,25,10,0,2,3,1,10,0,0,32,6,0,0" + "bonuses": "7,-1,25,10,0,2,3,1,10,0,0,32,6,0,0", + "requirements": "{5,60}", + "durability": null, + "weight": "2", + "weapon_interface": "1", + "render_anim": "28", + "attack_audios": "2555,0,0,0", + "name": "Saradomin crozier" }, { "ge_buy_limit": "2", @@ -88740,28 +88793,31 @@ "id": "10441" }, { - "requirements": "{5,60}", "ge_buy_limit": "2", "turn90cw_anim": "1207", "examine": "A Guthix crozier.", "walk_anim": "1205", - "durability": null, - "weight": "2", "turn90ccw_anim": "1208", "attack_speed": "5", - "weapon_interface": "1", "turn180_anim": "1206", - "render_anim": "28", + "defence_anim": "420", "equipment_slot": "3", + "attack_anims": "419,419,419,419", "grand_exchange_price": "2925", "stand_anim": "813", - "name": "Guthix crozier", "tradeable": "true", "run_anim": "1210", "archery_ticket_price": "0", "id": "10442", "stand_turn_anim": "1209", - "bonuses": "7,-1,25,10,0,2,3,1,10,0,0,32,6,0,0" + "bonuses": "7,-1,25,10,0,2,3,1,10,0,0,32,6,0,0", + "requirements": "{5,60}", + "durability": null, + "weight": "2", + "weapon_interface": "1", + "render_anim": "28", + "attack_audios": "2555,0,0,0", + "name": "Guthix crozier" }, { "ge_buy_limit": "2", @@ -88773,30 +88829,34 @@ "id": "10443" }, { - "requirements": "{5,60}", "ge_buy_limit": "2", "turn90cw_anim": "1207", "examine": "A Zamorak crozier.", "walk_anim": "1205", - "durability": null, - "weight": "2", "turn90ccw_anim": "1208", "attack_speed": "5", - "weapon_interface": "1", "turn180_anim": "1206", - "render_anim": "28", + "defence_anim": "420", "equipment_slot": "3", + "attack_anims": "419,419,419,419", "grand_exchange_price": "2794", "stand_anim": "813", - "name": "Zamorak crozier", "tradeable": "true", "run_anim": "1210", "archery_ticket_price": "0", "id": "10444", "stand_turn_anim": "1209", - "bonuses": "7,-1,25,10,0,2,3,1,10,0,0,32,6,0,0" + "bonuses": "7,-1,25,10,0,2,3,1,10,0,0,32,6,0,0", + "requirements": "{5,60}", + "durability": null, + "weight": "2", + "weapon_interface": "1", + "render_anim": "28", + "attack_audios": "2555,0,0,0", + "name": "Zamorak crozier" }, { + "attack_anims": "", "ge_buy_limit": "2", "grand_exchange_price": "2794", "durability": null, @@ -90987,6 +91047,7 @@ "equipment_slot": "1" }, { + "requirements": "{1,10}", "examine": "A black kitesheild with a heraldic design.", "grand_exchange_price": "15249", "durability": null, @@ -91000,17 +91061,19 @@ "equipment_slot": "5" }, { + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "A shield with a heraldic design.", - "grand_exchange_price": "16339", "durability": null, + "weight": "5", + "absorb": "3,0,6", + "equipment_slot": "5", + "grand_exchange_price": "16339", "name": "Adamant shield(h1)", "tradeable": "true", - "weight": "5", "archery_ticket_price": "0", "id": "10666", - "absorb": "3,0,6", - "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0", - "equipment_slot": "5" + "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0" }, { "requirements": "{1,40}", @@ -91027,6 +91090,7 @@ "equipment_slot": "5" }, { + "requirements": "{1,10}", "examine": "A black kiteshield with a heraldic design.", "grand_exchange_price": "9751", "durability": null, @@ -91040,17 +91104,19 @@ "equipment_slot": "5" }, { + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "A shield with a heraldic design.", - "grand_exchange_price": "3353", "durability": null, + "weight": "5", + "absorb": "3,0,6", + "equipment_slot": "5", + "grand_exchange_price": "3353", "name": "Adamant shield(h2)", "tradeable": "true", - "weight": "5", "archery_ticket_price": "0", "id": "10669", - "absorb": "3,0,6", - "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0", - "equipment_slot": "5" + "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0" }, { "requirements": "{1,40}", @@ -91067,6 +91133,7 @@ "equipment_slot": "5" }, { + "requirements": "{1,10}", "examine": "A black shield with a heraldic design.", "grand_exchange_price": "6791", "durability": null, @@ -91080,17 +91147,19 @@ "equipment_slot": "5" }, { + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "A shield with a heraldic design.", - "grand_exchange_price": "5566", "durability": null, + "weight": "5", + "absorb": "3,0,6", + "equipment_slot": "5", + "grand_exchange_price": "5566", "name": "Adamant shield(h3)", "tradeable": "true", - "weight": "5", "archery_ticket_price": "0", "id": "10672", - "absorb": "3,0,6", - "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0", - "equipment_slot": "5" + "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0" }, { "requirements": "{1,40}", @@ -91107,6 +91176,7 @@ "equipment_slot": "5" }, { + "requirements": "{1,10}", "examine": "A black shield with a heraldic design.", "grand_exchange_price": "5159", "durability": null, @@ -91120,17 +91190,19 @@ "equipment_slot": "5" }, { + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "A shield with a heraldic design.", - "grand_exchange_price": "3219", "durability": null, + "weight": "5", + "absorb": "3,0,6", + "equipment_slot": "5", + "grand_exchange_price": "3219", "name": "Adamant shield(h4)", "tradeable": "true", - "weight": "5", "archery_ticket_price": "0", "id": "10675", - "absorb": "3,0,6", - "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0", - "equipment_slot": "5" + "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0" }, { "requirements": "{1,40}", @@ -91147,6 +91219,7 @@ "equipment_slot": "5" }, { + "requirements": "{1,10}", "examine": "A black shield with a heraldic design.", "grand_exchange_price": "8451", "durability": null, @@ -91160,17 +91233,19 @@ "equipment_slot": "5" }, { + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "A shield with a heraldic design.", - "grand_exchange_price": "5905", "durability": null, + "weight": "5", + "absorb": "3,0,6", + "equipment_slot": "5", + "grand_exchange_price": "5905", "name": "Adamant shield(h5)", "tradeable": "true", - "weight": "5", "archery_ticket_price": "0", "id": "10678", - "absorb": "3,0,6", - "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0", - "equipment_slot": "5" + "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,0,0,0,0,0" }, { "requirements": "{1,40}", @@ -91269,18 +91344,19 @@ "equipment_slot": "4" }, { - "remove_sleeves": "true", + "requirements": "{1,20}-{6,40}", "examine": "Enchanted Wizards robes.", - "grand_exchange_price": "72800", "durability": null, + "weight": "1", + "absorb": "3,1,0", + "equipment_slot": "4", + "remove_sleeves": "true", + "grand_exchange_price": "72800", "name": "Enchanted top", "tradeable": "true", - "weight": "1", "archery_ticket_price": "0", "id": "10688", - "absorb": "3,1,0", - "bonuses": "0,0,0,20,0,0,0,0,20,0,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,20,0,0,0,0,20,0,20,0,0,0,0" }, { "lendable": "true", @@ -91296,32 +91372,34 @@ "equipment_slot": "10" }, { - "remove_sleeves": "true", + "requirements": "{1,10}", "examine": "Black platebody with trim.", - "grand_exchange_price": "90744", "durability": null, + "weight": "9.07", + "absorb": "1,0,2", + "equipment_slot": "4", + "remove_sleeves": "true", + "grand_exchange_price": "90744", "name": "Black platebody (t)", "tradeable": "true", - "weight": "9.07", "archery_ticket_price": "0", "id": "10690", - "absorb": "1,0,2", - "bonuses": "0,0,0,-30,-10,41,40,30,-6,40,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,-30,-10,41,40,30,-6,40,0,0,0,0,0" }, { - "remove_sleeves": "true", + "requirements": "{1,10}", "examine": "Black platebody with gold trim.", - "grand_exchange_price": "230800", "durability": null, + "weight": "9.07", + "absorb": "1,0,2", + "equipment_slot": "4", + "remove_sleeves": "true", + "grand_exchange_price": "230800", "name": "Black platebody (g)", "tradeable": "true", - "weight": "9.07", "archery_ticket_price": "0", "id": "10691", - "absorb": "1,0,2", - "bonuses": "0,0,0,-30,-10,41,40,30,-6,40,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,-30,-10,41,40,30,-6,40,0,0,0,0,0" }, { "lendable": "true", @@ -91384,35 +91462,40 @@ "equipment_slot": "10" }, { - "remove_sleeves": "true", + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "Adamant platebody with trim.", - "grand_exchange_price": "79300", "durability": null, + "weight": "9.07", + "absorb": "2,0,4", + "equipment_slot": "4", + "remove_sleeves": "true", + "grand_exchange_price": "79300", "name": "Adam platebody (t)", "tradeable": "true", - "weight": "9.07", "archery_ticket_price": "0", "id": "10697", - "absorb": "2,0,4", - "bonuses": "0,0,0,-30,-10,65,63,55,-6,63,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,-30,-10,65,63,55,-6,63,0,0,0,0,0" }, { - "remove_sleeves": "true", + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "Adamant platebody with gold trim.", - "grand_exchange_price": "207912", "durability": null, + "weight": "9.07", + "absorb": "2,0,4", + "equipment_slot": "4", + "remove_sleeves": "true", + "grand_exchange_price": "207912", "name": "Adam platebody (g)", "tradeable": "true", - "weight": "9.07", "archery_ticket_price": "0", "id": "10698", - "absorb": "2,0,4", - "bonuses": "0,0,0,-30,-10,65,63,55,-6,63,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,-30,-10,65,63,55,-6,63,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,10}", "examine": "A black helmet with a heraldic design.", "grand_exchange_price": "22022", "durability": null, @@ -91426,6 +91509,7 @@ }, { "remove_head": "true", + "requirements": "{1,10}", "examine": "A black helmet with a heraldic design.", "grand_exchange_price": "11700", "durability": null, @@ -91439,6 +91523,7 @@ }, { "remove_head": "true", + "requirements": "{1,10}", "examine": "A black helmet with a heraldic design.", "grand_exchange_price": "10424", "durability": null, @@ -91452,6 +91537,7 @@ }, { "remove_head": "true", + "requirements": "{1,10}", "examine": "A black helmet with a heraldic design.", "grand_exchange_price": "12717", "durability": null, @@ -91465,6 +91551,7 @@ }, { "remove_head": "true", + "requirements": "{1,10}", "examine": "A black helmet with a heraldic design.", "grand_exchange_price": "17852", "durability": null, @@ -91547,73 +91634,83 @@ }, { "remove_head": "true", + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "An adamant helmet with a heraldic design.", - "grand_exchange_price": "28407", "durability": null, + "weight": "3", + "absorb": "1,0,2", + "equipment_slot": "0", + "grand_exchange_price": "28407", "name": "Adamant helm (h1)", "tradeable": "true", - "weight": "3", "archery_ticket_price": "0", "id": "10709", - "absorb": "1,0,2", - "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "An adamant helmet with a heraldic design.", - "grand_exchange_price": "9839", "durability": null, + "weight": "3", + "absorb": "1,0,2", + "equipment_slot": "0", + "grand_exchange_price": "9839", "name": "Adamant helm (h2)", "tradeable": "true", - "weight": "3", "archery_ticket_price": "0", "id": "10710", - "absorb": "1,0,2", - "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "An adamant helmet with a heraldic design.", - "grand_exchange_price": "8485", "durability": null, + "weight": "3", + "absorb": "1,0,2", + "equipment_slot": "0", + "grand_exchange_price": "8485", "name": "Adamant helm (h3)", "tradeable": "true", - "weight": "3", "archery_ticket_price": "0", "id": "10711", - "absorb": "1,0,2", - "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "An Adamant helmet with a heraldic design.", - "grand_exchange_price": "10774", "durability": null, + "weight": "3", + "absorb": "1,0,2", + "equipment_slot": "0", + "grand_exchange_price": "10774", "name": "Adamant helm (h4)", "tradeable": "true", - "weight": "3", "archery_ticket_price": "0", "id": "10712", - "absorb": "1,0,2", - "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,30}", + "ge_buy_limit": "2", "examine": "An adamant helmet with a heraldic design.", - "grand_exchange_price": "17390", "durability": null, + "weight": "3", + "absorb": "1,0,2", + "equipment_slot": "0", + "grand_exchange_price": "17390", "name": "Adamant helm (h5)", "tradeable": "true", - "weight": "3", "archery_ticket_price": "0", "id": "10713", - "absorb": "1,0,2", - "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,0,0,0,0,0" }, { "remove_sleeves": "true", @@ -108828,108 +108925,128 @@ "id": "12855" }, { + "requirements": "{15,50}", "destroy_message": "You can reclaim this item from the place you found it.", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, "name": "Irit gloves", + "tradeable": "false", "archery_ticket_price": "0", "id": "12856", "equipment_slot": "9" }, { + "requirements": "{15,60}", "destroy_message": "You can reclaim this item from the place you found it.", "shop_price": "100", "examine": "A pair of mystical gloves.", "durability": null, "name": "Avantoe gloves", + "tradeable": "false", "archery_ticket_price": "0", "id": "12857", "equipment_slot": "9" }, { + "requirements": "{15,70}", "destroy_message": "You can reclaim this item from the place you found it.", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, "name": "Kwuarm gloves", + "tradeable": "false", "archery_ticket_price": "0", "id": "12858", "equipment_slot": "9" }, { + "requirements": "{15,80}", "destroy_message": "You can reclaim this item from the place you found it.", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, "name": "Cadantine gloves", + "tradeable": "false", "archery_ticket_price": "0", "id": "12859", "equipment_slot": "9" }, { + "requirements": "{10,65}", "destroy_message": "You can reclaim this item from the place you found it.", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, "name": "Swordfish gloves", - "weight": "0.2", + "tradeable": "false", + "weight": "1", "archery_ticket_price": "0", "id": "12860", "equipment_slot": "9" }, { + "requirements": "{10,90}", "destroy_message": "You can reclaim this item from the place you found it.", "shop_price": "200", "examine": "A pair of mystical gloves", "durability": null, "name": "Shark gloves", + "tradeable": "false", "weight": "1", "archery_ticket_price": "0", "id": "12861", "equipment_slot": "9" }, { + "requirements": "{18,70}", "destroy_message": "You can reclaim this item from the place you found it.", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, "name": "Dragon slayer gloves", + "tradeable": "false", "archery_ticket_price": "0", "id": "12862", "equipment_slot": "9" }, { + "requirements": "{20,10}", "destroy_message": "You can buy a new pair from the druids at the Fist of Guthix activity.", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, "name": "Air runecrafting gloves", "tradeable": "false", + "weight": "1", "destroy": "true", "archery_ticket_price": "0", "id": "12863", "equipment_slot": "9" }, { + "requirements": "{20,20}", "destroy_message": "You can buy a new pair from the druids at the Fist of Guthix activity.", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, "name": "Water runecrafting gloves", "tradeable": "false", + "weight": "1", "destroy": "true", "archery_ticket_price": "0", "id": "12864", "equipment_slot": "9" }, { + "requirements": "{20,30}", "destroy_message": "You can buy a new pair from the druids at the Fist of Guthix minigame.", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, "name": "Earth runecrafting gloves", "tradeable": "false", + "weight": "1", "destroy": "true", "archery_ticket_price": "0", "id": "12865", @@ -115828,8 +115945,8 @@ "bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" }, { - "destroy_message": "You can get another of these from Doric.", - "examine": "Doric's instructions for the task he gave you.", + "destroy_message": "You can get another by talking about jobs with citizens and tutors around Lumbridge.", + "examine": "This reminds me of my current job and who set me to the task.", "durability": null, "name": "Task list", "tradeable": "false", @@ -115968,10 +116085,11 @@ "absorb": "0,0,0", "render_anim": "2586", "defence_anim": "397", - "attack_anims": "395,395,395,395", + "attack_anims": "395,395,401,395", "lendable": "true", "destroy_message": "Drop", "grand_exchange_price": "123019", + "attack_audios": "2498,2498,2497,2498", "name": "Dragon battleaxe", "archery_ticket_price": "0", "id": "13472", @@ -123114,9 +123232,10 @@ "render_anim": "2586", "defence_anim": "397", "equipment_slot": "3", - "attack_anims": "395,395,395,395", + "attack_anims": "395,395,401,395", "destroy_message": "Drop", "grand_exchange_price": "332229", + "attack_audios": "2498,2498,2497,2498", "name": "Corrupt dragon battleaxe", "archery_ticket_price": "0", "id": "13973", @@ -123132,9 +123251,10 @@ "attack_speed": "4", "render_anim": "2586", "defence_anim": "397", - "attack_anims": "395,395,395,395", + "attack_anims": "395,395,401,395", "destroy_message": "Drop", "grand_exchange_price": "332229", + "attack_audios": "2498,2498,2497,2498", "name": "Corrupt dragon battleaxe", "tradeable": "true", "archery_ticket_price": "0", @@ -123154,9 +123274,10 @@ "render_anim": "2586", "defence_anim": "397", "equipment_slot": "3", - "attack_anims": "395,395,395,395", + "attack_anims": "395,395,401,395", "destroy_message": "Drop", "grand_exchange_price": "332229", + "attack_audios": "2498,2498,2497,2498", "name": "C. dragon battleaxe (deg)", "archery_ticket_price": "0", "id": "13975", @@ -129864,7 +129985,7 @@ { "destroy_message": "Drop", "shop_price": "1000", - "examine": "This will teleport me to Rellekka when I play it. ", + "examine": "This will teleport me to Rellekka when I play it.", "durability": null, "name": "Enchanted lyre(5)", "destroy": "true", @@ -129878,7 +129999,7 @@ { "destroy_message": "Drop", "shop_price": "1000", - "examine": "This will teleport me to Rellekka when I play it. ", + "examine": "This will teleport me to Rellekka when I play it.", "durability": null, "name": "Enchanted lyre(6)", "destroy": "true", diff --git a/game/data/configs/music_configs.json b/game/data/configs/music_configs.json index 1fb75f1..8994bce 100644 --- a/game/data/configs/music_configs.json +++ b/game/data/configs/music_configs.json @@ -1437,6 +1437,10 @@ "id": "532", "borders": "{1984,4416,2047,4479}" }, + { + "id": "537", + "borders": "{1856,5185,1917,5246}" + }, { "id": "542", "borders": "{3072,9280,3135,9343}" @@ -1449,6 +1453,18 @@ "id": "555", "borders": "" }, + { + "id": "558", + "borders": "{1985,5185,2047,5247}" + }, + { + "id": "559", + "borders": "{2116,5247,2172,5308}" + }, + { + "id": "560", + "borders": "{2305,5186,2366,5247}" + }, { "id": "569", "borders": "{3200,9984,3263,10047}" diff --git a/game/data/configs/npc_configs.json b/game/data/configs/npc_configs.json index b9b0197..c6a8990 100644 --- a/game/data/configs/npc_configs.json +++ b/game/data/configs/npc_configs.json @@ -182,15 +182,15 @@ }, { "examine": "He tries to keep order around here.", - "melee_animation": "284", + "melee_animation": "400", "range_animation": "0", "combat_audio": "511,513,512", "attack_speed": "4", "respawn_delay": "60", - "defence_animation": "285", + "defence_animation": "404", "weakness": "9", "magic_animation": "0", - "death_animation": "287", + "death_animation": "836", "name": "Guard", "defence_level": "13", "safespot": null, @@ -2157,17 +2157,19 @@ }, { "examine": "An aggressive humanoid.", + "slayer_task": "64", "melee_animation": "128", "range_animation": "128", "attack_speed": "5", "defence_animation": "129", + "weakness": "7", "magic_animation": "128", "death_animation": "131", "name": "Jogre", "defence_level": "41", "safespot": null, "lifepoints": "50", - "strength_level": "1", + "strength_level": "36", "id": "113", "aggressive": "true", "clue_level": "1", @@ -2176,12 +2178,14 @@ }, { "examine": "Big, ugly, and smelly.", + "slayer_task": "64", "melee_animation": "359", "range_animation": "359", "attack_speed": "6", "magic_level": "27", "respawn_delay": "25", "defence_animation": "360", + "slayer_exp": "", "magic_animation": "359", "death_animation": "361", "name": "Mogre", @@ -3102,6 +3106,7 @@ "examine": "He jumps out and attacks people.", "melee_animation": "422", "range_animation": "0", + "combat_audio": "511,513,512", "respawn_delay": "60", "defence_animation": "0", "weakness": "9", @@ -4002,44 +4007,53 @@ "attack_level": "1" }, { - "examine": "He's guarding the door.", - "melee_animation": "0", + "examine": "It's one of General Khazard's guards.", + "melee_animation": "395", "range_animation": "0", - "defence_animation": "0", + "combat_audio": "511,513,512", + "attack_speed": "6", + "respawn_delay": "60", + "defence_animation": "397", + "weakness": "6", "magic_animation": "0", - "death_animation": "0", + "death_animation": "836", "name": "Khazard Guard", - "defence_level": "1", + "defence_level": "22", "safespot": null, - "lifepoints": "10", - "strength_level": "1", + "lifepoints": "31", + "strength_level": "22", "id": "253", "range_level": "1", - "attack_level": "1" + "attack_level": "22" }, { "examine": "He's been guarding the tavern for a bit too long.", - "melee_animation": "0", + "melee_animation": "395", "range_animation": "0", - "defence_animation": "0", + "combat_audio": "511,513,512", + "attack_speed": "6", + "respawn_delay": "60", + "defence_animation": "397", + "weakness": "6", "magic_animation": "0", - "death_animation": "0", + "death_animation": "836", "name": "Khazard Guard", - "defence_level": "1", + "defence_level": "22", "safespot": null, - "lifepoints": "10", - "strength_level": "1", + "lifepoints": "31", + "strength_level": "22", "id": "254", "range_level": "1", - "attack_level": "1" + "attack_level": "22" }, { "examine": "His armour indicates he's a Khazard Guard.", "melee_animation": "395", "range_animation": "0", + "combat_audio": "511,513,512", "attack_speed": "6", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "397", "weakness": "6", "magic_animation": "0", "death_animation": "836", @@ -4056,9 +4070,10 @@ "examine": "His armour indicates he's a Khazard Guard.", "melee_animation": "395", "range_animation": "0", + "combat_audio": "511,513,512", "attack_speed": "6", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "397", "weakness": "6", "magic_animation": "0", "death_animation": "836", @@ -4071,6 +4086,66 @@ "range_level": "1", "attack_level": "22" }, + { + "examine": "He takes the slaves to the arena. He rarely takes them back..", + "melee_animation": "395", + "range_animation": "0", + "combat_audio": "511,513,512", + "attack_speed": "6", + "respawn_delay": "60", + "defence_animation": "397", + "weakness": "6", + "magic_animation": "0", + "death_animation": "836", + "name": "Khazard Guard", + "defence_level": "22", + "safespot": null, + "lifepoints": "31", + "strength_level": "22", + "id": "257", + "range_level": "1", + "attack_level": "22" + }, + { + "examine": "He looks really nasty. Smells bad too.", + "melee_animation": "7049", + "range_animation": "0", + "combat_audio": "511,513,512", + "attack_speed": "4", + "respawn_delay": "60", + "defence_animation": "7050", + "weakness": "6", + "magic_animation": "0", + "death_animation": "836", + "name": "General Khazard", + "defence_level": "80", + "safespot": null, + "lifepoints": "170", + "strength_level": "78", + "id": "258", + "range_level": "1", + "attack_level": "75" + }, + { + "examine": "A tough looking barman.", + "melee_animation": "0", + "range_animation": "0", + "combat_audio": "511,513,512", + "attack_speed": "6", + "respawn_delay": "60", + "defence_animation": "397", + "weakness": "6", + "magic_animation": "0", + "death_animation": "0", + "name": "Khazard barman", + "defence_level": "1", + "safespot": null, + "lifepoints": "10", + "strength_level": "1", + "id": "259", + "range_level": "1", + "attack_level": "1" + }, { "examine": "A slave fighter. He looks mistreated and weak.", "melee_animation": "0", @@ -4087,29 +4162,103 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "She looks wealthy.", + "melee_animation": "0", + "range_animation": "0", + "defence_animation": "0", + "magic_animation": "0", + "death_animation": "0", + "name": "Lady Servil", + "defence_level": "1", + "safespot": null, + "lifepoints": "10", + "strength_level": "1", + "id": "264", + "range_level": "1", + "attack_level": "1" + }, + { + "examine": "A young squire. He looks worse for wear.", + "magic_animation": "0", + "death_animation": "0", + "name": "Jeremy Servil", + "defence_level": "0", + "safespot": null, + "lifepoints": "10", + "strength_level": "0", + "id": "265", + "clue_level": "0", + "range_level": "0", + "attack_level": "0" + }, + { + "examine": "A young squire. He looks worse for wear.", + "magic_animation": "0", + "death_animation": "0", + "name": "Jeremy Servil", + "defence_level": "0", + "safespot": null, + "lifepoints": "10", + "strength_level": "0", + "id": "266", + "clue_level": "0", + "range_level": "0", + "attack_level": "0" + }, + { + "examine": "Jeremy father, Sir Servil.", + "magic_animation": "0", + "death_animation": "0", + "name": "Justin Servil", + "defence_level": "0", + "safespot": null, + "lifepoints": "10", + "strength_level": "0", + "id": "267", + "clue_level": "0", + "range_level": "0", + "attack_level": "0" + }, + { + "examine": "A scruffy looking chap.", + "magic_animation": "0", + "death_animation": "0", + "name": "Local", + "defence_level": "0", + "safespot": null, + "lifepoints": "10", + "strength_level": "0", + "id": "268", + "clue_level": "0", + "range_level": "0", + "attack_level": "0" + }, { "melee_animation": "6581", "respawn_delay": "60", "defence_animation": "6578", "death_animation": "6576", "name": "Bouncer", - "defence_level": "1", + "defence_level": "120", "safespot": null, "lifepoints": "116", - "strength_level": "1", + "strength_level": "120", "id": "269", "aggressive": "true", "range_level": "1", - "attack_level": "1" + "attack_level": "120" }, { "examine": "Khazard's strongest ogre warrior.", - "melee_animation": "2100", - "range_animation": "0", - "defence_animation": "0", - "weakness": "6", - "magic_animation": "0", - "death_animation": "8576", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "25", + "defence_animation": "360", + "magic_animation": "359", + "death_animation": "361", "name": "Khazard Ogre", "defence_level": "46", "safespot": null, @@ -4117,11 +4266,12 @@ "strength_level": "46", "id": "270", "aggressive": "true", + "bonuses": "22,22,22,0,0,0,0,0,0,0,0,20,0,0,0", "range_level": "1", "attack_level": "46" }, { - "examine": "A large", + "examine": "A large angry scorpion", "melee_animation": "6254", "range_animation": "0", "combat_audio": "3611,3612,3610", @@ -5385,6 +5535,7 @@ "examine": "Dead but not gone.", "melee_animation": "390", "range_animation": "0", + "combat_audio": "511,439,438", "respawn_delay": "50", "defence_animation": "0", "weakness": "9", @@ -5403,6 +5554,7 @@ "examine": "Dead but not gone.", "melee_animation": "390", "range_animation": "0", + "combat_audio": "511,439,438", "respawn_delay": "50", "defence_animation": "0", "weakness": "9", @@ -5421,6 +5573,7 @@ "examine": "Dead but not gone.", "melee_animation": "390", "range_animation": "0", + "combat_audio": "511,439,438", "respawn_delay": "50", "defence_animation": "0", "weakness": "9", @@ -5440,6 +5593,7 @@ "slayer_task": "73", "melee_animation": "390", "range_animation": "0", + "combat_audio": "511,439,438", "respawn_delay": "50", "defence_animation": "0", "weakness": "9", @@ -5460,6 +5614,7 @@ "slayer_task": "73", "melee_animation": "390", "range_animation": "0", + "combat_audio": "511,439,438", "magic_level": "1", "respawn_delay": "50", "defence_animation": "0", @@ -11029,14 +11184,15 @@ "weakness": "7", "magic_animation": "0", "name": "Rock", - "defence_level": "63", + "defence_level": "70", "safespot": null, - "lifepoints": "90", - "strength_level": "63", + "lifepoints": "140", + "strength_level": "110", "id": "1095", "aggressive": "true", + "bonuses": "60,60,60,0,0,35,60,35,200,200,0,100,0,0,0", "range_level": "1", - "attack_level": "63" + "attack_level": "70" }, { "examine": "Careful, he is a big.", @@ -11048,38 +11204,41 @@ "weakness": "7", "magic_animation": "0", "name": "Stick", - "defence_level": "61", + "defence_level": "60", "safespot": null, - "lifepoints": "87", - "strength_level": "61", + "lifepoints": "135", + "strength_level": "110", "id": "1096", "aggressive": "true", + "bonuses": "50,50,50,0,0,30,30,50,200,200,0,80,0,0,0", "range_level": "1", - "attack_level": "61" + "attack_level": "60" }, { "name": "Pee Hat", - "defence_level": "1", + "defence_level": "50", "safespot": null, - "lifepoints": "126", - "strength_level": "1", + "lifepoints": "120", + "strength_level": "100", "id": "1097", + "bonuses": "40,40,40,0,0,25,25,40,200,200,0,70,0,0,0", "range_level": "1", "respawn_delay": "60", - "attack_level": "1" + "attack_level": "50" }, { "name": "Kraka", - "defence_level": "1", + "defence_level": "50", "safespot": null, "lifepoints": "120", - "strength_level": "1", + "strength_level": "100", "attack_speed": "6", "id": "1098", "aggressive": "true", + "bonuses": "40,40,40,0,0,25,25,40,200,400,0,70,0,0,0", "range_level": "1", "respawn_delay": "60", - "attack_level": "1" + "attack_level": "50" }, { "examine": "Human is his speciality.", @@ -11546,13 +11705,14 @@ "weakness": "7", "magic_animation": "0", "name": "Dad", - "defence_level": "55", + "defence_level": "50", "safespot": null, - "lifepoints": "157", - "strength_level": "55", + "lifepoints": "120", + "strength_level": "120", "id": "1125", + "bonuses": "40,40,40,0,0,25,25,40,200,200,0,70,0,0,0", "range_level": "1", - "attack_level": "55" + "attack_level": "60" }, { "examine": "He's guarding the cells.", @@ -11562,13 +11722,14 @@ "weakness": "7", "magic_animation": "0", "name": "Twig", - "defence_level": "50", + "defence_level": "25", "safespot": null, - "lifepoints": "71", - "strength_level": "50", + "lifepoints": "90", + "strength_level": "90", "id": "1126", + "bonuses": "20,20,20,0,0,0,0,10,200,200,0,20,0,0,0", "range_level": "1", - "attack_level": "50" + "attack_level": "40" }, { "examine": "He's guarding the cells.", @@ -11579,13 +11740,14 @@ "weakness": "7", "magic_animation": "0", "name": "Berry", - "defence_level": "50", + "defence_level": "40", "safespot": null, - "lifepoints": "71", - "strength_level": "50", + "lifepoints": "90", + "strength_level": "90", "id": "1127", + "bonuses": "20,20,20,0,0,0,0,10,200,200,0,20,0,0,0", "range_level": "1", - "attack_level": "50" + "attack_level": "40" }, { "examine": "He's guarding the cells.", @@ -11596,13 +11758,14 @@ "weakness": "7", "magic_animation": "0", "name": "Twig", - "defence_level": "50", + "defence_level": "25", "safespot": null, - "lifepoints": "71", - "strength_level": "50", + "lifepoints": "90", + "strength_level": "90", "id": "1128", + "bonuses": "20,20,20,0,0,0,0,10,200,200,0,20,0,0,0", "range_level": "1", - "attack_level": "50" + "attack_level": "40" }, { "examine": "He's guarding the cells.", @@ -11613,13 +11776,14 @@ "weakness": "7", "magic_animation": "0", "name": "Berry", - "defence_level": "50", + "defence_level": "40", "safespot": null, - "lifepoints": "71", - "strength_level": "50", + "lifepoints": "90", + "strength_level": "90", "id": "1129", + "bonuses": "20,20,20,0,0,0,0,10,200,200,0,20,0,0,0", "range_level": "1", - "attack_level": "50" + "attack_level": "40" }, { "examine": "Small for a troll, but it's mean, ugly and throws rocks.", @@ -11964,6 +12128,7 @@ "attack_level": "1" }, { + "death_animation": "", "name": "Guard", "defence_level": "1", "safespot": null, @@ -20938,173 +21103,330 @@ "attack_level": "65" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "combat_audio": "", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "combat_audio": "", - "strength_level": "1", + "strength_level": "36", "id": "2044", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2045", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2046", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2047", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2048", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2049", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "It's falling apart!", + "slayer_task": "64", + "combat_audio": "", + "range_animation": "359", + "melee_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "weakness": "7", + "slayer_exp": "", + "magic_animation": "359", + "death_animation": "361", "name": "Skogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2050", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2051", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2052", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2053", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2054", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "A partially decomposing zombie ogre.", + "slayer_task": "64", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Zogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2055", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "It's falling apart!", + "slayer_task": "64", + "combat_audio": "", + "melee_animation": "359", + "range_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Skogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2056", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { + "examine": "It's falling apart!", + "slayer_task": "64", + "combat_audio": "", + "range_animation": "359", + "melee_animation": "359", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "360", + "slayer_exp": "", + "weakness": "7", + "magic_animation": "359", + "death_animation": "361", "name": "Skogre", - "defence_level": "1", + "defence_level": "35", "safespot": null, "lifepoints": "71", - "strength_level": "1", + "strength_level": "36", "id": "2057", "aggressive": "true", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1" + "attack_level": "20" }, { "examine": "What could be hiding in that crack in the wall?", @@ -29695,7 +30017,7 @@ "combat_audio": "511,513,512", "attack_speed": "5", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "404", "weakness": "7", "magic_animation": "0", "death_animation": "836", @@ -29711,12 +30033,12 @@ }, { "examine": "He tries to keep order around here.", - "melee_animation": "0", + "melee_animation": "4230", "range_animation": "2075", "combat_audio": "511,513,512", "attack_speed": "5", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "404", "weakness": "0", "magic_animation": "0", "death_animation": "836", @@ -29737,7 +30059,7 @@ "combat_audio": "511,513,512", "attack_speed": "5", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "404", "weakness": "7", "magic_animation": "0", "death_animation": "836", @@ -29910,7 +30232,7 @@ "combat_audio": "511,513,512", "attack_speed": "5", "respawn_delay": "60", - "defence_animation": "425", + "defence_animation": "404", "death_animation": "836", "name": "Guard", "defence_level": "1", @@ -33059,6 +33381,7 @@ "examine": "White and shaggy.", "melee_animation": "5338", "range_animation": "0", + "combat_audio": "757,759,758", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "0", @@ -36586,10 +36909,11 @@ "attack_level": "1" }, { - "examine": "A bony ghost.", + "examine": "A boney ghost.", "melee_animation": "422", "range_animation": "422", - "attack_speed": "6", + "combat_audio": "924,926,925", + "attack_speed": "4", "defence_animation": "404", "slayer_exp": "60", "magic_animation": "422", @@ -36606,10 +36930,11 @@ "attack_level": "50" }, { - "examine": "A bony ghost.", + "examine": "A boney ghost.", "melee_animation": "422", "range_animation": "422", - "attack_speed": "6", + "combat_audio": "924,926,925", + "attack_speed": "4", "defence_animation": "404", "slayer_exp": "60", "magic_animation": "422", @@ -36626,10 +36951,11 @@ "attack_level": "50" }, { - "examine": "A bony ghost.", + "examine": "A boney ghost.", "melee_animation": "422", "range_animation": "422", - "attack_speed": "6", + "combat_audio": "924,926,925", + "attack_speed": "4", "defence_animation": "404", "slayer_exp": "60", "magic_animation": "422", @@ -36691,6 +37017,7 @@ "slayer_task": "34", "melee_animation": "1184", "range_animation": "1184", + "combat_audio": "571,573,572", "attack_speed": "3", "respawn_delay": "30", "defence_animation": "1186", @@ -36713,6 +37040,7 @@ "examine": "I don't think insect repellent will work.", "melee_animation": "1184", "range_animation": "1184", + "combat_audio": "571,573,572", "attack_speed": "3", "respawn_delay": "30", "defence_animation": "1186", @@ -36734,6 +37062,7 @@ "examine": "I don't think insect repellent will work.", "melee_animation": "1184", "range_animation": "1184", + "combat_audio": "571,573,572", "attack_speed": "3", "respawn_delay": "30", "defence_animation": "1186", @@ -36752,10 +37081,10 @@ "attack_level": "100" }, { - "examine": "The walking dead.", + "examine": "Dead man walking.", "melee_animation": "5568", "range_animation": "5568", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5567", @@ -36768,15 +37097,16 @@ "lifepoints": "23", "strength_level": "1", "id": "4392", + "aggressive": "true", "bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25", "range_level": "1", "attack_level": "24" }, { - "examine": "Dead (wo)man walking.", + "examine": "Dead man walking.", "melee_animation": "5578", "range_animation": "5578", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5579", @@ -36795,10 +37125,10 @@ "attack_level": "35" }, { - "examine": "Could his name be \"Lurch\"?", + "examine": "Dead man walking.", "melee_animation": "5578", "range_animation": "5578", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5579", @@ -36811,6 +37141,7 @@ "lifepoints": "40", "strength_level": "1", "id": "4394", + "aggressive": "true", "bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45", "range_level": "1", "attack_level": "47" @@ -36819,8 +37150,11 @@ "examine": "Overgrown vermin.", "slayer_task": "67", "combat_audio": "703,705,704", + "melee_animation": "4933", "attack_speed": "5", + "defence_animation": "4934", "weakness": "9", + "death_animation": "4935", "name": "Giant rat", "defence_level": "23", "safespot": null, @@ -36836,7 +37170,7 @@ "examine": "A popular dwarven delicacy.", "melee_animation": "2705", "range_animation": "2705", - "combat_audio": "3102,3104,3103", + "combat_audio": "710,713,711", "attack_speed": "5", "defence_animation": "2706", "magic_animation": "2705", @@ -36853,6 +37187,7 @@ { "examine": "Big Cow-like... But cows don't have serpent tails!", "melee_animation": "4271", + "combat_audio": "511,330,329", "attack_speed": "5", "magic_level": "38", "spell_id": "7", @@ -36876,6 +37211,7 @@ { "examine": "Big Cow-like... But cows don't have serpent tails!", "melee_animation": "4271", + "combat_audio": "511,330,329", "attack_speed": "5", "magic_level": "38", "spell_id": "7", @@ -36899,6 +37235,7 @@ { "examine": "Big Cow-like... But cows don't have serpent tails!", "melee_animation": "4271", + "combat_audio": "511,330,329", "attack_speed": "5", "magic_level": "45", "spell_id": "7", @@ -36940,6 +37277,7 @@ }, { "melee_animation": "6249", + "combat_audio": "3604,3609,3608", "respawn_delay": "60", "defence_animation": "6250", "death_animation": "6251", @@ -36949,7 +37287,7 @@ "lifepoints": "22", "strength_level": "1", "id": "4401", - "aggressive": "true", + "aggressive": "false", "range_level": "1", "attack_level": "1" }, @@ -37072,7 +37410,7 @@ "examine": "An ugly green creature.", "melee_animation": "6185", "range_animation": "6185", - "combat_audio": "469,472,471", + "combat_audio": "3520,472,471", "attack_speed": "5", "defence_animation": "6183", "slayer_exp": "5", @@ -37093,7 +37431,7 @@ "examine": "An ugly green creature.", "melee_animation": "6185", "range_animation": "6185", - "combat_audio": "469,472,471", + "combat_audio": "3520,472,471", "attack_speed": "5", "defence_animation": "6183", "slayer_exp": "16", @@ -37114,7 +37452,7 @@ "examine": "An ugly green creature.", "melee_animation": "6185", "range_animation": "6185", - "combat_audio": "469,472,471", + "combat_audio": "3520,472,471", "attack_speed": "5", "defence_animation": "6183", "slayer_exp": "7", @@ -37135,7 +37473,7 @@ "examine": "An ugly green creature.", "melee_animation": "6185", "range_animation": "6185", - "combat_audio": "469,472,471", + "combat_audio": "3520,472,471", "attack_speed": "5", "defence_animation": "6183", "magic_animation": "6185", @@ -37155,7 +37493,7 @@ "examine": "An ugly green creature.", "melee_animation": "6185", "range_animation": "6185", - "combat_audio": "469,472,471", + "combat_audio": "3520,472,471", "attack_speed": "5", "defence_animation": "6183", "magic_animation": "6185", @@ -37175,7 +37513,7 @@ "examine": "An ugly green creature.", "melee_animation": "6185", "range_animation": "6185", - "combat_audio": "469,472,471", + "combat_audio": "3520,472,471", "attack_speed": "5", "defence_animation": "6183", "magic_animation": "6185", @@ -37238,7 +37576,7 @@ "slayer_task": "67", "melee_animation": "2705", "range_animation": "2705", - "combat_audio": "3102,3104,3103", + "combat_audio": "710,713,711", "attack_speed": "4", "magic_level": "1", "respawn_delay": "3", @@ -42466,7 +42804,10 @@ { "examine": "Overgrown vermin.", "combat_audio": "703,705,704", + "melee_animation": "4933", "attack_speed": "5", + "defence_animation": "4934", + "death_animation": "4935", "name": "Giant rat", "defence_level": "23", "safespot": null, @@ -42482,8 +42823,11 @@ "examine": "Overgrown vermin.", "slayer_task": "67", "combat_audio": "703,705,704", + "melee_animation": "4933", "attack_speed": "5", + "defence_animation": "4934", "weakness": "9", + "death_animation": "4935", "name": "Giant rat", "defence_level": "23", "safespot": null, @@ -43911,6 +44255,7 @@ { "examine": "White and shaggy.", "melee_animation": "5338", + "combat_audio": "757,759,758", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "5337", @@ -45199,6 +45544,7 @@ "attack_level": "1" }, { + "examine": "", "melee_animation": "5568", "combat_audio": "931,923,922", "respawn_delay": "60", @@ -45818,10 +46164,10 @@ "attack_level": "80" }, { - "examine": "Examine not added", + "examine": "Dead man walking.", "melee_animation": "5568", "range_animation": "5568", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5567", @@ -45834,15 +46180,16 @@ "lifepoints": "23", "strength_level": "1", "id": "5375", + "aggressive": "true", "bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25", "range_level": "1", "attack_level": "25" }, { - "examine": "Examine not added", + "examine": "Dead man walking.", "melee_animation": "5568", "range_animation": "5568", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5567", @@ -45855,15 +46202,16 @@ "lifepoints": "23", "strength_level": "1", "id": "5376", + "aggressive": "true", "bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25", "range_level": "1", "attack_level": "25" }, { - "examine": "Examine not added", + "examine": "Dead man walking.", "melee_animation": "5578", "range_animation": "5578", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5579", @@ -45876,15 +46224,16 @@ "lifepoints": "30", "strength_level": "1", "id": "5377", + "aggressive": "true", "bonuses": "15,25,28,28,25,28,28,15,15,28,25,25,25,25,25", "range_level": "1", "attack_level": "38" }, { - "examine": "Examine not added", + "examine": "Dead man walking.", "melee_animation": "5578", "range_animation": "5578", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5579", @@ -45897,15 +46246,16 @@ "lifepoints": "30", "strength_level": "1", "id": "5378", + "aggressive": "true", "bonuses": "15,25,28,28,25,28,28,15,15,28,25,25,25,25,25", "range_level": "1", "attack_level": "38" }, { - "examine": "Examine not added", + "examine": "The walking dead.", "melee_animation": "5578", "range_animation": "5578", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5579", @@ -45918,15 +46268,16 @@ "lifepoints": "40", "strength_level": "1", "id": "5379", + "aggressive": "true", "bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45", "range_level": "1", "attack_level": "47" }, { - "examine": "Examine not added", + "examine": "The walking dead.", "melee_animation": "5578", "range_animation": "5578", - "combat_audio": "931,923,922", + "combat_audio": "918,923,922", "attack_speed": "5", "respawn_delay": "30", "defence_animation": "5579", @@ -45939,6 +46290,7 @@ "lifepoints": "40", "strength_level": "1", "id": "5380", + "aggressive": "true", "bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45", "range_level": "1", "attack_level": "47" @@ -69044,6 +69396,7 @@ "safespot": null, "lifepoints": "10", "combat_audio": "774,775,777", + "melee_animation": "5485", "strength_level": "1", "id": "3705", "range_level": "1", @@ -69051,6 +69404,7 @@ }, { "combat_audio": "774,775,777", + "melee_animation": "5485", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "5513", @@ -69089,6 +69443,7 @@ }, { "combat_audio": "774,775,777", + "melee_animation": "5485", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "5513", @@ -69354,6 +69709,7 @@ { "examine": "Could do with gaining a few pounds.", "combat_audio": "774,775,777", + "melee_animation": "5485", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "5513", @@ -69371,6 +69727,7 @@ { "examine": "Could do with gaining a few pounds.", "combat_audio": "774,775,777", + "melee_animation": "5485", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "5513", @@ -71187,5 +71544,65 @@ "bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", "range_level": "1", "attack_level": "1" + }, + { + "name": "Puro Spawn (Low)", + "id": "6065", + "respawn_delay": "1" + }, + { + "name": "Puro Spawn (Mid)", + "id": "6066", + "respawn_delay": "1" + }, + { + "name": "Puro Spawn (High)", + "id": "6067", + "respawn_delay": "1" + }, + { + "name": "Baby Impling Puro", + "id": "6055", + "respawn_delay": "7" + }, + { + "name": "Young Impling Puro", + "id": "6056", + "respawn_delay": "7" + }, + { + "name": "Gourmet Impling Puro", + "id": "6057", + "respawn_delay": "7" + }, + { + "name": "Earth Impling Puro", + "id": "6058", + "respawn_delay": "50" + }, + { + "name": "Essence Impling Puro", + "id": "6059", + "respawn_delay": "50" + }, + { + "name": "Eclectic Impling Puro", + "id": "6060", + "respawn_delay": "7" + }, + { + "name": "Ninja Impling Puro", + "id": "6063", + "respawn_delay": "9999" + }, + { + "name": "Nature Impling Puro", + "id": "6061", + "respawn_delay": "9999" + }, + { + "name": "Magpie Impling Puro", + "id": "6062", + "respawn_delay": "9999" } -] +] \ No newline at end of file diff --git a/game/data/configs/npc_spawns.json b/game/data/configs/npc_spawns.json index cf8fa96..55cf47a 100644 --- a/game/data/configs/npc_spawns.json +++ b/game/data/configs/npc_spawns.json @@ -89,7 +89,7 @@ }, { "npc_id": "27", - "loc_data": "{2574,3285,2,0,0}-{2574,3308,2,0,0}-{2582,3284,2,0,0}-{2582,3309,2,0,0}-{2588,3290,2,0,0}-{2588,3303,2,0,0}-{2902,3568,1,1,3}-{2903,3569,1,1,3}-{2903,3567,1,0,3}-{2904,3566,1,0,3}-{2894,3559,1,0,3}-{2892,3557,1,0,3}-{2893,3569,1,0,3}" + "loc_data": "{2574,3285,2,0,0}-{2574,3308,2,0,0}-{2582,3284,2,0,0}-{2582,3309,2,0,0}-{2588,3290,2,0,0}-{2588,3303,2,0,0}-{2902,3568,1,1,3}-{2903,3559,1,1,3}-{2903,3557,1,1,3}-{2903,3569,1,1,3}-{2894,3559,1,1,3}-{2892,3557,1,0,3}-{2893,3569,1,1,3}" }, { "npc_id": "28", @@ -129,15 +129,15 @@ }, { "npc_id": "41", - "loc_data": "{3197,3356,0,1,4}-{3234,3297,0,1,3}-{3230,3296,0,1,5}-{3236,3288,0,1,6}-{3236,3300,0,1,2}-{3231,3308,0,1,3}-{2965,3336,0,1,4}-{3110,9573,0,1,6}-{2655,3441,0,1,6}-{2649,3438,0,1,7}-{2649,3446,0,1,6}-{2653,3444,0,1,6}-{2647,3441,0,1,1}-{2784,3062,0,1,4}-{2789,3063,0,1,4}-{3160,3082,0,1,3}-{3140,3096,0,1,3}-{3140,3093,0,1,0}-{3138,3094,0,1,1}-{3140,3093,0,1,3}-{3138,3093,0,1,1}-{3138,3094,0,1,0}-{3189,3278,0,1,3}-{3187,3276,0,1,5}-{3188,3278,0,1,4}-{2851,3370,0,1,3}-{2846,3374,0,1,3}-{2853,3372,0,1,3}-{2847,3373,0,1,3}-{2850,3371,0,1,1}-{2851,3373,0,1,4}-{2852,3370,0,1,4}-{3234,3293,0,1,4}-{3229,3298,0,1,1}-{3228,3296,0,1,4}-{2815,3560,0,1,7}-{2819,3561,0,1,4}-{2818,3559,0,1,6}-{3140,3093,0,1,1}-{2674,3652,0,1,3}-{2672,3655,0,1,6}-{2677,3655,0,1,6}-{2694,3274,0,1,6}-{2695,3275,0,1,3}" + "loc_data": "{3197,3356,0,1,4}-{3234,3297,0,1,3}-{3230,3296,0,1,5}-{3236,3288,0,1,6}-{3236,3300,0,1,2}-{2965,3336,0,1,4}-{3110,9573,0,1,6}-{2655,3441,0,1,6}-{2649,3438,0,1,7}-{2649,3446,0,1,6}-{2653,3444,0,1,6}-{2647,3441,0,1,1}-{2784,3062,0,1,4}-{2789,3063,0,1,4}-{3140,3096,0,1,3}-{3140,3093,0,1,0}-{3138,3094,0,1,1}-{3140,3093,0,1,3}-{3138,3093,0,1,1}-{3138,3094,0,1,0}-{3187,3276,0,1,5}-{3188,3278,0,1,4}-{2851,3370,0,1,3}-{2846,3374,0,1,3}-{2853,3372,0,1,3}-{2847,3373,0,1,3}-{2850,3371,0,1,1}-{2851,3373,0,1,4}-{2852,3370,0,1,4}-{3234,3293,0,1,4}-{3229,3298,0,1,1}-{3228,3296,0,1,4}-{2815,3560,0,1,7}-{2819,3561,0,1,4}-{2818,3559,0,1,6}-{3140,3093,0,1,1}-{2674,3652,0,1,3}-{2672,3655,0,1,6}-{2677,3655,0,1,6}-{2694,3274,0,1,6}-{2695,3275,0,1,3}" }, { "npc_id": "42", - "loc_data": "{3237,3346,0,1,1}" + "loc_data": "{3237,3346,0,1,1}-{3185,3220,0,1,0}-{3183,3222,0,1,0}" }, { "npc_id": "43", - "loc_data": "{3241,3354,0,1,3}-{3200,3263,0,0,0}-{3212,3262,0,1,1}-{2926,3323,0,1,0}-{2922,3325,0,1,3}" + "loc_data": "{3241,3354,0,1,3}-{3200,3263,0,1,0}-{3212,3262,0,1,1}-{2926,3323,0,1,0}-{2922,3325,0,1,3}-{3204,3268,0,1,0}" }, { "npc_id": "44", @@ -153,7 +153,7 @@ }, { "npc_id": "47", - "loc_data": "{3108, 9754, 0, 1, 5}-{3110, 9754, 0, 1, 5}-{3108, 9750, 0, 1, 5}-{2930,9699,0,1,0}-{2933,9697,0,1,0}-{2932,9685,0,1,0}-{2930,9693,0,1,0}-{3097,3364,0,1,3}-{3102,3363,0,1,5}-{3341,3267,0,1,5}-{3235,3224,0,1,3}-{3229,3220,0,1,4}-{3211,3211,0,1,3}-{3225,3220,0,1,1}-{3237,3215,0,1,5}-{3211,3210,0,1,7}-{3227,3220,0,1,7}-{3233,3227,0,1,5}-{3227,3210,0,1,6}-{3228,3222,0,1,4}-{3229,3226,0,1,0}-{3127,3487,0,1,4}-{3125,3486,0,1,6}-{3127,3486,0,1,4}-{3019,3292,0,1,7}-{3018,3295,0,1,7}-{3001,3202,0,1,5}-{3021,3205,0,1,6}-{3026,3174,0,1,5}-{3019,3176,0,1,7}-{3076,3282,0,1,5}-{3089,3266,0,1,4}-{3091,3266,0,1,4}-{3243,3687,0,1,5}-{3249,3669,0,1,3}-{3252,3675,0,1,4}-{3252,3680,0,1,3}-{3259,3683,0,1,0}-{3276,9871,0,1,1}-{3277,9871,0,1,3}-{3225,9862,0,1,4}-{3222,9861,0,1,6}-{3220,9860,0,1,6}-{3219,9865,0,1,6}-{3237,9862,0,1,4}-{3236,3217,0,1,4}-{3259,3230,0,1,4}-{3158,3226,0,1,5}-{3160,3202,0,1,4}-{3233,3237,0,1,7}-{2821,3170,0,1,1}-{2801,3158,0,1,2}-{2852,9642,0,1,6}-{2858,9632,0,1,3}-{2536,2982,0,1,3}-{2531,2980,0,1,0}-{2522,2981,0,1,4}-{2545,2989,0,1,4}-{2523,2970,0,1,2}-{2603,9480,0,1,1}-{2600,9477,0,1,0}-{2579,9496,0,1,4}-{2580,9508,0,1,0}-{2571,9522,0,1,4}-{2654,9640,0,1,6}-{2655,9637,0,1,4}-{2656,9639,0,1,7}-{2651,9636,0,1,5}-{2648,9637,0,1,4}-{2651,9642,0,1,1}-{2654,9640,0,1,0}-{2654,9635,0,1,6}-{2655,9635,0,1,3}-{2664,9626,0,1,6}-{2664,9624,0,1,1}-{2661,9623,0,1,1}-{2663,9623,0,1,3}-{2664,9626,0,1,6}-{2592,9831,0,1,3}-{2588,9825,0,1,6}-{2583,9829,0,1,4}-{2581,9841,0,1,0}-{2597,9823,0,1,2}-{2579,9805,0,1,3}-{2576,9804,0,1,0}-{2573,9805,0,1,5}-{2571,9808,0,1,3}-{2576,9810,0,1,2}-{2587,9802,0,1,2}-{2592,9800,0,1,4}-{2596,9805,0,1,6}-{2601,9802,0,1,5}-{2585,9801,0,1,7}-{2594,9803,0,1,0}-{2590,9806,0,1,3}-{2612,9808,0,1,6}-{2604,9810,0,1,6}-{2579,9821,0,1,2}-{2576,9812,0,1,6}-{2580,9813,0,1,6}-{2600,9813,0,1,4}-{2599,9809,0,1,4}-{2514,3193,0,1,6}-{2518,3192,0,1,3}-{2507,3181,0,1,3}-{2508,3178,0,1,6}-{2511,3183,0,1,3}-{2515,3182,0,1,1}-{2565,9505,0,1,1}-{2566,9510,0,1,6}-{2594,9497,0,1,4}-{3475,9840,0,1,6}-{3481,9842,0,1,1}-{3486,9843,0,1,7}-{3483,9824,0,1,4}-{3496,9808,0,0,5}-{3490,9815,0,1,1}-{3478,9834,0,0,3}-{3490,9824,0,1,4}" + "loc_data": "{3108, 9754, 0, 1, 5}-{3110, 9754, 0, 1, 5}-{3108, 9750, 0, 1, 5}-{2930,9699,0,1,0}-{2933,9697,0,1,0}-{2932,9685,0,1,0}-{2930,9693,0,1,0}-{3097,3364,0,1,3}-{3102,3363,0,1,5}-{3341,3267,0,1,5}-{3235,3224,0,1,3}-{3229,3220,0,1,4}-{3211,3211,0,1,3}-{3225,3220,0,1,1}-{3237,3215,0,1,5}-{3211,3210,0,1,7}-{3227,3220,0,1,7}-{3233,3227,0,1,5}-{3227,3210,0,1,6}-{3228,3222,0,1,4}-{3229,3226,0,1,0}-{3127,3487,0,1,4}-{3125,3486,0,1,6}-{3127,3486,0,1,4}-{3019,3292,0,1,7}-{3018,3295,0,1,7}-{3001,3202,0,1,5}-{3021,3205,0,1,6}-{3026,3174,0,1,5}-{3019,3176,0,1,7}-{3076,3282,0,1,5}-{3089,3266,0,1,4}-{3091,3266,0,1,4}-{3243,3687,0,1,5}-{3249,3669,0,1,3}-{3252,3675,0,1,4}-{3252,3680,0,1,3}-{3259,3683,0,1,0}-{3276,9871,0,1,1}-{3277,9871,0,1,3}-{3225,9862,0,1,4}-{3222,9861,0,1,6}-{3220,9860,0,1,6}-{3219,9865,0,1,6}-{3237,9862,0,1,4}-{3236,3217,0,1,4}-{3259,3230,0,1,4}-{3158,3226,0,1,5}-{3160,3202,0,1,4}-{3233,3237,0,1,7}-{2821,3170,0,1,1}-{2801,3158,0,1,2}-{2852,9642,0,1,6}-{2858,9632,0,1,3}-{2536,2982,0,1,3}-{2531,2980,0,1,0}-{2522,2981,0,1,4}-{2545,2989,0,1,4}-{2523,2970,0,1,2}-{2603,9480,0,1,1}-{2600,9477,0,1,0}-{2579,9496,0,1,4}-{2580,9508,0,1,0}-{2571,9522,0,1,4}-{2654,9640,0,1,6}-{2655,9637,0,1,4}-{2656,9639,0,1,7}-{2651,9636,0,1,5}-{2648,9637,0,1,4}-{2651,9642,0,1,1}-{2654,9640,0,1,0}-{2654,9635,0,1,6}-{2655,9635,0,1,3}-{2664,9626,0,1,6}-{2664,9624,0,1,1}-{2661,9623,0,1,1}-{2663,9623,0,1,3}-{2664,9626,0,1,6}-{2592,9831,0,1,3}-{2588,9825,0,1,6}-{2583,9829,0,1,4}-{2581,9841,0,1,0}-{2597,9823,0,1,2}-{2579,9805,0,1,3}-{2576,9804,0,1,0}-{2573,9805,0,1,5}-{2571,9808,0,1,3}-{2576,9810,0,1,2}-{2587,9802,0,1,2}-{2592,9800,0,1,4}-{2596,9805,0,1,6}-{2601,9802,0,1,5}-{2585,9801,0,1,7}-{2594,9803,0,1,0}-{2590,9806,0,1,3}-{2612,9808,0,1,6}-{2604,9810,0,1,6}-{2579,9821,0,1,2}-{2576,9812,0,1,6}-{2580,9813,0,1,6}-{2600,9813,0,1,4}-{2599,9809,0,1,4}-{2514,3193,0,1,6}-{2518,3192,0,1,3}-{2507,3181,0,1,3}-{2508,3178,0,1,6}-{2511,3183,0,1,3}-{2515,3182,0,1,1}-{2565,9505,0,1,1}-{2566,9510,0,1,6}-{2594,9497,0,1,4}-{3475,9840,0,1,6}-{3481,9842,0,1,1}-{3486,9843,0,1,7}-{3483,9824,0,1,4}-{3496,9808,0,0,5}-{3490,9815,0,1,1}-{3478,9834,0,0,3}-{3490,9824,0,1,4}-{3192,3203,0,1,0}-{3194,3204,0,1,0}-{3196,3206,0,1,0}-{3197,3204,0,1,0}-{3205,3204,0,1,0}-{3206,3204,0,1,0}-{3205,3203,0,1,0}-{3206,3202,0,1,0}-{3207,3202,0,1,0}-{3208,3203,0,1,0}" }, { "npc_id": "48", @@ -161,7 +161,7 @@ }, { "npc_id": "49", - "loc_data": "{2871,9819,0,1,0}-{2871,9822,0,1,0}-{2870,9826,0,1,0}-{2869,9829,0,1,0}-{2867,9834,0,1,0}-{2867,9841,0,1,0}-{2864,9853,0,1,0}-{2859,9852,0,1,0}-{2851,9850,0,1,0}-{2856,9846,0,1,0}-{2857,9841,0,1,0}-{2861,9838,0,1,0}-{2854,9838,0,1,0}-{3104,3680,0,1,3}-{3114,3688,0,1,1}-{3121,3675,0,1,1}-{3127,3695,0,1,3}-{3129,3678,0,1,2}-{3130,3689,0,1,2}-{3128,3665,0,1,3}-{3135,3701,0,1,6}-{3085,10134,0,1,0}-{3090,10123,0,1,0}-{3094,10133,0,1,0}-{3095,10120,0,1,0}-{3095,10128,0,1,0}-{3098,10122,0,1,0}-{3104,10127,0,1,0}-{3105,10125,0,1,0}-{3177,3905,0,1,4}-{3180,3908,0,1,2}-{3189,3914,0,1,6}-{3193,3906,0,1,2}-{2402,9785,0,1,1}-{2403,9782,0,1,1}-{2408,9782,0,1,1}-{2408,9785,0,1,1}-{2413,9776,0,1,1}-{2417,9777,0,1,1}-{2412,9773,0,1,1}-{2416,9773,0,1,1}-{2735,9692,0,1,1}-{2732,9687,0,1,1}-{2733,9688,0,1,1}-{2734,9690,0,1,1}-{2733,9686,0,1,1}-{2732,9692,0,1,1}-{2736,9685,0,1,1}-{2730,9691,0,1,1}" + "loc_data": "{2871,9819,0,1,0}-{2871,9822,0,1,0}-{2870,9826,0,1,0}-{2869,9829,0,1,0}-{2867,9834,0,1,0}-{2867,9841,0,1,0}-{2864,9853,0,1,0}-{2859,9852,0,1,0}-{2851,9850,0,1,0}-{2856,9846,0,1,0}-{2857,9841,0,1,0}-{2861,9838,0,1,0}-{2854,9838,0,1,0}-{3104,3680,0,1,3}-{3114,3688,0,1,1}-{3121,3675,0,1,1}-{3127,3695,0,1,3}-{3129,3678,0,1,2}-{3130,3689,0,1,2}-{3128,3665,0,1,3}-{3135,3701,0,1,6}-{3177,3905,0,1,4}-{3180,3908,0,1,2}-{3189,3914,0,1,6}-{3193,3906,0,1,2}-{2735,9692,0,1,1}-{2732,9687,0,1,1}-{2733,9688,0,1,1}-{2734,9690,0,1,1}-{2733,9686,0,1,1}-{2732,9692,0,1,1}-{2736,9685,0,1,1}-{2730,9691,0,1,1}" }, { "npc_id": "50", @@ -189,7 +189,7 @@ }, { "npc_id": "59", - "loc_data": "{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3188,3216,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3169,3257,0,1,1}-{3164,3236,0,1,6}-{3148,3226,0,1,5}-{3162,3223,0,1,7}-{3151,3221,0,1,0}-{3160,3221,0,1,0}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}" + "loc_data": "{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3162,3223,0,1,7}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}-{3164,3242,0,1,0}-{3169,3246,0,1,0}-{3170,3250,0,1,0}-{3166,3247,0,1,0}-{3164,3249,0,1,0}-{3157,3226,0,1,0}-{3163,3227,0,1,0}-{3165,3223,0,1,0}-{3194,3236,0,1,0}" }, { "npc_id": "60", @@ -253,11 +253,11 @@ }, { "npc_id": "82", - "loc_data": "{2936,9652,0,1,3}-{2926,9803,0,1,0}-{2935,9794,0,1,0}-{3052,3117,2,1,1}-{2841,9557,0,1,3}-{2831,9562,0,1,3}-{2838,9605,0,1,3}-{3058,10128,0,1,0}-{3046,10139,0,1,0}-{3110,3157,2,1,5}" + "loc_data": "{2936,9652,0,1,3}-{2926,9803,0,1,0}-{2935,9794,0,1,0}-{3052,3117,2,1,1}-{2841,9557,0,1,3}-{2831,9562,0,1,3}-{2838,9605,0,1,3}-{3110,3157,2,1,5}" }, { "npc_id": "83", - "loc_data": "{3169,3711,0,1,7}-{3095,10095,0,1,0}-{3095,10086,0,1,0}-{2639,9477,2,0,3}-{2635,9497,2,0,2}" + "loc_data": "{3169,3711,0,1,7}-{2639,9477,2,0,3}-{2635,9497,2,0,2}" }, { "npc_id": "84", @@ -265,7 +265,7 @@ }, { "npc_id": "86", - "loc_data": "{2632,9696,0,1,1}-{2639,9697,0,1,3}-{2646,9696,0,1,3}-{2650,9697,0,1,4}-{2646,9702,0,1,6}-{3098,9880,0,1,5}-{3094,9883,0,1,1}-{3196,3208,0,1,1}-{3119,9891,0,1,4}-{3249,9868,0,1,4}-{3237,9868,0,1,3}-{3221,9873,0,1,6}-{3225,9862,0,1,2}-{3199,3209,0,1,1}-{3193,3211,0,1,5}-{3197,3203,0,1,1}-{3201,3200,0,1,4}-{3199,3210,0,1,0}-{3191,3207,0,1,4}-{3037,9511,0,1,6}-{3105,9517,0,1,7}-{3101,9517,0,1,6}-{3102,9521,0,1,4}-{3106,9519,0,1,1}-{3104,9514,0,1,4}-{3104,9518,0,1,1}-{3107,9519,0,1,1}-{3109,9516,0,1,1}-{3107,9515,0,1,7}-{3105,9512,0,1,6}-{3102,9513,0,1,3}-{3100,9514,0,1,1}-{3100,9516,0,1,7}-{3099,9521,0,1,0}-{3103,9523,0,1,1}-{3212,3191,0,1,6}-{3207,3192,0,1,2}-{3216,3184,0,1,2}-{3224,3174,0,1,4}-{3229,3183,0,1,5}-{3222,3185,0,1,3}-{3216,3177,0,1,4}-{3200,3182,0,1,5}-{3202,3189,0,1,6}-{3188,3181,0,1,7}-{3181,3191,0,1,7}-{3185,3199,0,1,4}-{3176,3198,0,1,6}-{3168,3188,0,1,4}-{3172,3178,0,1,1}-{3179,3174,0,1,1}-{3189,3168,0,1,5}-{3237,9866,0,1,6}-{3232,9867,0,1,7}-{3219,9862,0,1,7}-{3227,9875,0,1,4}-{3276,9870,0,1,3}-{3291,3388,0,1,6}-{2647,9713,0,1,3}-{2641,9719,0,1,1}-{2650,9716,0,1,1}-{2518,3187,0,1,3}-{3495,9812,0,1,1}-{3502,9807,0,0,4}" + "loc_data": "{2632,9696,0,1,1}-{2639,9697,0,1,3}-{2646,9696,0,1,3}-{2650,9697,0,1,4}-{2646,9702,0,1,6}-{3098,9880,0,1,5}-{3094,9883,0,1,1}-{3196,3208,0,1,1}-{3196,3205,0,1,0}-{3195,3212,0,1,0}-{3119,9891,0,1,4}-{3249,9868,0,1,4}-{3237,9868,0,1,3}-{3221,9873,0,1,6}-{3225,9862,0,1,2}-{3105,9517,0,1,7}-{3101,9517,0,1,6}-{3102,9521,0,1,4}-{3106,9519,0,1,1}-{3104,9514,0,1,4}-{3104,9518,0,1,1}-{3107,9519,0,1,1}-{3109,9516,0,1,1}-{3107,9515,0,1,7}-{3105,9512,0,1,6}-{3102,9513,0,1,3}-{3100,9514,0,1,1}-{3100,9516,0,1,7}-{3099,9521,0,1,0}-{3103,9523,0,1,1}-{3212,3191,0,1,6}-{3207,3192,0,1,2}-{3216,3184,0,1,2}-{3224,3174,0,1,4}-{3229,3183,0,1,5}-{3222,3185,0,1,3}-{3216,3177,0,1,4}-{3200,3182,0,1,5}-{3202,3189,0,1,6}-{3188,3181,0,1,7}-{3181,3191,0,1,7}-{3185,3199,0,1,4}-{3176,3198,0,1,6}-{3168,3188,0,1,4}-{3172,3178,0,1,1}-{3179,3174,0,1,1}-{3189,3168,0,1,5}-{3237,9866,0,1,6}-{3232,9867,0,1,7}-{3219,9862,0,1,7}-{3227,9875,0,1,4}-{3276,9870,0,1,3}-{3291,3388,0,1,6}-{2647,9713,0,1,3}-{2641,9719,0,1,1}-{2650,9716,0,1,1}-{2518,3187,0,1,3}-{3495,9812,0,1,1}-{3502,9807,0,0,4}" }, { "npc_id": "87", @@ -305,7 +305,7 @@ }, { "npc_id": "96", - "loc_data": "{2842,3450,0,0,0}-{2872,3437,0,0,0}-{2873,3449,0,0,0}-{2868,3456,0,0,0}-{2856,3490,0,0,0}-{2861,3492,0,0,0}-{2862,3505,0,0,0}-{2856,3507,0,0,0}-{3004,3920,0,1,7}-{3007,3925,0,1,3}-{3005,3927,0,1,3}-{3004,3924,0,1,3}-{2988,3918,0,1,2}-{2992,3921,0,1,2}-{2990,3923,0,1,3}-{2988,3925,0,1,6}-{2987,3921,0,1,6}" + "loc_data": "{2842,3450,0,0,0}-{2872,3437,0,0,0}-{2873,3449,0,0,0}-{2868,3456,0,0,0}-{2860,3490,0,0,0}-{2861,3492,0,0,0}-{2855,3511,0,0,0}-{2857,3508,0,0,0}-{3004,3920,0,1,7}-{3007,3925,0,1,3}-{3005,3927,0,1,3}-{3004,3924,0,1,3}-{2988,3918,0,1,2}-{2992,3921,0,1,2}-{2990,3923,0,1,3}-{2988,3925,0,1,6}-{2987,3921,0,1,6}" }, { "npc_id": "97", @@ -377,7 +377,7 @@ }, { "npc_id": "115", - "loc_data": "{2583,2967,0,1,0}-{2572,3028,0,1,2}-{2550,3046,0,1,4}-{2572,3034,0,1,3}-{2576,3026,0,1,4}-{2534,2975,0,1,1}-{2518,2974,0,1,1}-{2573,2987,0,1,1}-{2592,2967,0,1,3}-{2589,2961,0,0,2}-{2575,2989,0,1,0}-{2574,2992,0,1,4}-{2521,2974,0,1,4}-{2500,3092,0,1,6}-{2524,3375,0,1,3}-{2524,3374,0,1,3}-{2529,3374,0,1,3}-{2532,3375,0,1,1}-{2532,3373,0,1,1}-{2527,3376,0,1,6}-{2525,3373,0,1,7}-{2525,3373,0,1,5}-{2511,3086,0,1,1}-{2511,3084,0,1,3}-{2503,3114,0,1,6}-{2509,3120,0,1,4}-{2506,3107,0,1,4}-{2500,3112,0,1,4}-{2521,3045,0,1,6}-{2517,3043,0,1,5}-{2500,3095,0,1,3}-{2497,3090,0,1,4}-{2502,3099,0,1,4}-{2504,3097,0,1,4}-{2503,3134,0,1,3}-{2554,3196,0,1,7}-{2519,3039,0,1,4}-{2722,9701,0,1,1}-{2720,9715,0,1,1}-{2721,9669,0,1,1}-{2722,9707,0,1,1}-{2723,9716,0,1,1}-{2717,9669,0,1,1}" + "loc_data": "{2540,3020,0,0,0}-{2555,2953,0,0,0}-{2583,2967,0,1,0}-{2572,3028,0,1,2}-{2550,3046,0,1,4}-{2572,3034,0,1,3}-{2576,3026,0,1,4}-{2534,2975,0,1,1}-{2518,2974,0,1,1}-{2573,2987,0,1,1}-{2592,2967,0,1,3}-{2589,2961,0,0,2}-{2575,2989,0,1,0}-{2574,2992,0,1,4}-{2521,2974,0,1,4}-{2500,3092,0,1,6}-{2524,3375,0,1,3}-{2524,3374,0,1,3}-{2529,3374,0,1,3}-{2532,3375,0,1,1}-{2532,3373,0,1,1}-{2527,3376,0,1,6}-{2525,3373,0,1,7}-{2525,3373,0,1,5}-{2511,3086,0,1,1}-{2511,3084,0,1,3}-{2503,3114,0,1,6}-{2509,3120,0,1,4}-{2506,3107,0,1,4}-{2500,3112,0,1,4}-{2521,3045,0,1,6}-{2517,3043,0,1,5}-{2500,3095,0,1,3}-{2497,3090,0,1,4}-{2502,3099,0,1,4}-{2504,3097,0,1,4}-{2503,3134,0,1,3}-{2554,3196,0,1,7}-{2519,3039,0,1,4}-{2722,9701,0,1,1}-{2720,9715,0,1,1}-{2721,9669,0,1,1}-{2722,9707,0,1,1}-{2723,9716,0,1,1}-{2717,9669,0,1,1}" }, { "npc_id": "116", @@ -499,6 +499,10 @@ "npc_id": "162", "loc_data": "{2480,3426,0,1,6}-{2489,3429,0,1,1}-{2480,3431,0,1,0}-{2475,3418,0,1,4}-{2470,3423,0,1,1}" }, + { + "npc_id": "163", + "loc_data": "{2465,9899,0,1,6}-{2477,9896,0,1,6}-{2469,9887,0,1,6}-{2463,9893,0,1,6}" + }, { "npc_id": "166", "loc_data": "{2450,3480,1,0,1}-{2449,3480,1,0,1}-{2448,3480,1,0,1}-{2440,3488,1,0,4}-{2440,3487,1,0,4}-{2448,3427,1,0,6}-{2448,3424,1,0,6}-{2443,3424,1,0,3}-{2443,3425,1,0,3}" @@ -509,7 +513,7 @@ }, { "npc_id": "175", - "loc_data": "{3084,3495,0,1,4}-{2994,9549,0,1,6}-{2993,9551,0,1,6}-{2995,9555,0,1,6}-{2999,9548,0,1,0}-{3182,3365,0,1,6}" + "loc_data": "{3084,3495,0,1,4}-{2994,9549,0,1,6}-{2993,9551,0,1,6}-{2995,9555,0,1,6}-{2999,9548,0,1,0}-{3182,3365,0,1,6}-{3179,3215,0,1,0}" }, { "npc_id": "178", @@ -549,11 +553,11 @@ }, { "npc_id": "188", - "loc_data": "{2933,3516,0,1,3}-{2935,3515,0,1,3}-{2932,3514,0,1,2}-{3158,5497,0,1,6}-{3157,5494,0,1,1}-{3155,5498,0,1,6}-{3140,5494,0,1,6}-{3143,5493,0,1,5}-{3142,5497,0,1,4}-{3156,5494,0,1,5}-{3148,5496,0,1,4}" + "loc_data": "{2940,3517,0,1,3}-{2938,3517,0,1,3}-{3158,5497,0,1,6}-{3157,5494,0,1,1}-{3155,5498,0,1,6}-{3140,5494,0,1,6}-{3143,5493,0,1,5}-{3142,5497,0,1,4}-{3156,5494,0,1,5}-{3148,5496,0,1,4}" }, { "npc_id": "189", - "loc_data": "{3151,5489,0,1,7}-{3145,5495,0,1,3}-{3142,5493,0,1,3}-{3149,5489,0,1,6}-{3155,5491,0,1,2}-{3142,5497,0,1,3}" + "loc_data": "{2936,3514,0,1,3}-{2931,3514,0,1,3}-{2933,3517,0,1,3}-{2936,3517,0,1,3}-{3151,5489,0,1,7}-{3151,5489,0,1,7}-{3145,5495,0,1,3}-{3142,5493,0,1,3}-{3149,5489,0,1,6}-{3155,5491,0,1,2}-{3142,5497,0,1,3}" }, { "npc_id": "190", @@ -697,51 +701,79 @@ }, { "npc_id": "253", - "loc_data": "{2616,3172,0,1,1}-{2583,3142,0,1,6}" + "loc_data": "{2580,3163,0,1,1}-{2590,3184,0,1,1}-{2589,3140,0,1,1}-{2601,3177,0,1,1}-{2607,3182,0,1,1}-{2612,3187,0,1,1}" }, { "npc_id": "254", - "loc_data": "{2565,3150,0,1,6}-{2564,3146,0,1,5}-{2572,3143,0,1,4}" + "loc_data": "{2569,3149,0,0,1}-{2614,3169,0,1,1}-{2564,3153,0,1,1}-{2568,3147,0,1,1}-{2579,3176,0,1,3}-{2580,3174,0,1,1}-{2584,3149,0,1,3}-{2590,3190,0,1,1}-{2594,3181,0,1,1}-{2595,3186,0,1,1}-{2597,3175,0,1,1}-{2597,3181,0,1,1}-{2607,3185,0,1,1}-{2614,3150,0,1,1}-{2619,3168,0,1,1}" }, { "npc_id": "255", - "loc_data": "{2601,3195,0,1,3}-{2615,3188,0,1,6}-{2606,3186,0,1,3}" + "loc_data": "{2571,3142,0,1,1}-{2617,3150,0,1,1}-{2609,3171,0,0,1}-{2617,3157,0,1,1}-{2577,3167,0,1,1}-{2597,3176,0,1,1}-{2607,3181,0,1,1}-{2608,3148,0,1,1}-{2600,3190,0,1,1}-{2610,3150,0,1,1}-{2609,3171,0,1,1}" }, { "npc_id": "256", - "loc_data": "{2568,3144,0,1,3}-{2606,3180,0,1,5}-{2600,3184,0,1,4}-{2598,3185,0,1,6}-{2593,3175,0,1,2}-{2594,3182,0,1,3}-{2594,3188,0,1,3}-{2593,3193,0,1,3}-{2592,3179,0,1,1}-{2605,3171,0,1,3}-{2581,3170,0,1,6}-{2580,3166,0,1,6}-{2577,3163,0,1,1}-{2585,3150,0,1,4}" + "loc_data": "{2609,3194,0,1,2}" + }, + { + "npc_id": "257", + "loc_data": "" + }, + { + "npc_id": "258", + "loc_data": "" }, { "npc_id": "259", - "loc_data": "{2567,3140,0,0,0}" + "loc_data": "{2566,3140,0,0,1}" }, { "npc_id": "260", - "loc_data": "{2589,3142,0,0,0}" + "loc_data": "{2589,3142,0,1,4}" }, { "npc_id": "261", - "loc_data": "{2587,3142,0,0,0}" + "loc_data": "{2587,3142,0,1,3}" }, { "npc_id": "262", - "loc_data": "{2616,3162,0,0,0}-{2616,3161,0,0,0}-{2596,3142,0,0,0}" + "loc_data": "{2615,3160,0,1,4}-{2616,3164,0,1,1}-{2594,3143,0,0,2}" }, { "npc_id": "263", - "loc_data": "{2597,3143,0,0,0}" + "loc_data": "{2597,3143,0,0,4}" + }, + { + "npc_id": "264", + "loc_data": "{2568,3200,0,1,0}" }, { "npc_id": "265", - "loc_data": "{2616,3167,0,0,0}" + "loc_data": "" + }, + { + "npc_id": "266", + "loc_data": "{2601,3154,0,1,0}" }, { "npc_id": "267", - "loc_data": "{2601,3168,0,0,0}" + "loc_data": "{2601,3168,0,0,3}" }, { "npc_id": "268", - "loc_data": "{2583,3171,0,0,0}" + "loc_data": "{2582,3172,0,1,1}" + }, + { + "npc_id": "269", + "loc_data": "{2608,3163,0,1,3}" + }, + { + "npc_id": "270", + "loc_data": "{2608,3165,0,1,3}" + }, + { + "npc_id": "271", + "loc_data": "{2608,3158,0,1,3}" }, { "npc_id": "278", @@ -841,7 +873,7 @@ }, { "npc_id": "309", - "loc_data": "{2860,2976,0,0,4}-{2856,2977,0,0,4}-{2852,2973,0,0,4}-{2267,3253,0,0,4}-{2266,3253,0,0,4}-{2262,3249,0,0,4}-{2716,3530,0,0,0}-{2561,3374,0,0,4}-{2562,3374,0,0,4}-{2633,3693,0,0,4}-{2633,3694,0,0,4}-{2215,3248,0,0,4}-{2217,3245,0,0,4}-{2213,3241,0,0,4}-{3104,3424,0,0,0}-{3104,3425,0,0,0}-{2566,3370,0,0,0}-{2637,3444,0,0,0}-{2471,3146,0,0,4}-{2465,3156,0,0,4}-{2461,3150,0,0,4}-{2678,3595,0,0,4}-{2689,3598,0,0,4}" + "loc_data": "{2860,2976,0,0,4}-{2856,2977,0,0,4}-{2852,2973,0,0,4}-{2267,3253,0,0,4}-{2266,3253,0,0,4}-{2262,3249,0,0,4}-{2716,3530,0,0,0}-{2561,3374,0,0,4}-{2562,3374,0,0,4}-{2633,3693,0,0,4}-{2633,3694,0,0,4}-{2215,3248,0,0,4}-{2217,3245,0,0,4}-{2213,3241,0,0,4}-{3104,3424,0,0,0}-{3104,3425,0,0,0}-{2566,3370,0,0,0}-{2637,3444,0,0,0}-{2471,3146,0,0,4}-{2465,3156,0,0,4}-{2461,3150,0,0,4}-{2678,3595,0,0,4}" }, { "npc_id": "310", @@ -865,7 +897,7 @@ }, { "npc_id": "323", - "loc_data": "{2926,3177,0,0,6}-{3259,3204,0,0,3}-{3248,3161,0,0,4}-{3259,3206,0,0,3}-{2516,3575,0,0,7}-{2511,3562,0,0,7}-{2498,3547,0,0,7}" + "loc_data": "{2926,3177,0,0,6}-{3248,3161,0,0,4}-{2516,3575,0,0,7}-{2511,3562,0,0,7}-{2498,3547,0,0,7}" }, { "npc_id": "324", @@ -877,7 +909,7 @@ }, { "npc_id": "326", - "loc_data": "{2840,3431,0,0,0}-{3246,3156,0,0,0}-{3245,3152,0,0,0}-{3242,3148,0,0,0}-{2855,3423,0,0,1}-{3267,3148,0,0,6}-{3276,3140,0,0,6}-{3275,3140,0,0,6}-{3169,3266,0,0,3}-{3173,3274,0,0,3}-{2607,3416,0,0,1}-{2604,3417,0,0,1}-{2602,3419,0,0,1}" + "loc_data": "{2840,3431,0,0,0}-{3246,3156,0,0,0}-{3245,3152,0,0,0}-{3242,3148,0,0,0}-{2855,3423,0,0,1}-{3267,3148,0,0,6}-{3276,3140,0,0,6}-{3275,3140,0,0,6}-{2607,3416,0,0,1}-{2604,3417,0,0,1}-{2602,3419,0,0,1}" }, { "npc_id": "333", @@ -1461,11 +1493,11 @@ }, { "npc_id": "551", - "loc_data": "{3203,3397,0,1,3}" + "loc_data": "{3210,3400,0,1,3}" }, { "npc_id": "552", - "loc_data": "{3205,3399,0,1,3}" + "loc_data": "{3206,3400,0,1,3}" }, { "npc_id": "553", @@ -1790,14 +1822,30 @@ { "npc_id": "668", "loc_data": "{3284,3503,1,1,1}" - }, + }, + { + "npc_id": "669", + "loc_data": "{2678,3086,1,1,1}" + }, { "npc_id": "670", - "loc_data": "{2465,3496,0,1,6}" + "loc_data": "{2465,3496,0,1,6}-{2466,9896,0,0,6}" + }, + { + "npc_id": "671", + "loc_data": "{2479,3463,1,1,6}" + }, + { + "npc_id": "672", + "loc_data": "{2390,3515,1,1,6}" + }, + { + "npc_id": "673", + "loc_data": "{2464,3495,3,0,6}" }, { "npc_id": "674", - "loc_data": "{3001,3041,0,0,0}" + "loc_data": "{3001,3041,0,0,0}-{2954,3025,0,0,0}" }, { "npc_id": "675", @@ -2345,7 +2393,7 @@ }, { "npc_id": "941", - "loc_data": "{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}" + "loc_data": "{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}" }, { "npc_id": "942", @@ -2437,7 +2485,7 @@ }, { "npc_id": "1017", - "loc_data": "{3198,3359,0,1,0}-{3231,3296,0,1,6}-{3233,3300,0,1,4}-{3235,3293,0,1,3}-{3232,3288,0,1,0}-{3234,3298,0,1,6}-{2785,3069,0,1,4}-{2800,3072,0,1,6}-{3234,3297,0,1,3}-{3234,3292,0,1,4}-{3235,3289,0,1,1}-{2677,3656,0,1,2}-{2672,3654,0,1,2}-{2676,3652,0,1,4}-{2681,3652,0,1,4}-{2675,3652,0,1,3}-{2693,3271,0,1,3}-{2692,3272,0,1,3}" + "loc_data": "{3191,3277,0,1,0}-{3188,3279,0,1,0}-{3187,3277,0,1,0}-{3198,3359,0,1,0}-{3231,3296,0,1,6}-{3233,3300,0,1,4}-{3235,3293,0,1,3}-{3232,3288,0,1,0}-{3234,3298,0,1,6}-{2785,3069,0,1,4}-{2800,3072,0,1,6}-{3234,3297,0,1,3}-{3234,3292,0,1,4}-{3235,3289,0,1,1}-{2677,3656,0,1,2}-{2672,3654,0,1,2}-{2676,3652,0,1,4}-{2681,3652,0,1,4}-{2675,3652,0,1,3}-{2693,3271,0,1,3}-{2692,3272,0,1,3}-{3190,3278,0,1,0}-{3187,3277,0,1,0}--{3189,3278,0,1,3}" }, { "npc_id": "1019", @@ -2463,30 +2511,6 @@ "npc_id": "1027", "loc_data": "{3278,3155,0,0,0}-{2354,3608,0,0,0}" }, - { - "npc_id": "1028", - "loc_data": "{2778,3436,0,0,0}" - }, - { - "npc_id": "1029", - "loc_data": "{2920,3499,0,0,0}-{2784,3480,0,0,0}" - }, - { - "npc_id": "1030", - "loc_data": "{2768,3470,0,1,0}-{2843,3155,0,1,0}" - }, - { - "npc_id": "1032", - "loc_data": "{2865,3504,0,0,0}" - }, - { - "npc_id": "1033", - "loc_data": "{2606,2967,0,0,0}" - }, - { - "npc_id": "1035", - "loc_data": "{2599,2954,0,0,0}" - }, { "npc_id": "1036", "loc_data": "{3514,3478,0,0,0}-{3514,3479,0,0,0}-{3514,3480,0,0,0}-{3514,3481,0,0,0}-{3514,3482,0,0,0}-{3514,3483,0,0,0}" @@ -2601,7 +2625,7 @@ }, { "npc_id": "1072", - "loc_data": "{2897,3569,0,0,0}-{2893,3565,0,0,0}" + "loc_data": "{2893,3558,0,1,3}" }, { "npc_id": "1073", @@ -2609,15 +2633,15 @@ }, { "npc_id": "1074", - "loc_data": "{2897,3549,0,0,5}" + "loc_data": "{2897,3549,0,0,4}" }, { "npc_id": "1076", - "loc_data": "{2900,3556,0,0,1}-{2897,3565,0,1,4}" + "loc_data": "{2897,3556,0,0,6}-{2896,3566,0,0,6}" }, { "npc_id": "1077", - "loc_data": "{2897,3556,0,0,5}" + "loc_data": "{2900,3556,0,0,6}" }, { "npc_id": "1079", @@ -2625,7 +2649,7 @@ }, { "npc_id": "1081", - "loc_data": "{2896,3562,0,0,0}-{2891,3568,0,0,0}" + "loc_data": "{2897,3565,0,1,4}" }, { "npc_id": "1082", @@ -3443,6 +3467,10 @@ "npc_id": "1520", "loc_data": "{3434,3486,0,0,0}" }, + { + "npc_id": "1526", + "loc_data": "{2443,3089,0,0,0}" + }, { "npc_id": "1553", "loc_data": "{2828,10065,1,0,0}" @@ -3473,19 +3501,19 @@ }, { "npc_id": "1582", - "loc_data": "{2657,9500,0,0,1}-{2632,9589,2,0,1}-{2628,9549,2,0,5}-{2629,9543,2,0,2}-{3249,5517,0,1,3}-{2568,9889,0,1,6}-{2578,9898,0,1,1}-{2352,9755,0,1,1}-{2343,9775,0,1,1}-{2340,9777,0,1,1}-{2334,9775,0,1,1}" + "loc_data": "{2657,9500,0,0,1}-{2632,9589,2,0,1}-{2628,9549,2,0,5}-{2629,9543,2,0,2}-{3249,5517,0,1,3}-{2568,9889,0,1,6}-{2578,9898,0,1,1}" }, { "npc_id": "1583", - "loc_data": "{2655,9481,0,0,3}-{2631,9579,2,0,4}-{3211,5519,0,1,0}-{3254,5513,0,1,7}-{2563,9885,0,1,7}-{2575,9897,0,1,1}-{2352,9760,0,1,1}" + "loc_data": "{2655,9481,0,0,3}-{2631,9579,2,0,4}-{3211,5519,0,1,0}-{3254,5513,0,1,7}-{2563,9885,0,1,7}-{2575,9897,0,1,1}" }, { "npc_id": "1584", - "loc_data": "{2661,9481,0,0,4}-{2635,9570,2,0,1}-{2627,9539,2,0,5}-{3209,5512,0,1,6}-{3231,5494,0,1,7}-{2350,9776,0,1,1}-{2337,9773,0,1,1}" + "loc_data": "{2661,9481,0,0,4}-{2635,9570,2,0,1}-{2627,9539,2,0,5}-{3209,5512,0,1,6}-{3231,5494,0,1,7}" }, { "npc_id": "1585", - "loc_data": "{2666,9482,0,0,5}-{2641,9563,2,0,5}-{3257,5523,0,1,1}-{3204,5516,0,1,3}-{2575,9892,0,1,6}-{2355,9762,0,1,1}-{2354,9768,0,1,1}-{2351,9770,0,1,1}-{2354,9773,0,1,1}" + "loc_data": "{2666,9482,0,0,5}-{2641,9563,2,0,5}-{3257,5523,0,1,1}-{3204,5516,0,1,3}-{2575,9892,0,1,6}" }, { "npc_id": "1586", @@ -3505,15 +3533,15 @@ }, { "npc_id": "1590", - "loc_data": "{2730,9490,0,1,0}-{2731,9482,0,1,7}-{2742,9491,0,1,0}-{3184,5557,0,1,7}-{3148,5514,0,1,6}-{3144,5514,0,1,3}-{2340,9733,0,1,3}-{2348,9733,0,1,3}-{2348,9743,0,1,3}" + "loc_data": "{2730,9490,0,1,0}-{2731,9482,0,1,7}-{2742,9491,0,1,0}-{3184,5557,0,1,7}-{3148,5514,0,1,6}-{3144,5514,0,1,3}" }, { "npc_id": "1591", - "loc_data": "{2703,9456,0,0,0}-{2717,9459,0,0,7}-{2731,9460,0,0,3}-{2737,9454,0,0,3}-{2737,9444,0,0,3}-{2736,9432,0,0,3}-{2738,9421,0,0,5}-{2727,9418,0,0,1}-{2724,9439,0,0,0}-{2715,9443,0,0,4}-{2891,3919,0,1,0}-{2901,3914,0,1,0}-{2911,3914,0,1,0}-{2920,3919,0,1,0}-{2929,3919,0,1,0}-{2929,3935,0,1,0}-{2929,3944,0,1,0}-{2702,9443,0,0,3}-{2700,9428,0,0,3}-{2705,9419,0,0,7}-{2311,9744,0,1,3}-{2313,9733,0,1,3}-{2317,9735,0,1,3}-{2329,9736,0,1,3}" + "loc_data": "{2703,9456,0,0,0}-{2717,9459,0,0,7}-{2731,9460,0,0,3}-{2737,9454,0,0,3}-{2737,9444,0,0,3}-{2736,9432,0,0,3}-{2738,9421,0,0,5}-{2727,9418,0,0,1}-{2724,9439,0,0,0}-{2715,9443,0,0,4}-{2702,9443,0,0,3}-{2700,9428,0,0,3}-{2705,9419,0,0,7}" }, { "npc_id": "1592", - "loc_data": "{2893,3929,0,1,0}-{2893,3942,0,1,0}-{2897,3951,0,1,0}-{2903,3954,0,1,0}-{2910,3954,0,1,0}-{2920,3952,0,1,0}-{2929,3952,0,1,0}-{2728,9426,0,0,4}-{2714,9432,0,0,0}-{2707,9450,0,0,6}-{2724,9451,0,0,6}-{2311,9778,0,1,3}-{2313,9772,0,1,2}-{2318,9776,0,1,3}-{2318,9764,0,1,3}-{2318,9760,0,1,3}-{2313,9752,0,1,3}" + "loc_data": "{2728,9426,0,0,4}-{2714,9432,0,0,0}-{2707,9450,0,0,6}-{2724,9451,0,0,6}" }, { "npc_id": "1593", @@ -3553,7 +3581,7 @@ }, { "npc_id": "1604", - "loc_data": "{3434,3550,1,1,3}-{3439,3549,1,1,4}-{3425,3549,1,1,5}-{3423,3553,1,1,4}-{3426,3541,1,1,1}-{3425,3541,1,1,2}-{3426,3539,1,1,0}-{3420,3537,1,1,3}-{3417,3536,1,1,6}-{2373,9778,0,1,1}-{2372,9768,0,1,1}-{2371,9774,0,1,1}-{2375,9770,0,1,1}-{2383,9777,0,1,1}-{2387,9774,0,1,1}-{2384,9772,0,1,1}-{2387,9770,0,1,1}-{2392,9780,0,1,1}-{2396,9775,0,1,1}-{2399,9777,0,1,1}" + "loc_data": "{3434,3550,1,1,3}-{3439,3549,1,1,4}-{3425,3549,1,1,5}-{3423,3553,1,1,4}-{3426,3541,1,1,1}-{3425,3541,1,1,2}-{3426,3539,1,1,0}-{3420,3537,1,1,3}-{3417,3536,1,1,6}" }, { "npc_id": "1608", @@ -3565,7 +3593,7 @@ }, { "npc_id": "1610", - "loc_data": "{3443,3537,2,1,4}-{3434,3536,2,1,4}-{3443,3540,2,1,3}-{3446,3548,2,1,4}-{3439,3549,2,1,3}-{3434,3547,2,1,1}-{3444,3537,2,1,3}-{3174,5474,0,1,4}-{3175,5479,0,1,6}-{3183,5473,0,1,7}-{3178,5468,0,1,4}-{2428,9745,0,1,1}-{2428,9742,0,1,1}-{2428,9735,0,1,1}-{2425,9737,0,1,1}-{2422,9735,0,1,1}-{2419,9738,0,1,1}" + "loc_data": "{3443,3537,2,1,4}-{3434,3536,2,1,4}-{3443,3540,2,1,3}-{3446,3548,2,1,4}-{3439,3549,2,1,3}-{3434,3547,2,1,1}-{3444,3537,2,1,3}-{3174,5474,0,1,4}-{3175,5479,0,1,6}-{3183,5473,0,1,7}-{3178,5468,0,1,4}" }, { "npc_id": "1612", @@ -3573,11 +3601,11 @@ }, { "npc_id": "1613", - "loc_data": "{3439,3565,2,1,6}-{3443,3571,2,1,1}-{3435,3565,2,1,3}-{3443,3564,2,1,2}-{3444,3559,2,1,2}-{3427,3558,2,1,0}-{3425,3557,2,1,4}-{3430,3557,2,1,3}-{3170,5554,0,1,2}-{3166,5556,0,1,5}-{3171,5560,0,1,4}-{3173,5556,0,1,3}-{2426,9751,0,1,1}-{2427,9754,0,1,1}-{2425,9757,0,1,1}-{2422,9756,0,1,1}-{2426,9753,0,1,1}-{2420,9755,0,1,1}-{2417,9755,0,1,1}-{2406,9763,0,1,1}-{2404,9765,0,1,1}-{2407,9766,0,1,1}-{2410,9764,0,1,1}-{2416,9765,0,1,1}-{2417,9763,0,1,1}-{2420,9764,0,1,1}-{2418,9765,0,1,1}" + "loc_data": "{3439,3565,2,1,6}-{3443,3571,2,1,1}-{3435,3565,2,1,3}-{3443,3564,2,1,2}-{3444,3559,2,1,2}-{3427,3558,2,1,0}-{3425,3557,2,1,4}-{3430,3557,2,1,3}-{3170,5554,0,1,2}-{3166,5556,0,1,5}-{3171,5560,0,1,4}-{3173,5556,0,1,3}" }, { "npc_id": "1615", - "loc_data": "{3422,3566,2,1,5}-{3426,3568,2,1,6}-{3418,3562,2,1,4}-{3414,3566,2,1,3}-{3412,3570,2,1,4}-{3421,3572,2,1,2}-{3422,3571,2,1,1}-{3033,4873,0,1,7}-{3039,4885,0,1,3}-{3050,4890,0,1,3}-{3062,4892,0,1,5}-{3064,4901,0,1,3}-{3056,4912,0,1,3}-{3048,4916,0,1,5}-{3038,4911,0,1,6}-{3022,4914,0,1,6}-{3018,4902,0,1,6}-{3025,4898,0,1,4}-{3033,4885,0,1,0}-{3021,4877,0,1,3}-{3048,4872,0,1,1}-{3061,4880,0,1,3}-{3061,4891,0,1,1}-{3054,4901,0,1,1}-{2402,9739,0,1,1}-{2402,9742,0,1,1}-{2402,9751,0,1,1}-{2406,9753,0,1,1}-{2408,9750,0,1,1}-{2404,9748,0,1,1}-{2407,9748,0,1,1}-{2416,9748,0,1,1}-{2415,9745,0,1,1}-{2418,9745,0,1,1}" + "loc_data": "{3422,3566,2,1,5}-{3426,3568,2,1,6}-{3418,3562,2,1,4}-{3414,3566,2,1,3}-{3412,3570,2,1,4}-{3421,3572,2,1,2}-{3422,3571,2,1,1}-{3033,4873,0,1,7}-{3039,4885,0,1,3}-{3050,4890,0,1,3}-{3062,4892,0,1,5}-{3064,4901,0,1,3}-{3056,4912,0,1,3}-{3048,4916,0,1,5}-{3038,4911,0,1,6}-{3022,4914,0,1,6}-{3018,4902,0,1,6}-{3025,4898,0,1,4}-{3033,4885,0,1,0}-{3021,4877,0,1,3}-{3048,4872,0,1,1}-{3061,4880,0,1,3}-{3061,4891,0,1,1}-{3054,4901,0,1,1}" }, { "npc_id": "1616", @@ -3589,7 +3617,7 @@ }, { "npc_id": "1618", - "loc_data": "{3424,3565,1,1,1}-{3416,3562,1,1,6}-{3423,3559,1,1,0}-{3424,3560,1,1,4}-{3412,3558,1,1,1}-{3412,3568,1,1,1}-{3417,3565,1,1,3}-{2425,9774,0,1,1}-{2425,9776,0,1,1}-{2423,9779,0,1,1}-{2419,9785,0,1,1}-{2415,9785,0,1,1}-{2416,9788,0,1,1}-{2430,9788,0,1,1}-{2434,9789,0,1,1}-{2436,9794,0,1,1}" + "loc_data": "{3424,3565,1,1,1}-{3416,3562,1,1,6}-{3423,3559,1,1,0}-{3424,3560,1,1,4}-{3412,3558,1,1,1}-{3412,3568,1,1,1}-{3417,3565,1,1,3}" }, { "npc_id": "1620", @@ -3813,7 +3841,7 @@ }, { "npc_id": "1757", - "loc_data": "{3233,3308,0,0,4}" + "loc_data": "{3233,3308,0,1,4}" }, { "npc_id": "1758", @@ -3829,7 +3857,7 @@ }, { "npc_id": "1765", - "loc_data": "{3206,3265,0,1,4}-{2923,3320,0,1,7}-{2921,3320,0,1,4}-{2923,3320,0,1,5}" + "loc_data": "{3206,3265,0,1,4}-{2923,3320,0,1,7}-{2921,3320,0,1,4}-{2923,3320,0,1,5}-{3201,3265,0,1,0}-{3198,3270,0,1,0}" }, { "npc_id": "1766", @@ -3845,15 +3873,15 @@ }, { "npc_id": "1770", - "loc_data": "{2999,3212,0,1,1}-{3262,3253,0,1,6}-{3259,3254,0,1,3}-{2595,9826,0,1,1}" + "loc_data": "{2999,3212,0,1,1}-{3262,3253,0,1,6}-{3259,3254,0,1,3}-{2595,9826,0,1,1}-{3189,3246,0,1,0}-{3143,3231,0,1,0}-{3140,3263,0,1,0}" }, { "npc_id": "1771", - "loc_data": "{2993,3199,0,1,6}-{3248,3233,0,1,6}-{3247,3240,0,1,3}-{3187, 3286, 0, 1, 0}-{3209, 3277, 0, 1, 0}-{3174, 3294, 0, 1, 0}-{3178, 3294, 0, 1, 0}-{3144, 3302, 0, 1, 0}-{3142, 3303, 0, 1, 0}-{3151, 3300, 0, 1, 0}-{3139, 3299, 0, 1, 0}" + "loc_data": "{2993,3199,0,1,6}-{3248,3233,0,1,6}-{3247,3240,0,1,3}-{3187, 3286, 0, 1, 0}-{3209, 3277, 0, 1, 0}-{3174, 3294, 0, 1, 0}-{3178, 3294, 0, 1, 0}-{3144, 3302, 0, 1, 0}-{3142, 3303, 0, 1, 0}-{3151, 3300, 0, 1, 0}-{3139, 3299, 0, 1, 0}-{3192,3245,0,1,0}-{3184,3248,0,1,0}-{3140,3230,0,1,0}-{3141,3261,0,1,0}" }, { "npc_id": "1772", - "loc_data": "{2993,3203,0,1,0}-{3251,3231,0,1,1}-{3260,3241,0,1,0}-{3259,3222,0,0,4}" + "loc_data": "{2993,3203,0,1,0}-{3251,3231,0,1,1}-{3260,3241,0,1,0}-{3259,3222,0,0,4}-{3194,3255,0,1,0}-{3143,3234,0,1,0}" }, { "npc_id": "1773", @@ -4317,7 +4345,7 @@ }, { "npc_id": "2264", - "loc_data": "{3020,4888,0,1,3}-{3039,4871,0,1,4}-{3049,4921,0,1,7}-{3019,4877,0,1,6}-{3017,4893,0,1,7}-{3017,4821,0,1,4}-{3019,4898,0,1,4}-{3059,4813,0,1,0}-{3020,4912,0,1,2}-{3032,4808,0,1,3}-{3059,4820,0,1,3}-{3062,4828,0,1,6}-{3036,4856,0,1,7}-{3062,4837,0,1,5}-{3025,4850,0,1,1}-{3052,4859,0,1,1}-{3024,4813,0,1,4}-{3054,4915,0,1,7}-{3048,4854,0,1,3}-{3034,4852,0,1,1}-{3052,4898,0,1,1}-{3028,4808,0,1,1}-{3034,4905,0,1,4}-{3018,4843,0,1,2}-{3028,4851,0,1,0}-{3016,4831,0,1,1}-{3052,4896,0,1,3}-{3046,4901,0,1,2}-{3043,4810,0,1,3}-{3062,4884,0,1,6}-{3049,4873,0,1,1}-{3041,4871,0,1,1}" + "loc_data": "{3020,4888,0,1,3}-{3039,4871,0,1,4}-{3049,4921,0,1,7}-{3019,4877,0,1,6}-{3017,4893,0,1,7}-{3017,4821,0,1,4}-{3019,4898,0,1,4}-{3059,4813,0,1,0}-{3020,4912,0,1,2}-{3032,4808,0,1,3}-{3059,4820,0,1,3}-{3062,4828,0,1,6}-{3036,4856,0,1,7}-{3062,4837,0,1,5}-{3025,4850,0,1,1}-{3052,4858,0,1,1}-{3024,4813,0,1,4}-{3054,4915,0,1,7}-{3048,4854,0,1,3}-{3034,4852,0,1,1}-{3052,4898,0,1,1}-{3028,4808,0,1,1}-{3034,4905,0,1,4}-{3018,4843,0,1,2}-{3028,4851,0,1,0}-{3016,4831,0,1,1}-{3052,4896,0,1,3}-{3046,4901,0,1,2}-{3043,4810,0,1,3}-{3062,4884,0,1,6}-{3049,4873,0,1,1}-{3041,4871,0,1,1}" }, { "npc_id": "2265", @@ -4353,19 +4381,19 @@ }, { "npc_id": "2278", - "loc_data": "{3247,3244,0,1,2}" + "loc_data": "{3247,3244,0,1,2}-{3190,3251,0,1,0}-{3179,3243,0,1,0}-{3179,3248,0,1,0}-{3146,3235,0,1,0}-{3146,3261,0,1,0}" }, { "npc_id": "2279", - "loc_data": "{3244,3247,0,1,3}" + "loc_data": "{3244,3247,0,1,3}-{3181,3243,0,1,0}-{3176,3248,0,1,0}-{3182,3248,0,1,0}-{3140,3226,0,1,0}-{3140,3259,0,1,0}-{3143,3260,0,1,0}" }, { "npc_id": "2280", - "loc_data": "{3245,3244,0,1,4}" + "loc_data": "{3245,3244,0,1,4}-{3144,3228,0,1,0}" }, { "npc_id": "2281", - "loc_data": "{3246,3245,0,1,4}" + "loc_data": "{3246,3245,0,1,4}-{3187,3241,0,1,0}-{3177,3243,0,1,0}" }, { "npc_id": "2290", @@ -5175,6 +5203,18 @@ "npc_id": "2819", "loc_data": "{3295,3193,0,0,0}" }, + { + "npc_id": "2820", + "loc_data": "{3302,3185,0,1,4}" + }, + { + "npc_id": "2821", + "loc_data": "{3306,3196,0,0,4}" + }, + { + "npc_id": "2823", + "loc_data": "{3302,3197,0,1,4}" + }, { "npc_id": "2824", "loc_data": "{3275,3193,0,0,0}" @@ -5693,7 +5733,7 @@ }, { "npc_id": "3264", - "loc_data": "{3265,3331,0,1,7}-{3146,3460,0,1,6}-{3115,3414,0,1,3}-{3195,3240,0,1,6}-{2565,9843,0,1,0}" + "loc_data": "{3265,3331,0,1,7}-{3146,3460,0,1,6}-{3115,3414,0,1,3}-{2565,9843,0,1,0}" }, { "npc_id": "3265", @@ -5705,7 +5745,7 @@ }, { "npc_id": "3267", - "loc_data": "{3134,3459,0,1,1}-{3194,3240,0,1,0}-{3178,3257,0,1,1}-{3170,3255,0,1,7}-{3192,3243,0,1,1}-{3175,3249,0,1,1}-{3170,3242,0,1,2}-{3193,3243,0,1,7}-{3189,3258,0,1,1}-{3172,3245,0,1,4}-{3172,3238,0,1,6}-{3187,3246,0,1,4}-{3186,3243,0,1,7}-{3222,3238,0,1,1}-{3144,3235,0,1,6}-{3147,3224,0,1,1}-{3131,3243,0,1,7}-{3142,3242,0,1,4}-{3157,3228,0,1,6}-{3151,3217,0,1,6}-{3152,3246,0,1,1}-{3145,3266,0,1,4}-{3148,3240,0,1,1}-{3135,3258,0,1,2}-{3140,3260,0,1,3}" + "loc_data": "{3134,3459,0,1,1}" }, { "npc_id": "3268", @@ -5901,7 +5941,7 @@ }, { "npc_id": "3419", - "loc_data": "{2540,3020,0,0,0}-{2555,2953,0,0,0}" + "loc_data": "" }, { "npc_id": "3450", @@ -5937,7 +5977,7 @@ }, { "npc_id": "3673", - "loc_data": "{2925,3321,0,1,4}-{2924,3319,0,1,0}" + "loc_data": "{2925,3321,0,1,4}-{2924,3319,0,1,0}-{3196,3264,0,1,0}" }, { "npc_id": "3675", @@ -5953,7 +5993,7 @@ }, { "npc_id": "3680", - "loc_data": "{3281,3331,0,1,7}" + "loc_data": "{3282,3327,0,1,7}" }, { "npc_id": "3695", @@ -6365,11 +6405,11 @@ }, { "npc_id": "4381", - "loc_data": "{3024,10152,0,0,0}-{3020,10148,0,0,0}-{3023,10145,0,0,0}-{3018,10140,0,0,0}-{3033,10139,0,0,0}-{3028,10137,0,0,0}-{2361,5241,0,0,1}-{2358,5240,0,0,1}-{2362,5239,0,0,1}-{2364,5240,0,0,1}-{2364,5242,0,0,1}-{2372,9743,0,1,1}-{2373,9745,0,1,1}-{2374,9742,0,1,1}-{2377,9750,0,1,1}-{2378,9752,0,1,1}-{2377,9754,0,1,1}" + "loc_data": "{2361,5241,0,1,1}-{2358,5240,0,1,1}-{2362,5239,0,1,1}-{2364,5240,0,1,1}-{2364,5242,0,1,1}-{2357,5242,0,1,1}-{2356,5240,0,1,1}-{2356,5242,0,1,1}-{2360,5243,0,1,1}" }, { "npc_id": "4382", - "loc_data": "{3162,3716,0,0,0}-{3175,3717,0,0,0}-{3161,3727,0,0,0}-{2304,5160,0,0,2}-{2324,5210,0,0,2}-{2322,5201,0,0,7}-{2324,5210,0,0,2}-{2322,5201,0,0,7}-{2327,5205,0,0,7}-{2328,5200,0,0,7}-{2326,5198,0,0,7}-{2331,5198,0,0,4}-{2333,5201,0,0,4}-{2333,5199,0,0,2}" + "loc_data": "{3162,3716,0,1,0}-{3175,3717,0,1,0}-{3161,3727,0,1,0}-{2304,5160,0,0,2}-{2324,5210,0,1,2}-{2322,5201,0,1,7}-{2324,5210,0,1,2}-{2322,5201,0,1,7}-{2327,5205,0,1,7}-{2328,5200,0,1,7}-{2326,5198,0,1,7}-{2331,5198,0,1,4}-{2333,5201,0,1,4}-{2333,5199,0,1,2}" }, { "npc_id": "4383", @@ -6393,19 +6433,19 @@ }, { "npc_id": "4388", - "loc_data": "{2305,5231,0,0,2}-{2312,5225,0,0,2}-{2314,5240,0,0,2}-{2310,5241,0,0,2}-{2308,5246,0,0,2}-{2309,5245,0,0,2}-{2315,5237,0,0,2}" + "loc_data": "{2305,5231,0,1,2}-{2312,5225,0,1,2}-{2314,5240,0,1,2}-{2310,5241,0,1,2}-{2308,5246,0,1,2}-{2309,5245,0,1,2}-{2315,5237,0,1,2}" }, { "npc_id": "4389", - "loc_data": "{2013,5238,0,1,0}" + "loc_data": "{2013,5238,0,1,0}-{2043,5233,0,1,0}-{2041,5231,0,1,0}--{2029,5233,0,1,0}-{2020,5238,0,1,0}" }, { "npc_id": "4390", - "loc_data": "{1984,5160,0,1,2}-{2040,5190,0,1,3}-{2044,5187,0,1,2}-{2042,5191,0,1,1}-{2045,5190,0,1,7}-{2041,5187,0,1,2}" + "loc_data": "{1984,5160,0,1,2}-{2040,5190,0,1,3}-{2044,5187,0,1,2}-{2042,5191,0,1,1}-{2045,5190,0,1,7}-{2041,5187,0,1,2}-{2045,5186,0,1,2}-{2044,5188,0,1,2}-{2042,5192,0,1,2}" }, { "npc_id": "4391", - "loc_data": "{1952,5192,0,1,2}-{1993,5240,0,1,4}-{1991,5235,0,1,4}-{1990,5240,0,1,3}-{1989,5237,0,1,6}-{2009,5202,0,1,1}-{2005,5199,0,1,3}" + "loc_data": "{1952,5192,0,1,2}-{1993,5240,0,1,4}-{1991,5235,0,1,4}-{1990,5240,0,1,3}-{1989,5237,0,1,6}-{2009,5202,0,1,1}-{2005,5199,0,1,3}-{1994,5236,0,1,6}-{1991,5242,0,1,6}-{2007,5201,0,1,6}-{2009,5201,0,1,6}-{2004,5197,0,1,6}-{2004,5207,0,1,6}-{2006,5205,0,1,6}" }, { "npc_id": "4392", @@ -6413,7 +6453,7 @@ }, { "npc_id": "4393", - "loc_data": "{2045,5222,0,1,4}-{1944,5152,0,1,2}-{1993,5190,0,1,6}-{1993,5190,0,1,4}-{2044,5216,0,1,4}-{2008,5203,0,1,1}-{2006,5208,0,1,1}-{2037,5214,0,1,3}-{2037,5210,0,1,1}" + "loc_data": "{2045,5222,0,1,4}-{1944,5152,0,1,2}-{1993,5190,0,1,6}-{1993,5190,0,1,4}-{2044,5216,0,1,4}-{2008,5203,0,1,1}-{2006,5208,0,1,1}-{2037,5214,0,1,3}-{2037,5210,0,1,1}-{2043,5217,0,1,1}-{2040,5214,0,1,1}-{2042,5217,0,1,1}-{2038,5214,0,1,1}-{2041,5218,0,1,1}" }, { "npc_id": "4394", @@ -6421,7 +6461,7 @@ }, { "npc_id": "4395", - "loc_data": "{2016,5237,0,1,7}-{1988,5190,0,1,2}-{2039,5216,0,1,6}" + "loc_data": "{2016,5237,0,1,7}-{1988,5190,0,1,2}-{2039,5216,0,1,6}-{2017,5238,0,1,6}" }, { "npc_id": "4396", @@ -6441,7 +6481,7 @@ }, { "npc_id": "4400", - "loc_data": "{3018,10313,0,1,4}-{3016,10315,0,1,4}-{3018,10322,0,1,4}-{3024,10326,0,1,3}-{3030,10332,0,1,4}-{3029,10337,0,1,6}-{3034,10342,0,1,3}-{2072,5200,0,1,7}-{2130,5267,0,1,7}-{2140,5252,0,1,5}-{2141,5252,0,1,1}-{2142,5252,0,1,0}-{2148,5255,0,1,3}-{2125,5270,0,1,1}-{2148,5257,0,1,1}-{2117,5274,0,1,4}-{2146,5307,0,1,2}-{2145,5305,0,1,5}-{2152,5307,0,1,4}-{2148,5252,0,1,0}-{2142,5262,0,1,3}-{2124,5275,0,1,4}-{2121,5276,0,1,3}-{2148,5304,0,1,0}-{2146,5305,0,1,5}-{2148,5304,0,1,1}-{2151,5304,0,1,6}-{2145,5306,0,1,3}-{2134,5272,0,1,6}" + "loc_data": "{3018,10313,0,1,4}-{3016,10315,0,1,4}-{3018,10322,0,1,4}-{3024,10326,0,1,3}-{3030,10332,0,1,4}-{3029,10337,0,1,6}-{3034,10342,0,1,3}-{2072,5200,0,1,7}-{2130,5267,0,1,7}-{2140,5252,0,1,5}-{2141,5252,0,1,1}-{2142,5252,0,1,0}-{2148,5255,0,1,3}-{2125,5270,0,1,1}-{2148,5257,0,1,1}-{2117,5274,0,1,4}-{2146,5307,0,1,2}-{2145,5305,0,1,5}-{2152,5307,0,1,4}-{2148,5252,0,1,0}-{2142,5262,0,1,3}-{2124,5275,0,1,4}-{2121,5276,0,1,3}-{2148,5304,0,1,0}-{2146,5305,0,1,5}-{2148,5304,0,1,1}-{2151,5304,0,1,6}-{2145,5306,0,1,3}-{2134,5272,0,1,6}-{2151,5307,0,1,6}-{2151,5308,0,1,6}-{2149,5307,0,1,6}-{2150,5308,0,1,6}-{2150,5305,0,1,6}-{2153,5307,0,1,6}-{2152,5305,0,1,6}-{2128,5272,0,1,6}-{2129,5272,0,1,6}-{2124,5271,0,1,6}-{2124,5272,0,1,6}-{2122,5272,0,1,6}-{2121,5275,0,1,6}" }, { "npc_id": "4401", @@ -6865,19 +6905,19 @@ }, { "npc_id": "4677", - "loc_data": "{3335,3687,0,1,4}-{3338,3700,0,1,2}-{3316,5448,0,1,2}-{3107,10065,0,1,0}-{3299,5545,0,1,6}" + "loc_data": "{3335,3687,0,1,4}-{3338,3700,0,1,2}-{3316,5448,0,1,2}-{3299,5545,0,1,6}" }, { "npc_id": "4678", - "loc_data": "{3335,3701,0,1,6}-{3350,3687,0,1,5}-{3305,5454,0,1,6}-{3110,10076,0,1,0}" + "loc_data": "{3335,3701,0,1,6}-{3350,3687,0,1,5}-{3305,5454,0,1,6}" }, { "npc_id": "4679", - "loc_data": "{3333,3694,0,1,6}-{3341,3685,0,1,4}-{3118,10068,0,1,0}-{3312,5558,0,1,1}" + "loc_data": "{3333,3694,0,1,6}-{3341,3685,0,1,4}-{3312,5558,0,1,1}" }, { "npc_id": "4680", - "loc_data": "{3349,3696,0,1,5}-{3120,10080,0,1,0}" + "loc_data": "{3349,3696,0,1,5}" }, { "npc_id": "4681", @@ -6913,35 +6953,35 @@ }, { "npc_id": "4694", - "loc_data": "{3098,3870,0,1,1}-{3020,3854,0,1,7}-{2843,9558,0,1,1}-{2840,9605,0,1,4}-{3053,10124,0,1,0}-{3056,10140,0,1,0}" + "loc_data": "{3098,3870,0,1,1}-{3020,3854,0,1,7}-{2843,9558,0,1,1}-{2840,9605,0,1,4}" }, { "npc_id": "4695", - "loc_data": "{3097,3696,0,1,4}-{3017,3851,0,1,2}-{2839,9565,0,1,3}-{2837,9601,0,1,4}-{2840,3279,0,1,6}-{3048,10134,0,1,0}-{3061,10138,0,1,0}" + "loc_data": "{3097,3696,0,1,4}-{3017,3851,0,1,2}-{2839,9565,0,1,3}-{2837,9601,0,1,4}-{2840,3279,0,1,6}" }, { "npc_id": "4696", - "loc_data": "{3118,3695,0,1,6}-{2931,9808,0,1,0}-{2930,9799,0,1,0}-{3010,3851,0,1,1}-{2839,9560,0,1,4}-{2846,9613,0,1,6}-{3062,10131,0,1,0}" + "loc_data": "{3118,3695,0,1,6}-{2931,9808,0,1,0}-{2930,9799,0,1,0}-{3010,3851,0,1,1}-{2839,9560,0,1,4}-{2846,9613,0,1,6}" }, { "npc_id": "4697", - "loc_data": "{3125,3706,0,1,5}-{3331,3853,0,1,2}-{3016,3841,0,1,4}-{2845,9557,0,1,2}-{2839,9624,0,1,6}-{2825,3277,0,1,3}-{3065,10125,0,1,0}" + "loc_data": "{3125,3706,0,1,5}-{3331,3853,0,1,2}-{3016,3841,0,1,4}-{2845,9557,0,1,2}-{2839,9624,0,1,6}-{2825,3277,0,1,3}" }, { "npc_id": "4698", - "loc_data": "{3139,3712,0,1,5}-{3306,3890,0,1,6}-{3085,10093,0,1,0}-{3090,10084,0,1,0}-{2861,9752,0,1,4}-{2363,9776,0,1,1}-{2361,9755,0,1,1}-{2365,9754,0,1,1}-{2362,9751,0,1,1}" + "loc_data": "{3139,3712,0,1,5}-{3306,3890,0,1,6}-{2861,9752,0,1,4}" }, { "npc_id": "4699", - "loc_data": "{3035,10245,0,1,4}-{3159,3707,0,1,3}-{3301,3871,0,1,5}-{3097,10092,0,1,0}-{3082,10083,0,1,0}-{2629,9477,2,0,0}-{2640,9502,2,0,1}-{2359,9741,0,1,1}" + "loc_data": "{3035,10245,0,1,4}-{3159,3707,0,1,3}-{3301,3871,0,1,5}-{2629,9477,2,0,0}-{2640,9502,2,0,1}" }, { "npc_id": "4700", - "loc_data": "{3030,10259,0,1,3}-{3144,3701,0,1,4}-{3279,3876,0,1,4}-{3094,10092,0,1,0}-{3089,10081,0,1,0}-{2633,9488,2,0,6}-{2862,9750,0,1,7}-{2358,9737,0,1,1}-{2366,9763,0,1,1}" + "loc_data": "{3144,3701,0,1,4}-{3279,3876,0,1,4}-{2633,9488,2,0,6}-{2862,9750,0,1,7}" }, { "npc_id": "4701", - "loc_data": "{3028,10250,0,1,4}-{3149,3690,0,1,4}-{3286,3901,0,1,3}-{3089,10089,0,1,0}-{3085,10081,0,1,0}-{2628,9489,2,0,0}-{2631,9504,2,0,5}-{2361,9755,0,1,1}-{2363,9743,0,1,1}-{2363,9772,0,1,1}" + "loc_data": "{3028,10250,0,1,4}-{3149,3690,0,1,4}-{3286,3901,0,1,3}" }, { "npc_id": "4702", @@ -7043,9 +7083,13 @@ "npc_id": "4932", "loc_data": "{3414,2891,0,1,1}-{3410,2888,0,1,7}" }, + { + "npc_id": "4942", + "loc_data": "{3191,3210,0,1,0}" + }, { "npc_id": "4944", - "loc_data": "{2042,5213,0,1,5}-{2020,5236,0,1,2}-{1944,5152,0,1,2}-{2041,5216,0,1,0}" + "loc_data": "{2042,5213,0,1,5}-{2020,5236,0,1,2}-{1944,5152,0,1,2}-{1993,5188,0,1,2}-{1994,5191,0,1,2}" }, { "npc_id": "4945", @@ -7341,7 +7385,7 @@ }, { "npc_id": "5120", - "loc_data": "{2326,3488,0,1,0}-{2325,3483,0,1,0}-{2315,3482,0,1,0}-{2336,3491,0,1,0}" + "loc_data": "{2326,3488,0,1,2}-{2325,3483,0,1,2}-{2315,3482,0,1,2}-{2336,3491,0,1,2}" }, { "npc_id": "5125", @@ -7373,15 +7417,15 @@ }, { "npc_id": "5156", - "loc_data": "{3203,3262,0,1,5}" + "loc_data": "{3203,3262,0,1,5}-{3195,3265,0,1,0}-{3199,3267,0,1,0}" }, { "npc_id": "5157", - "loc_data": "{3205,3262,0,1,1}" + "loc_data": "{3205,3262,0,1,1}-{3194,3265,0,1,0}-{3201,3274,0,1,0}" }, { "npc_id": "5160", - "loc_data": "{3205,3270,0,1,4}-{3249,3345,0,1,5}" + "loc_data": "{3205,3270,0,1,4}-{3249,3345,0,1,5}-{3195,3272,0,1,0}-{3195,3268,0,1,0}" }, { "npc_id": "5161", @@ -7557,7 +7601,7 @@ }, { "npc_id": "5361", - "loc_data": "{3176,5543,0,1,3}-{3191,5542,0,1,4}-{1757,5358,0,1,5}-{1760,5357,0,1,5}-{1755,5352,0,1,5}-{1751,5342,0,1,3}-{1745,5342,0,1,6}-{1739,5342,0,1,3}-{1737,5344,0,1,7}-{1739,5347,0,1,6}-{1740,5350,0,1,5}-{1739,5355,0,1,3}-{1747,5363,0,1,4}-{1749,5363,0,1,4}-{1743,5360,0,1,3}-{1739,5356,0,1,0}-{3175,5543,0,1,2}-{3178,5541,0,1,2}-{3187,5542,0,1,3}-{3192,5545,0,1,2}-{3192,5542,0,1,3}-{3179,5549,0,1,6}-{2386,9745,0,1,1}-{2385,9748,0,1,1}-{2389,9746,0,1,1}-{2390,9751,0,1,1}-{2306,9760,0,1,1}-{2395,9757,0,1,1}-{2397,9756,0,1,1}-{2399,9758,0,1,1}-{2385,9762,0,1,1}-{2382,9759,0,1,1}-{2385,9757,0,1,1}-{2388,9759,0,1,1}-{2393,9768,0,1,1}-{2394,9741,0,1,1}" + "loc_data": "{3176,5543,0,1,3}-{3191,5542,0,1,4}-{1757,5358,0,1,5}-{1760,5357,0,1,5}-{1755,5352,0,1,5}-{1751,5342,0,1,3}-{1745,5342,0,1,6}-{1739,5342,0,1,3}-{1737,5344,0,1,7}-{1739,5347,0,1,6}-{1740,5350,0,1,5}-{1739,5355,0,1,3}-{1747,5363,0,1,4}-{1749,5363,0,1,4}-{1743,5360,0,1,3}-{1739,5356,0,1,0}-{3175,5543,0,1,2}-{3178,5541,0,1,2}-{3187,5542,0,1,3}-{3192,5545,0,1,2}-{3192,5542,0,1,3}-{3179,5549,0,1,6}" }, { "npc_id": "5362", @@ -7605,7 +7649,7 @@ }, { "npc_id": "5377", - "loc_data": "{2004,5189,0,1,3}-{2002,5207,0,1,3}-{2009,5199,0,1,5}-{2004,5203,0,1,6}" + "loc_data": "{2004,5189,0,1,3}-{2002,5207,0,1,3}-{2009,5199,0,1,5}-{2004,5203,0,1,6}-{1989,5192,0,1,6}-{1988,5187,0,1,6}" }, { "npc_id": "5378", @@ -7617,7 +7661,7 @@ }, { "npc_id": "5380", - "loc_data": "{1952,5192,0,1,2}-{2028,5192,0,1,0}" + "loc_data": "{1952,5192,0,1,2}-{2028,5192,0,1,0}-{2031,5186,0,1,0}-{2027,5194,0,1,0}--{2021,5188,0,1,0}" }, { "npc_id": "5383", @@ -8639,6 +8683,42 @@ "npc_id": "6051", "loc_data": "{3292,3069,0,1,1}-{3285,3071,0,1,1}-{3279,3078,0,1,4}-{3273,3065,0,1,3}-{3288,3066,0,1,6}-{3281,3057,0,1,5}-{3294,3056,0,1,5}-{3305,3064,0,1,3}-{3312,3075,0,1,6}-{3306,3086,0,1,4}-{3272,3082,0,1,4}" }, + { + "npc_id": "6055", + "loc_data": "{2563,4348,0,1,0}-{2620,4348,0,1,0}-{2620,4291,0,1,0}-{2563,4291,0,1,0}-{2572,4339,0,1,0}-{2565,4327,0,1,0}-{2575,4315,0,1,0}-{2586,4306,0,1,0}-{2593,4304,0,1,0}-{2605,4312,0,1,0}-{2614,4330,0,1,0}-" + }, + { + "npc_id": "6056", + "loc_data": "{2565,4320,0,1,0}-{2592,4348,0,1,0}-{2596,4346,0,1,0}-{2576,4333,0,1,0}-{2576,4324,0,1,0}-{2612,4333,0,1,0}-{2617,4329,0,1,0}-{2608,4316,0,1,0}-{2593,4295,0,1,0}-{2587,4307,0,1,0}-" + }, + { + "npc_id": "6057", + "loc_data": "{2604,4348,0,1,0}-{2613,4346,0,1,0}-{2582,4347,0,1,0}-{2568,4333,0,1,0}-{2576,4321,0,1,0}-{2571,4302,0,1,0}-{2587,4296,0,1,0}-{2598,4301,0,1,0}-{2612,4303,0,1,0}-{2607,4321,0,1,0}-{2617,4325,0,1,0}-{2617,4346,0,1,0}-" + }, + { + "npc_id": "6058", + "loc_data": "{2585,4343,0,1,0}-{2599,4338,0,1,0}-{2612,4338,0,1,0}-{2573,4329,0,1,0}-{2572,4320,0,1,0}-{2575,4309,0,1,0}-{2587,4302,0,1,0}-{2606,4319,0,1,0}-{2608,4336,0,1,0}-" + }, + { + "npc_id": "6059", + "loc_data": "{2579,4340,0,1,0}-{2578,4323,0,1,0}-{2580,4302,0,1,0}-{2611,4324,0,1,0}-{2594,4338,0,1,0}-" + }, + { + "npc_id": "6060", + "loc_data": "{2589,4341,0,1,0}-{2569,4315,0,1,0}-{2591,4299,0,1,0}-{2611,4330,0,1,0}-" + }, + { + "npc_id": "6065", + "loc_data": "{2612,4348,0,1,0}-{2606,4340,0,1,0}-{2592,4333,0,1,0}-{2579,4336,0,1,0}-{2565,4340,0,1,0}-{2569,4329,0,1,0}-{2574,4311,0,1,0}-{2570,4304,0,1,0}-{2567,4294,0,1,0}-{2604,4305,0,1,0}-{2610,4293,0,1,0}-{2612,4320,0,1,0}-" + }, + { + "npc_id": "6066", + "loc_data": "{2601,4334,0,1,0}-{2586,4335,0,1,0}-{2572,4334,0,1,0}-{2574,4323,0,1,0}-{2579,4295,0,1,0}-{2588,4298,0,1,0}-{2600,4304,0,1,0}-{2612,4312,0,1,0}-{2607,4329,0,1,0}-{2616,4336,0,1,0}-" + }, + { + "npc_id": "6067", + "loc_data": "{2570,4341,0,0,0}-{2613,4298,0,0,0}-" + }, { "npc_id": "6070", "loc_data": "{2589,4313,0,1,6}" @@ -9554,7 +9634,11 @@ { "npc_id": "6987", "loc_data": "{2894,3445,0,1,0}" - }, + }, + { + "npc_id": "6996", + "loc_data": "{3259,3206,0,0,3}-{3259,3204,0,0,3}-{3169,3266,0,0,3}-{3173,3274,0,0,3}-{2689,3598,0,0,4}" + }, { "npc_id": "6997", "loc_data": "{3002,3257,0,0,0}-{3058,3429,0,0,0}-{3059,3420,0,0,0}-{3059,3425,0,0,0}-{3049,3429,0,0,0}-{3007,3261,0,0,0}" @@ -10951,17 +11035,13 @@ "npc_id": "5517", "loc_data": "{2403,3853,0,1,0}-{2328,3830,0,1,0}-{2405,3860,0,1,0}-{2335,3894,0,1,0}" }, - { - "npc_id": "3848", - "loc_data": "{2410,3780,0,1,0}-{2414,3780,0,1,0}" - }, { "npc_id": "313", - "loc_data":"{2401,3781,0,1,0}" + "loc_data":"{2401,3781,0,0,0}" }, { "npc_id": "312", - "loc_data": "{2421,3789,0,1,0}" + "loc_data": "{2421,3789,0,0,0}-{2410,3780,0,0,0}-{2414,3780,0,0,0}" }, { "npc_id": "1164", @@ -11009,7 +11089,7 @@ }, { "npc_id": "800", - "loc_data": "{2884,9765,0,1,0}-{2890,9766,0,1,0}-{2894,9764,0,1,0}" + "loc_data": "{2884,9765,0,0,0}-{2890,9766,0,0,0}-{2894,9764,0,0,0}" }, { "npc_id": "3322", @@ -11058,6 +11138,13 @@ { "npc_id": "1676", "loc_data": "{3481,9942,0,1,0}-{3493,9925,0,1,0}-{3525,9932,0,1,0}-{3555,9927,0,1,0}-{3554,9947,0,1,0}-{3529,9968,0,1,0}" + }, + { + "npc_id": "5083", + "loc_data": "{2699,3780,0,1,4}-{2694,3785,0,1,4}-{2708,3772,0,1,0}-{2714,3765,0,1,0}-{2717,3776,0,1,0}-{2718,3784,0,1,0}-{2621,3835,1,1,4}-{2723,3786,0,1,0}-{2725,3833,1,1,0}-{2728,3776,0,1,0}" + }, + { + "npc_id": "5084", + "loc_data": "{2703,3829,1,1,0}-{2708,3824,1,1,0}-{2714,3826,1,1,0}-{2722,3833,1,1,0}-{2724,3771,0,1,0}-{2738,3769,0,1,0}-{2737,3776,0,1,0}" } - ] diff --git a/game/data/configs/object_configs.json b/game/data/configs/object_configs.json index 354bfc6..4ee1d9a 100644 --- a/game/data/configs/object_configs.json +++ b/game/data/configs/object_configs.json @@ -145,7 +145,7 @@ }, { "examine": "Used for storage.", - "ids": "63,64" + "ids": "63,64,36351,36352" }, { "examine": "Surprisingly sturdy looking.", @@ -2601,7 +2601,7 @@ }, { "examine": "I can climb this.", - "ids": "1729" + "ids": "1729,36347,36363,36644" }, { "examine": "Dare I go up?", @@ -3641,7 +3641,7 @@ }, { "examine": "I can climb down this.", - "ids": "2408" + "ids": "2408,36693,36694" }, { "examine": "A commonly found tree.", @@ -6777,7 +6777,7 @@ }, { "examine": "A solid stone staircase.", - "ids": "4415,4416,4417,4418,4419,4420" + "ids": "4415,4416,4417,4418,4419,4420,36480,36481,36484,36495,36521,36523,36532,36540" }, { "examine": "A spiky barricade.", @@ -7609,7 +7609,7 @@ }, { "examine": "I can climb down this.", - "ids": "4911,4912" + "ids": "4911,4912,36349,36365" }, { "examine": "It looks cramped and dark.", @@ -20602,5 +20602,33 @@ { "examine": "Keeps the puppies out of trouble.", "ids": "28341" + }, + { + "examine": "There are some toolboxes on this table.", + "ids": "36573,36580" + }, + { + "examine": "There's some rock I can use with the catapult here.", + "ids": "36574,36581" + }, + { + "examine": "There are some barricades here.", + "ids": "36575,36582" + }, + { + "examine": "There is some rope here.", + "ids": "36576,36583" + }, + { + "examine": "There are some explosive potions here.", + "ids": "36577,36584" + }, + { + "examine": "There are some pickaxes on this table.", + "ids": "36578,36585" + }, + { + "examine": "There are some bandages on this table.", + "ids": "36579,36586" } ] \ No newline at end of file diff --git a/game/data/configs/shared_tables/RDT.xml b/game/data/configs/shared_tables/RDT.xml index 080dd90..78ed522 100644 --- a/game/data/configs/shared_tables/RDT.xml +++ b/game/data/configs/shared_tables/RDT.xml @@ -26,4 +26,5 @@ + \ No newline at end of file diff --git a/game/data/configs/shops.json b/game/data/configs/shops.json index 39f14ca..29c8195 100644 --- a/game/data/configs/shops.json +++ b/game/data/configs/shops.json @@ -1251,13 +1251,13 @@ "stock": "{12204,10,100}-{12207,10,100}-{12210,10,100}-{12213,10,100}-{12216,10,100}-{12219,10,100}-{12222,10,100}-{12183,125000,100}-{12155,5000,100}" }, { - "npcs": "6996", + "npcs": "4472", "high_alch": "0", "currency": "995", "general_store": "false", "id": "142", "title": "Bogrog's Summoning Shop", - "stock": "{12204,10,100}-{12207,10,100}-{12210,10,100}-{12213,10,100}-{12216,10,100}-{12219,10,100}-{12222,10,100}-{12183,125000,100}-{12155,5000,100}" + "stock": "{12204,10,100}-{12207,10,100}-{12210,0,100}-{12213,0,100}-{12216,0,100}-{12219,0,100}-{12222,0,100}-{12183,65000,100}-{12155,5000,100}" }, { "npcs": "3671", @@ -1891,12 +1891,13 @@ }, { "npcs": "2564", + "force_shared": "true", "high_alch": "0", "currency": "995", "general_store": "false", "id": "222", "title": "Ore Shop\b", - "stock": "{436,1500,100}-{438,1500,100}-{440,1500,100}-{442,1500,100}-{444,1500,100}-{447,1500,100}-{453,1500,100}" + "stock": "{436,0,0}-{438,0,0}-{440,0,0}-{442,0,0}-{444,0,0}-{447,0,0}-{453,0,0}" }, { "npcs": "603", @@ -2176,5 +2177,14 @@ "id": "254", "title": "Gabooty's Tai Bwo Wannai Drinky Store", "stock": "{2084,0,100}-{2092,0,100}-{2048,0,100}-{2054,0,100}-{2064,0,100}-{2074,0,100}" + }, + { + "npcs": "1526", + "high_alch": "0", + "currency": "4067", + "general_store": "false", + "id": "255", + "title": "Castle Wars Ticket Exchange", + "stock": "{4068,1,100}-{4069,1,100}-{4070,1,100}-{4071,1,100}-{4072,1,100}-{4503,1,100}-{4504,1,100}-{4505,1,100}-{4506,1,100}-{4507,1,100}-{4508,1,100}-{4509,1,100}-{4510,1,100}-{4511,1,100}-{4512,1,100}-{4513,1,100}-{4514,1,100}-{4515,1,100}-{4516,1,100}" } ] \ No newline at end of file diff --git a/game/server.jar b/game/server.jar index 84ad833..c202d85 100644 Binary files a/game/server.jar and b/game/server.jar differ diff --git a/game/worldprops/default.conf b/game/worldprops/default.conf index d609d95..a2c60af 100644 --- a/game/worldprops/default.conf +++ b/game/worldprops/default.conf @@ -13,6 +13,7 @@ use_auth = false #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION! #NOTE: this does not affect actual save data, like stats, inventory, etc. persist_accounts = false #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION! noauth_default_admin = false #NOTE: If we are not using auth, this determines whether or not players are admins by default. +max_pathfind_dist = 50 #------------------------------------------------------------------------------------------------------ #The limit on how many different accounts a player can log into per day. daily_accounts_per_ip = 3