diff --git a/game/data/ObjectParser.xml b/game/data/ObjectParser.xml index 3a354d6..b10a0d4 100644 --- a/game/data/ObjectParser.xml +++ b/game/data/ObjectParser.xml @@ -22,7 +22,6 @@ - diff --git a/game/data/configs/door_configs.json b/game/data/configs/door_configs.json index 19083ed..7a4fc7a 100644 --- a/game/data/configs/door_configs.json +++ b/game/data/configs/door_configs.json @@ -193,7 +193,7 @@ }, { "id": "1553", - "replaceId": "1552", + "replaceId": "1556", "fence": "true", "metal": "false" }, @@ -332,13 +332,13 @@ { "id": "2050", "replaceId": "15511", - "fence": "false", + "fence": "true", "metal": "false" }, { "id": "2051", "replaceId": "15513", - "fence": "false", + "fence": "true", "metal": "false" }, { @@ -896,12 +896,12 @@ { "id": "3725", "replaceId": "3727", - "fence": "false", + "fence": "true", "metal": "false" }, { "id": "3726", - "replaceId": "3727", + "replaceId": "3728", "fence": "true", "metal": "false" }, @@ -1238,12 +1238,12 @@ { "id": "7049", "replaceId": "7051", - "fence": "false", + "fence": "true", "metal": "false" }, { "id": "7050", - "replaceId": "23919", + "replaceId": "7052", "fence": "true", "metal": "false" }, @@ -1340,7 +1340,7 @@ { "id": "8810", "replaceId": "8812", - "fence": "false", + "fence": "true", "metal": "false" }, { @@ -1987,6 +1987,14 @@ "autowalk": "true", "questRequirement": "Icthlarin's Little Helper" }, + { + "id": "28514", + "replaceId": "28518", + "fence": "false", + "metal": "true", + "autowalk": "true", + "questRequirement": "Icthlarin's Little Helper" + }, { "id": "21065", "replaceId": "21161", @@ -2359,11 +2367,25 @@ "fence": "false", "metal": "true" }, + { + "id": "26081", + "replaceId": "26083", + "fence": "false", + "metal": "true", + "autowalk": "true" + }, + { + "id": "26082", + "replaceId": "26084", + "fence": "false", + "metal": "true", + "autowalk": "true" + }, { "id": "26130", "replaceId": "26132", "fence": "false", - "metal": "false" + "metal": "true" }, { "id": "26131", @@ -2509,12 +2531,6 @@ "fence": "false", "metal": "false" }, - { - "id": "28514", - "replaceId": "28518", - "fence": "true", - "metal": "true" - }, { "id": "28589", "replaceId": "28588", @@ -2800,7 +2816,7 @@ { "id": "34780", "replaceId": "34778", - "fence": "false", + "fence": "true", "metal": "false" }, { diff --git a/game/data/configs/drop_tables.json b/game/data/configs/drop_tables.json index 3505d09..8584b92 100644 --- a/game/data/configs/drop_tables.json +++ b/game/data/configs/drop_tables.json @@ -16,7 +16,7 @@ } ], "charm": [], - "ids": "1,2,3,16,24,170,351,359,663,726,727,728,729,730,1086,2675,3223,3224,3225,3915,5923", + "ids": "1,2,3,16,24,170,351,359,663,726,727,728,729,730,1081,1084,1085,1086,1087,1088,1089,2675,3223,3224,3225,3915,5923", "description": "", "main": [ { @@ -1757,7 +1757,7 @@ } ], "charm": [], - "ids": "21", + "ids": "21,1072", "description": "", "main": [] }, @@ -2438,7 +2438,7 @@ "minAmount": "75", "weight": "1.0", "id": "556", - "maxAmount": "5" + "maxAmount": "75" }, { "minAmount": "10", @@ -4380,12 +4380,6 @@ "ids": "94,3844,3850,3851", "description": "", "main": [ - { - "minAmount": "1", - "weight": "50.0", - "id": "1391", - "maxAmount": "1" - }, { "minAmount": "1", "weight": "50.0", @@ -12180,12 +12174,6 @@ "id": "12070", "maxAmount": "1" }, - { - "minAmount": "1", - "weight": "5.0", - "id": "6808", - "maxAmount": "1" - }, { "minAmount": "1", "weight": "5.0", @@ -16156,135 +16144,6 @@ } ] }, - { - "default": [ - { - "minAmount": "1", - "weight": "100.0", - "id": "526", - "maxAmount": "1" - } - ], - "charm": [], - "ids": "1087", - "description": "", - "main": [ - { - "minAmount": "2", - "weight": "25.0", - "id": "562", - "maxAmount": "9" - }, - { - "minAmount": "6", - "weight": "25.0", - "id": "554", - "maxAmount": "6" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "199", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "201", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "205", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "203", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "207", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "209", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "211", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "215", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "217", - "maxAmount": "1" - }, - { - "minAmount": "3", - "weight": "25.0", - "id": "877", - "maxAmount": "12" - }, - { - "minAmount": "7", - "weight": "25.0", - "id": "882", - "maxAmount": "7" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "1203", - "maxAmount": "1" - }, - { - "minAmount": "3", - "weight": "50.0", - "id": "995", - "maxAmount": "25" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "1965", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "436", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "313", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25.0", - "id": "7767", - "maxAmount": "1" - } - ] - }, { "default": [ { @@ -19687,10 +19546,10 @@ "maxAmount": "1" }, { - "minAmount": "110", + "minAmount": "30", "weight": "5.0", "id": "313", - "maxAmount": "30" + "maxAmount": "110" }, { "minAmount": "1", @@ -19852,10 +19711,10 @@ "maxAmount": "1" }, { - "minAmount": "110", + "minAmount": "30", "weight": "5.0", "id": "313", - "maxAmount": "30" + "maxAmount": "110" }, { "minAmount": "1", @@ -28629,12 +28488,6 @@ "id": "5733", "maxAmount": "1" }, - { - "minAmount": "1", - "weight": "5.0", - "id": "6808", - "maxAmount": "1" - }, { "minAmount": "1", "weight": "5.0", @@ -46734,7 +46587,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "5733", + "id": "12070", "maxAmount": "1" }, { @@ -46850,7 +46703,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "1", + "id": "12070", "maxAmount": "1" } ] @@ -48495,10 +48348,10 @@ "maxAmount": "2" }, { - "minAmount": "3", + "minAmount": "1", "weight": "500.0", "id": "7054", - "maxAmount": "1" + "maxAmount": "3" }, { "minAmount": "1", @@ -59066,7 +58919,7 @@ } ], "charm": [], - "ids": "1904,6368,6367,912,913,914,255,256,27,34,35,689,690,691,3814,3816,4402,4403", + "ids": "1904,6368,6367,912,913,914,253,254,255,256,258,27,34,35,689,690,691,3814,3816,4402,4403", "description": "", "main": [ { @@ -60209,5 +60062,33 @@ "maxAmount": "1" } ] + }, + { + "default": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "526", + "maxAmount": "1" + } + ], + "charm": [], + "ids": "3057,3059,3058,3060,3061,3062,3063,3064,3065,3066", + "description": "Champion's Challenge NPC - activity", + "main": [] + }, + { + "default": [], + "charm": [], + "ids": "2459,2460,2461,2462", + "description": "Pheasant NPC (level 4) - Freaky Forester - Random event", + "main": [ + { + "minAmount": "1", + "weight": "1.0", + "id": "6178", + "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 9fe32a4..adfa66c 100644 --- a/game/data/configs/ground_spawns.json +++ b/game/data/configs/ground_spawns.json @@ -14,7 +14,11 @@ { "item_id": "41", "loc_data": "{1,3125,9997,0,7209050}" - }, + }, + { + "item_id": "53", + "loc_data": "{3,3240,3940,0,300}-{2,3237,3948,0,300}-{3,3235,3949,0,300}" + }, { "item_id": "88", "loc_data": "{1,2654,9767,0,4587583}" @@ -81,7 +85,7 @@ }, { "item_id": "303", - "loc_data": "{1,3245,3155,0,10485900}-{1,3244,3159,0,10485900}" + "loc_data": "{1,3245,3155,0,10485900}-{1,3244,3159,0,10485900}-{1,3429,4784,0,75}-{1,3432,4783,0,75}-{1,3414,4768,0,75}-{1,3429,4769,0,75}-{1,3431,4772,0,75}-{1,3415,4786,0,75}-{1,3412,4784,0,75}" }, { "item_id": "305", @@ -117,7 +121,7 @@ }, { "item_id": "526", - "loc_data": "{1,2917,9796,0,7864410}-{1,2914,9796,0,7864410}-{1,2910,9797,0,7864410}-{1,2908,9794,0,7864410}-{1,3103,9953,0,7864410}-{1,3104,9950,0,7864410}-{1,3110,9952,0,7864410}-{1,3111,9956,0,7864410}-{1,3110,9958,0,7864410}-{1,3111,9959,0,7864410}-{1,3116,9950,0,7864410}-{1,3127,9957,0,7864410}-{1,2926,9801,0,7864410}-{1,2924,9801,0,7864410}-{1,2924,9804,0,7864410}-{1,2927,9805,0,7864410}-{1,2929,9807,0,7864410}-{1,2938,9792,0,7864410}-{1,2938,9796,0,7864410}-{1,2935,9799,0,7864410}-{1,2930,9794,0,7864410}-{1,2932,9792,0,7864410}-{1,2966,9772,0,7864410}-{1,2968,9771,0,7864410}-{1,2903,9826,0,7864410}-{1,2906,9823,0,7864410}-{1,2906,9825,0,7864410}-{1,2907,9824,0,7864410}-{1,2910,9825,0,7864410}-{1,3101,9825,0,7864410}-{1,3107,9823,0,7864410}-{1,3109,9823,0,7864410}-{1,3110,9825,0,7864410}-{1,3138,9880,0,7864410}-{1,3141,9879,0,7864410}-{1,3142,9880,0,7864410}-{1,3143,9878,0,7864410}-{1,3097,9902,0,7864410}-{1,3094,9907,0,7864410}-{1,3093,9884,0,7864410}-{1,3098,9886,0,7864410}-{1,3093,9879,0,7864410}-{1,3122,9891,0,7864410}-{1,3116,9891,0,7864410}-{1,3119,9894,0,7864410}-{1,3120,9894,0,7864410}-{1,2831,9766,0,7864410}-{1,2829,9764,0,7864410}-{1,2510,3080,0,5898270}-{1,2516,3084,0,5898270}-{1,2509,3090,0,5898270}-{1,2512,3084,0,5898270}-{1,2510,3084,0,5898270}-{1,2505,3114,0,5898270}-{1,2507,3116,0,5898270}-{1,2503,3118,0,5898270}-{1,2510,3114,0,5898270}-{1,3238,3606,0,9830500}-{1,3236,3605,0,9830500}-{1,3238,3603,0,9830500}-{1,3240,3603,0,9830500}-{1,3242,3604,0,9830500}-{1,3244,3611,0,9830500}-{1,3247,3614,0,9830500}-{1,3238,3610,0,9830500}-{1,3238,3608,0,9830500}" + "loc_data": "{1,2917,9796,0,7864410}-{1,2914,9796,0,7864410}-{1,2910,9797,0,7864410}-{1,2908,9794,0,7864410}-{1,3103,9953,0,7864410}-{1,3104,9950,0,7864410}-{1,3110,9952,0,7864410}-{1,3111,9956,0,7864410}-{1,3110,9958,0,7864410}-{1,3111,9959,0,7864410}-{1,3116,9950,0,7864410}-{1,3127,9957,0,7864410}-{1,2926,9801,0,7864410}-{1,2924,9801,0,7864410}-{1,2924,9804,0,7864410}-{1,2927,9805,0,7864410}-{1,2929,9807,0,7864410}-{1,2938,9792,0,7864410}-{1,2938,9796,0,7864410}-{1,2935,9799,0,7864410}-{1,2930,9794,0,7864410}-{1,2932,9792,0,7864410}-{1,2966,9772,0,7864410}-{1,2968,9771,0,7864410}-{1,2903,9826,0,7864410}-{1,2906,9823,0,7864410}-{1,2906,9825,0,7864410}-{1,2907,9824,0,7864410}-{1,2910,9825,0,7864410}-{1,3101,9825,0,7864410}-{1,3107,9823,0,7864410}-{1,3109,9823,0,7864410}-{1,3110,9825,0,7864410}-{1,3138,9880,0,7864410}-{1,3141,9879,0,7864410}-{1,3142,9880,0,7864410}-{1,3143,9878,0,7864410}-{1,3097,9902,0,7864410}-{1,3094,9907,0,7864410}-{1,3093,9884,0,7864410}-{1,3098,9886,0,7864410}-{1,3093,9879,0,7864410}-{1,3122,9891,0,7864410}-{1,3116,9891,0,7864410}-{1,3119,9894,0,7864410}-{1,3120,9894,0,7864410}-{1,2831,9766,0,7864410}-{1,2829,9764,0,7864410}-{1,2510,3080,0,5898270}-{1,2516,3084,0,5898270}-{1,2509,3090,0,5898270}-{1,2512,3084,0,5898270}-{1,2510,3084,0,5898270}-{1,2505,3114,0,5898270}-{1,2507,3116,0,5898270}-{1,2503,3118,0,5898270}-{1,2510,3114,0,5898270}-{1,3238,3606,0,9830500}-{1,3236,3605,0,9830500}-{1,3238,3603,0,9830500}-{1,3240,3603,0,9830500}-{1,3242,3604,0,9830500}-{1,3244,3611,0,9830500}-{1,3247,3614,0,9830500}-{1,3238,3610,0,9830500}-{1,3238,3608,0,9830500}-{1,3232,3948,0,9830500}-{1,3237,3938,0,9830500}-{1,3250,3952,0,9830500}" }, { "item_id": "528", @@ -487,10 +491,6 @@ "item_id": "2347", "loc_data": "{1,2934,3286,0,7209050}-{1,2579,3463,0,5242920}-{1,2975,3368,1,5898270}-{1,1953,4974,0,5898270}" }, - { - "item_id": "2351", - "loc_data": "{1,3062,3657,0,11141270}" - }, { "item_id": "2357", "loc_data": "{1,3192,9822,0,11141270}" diff --git a/game/data/configs/item_configs.json b/game/data/configs/item_configs.json index 7a21079..0fcfa4d 100644 --- a/game/data/configs/item_configs.json +++ b/game/data/configs/item_configs.json @@ -24333,6 +24333,13 @@ "stand_turn_anim": "1209", "bonuses": "-1,-1,6,6,0,2,3,1,6,0,0,2,0,0,0" }, + { + "examine": "A heavy key made of bronze. (Prince Ali Rescue).", + "durability": null, + "name": "Bronze key", + "archery_ticket_price": "0", + "id": "2418" + }, { "examine": "A grey woollen wig.", "durability": null, @@ -35386,9 +35393,9 @@ "durability": null, "name": "Sticky red goop", "tradeable": "true", - "alchemizable": "true", "archery_ticket_price": "0", - "id": "3747" + "id": "3747", + "alchemizable": "true" }, { "remove_head": "true", @@ -35396,11 +35403,11 @@ "durability": null, "name": "Fremennik helm", "weight": "2.7", - "alchemizable": "true", "archery_ticket_price": "0", "id": "3748", "absorb": "1,0,2", "bonuses": "0,0,0,-6,-2,19,21,16,-1,19,6,0,0,0,0", + "alchemizable": "true", "equipment_slot": "0" }, { @@ -35516,19 +35523,19 @@ "id": "3756" }, { - "attack_anims": "390,390,381,390", "examine": "A sword used only by Fremennik warriors.", "durability": null, - "name": "Fremennik blade", "weight": "1.8", - "alchemizable": "true", - "archery_ticket_price": "0", "attack_speed": "4", "weapon_interface": "6", - "id": "3757", - "bonuses": "6,29,-2,0,0,0,1,0,0,0,0,28,0,0,0", + "alchemizable": "true", "defence_anim": "397", - "equipment_slot": "3" + "equipment_slot": "3", + "attack_anims": "390,390,381,390", + "name": "Fremennik blade", + "archery_ticket_price": "0", + "id": "3757", + "bonuses": "6,29,-2,0,0,0,1,0,0,0,0,28,0,0,0" }, { "examine": "A shield worn by Fremennik warriors.", @@ -35536,10 +35543,10 @@ "name": "Fremennik shield", "destroy": "true", "weight": "2.2", - "alchemizable": "true", "archery_ticket_price": "0", "id": "3758", "bonuses": "0,0,0,-8,-2,27,31,29,-1,29,30,0,0,0,0", + "alchemizable": "true", "equipment_slot": "5" }, { @@ -36902,6 +36909,7 @@ "weapon_interface": "6", "turn180_anim": "820", "render_anim": "1", + "castle_wars_ticket_price": "5", "equipment_slot": "3", "stand_anim": "808", "name": "Decorative sword", @@ -36909,8 +36917,7 @@ "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", - "castle_wars_ticket_price": "5" + "bonuses": "13,18,-2,0,0,0,3,2,0,0,0,16,0,0,0" }, { "remove_sleeves": "true", @@ -36920,8 +36927,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", - "castle_wars_ticket_price": "8" + "castle_wars_ticket_price": "8", + "equipment_slot": "4" }, { "requirements": "{1,5}", @@ -36930,8 +36937,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", - "castle_wars_ticket_price": "6" + "castle_wars_ticket_price": "6", + "equipment_slot": "7" }, { "remove_head": "true", @@ -36944,8 +36951,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", - "castle_wars_ticket_price": "4" + "castle_wars_ticket_price": "4", + "equipment_slot": "0" }, { "requirements": "{1,5}", @@ -36956,8 +36963,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", - "castle_wars_ticket_price": "6" + "castle_wars_ticket_price": "6", + "equipment_slot": "5" }, { "examine": "Not so useful for lighting a fire.", @@ -38248,44 +38255,44 @@ "durability": null, "name": "Arms", "weight": "2", - "alchemizable": "true", "archery_ticket_price": "0", - "id": "4195" + "id": "4195", + "alchemizable": "true" }, { "examine": "A pair of lifeless, rotting legs.", "durability": null, "name": "Legs", - "alchemizable": "true", "archery_ticket_price": "0", - "id": "4196" + "id": "4196", + "alchemizable": "true" }, { "examine": "No brain: A gruesome, decapitated head, whose brain has rotted away. Brain: A gruesome, decapitated head - its eyes stare lifelessly at nothing.", "durability": null, "name": "Decapitated head", "weight": "3", - "alchemizable": "true", "archery_ticket_price": "0", - "id": "4197" + "id": "4197", + "alchemizable": "true" }, { "examine": "No brain: A gruesome, decapitated head, whose brain has rotted away. Brain: A gruesome, decapitated head - its eyes stare lifelessly at nothing.", "durability": null, "name": "Decapitated head", "weight": "3", - "alchemizable": "true", "archery_ticket_price": "0", - "id": "4198" + "id": "4198", + "alchemizable": "true" }, { "shop_price": "50", "examine": "A pickled brain, submerged inside a jar of vinegar.", "durability": null, "name": "Pickled brain", - "alchemizable": "true", "archery_ticket_price": "0", - "id": "4199" + "id": "4199", + "alchemizable": "true" }, { "examine": "A mould for making silver lightning conductors.", @@ -41203,6 +41210,7 @@ "turn180_anim": "820", "render_anim": "1", "defence_anim": "397", + "castle_wars_ticket_price": "50", "equipment_slot": "3", "attack_anims": "390,390,381,390", "stand_anim": "808", @@ -41211,8 +41219,7 @@ "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", - "castle_wars_ticket_price": "50" + "bonuses": "15,20,-2,0,0,0,3,2,0,0,0,22,0,0,0" }, { "remove_sleeves": "true", @@ -41222,8 +41229,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", - "castle_wars_ticket_price": "80" + "castle_wars_ticket_price": "80", + "equipment_slot": "4" }, { "requirements": "{1,20}", @@ -41232,8 +41239,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", - "castle_wars_ticket_price": "60" + "castle_wars_ticket_price": "60", + "equipment_slot": "7" }, { "remove_head": "true", @@ -41246,8 +41253,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", - "castle_wars_ticket_price": "40" + "castle_wars_ticket_price": "40", + "equipment_slot": "0" }, { "requirements": "{1,20}", @@ -41258,8 +41265,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", - "castle_wars_ticket_price": "60" + "castle_wars_ticket_price": "60", + "equipment_slot": "5" }, { "requirements": "{0,30}", @@ -41274,6 +41281,7 @@ "turn180_anim": "820", "render_anim": "1", "defence_anim": "397", + "castle_wars_ticket_price": "500", "equipment_slot": "3", "attack_anims": "390,390,381,390", "stand_anim": "808", @@ -41282,8 +41290,7 @@ "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", - "castle_wars_ticket_price": "500" + "bonuses": "20,29,-2,0,0,0,3,2,0,0,0,31,0,0,0" }, { "remove_sleeves": "true", @@ -41293,8 +41300,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", - "castle_wars_ticket_price": "800" + "castle_wars_ticket_price": "800", + "equipment_slot": "4" }, { "requirements": "{1,30}", @@ -41303,8 +41310,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", - "castle_wars_ticket_price": "600" + "castle_wars_ticket_price": "600", + "equipment_slot": "7" }, { "remove_head": "true", @@ -41317,8 +41324,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", - "castle_wars_ticket_price": "400" + "castle_wars_ticket_price": "400", + "equipment_slot": "0" }, { "requirements": "{1,30}", @@ -41329,8 +41336,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", - "castle_wars_ticket_price": "600" + "castle_wars_ticket_price": "600", + "equipment_slot": "5" }, { "remove_head": "true", @@ -41339,8 +41346,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", - "castle_wars_ticket_price": "10" + "castle_wars_ticket_price": "10", + "equipment_slot": "0" }, { "durability": null, @@ -41348,8 +41355,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", - "castle_wars_ticket_price": "10" + "castle_wars_ticket_price": "10", + "equipment_slot": "1" }, { "remove_head": "true", @@ -41358,8 +41365,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", - "castle_wars_ticket_price": "10" + "castle_wars_ticket_price": "10", + "equipment_slot": "0" }, { "durability": null, @@ -41367,8 +41374,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", - "castle_wars_ticket_price": "10" + "castle_wars_ticket_price": "10", + "equipment_slot": "1" }, { "ge_buy_limit": "1000", @@ -41695,7 +41702,7 @@ }, { "remove_head": "true", - "requirements": "{1,5}-{18,35}", + "requirements": "{1,5}", "shop_price": "650", "ge_buy_limit": "100", "examine": "You don't want to wear it inside-out.", @@ -66447,7 +66454,7 @@ "id": "7373" }, { - "requirements": "{1,50}-{4,40}", + "requirements": "{1,40}-{4,50}", "ge_buy_limit": "2", "examine": "Made from 100% real dragonhide, with colourful trim!", "grand_exchange_price": "6883", @@ -66470,7 +66477,7 @@ "id": "7375" }, { - "requirements": "{1,50}-{4,40}", + "requirements": "{1,40}-{4,50}", "ge_buy_limit": "2", "examine": "Made from 100% real dragonhide, with colourful trim!", "grand_exchange_price": "5268", @@ -66721,7 +66728,7 @@ "id": "7397" }, { - "requirements": "{1,40}-{6,20}", + "requirements": "{1,20}-{6,40}", "ge_buy_limit": "2", "examine": "Enchanted Wizards robes.", "durability": null, @@ -66753,7 +66760,7 @@ }, { "remove_head": "true", - "requirements": "{1,40}-{6,20}", + "requirements": "{1,20}-{6,40}", "ge_buy_limit": "2", "examine": "A three pointed hat of magic.", "grand_exchange_price": "8845", @@ -73251,6 +73258,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73263,6 +73271,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73275,6 +73284,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73287,6 +73297,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73299,6 +73310,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73311,6 +73323,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73323,6 +73336,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73335,6 +73349,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73347,6 +73362,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73359,6 +73375,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73371,6 +73388,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73383,6 +73401,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73395,6 +73414,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73407,6 +73427,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73419,6 +73440,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -73431,6 +73453,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "The colours represent crest.", "durability": null, "name": "Rune heraldic helm", @@ -74990,6 +75013,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75002,6 +75026,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75014,6 +75039,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75026,6 +75052,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75038,6 +75065,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75050,6 +75078,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75062,6 +75091,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75074,6 +75104,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75086,6 +75117,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75098,6 +75130,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75110,6 +75143,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75122,6 +75156,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75134,6 +75169,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75146,6 +75182,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75158,6 +75195,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -75170,6 +75208,7 @@ }, { "remove_head": "true", + "requirements": "{1,5}", "examine": "The colours represent crest.", "durability": null, "name": "Steel heraldic helm", @@ -88011,7 +88050,7 @@ "id": "10371" }, { - "requirements": "{4,70}", + "requirements": "{1,40}-{4,70}", "ge_buy_limit": "2", "examine": "Zamorak blessed dragonhide chaps.", "durability": null, @@ -88108,7 +88147,7 @@ "id": "10379" }, { - "requirements": "{4,70}", + "requirements": "{1,40}-{4,70}", "ge_buy_limit": "2", "examine": "Guthix blessed dragonhide chaps.", "durability": null, @@ -88207,7 +88246,7 @@ "id": "10387" }, { - "requirements": "{4,70}", + "requirements": "{1,40}-{4,70}", "ge_buy_limit": "2", "examine": "Saradomin blessed dragonhide chaps.", "grand_exchange_price": "36600", @@ -90438,6 +90477,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "Protective headwear made from crabs. Better than it sounds.", "durability": null, "weight": "2.7", @@ -90453,6 +90493,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}-{4,40}", "examine": "A helm fit for any Fremennik ranger.", "durability": null, "weight": "1", @@ -91582,6 +91623,7 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "A rune helmet with a heraldic design.", "grand_exchange_price": "30298", "durability": null, @@ -91595,59 +91637,63 @@ }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "A rune helmet with a heraldic design.", - "grand_exchange_price": "26127", "durability": null, + "weight": "3", + "absorb": "1,0,3", + "equipment_slot": "0", + "grand_exchange_price": "26127", "name": "Rune helm (h2)", "tradeable": "true", - "weight": "3", "archery_ticket_price": "0", "id": "10705", - "absorb": "1,0,3", - "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "A rune helmet with a heraldic design.", - "grand_exchange_price": "37333", "durability": null, + "weight": "4", + "absorb": "1,0,3", + "equipment_slot": "0", + "grand_exchange_price": "37333", "name": "Rune helm (h3)", "tradeable": "true", - "weight": "4", "archery_ticket_price": "0", "id": "10706", - "absorb": "1,0,3", - "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "A rune helmet with a heraldic design.", - "grand_exchange_price": "29600", "durability": null, + "weight": "2", + "absorb": "1,0,3", + "equipment_slot": "0", + "grand_exchange_price": "29600", "name": "Rune helm (h4)", "tradeable": "true", - "weight": "2", "archery_ticket_price": "0", "id": "10707", - "absorb": "1,0,3", - "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0" }, { "remove_head": "true", + "requirements": "{1,40}", "examine": "A rune helmet with a heraldic design.", - "grand_exchange_price": "41325", "durability": null, + "weight": "2", + "absorb": "1,0,3", + "equipment_slot": "0", + "grand_exchange_price": "41325", "name": "Rune helm (h5)", "tradeable": "true", - "weight": "2", "archery_ticket_price": "0", "id": "10708", - "absorb": "1,0,3", - "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0", - "equipment_slot": "0" + "bonuses": "0,0,0,-6,-2,30,32,27,-1,30,0,0,0,0,0" }, { "remove_head": "true", @@ -92199,6 +92245,7 @@ "equipment_slot": "0" }, { + "requirements": "{1,40}", "examine": "Rune platebody in the colours of Zamorak.", "durability": null, "weight": "9", @@ -92214,6 +92261,7 @@ "bonuses": "0,0,0,-30,-10,82,80,72,-6,80,0,0,0,0,0" }, { + "requirements": "{1,40}", "examine": "Rune platebody in the colours of Saradomin.", "durability": null, "weight": "9.07", @@ -92229,6 +92277,7 @@ "bonuses": "0,0,0,-30,-10,82,80,72,-6,80,0,0,0,0,0" }, { + "requirements": "{1,40}", "examine": "Rune platebody in the colours of Guthix.", "durability": null, "weight": "9.07", @@ -92244,6 +92293,7 @@ "bonuses": "0,0,0,-30,-10,82,80,72,-6,80,0,0,0,0,0" }, { + "requirements": "{1,40}", "examine": "Rune platebody with complete gold trim & plating.", "durability": null, "weight": "10", @@ -92259,6 +92309,7 @@ "bonuses": "0,0,0,-30,-10,82,80,72,-6,80,0,0,0,0,0" }, { + "requirements": "{5,20}", "remove_sleeves": "true", "examine": "Blessed vestments of Saradomin.", "grand_exchange_price": "106389", @@ -92271,6 +92322,7 @@ "equipment_slot": "4" }, { + "requirements": "{5,20}", "remove_sleeves": "true", "examine": "Zamorak Vestments.", "grand_exchange_price": "151000", @@ -92284,6 +92336,7 @@ "equipment_slot": "4" }, { + "requirements": "{5,20}", "remove_sleeves": "true", "examine": "Blessed vestments of Guthix.", "grand_exchange_price": "80181", @@ -92297,20 +92350,22 @@ "equipment_slot": "4" }, { - "remove_sleeves": "true", + "requirements": "{1,40}-{4,70}", "examine": "Zamorak blessed dragonhide body armour.", - "grand_exchange_price": "84966", "durability": null, + "weight": "6", + "absorb": "0,6,3", + "equipment_slot": "4", + "remove_sleeves": "true", + "grand_exchange_price": "84966", "name": "Zamorak d'hide", "tradeable": "true", - "weight": "6", "archery_ticket_price": "0", "id": "10790", - "absorb": "0,6,3", - "bonuses": "0,0,0,-15,30,55,47,60,50,55,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,-15,30,55,47,60,50,55,0,0,0,0,0" }, { + "requirements": "{1,40}-{4,70}", "shop_price": "13000", "examine": "Saradomin blessed dragonhide body armour.", "durability": null, @@ -92327,6 +92382,7 @@ "bonuses": "0,0,0,-15,30,55,47,60,50,55,0,0,0,0,0" }, { + "requirements": "{1,40}-{4,70}", "shop_price": "13", "examine": "Guthix blessed dragonhide body armour.", "durability": null, @@ -92343,6 +92399,7 @@ }, { "lendable": "true", + "requirements": "{4,40}", "examine": "Endorsed by Robin Hood.", "grand_exchange_price": "3070557", "durability": null, @@ -92355,6 +92412,7 @@ "equipment_slot": "0" }, { + "requirements": "{1,40}", "examine": "Rune platebody with gold trim.", "durability": null, "weight": "9.07", @@ -92370,6 +92428,7 @@ "bonuses": "0,0,0,-30,-10,82,80,72,-6,80,0,0,0,0,0" }, { + "requirements": "{1,40}", "examine": "Rune platebody with trim.", "durability": null, "weight": "9.07", @@ -92724,10 +92783,10 @@ { "durability": null, "name": "A jester stick", - "alchemizable": "true", "archery_ticket_price": "0", "id": "10840", "bonuses": "0,0,0,0,0,0,0,0,5,-5,0,0,0,0,0", + "alchemizable": "true", "equipment_slot": "3" }, { @@ -108943,8 +109002,8 @@ "id": "12855" }, { - "requirements": "{15,50}", "destroy_message": "You can reclaim this item from the place you found it.", + "requirements": "{15,50}", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, @@ -108955,8 +109014,8 @@ "equipment_slot": "9" }, { - "requirements": "{15,60}", "destroy_message": "You can reclaim this item from the place you found it.", + "requirements": "{15,60}", "shop_price": "100", "examine": "A pair of mystical gloves.", "durability": null, @@ -108967,8 +109026,8 @@ "equipment_slot": "9" }, { - "requirements": "{15,70}", "destroy_message": "You can reclaim this item from the place you found it.", + "requirements": "{15,70}", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, @@ -108979,8 +109038,8 @@ "equipment_slot": "9" }, { - "requirements": "{15,80}", "destroy_message": "You can reclaim this item from the place you found it.", + "requirements": "{15,80}", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, @@ -108991,8 +109050,8 @@ "equipment_slot": "9" }, { - "requirements": "{10,65}", "destroy_message": "You can reclaim this item from the place you found it.", + "requirements": "{10,65}", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, @@ -109004,8 +109063,8 @@ "equipment_slot": "9" }, { - "requirements": "{10,90}", "destroy_message": "You can reclaim this item from the place you found it.", + "requirements": "{10,90}", "shop_price": "200", "examine": "A pair of mystical gloves", "durability": null, @@ -109017,8 +109076,8 @@ "equipment_slot": "9" }, { - "requirements": "{18,70}", "destroy_message": "You can reclaim this item from the place you found it.", + "requirements": "{18,70}", "shop_price": "200", "examine": "A pair of mystical gloves.", "durability": null, @@ -109029,8 +109088,8 @@ "equipment_slot": "9" }, { - "requirements": "{20,10}", "destroy_message": "You can buy a new pair from the druids at the Fist of Guthix activity.", + "requirements": "{20,10}", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, @@ -109043,8 +109102,8 @@ "equipment_slot": "9" }, { - "requirements": "{20,20}", "destroy_message": "You can buy a new pair from the druids at the Fist of Guthix activity.", + "requirements": "{20,20}", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, @@ -109057,8 +109116,8 @@ "equipment_slot": "9" }, { - "requirements": "{20,30}", "destroy_message": "You can buy a new pair from the druids at the Fist of Guthix minigame.", + "requirements": "{20,30}", "shop_price": "75", "examine": "A pair of mystical gloves.", "durability": null, @@ -109072,7 +109131,7 @@ }, { "remove_head": "true", - "requirements": "{1,60}-{6,50}", + "requirements": "{1,50}-{6,60}", "shop_price": "250", "examine": "Its arcane power is waning.", "durability": null, @@ -109087,7 +109146,7 @@ }, { "remove_head": "true", - "requirements": "{1,60}-{6,50}", + "requirements": "{1,50}-{6,60}", "shop_price": "250", "examine": "Its arcane power is waning.", "durability": null, @@ -109102,7 +109161,7 @@ }, { "remove_head": "true", - "requirements": "{1,60}-{6,50}", + "requirements": "{1,50}-{6,60}", "shop_price": "250", "examine": "Its arcane power is waning.", "durability": null, @@ -109117,7 +109176,7 @@ }, { "remove_head": "true", - "requirements": "{1,60}-{6,50}", + "requirements": "{1,50}-{6,60}", "shop_price": "250", "examine": "Its arcane power is waning.", "durability": null, @@ -109132,7 +109191,7 @@ }, { "remove_head": "true", - "requirements": "{1,60}-{6,50}", + "requirements": "{1,50}-{6,60}", "shop_price": "250", "examine": "Its arcane power is waning.", "durability": null, @@ -109147,7 +109206,7 @@ }, { "remove_head": "true", - "requirements": "{1,60}-{6,50}", + "requirements": "{1,50}-{6,60}", "shop_price": "250", "ge_buy_limit": "10", "examine": "Its arcane power is waning.", @@ -109380,7 +109439,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A worn-out hood, formerly worn by the followers of Guthix.", "durability": null, @@ -109395,7 +109454,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A worn-out hood, formerly worn by the followers of Guthix.", "durability": null, @@ -109410,7 +109469,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A worn-out hood, formerly worn by the followers of Guthix.", "durability": null, @@ -109425,7 +109484,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A worn-out hood, formerly worn by the followers of Guthix.", "durability": null, @@ -109440,7 +109499,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A worn-out hood, formerly worn by the followers of Guthix.", "durability": null, @@ -109455,7 +109514,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "ge_buy_limit": "10", "examine": "A worn-out hood, formerly worn by the followers of Guthix.", @@ -109479,7 +109538,7 @@ "id": "12893" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "300", "examine": "A magical robe top worn by followers of Guthix.", "durability": null, @@ -109495,7 +109554,7 @@ "bonuses": "0,0,0,7,0,0,0,0,7,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "300", "examine": "A magical robe top worn by followers of Guthix.", "durability": null, @@ -109511,7 +109570,7 @@ "bonuses": "0,0,0,7,0,0,0,0,7,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "300", "examine": "A magical robe top worn by followers of Guthix.", "durability": null, @@ -109527,7 +109586,7 @@ "bonuses": "0,0,0,7,0,0,0,0,7,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "300", "examine": "A magical robe top worn by followers of Guthix.", "durability": null, @@ -109543,7 +109602,7 @@ "bonuses": "0,0,0,7,0,0,0,0,7,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "300", "examine": "A magical robe top worn by followers of Guthix.", "durability": null, @@ -109559,7 +109618,7 @@ "bonuses": "0,0,0,7,0,0,0,0,7,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "300", "ge_buy_limit": "10", "examine": "A magical robe top worn by followers of Guthix.", @@ -109585,7 +109644,7 @@ "id": "12900" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "200", "examine": "A magical robe bottom worn by a person who follows Guthix.", "durability": null, @@ -109600,7 +109659,7 @@ "bonuses": "0,0,0,6,0,0,0,0,6,0,6,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "200", "examine": "A magical robe bottom worn by a person who follows Guthix.", "durability": null, @@ -109615,7 +109674,7 @@ "bonuses": "0,0,0,6,0,0,0,0,6,0,6,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "200", "examine": "A magical robe bottom worn by a person who follows Guthix.", "durability": null, @@ -109630,7 +109689,7 @@ "bonuses": "0,0,0,6,0,0,0,0,6,0,6,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "200", "examine": "A magical robe bottom worn by a person who follows Guthix.", "durability": null, @@ -109645,7 +109704,7 @@ "bonuses": "0,0,0,6,0,0,0,0,6,0,6,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "200", "examine": "A magical robe bottom worn by a person who follows Guthix.", "durability": null, @@ -109660,7 +109719,7 @@ "bonuses": "0,0,0,6,0,0,0,0,6,0,6,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "200", "ge_buy_limit": "10", "examine": "A magical robe bottom worn by a person who follows Guthix.", @@ -110520,7 +110579,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "50", "examine": "A magical hood, especially created for combat spells.", "durability": null, @@ -110535,7 +110594,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "50", "examine": "A magical hood, especially created for combat spells.", "durability": null, @@ -110550,7 +110609,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "50", "examine": "A magical hood, especially created for combat spells.", "durability": null, @@ -110565,7 +110624,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "50", "examine": "A magical hood, especially created for combat spells.", "durability": null, @@ -110580,7 +110639,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "50", "examine": "A magical hood, especially created for combat spells.", "durability": null, @@ -110595,7 +110654,7 @@ }, { "remove_head": "true", - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "50", "ge_buy_limit": "10", "examine": "A magical hood, especially created for combat spells.", @@ -110619,7 +110678,7 @@ "id": "12970" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "150", "examine": "A magical robe top, especially made for combat spells.", "durability": null, @@ -110635,7 +110694,7 @@ "bonuses": "0,0,0,7,0,1,1,1,7,0,8,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "150", "examine": "A magical robe top, especially made for combat spells.", "durability": null, @@ -110651,7 +110710,7 @@ "bonuses": "0,0,0,7,0,1,1,1,7,0,8,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "150", "examine": "A magical robe top, especially made for combat spells.", "durability": null, @@ -110667,7 +110726,7 @@ "bonuses": "0,0,0,7,0,1,1,1,7,0,8,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "150", "examine": "A magical robe top, especially made for combat spells.", "durability": null, @@ -110683,7 +110742,7 @@ "bonuses": "0,0,0,7,0,1,1,1,7,0,8,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "150", "examine": "A magical robe top, especially made for combat spells.", "durability": null, @@ -110699,7 +110758,7 @@ "bonuses": "0,0,0,7,0,1,1,1,7,0,8,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "150", "ge_buy_limit": "10", "examine": "A magical robe top, especially made for combat spells.", @@ -110725,7 +110784,7 @@ "id": "12977" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A magical robe bottom, especially created for combat spells.", "durability": null, @@ -110740,7 +110799,7 @@ "bonuses": "0,0,0,6,0,1,1,1,6,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A magical robe bottom, especially created for combat spells.", "durability": null, @@ -110755,7 +110814,7 @@ "bonuses": "0,0,0,6,0,1,1,1,6,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A magical robe bottom, especially created for combat spells.", "durability": null, @@ -110770,7 +110829,7 @@ "bonuses": "0,0,0,6,0,1,1,1,6,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A magical robe bottom, especially created for combat spells.", "durability": null, @@ -110785,7 +110844,7 @@ "bonuses": "0,0,0,6,0,1,1,1,6,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "examine": "A magical robe bottom, especially created for combat spells.", "durability": null, @@ -110800,7 +110859,7 @@ "bonuses": "0,0,0,6,0,1,1,1,6,0,7,0,0,0,0" }, { - "requirements": "{1,20}-{6,10}", + "requirements": "{1,10}-{6,20}", "shop_price": "100", "ge_buy_limit": "10", "examine": "A magical robe bottom, especially created for combat spells.", @@ -121436,7 +121495,7 @@ "id": "13867", "stand_turn_anim": "1209", "bonuses": "13,-1,65,18,0,5,7,4,18,0,0,72,0,0,10", - "requirements": "{6,78}", + "requirements": "{0,78}-{6,78}", "shop_price": "300000", "durability": null, "destroy": "false", @@ -121447,7 +121506,7 @@ }, { "destroy_message": "Drop", - "requirements": "{6,78}", + "requirements": "{0,78}-{6,78}", "shop_price": "300000", "examine": "This item degrades in combat, and will turn to dust.", "grand_exchange_price": "2116989", @@ -121479,6 +121538,7 @@ "id": "13869", "stand_turn_anim": "1209", "bonuses": "13,-1,65,18,0,5,7,4,18,0,0,72,0,0,10", + "requirements": "{0,78}-{6,78}", "shop_price": "300000", "durability": null, "destroy": "true", @@ -122165,19 +122225,19 @@ "requirements": "{0,78}", "shop_price": "180000", "examine": "This item degrades in combat, and will turn to dust.", + "walk_anim": "1205", "has_special": "true", "durability": null, "destroy": "true", "attack_speed": "5", "two_handed": "true", + "turn90ccw_anim": "1208", "weapon_interface": "14", "absorb": "0,0,0", - "turn90ccw_anim": "1208", - "walk_anim": "1205", "defence_anim": "2079", - "attack_anims": "2080,2081,2082,2080", "render_anim": "28", "equipment_slot": "3", + "attack_anims": "2080,2081,2082,2080", "destroy_message": "Drop", "grand_exchange_price": "5264612", "name": "Vesta's spear (deg)", @@ -130876,4 +130936,4 @@ "name": "ASDT Slot", "id": "14430" } -] +] \ No newline at end of file diff --git a/game/data/configs/music_configs.json b/game/data/configs/music_configs.json index 8994bce..96fb000 100644 --- a/game/data/configs/music_configs.json +++ b/game/data/configs/music_configs.json @@ -873,15 +873,15 @@ }, { "id": "289", - "borders": "{2560,3648,2623,3711}" + "borders": "{2563,3647,2687,3776}" }, { "id": "290", - "borders": "{2560,3584,2623,3647}" + "borders": "{2560,3584,2689,3647}" }, { "id": "291", - "borders": "{2688,3648,2751,3711}" + "borders": "{2688,3648,2751,3776}" }, { "id": "292", @@ -1239,7 +1239,7 @@ }, { "id": "411", - "borders": "{2496,4736,2559,4799}" + "borders": "{3403,4761,3442,4792}" }, { "id": "412", @@ -1307,7 +1307,7 @@ }, { "id": "456", - "borders": "" + "borders": "{2202,5339,2212,5351}-{2328,10006,2338,10017}-{3436,9743,3446,9752}" }, { "id": "461", diff --git a/game/data/configs/npc_configs.json b/game/data/configs/npc_configs.json index 03d18fb..b1a24c3 100644 --- a/game/data/configs/npc_configs.json +++ b/game/data/configs/npc_configs.json @@ -184,7 +184,7 @@ "examine": "He tries to keep order around here.", "melee_animation": "400", "range_animation": "0", - "combat_audio": "511,513,512", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "60", "defence_animation": "404", @@ -1779,6 +1779,7 @@ "slayer_task": "92", "melee_animation": "6579", "range_animation": "6579", + "combat_audio": "909,912,911", "attack_speed": "4", "defence_animation": "6578", "weakness": "9", @@ -1800,6 +1801,7 @@ "slayer_task": "92", "melee_animation": "6579", "range_animation": "6579", + "combat_audio": "909,912,911", "attack_speed": "4", "defence_animation": "6578", "weakness": "7", @@ -5871,7 +5873,7 @@ }, { "examine": "I wonder who he's guarding?", - "melee_animation": "0", + "melee_animation": "401", "range_animation": "0", "combat_audio": "511,513,512", "attack_speed": "5", @@ -5911,7 +5913,7 @@ }, { "examine": "I wonder who he's guarding?", - "melee_animation": "0", + "melee_animation": "401", "range_animation": "0", "combat_audio": "511,513,512", "attack_speed": "5", @@ -9683,7 +9685,7 @@ }, { "examine": "I wonder who he's guarding?", - "melee_animation": "0", + "melee_animation": "401", "range_animation": "0", "combat_audio": "511,513,512", "attack_speed": "5", @@ -10888,6 +10890,22 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "A sergeant of the Imperial Guard.", + "melee_animation": "0", + "range_animation": "0", + "defence_animation": "0", + "magic_animation": "0", + "death_animation": "0", + "name": "Sergeant", + "defence_level": "1", + "safespot": null, + "lifepoints": "10", + "strength_level": "1", + "id": "1062", + "range_level": "1", + "attack_level": "1" + }, { "examine": "A soldier of the Imperial Guard.", "melee_animation": "0", @@ -10998,6 +11016,22 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "The Burthorpe Castle cook.", + "melee_animation": "422", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "425", + "death_animation": "836", + "name": "Eadburg", + "defence_level": "3", + "safespot": null, + "lifepoints": "10", + "strength_level": "2", + "id": "1072", + "range_level": "1", + "attack_level": "3" + }, { "examine": "A Burthorpe Castle Archer.", "start_gfx": "19", @@ -11044,13 +11078,11 @@ }, { "examine": "A Burthorpe Castle guard.", - "melee_animation": "0", - "range_animation": "0", + "melee_animation": "401", "combat_audio": "511,513,512", "magic_level": "1", - "defence_animation": "0", - "magic_animation": "0", - "death_animation": "0", + "defence_animation": "404", + "death_animation": "836", "name": "Guard", "defence_level": "33", "safespot": null, @@ -11063,13 +11095,11 @@ }, { "examine": "A Burthorpe Castle guard.", - "melee_animation": "0", - "range_animation": "0", + "melee_animation": "401", "combat_audio": "511,513,512", "magic_level": "1", - "defence_animation": "0", - "magic_animation": "0", - "death_animation": "0", + "defence_animation": "404", + "death_animation": "836", "name": "Guard", "defence_level": "33", "safespot": null, @@ -11081,34 +11111,77 @@ "attack_level": "33" }, { - "examine": "A servant for Prince Anlaf.", - "melee_animation": "0", - "range_animation": "0", - "defence_animation": "0", - "magic_animation": "0", - "death_animation": "0", - "name": "Servant", - "defence_level": "1", - "safespot": null, - "lifepoints": "10", - "strength_level": "1", - "id": "1081", - "range_level": "1", - "attack_level": "1" + "examine": "An off-duty Burthorpe Castle guard.", + "name": "Harold", + "id": "1078" }, { + "examine": "Barman of the Toad and Chicken.", + "name": "Tostig", + "id": "1079" + }, + { + "examine": "Head servant for Prince Anlaf.", + "name": "Eohric", + "id": "1080" + }, + { + "examine": "A servant for Prince Anlaf.", + "melee_animation": "422", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "425", "death_animation": "836", - "name": "Ocga", - "defence_level": "1", + "name": "Servant", + "defence_level": "3", "safespot": null, "lifepoints": "10", + "strength_level": "3", + "id": "1081", + "range_level": "1", + "attack_level": "3" + }, + { + "examine": "Smithy for Burthorpe.", + "name": "Dunstan", + "id": "1082" + }, + { + "examine": "Shopkeeper for Burthorpe.", + "name": "Wistan", + "id": "1083" + }, + { + "examine": "A citizen of Burthorpe.", "melee_animation": "422", - "strength_level": "1", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "425", + "death_animation": "836", + "name": "Breoca", + "defence_level": "3", + "safespot": null, + "lifepoints": "10", + "strength_level": "3", + "id": "1084", + "range_level": "1", + "attack_level": "3" + }, + { + "examine": "A citizen of Burthorpe.", + "melee_animation": "422", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "425", + "death_animation": "836", + "name": "Ocga", + "defence_level": "3", + "safespot": null, + "lifepoints": "10", + "strength_level": "3", "id": "1085", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1", - "defence_animation": "425" + "attack_level": "3" }, { "name": "Man", @@ -11123,46 +11196,57 @@ "attack_level": "1" }, { + "examine": "A citizen of Burthorpe.", + "melee_animation": "422", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "425", "death_animation": "836", "name": "Penda", - "defence_level": "1", + "defence_level": "3", "safespot": null, "lifepoints": "10", - "melee_animation": "422", - "strength_level": "1", + "strength_level": "3", "id": "1087", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1", - "defence_animation": "425" + "attack_level": "3" }, { + "examine": "A citizen of Burthorpe.", + "melee_animation": "422", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "425", "death_animation": "836", "name": "Hygd", - "defence_level": "1", + "defence_level": "3", "safespot": null, "lifepoints": "10", - "melee_animation": "422", - "strength_level": "1", + "strength_level": "2", "id": "1088", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1", - "defence_animation": "425" + "attack_level": "3" }, { + "examine": "A citizen of Burthorpe.", + "melee_animation": "422", + "magic_level": "1", + "respawn_delay": "60", + "defence_animation": "425", "death_animation": "836", "name": "Ceolburg", - "defence_level": "1", + "defence_level": "3", "safespot": null, "lifepoints": "10", - "melee_animation": "422", - "strength_level": "1", + "strength_level": "2", "id": "1089", "range_level": "1", - "respawn_delay": "60", - "attack_level": "1", - "defence_animation": "425" + "attack_level": "3" + }, + { + "examine": "A pretty young woman with an air of mystery around her.", + "name": "Hild", + "id": "1090" }, { "examine": "The knight seems to be watching something.", @@ -12409,15 +12493,15 @@ "attack_level": "1" }, { - "examine": "A huge beast", - "melee_animation": "313", - "range_animation": "0", + "examine": "A huge beast, resembling in some ways a lion, but mostly a twisted nightmare.", + "melee_animation": "1199", + "range_animation": "1197", "attack_speed": "5", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "1200", "weakness": "9", - "magic_animation": "0", - "death_animation": "315", + "magic_animation": "1197", + "death_animation": "1201", "name": "The Shaikahan", "defence_level": "50", "safespot": null, @@ -14113,6 +14197,7 @@ "examine": "Keeps the stalls secure.", "melee_animation": "390", "range_animation": "0", + "combat_audio": "", "defence_animation": "0", "weakness": "9", "magic_animation": "0", @@ -14547,6 +14632,16 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "Pretty barmaid.", + "name": "Sam", + "id": "1357" + }, + { + "examine": "Pretty barmaid.", + "name": "Rachael", + "id": "1358" + }, { "examine": "He seems happy to see you.", "melee_animation": "0", @@ -15911,11 +16006,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice Troll", "defence_level": "60", "safespot": null, @@ -15929,10 +16026,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", - "defence_animation": "0", + "respawn_delay": "60", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice Troll", "defence_level": "60", "safespot": null, @@ -15945,11 +16045,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice Troll", "defence_level": "60", "safespot": null, @@ -15963,10 +16065,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", - "defence_animation": "0", + "respawn_delay": "60", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice Troll", "defence_level": "60", "safespot": null, @@ -15979,11 +16084,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice Troll", "defence_level": "60", "safespot": null, @@ -15997,11 +16104,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice Troll", "defence_level": "60", "safespot": null, @@ -16015,10 +16124,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", - "defence_animation": "0", + "respawn_delay": "60", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice Troll", "defence_level": "60", "safespot": null, @@ -20060,11 +20172,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice troll", "defence_level": "64", "safespot": null, @@ -20078,10 +20192,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", - "defence_animation": "0", + "respawn_delay": "60", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice troll", "defence_level": "64", "safespot": null, @@ -20094,11 +20211,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice troll", "defence_level": "64", "safespot": null, @@ -20112,10 +20231,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", - "defence_animation": "0", + "respawn_delay": "60", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice troll", "defence_level": "64", "safespot": null, @@ -20128,11 +20250,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice troll", "defence_level": "64", "safespot": null, @@ -20146,11 +20270,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice troll", "defence_level": "64", "safespot": null, @@ -20164,10 +20290,13 @@ { "examine": "Brrrrr...he must be cold!", "slayer_task": "83", + "melee_animation": "284", "range_animation": "0", - "defence_animation": "0", + "respawn_delay": "60", + "defence_animation": "285", "weakness": "9", "magic_animation": "0", + "death_animation": "287", "name": "Ice troll", "defence_level": "64", "safespot": null, @@ -22735,6 +22864,7 @@ "examine": "He guards the Draynor Market stalls from thieves.", "melee_animation": "390", "range_animation": "0", + "combat_audio": "2547,1979,512", "respawn_delay": "60", "defence_animation": "0", "weakness": "6", @@ -24012,6 +24142,82 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "A brightly coloured game bird.", + "melee_animation": "2372", + "range_animation": "2372", + "combat_audio": "690,692,691", + "attack_speed": "6", + "respawn_delay": "18", + "defence_animation": "2371", + "magic_animation": "2372", + "death_animation": "2373", + "name": "Pheasant", + "defence_level": "1", + "safespot": null, + "lifepoints": "5", + "strength_level": "1", + "id": "2459", + "range_level": "1", + "attack_level": "1" + }, + { + "examine": "A brightly coloured game bird.", + "melee_animation": "2372", + "range_animation": "2372", + "combat_audio": "690,692,691", + "attack_speed": "6", + "respawn_delay": "18", + "defence_animation": "2371", + "magic_animation": "2372", + "death_animation": "2373", + "name": "Pheasant", + "defence_level": "1", + "safespot": null, + "lifepoints": "5", + "strength_level": "1", + "id": "2460", + "range_level": "1", + "attack_level": "1" + }, + { + "examine": "A brightly coloured game bird.", + "melee_animation": "2372", + "range_animation": "2372", + "combat_audio": "690,692,691", + "attack_speed": "6", + "respawn_delay": "18", + "defence_animation": "2371", + "magic_animation": "2372", + "death_animation": "2373", + "name": "Pheasant", + "defence_level": "1", + "safespot": null, + "lifepoints": "5", + "strength_level": "1", + "id": "2461", + "range_level": "1", + "attack_level": "1" + }, + { + "examine": "A brightly coloured game bird.", + "melee_animation": "2372", + "range_animation": "2372", + "combat_audio": "690,692,691", + "attack_speed": "6", + "respawn_delay": "18", + "defence_animation": "2371", + "magic_animation": "2372", + "death_animation": "2373", + "name": "Pheasant", + "defence_level": "1", + "safespot": null, + "lifepoints": "5", + "strength_level": "1", + "id": "2462", + "range_level": "1", + "attack_level": "1" + }, { "examine": "A fowl beast.", "combat_style": "2", @@ -24188,7 +24394,7 @@ "attack_level": "1" }, { - "examine": "Hey", + "examine": "Hey, it's Bob the cat! Or... is it?", "melee_animation": "0", "range_animation": "0", "defence_animation": "0", @@ -24533,6 +24739,16 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "He smells of rock dust.", + "name": "Ordan", + "id": "2564" + }, + { + "examine": "He buys stuff.", + "name": "Jorzik", + "id": "2565" + }, { "death_animation": "836", "name": "Market Guard", @@ -25188,6 +25404,11 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "Nice but dim.", + "name": "Unferth", + "id": "2655" + }, { "examine": "Known for his light-fingered qualities.", "melee_animation": "422", @@ -28624,19 +28845,20 @@ "magic_animation": "0", "death_animation": "2946", "name": "Earth Warrior Champion", - "defence_level": "51", + "defence_level": "84", "safespot": null, - "lifepoints": "72", - "strength_level": "51", + "lifepoints": "108", + "strength_level": "84", "id": "3057", "aggressive": "true", "range_level": "1", - "attack_level": "51" + "attack_level": "84" }, { "examine": "Champion of the giants.", "melee_animation": "6368", "range_animation": "0", + "attack_speed": "4", "respawn_delay": "60", "defence_animation": "0", "weakness": "8", @@ -28644,14 +28866,14 @@ "magic_animation": "0", "death_animation": "6369", "name": "Giant Champion", - "defence_level": "28", + "defence_level": "52", "safespot": null, - "lifepoints": "40", - "strength_level": "28", + "lifepoints": "70", + "strength_level": "44", "id": "3058", "aggressive": "true", "range_level": "1", - "attack_level": "28" + "attack_level": "36" }, { "examine": "Champion of the ghouls.", @@ -28682,86 +28904,89 @@ "melee_animation": "6188", "range_animation": "0", "combat_audio": "469,472,471", - "magic_level": "12", + "attack_speed": "4", + "magic_level": "26", "defence_animation": "0", "weakness": "10", "magic_animation": "0", "death_animation": "6190", "name": "Goblin Champion", - "defence_level": "12", + "defence_level": "14", "safespot": null, - "lifepoints": "17", - "strength_level": "6", + "lifepoints": "32", + "strength_level": "1", "id": "3060", "range_level": "1", - "attack_level": "6" + "attack_level": "1" }, { "examine": "Champion of the hobgoblins.", "combat_style": "1", - "range_animation": "0", + "melee_animation": "164", + "range_animation": "164", "combat_audio": "469,472,471", + "attack_speed": "4", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "165", "weakness": "0", - "magic_animation": "0", - "death_animation": "2958", + "magic_animation": "164", + "death_animation": "167", "name": "Hobgoblin Champion", - "defence_level": "28", + "defence_level": "48", "safespot": null, - "lifepoints": "40", - "strength_level": "14", + "lifepoints": "58", + "strength_level": "48", "id": "3061", "aggressive": "true", - "range_level": "28", - "attack_level": "14" + "range_level": "44", + "attack_level": "44" }, { "examine": "Champion of the imps.", "melee_animation": "5285", "range_animation": "0", - "attack_speed": "5", + "attack_speed": "4", "respawn_delay": "60", "defence_animation": "0", "weakness": "7", "magic_animation": "0", "death_animation": "172", "name": "Imp Champion", - "defence_level": "7", + "defence_level": "5", "safespot": null, - "lifepoints": "10", - "strength_level": "7", + "lifepoints": "40", + "strength_level": "5", "id": "3062", "aggressive": "true", - "range_level": "7", - "attack_level": "7" + "range_level": "5", + "attack_level": "5" }, { "examine": "Champion of the jogres.", - "melee_animation": "2100", - "range_animation": "0", + "melee_animation": "2936", + "range_animation": "2936", "poisonous": "true", "respawn_delay": "60", - "defence_animation": "0", + "defence_animation": "2937", "weakness": "9", - "magic_animation": "0", - "death_animation": "8576", + "magic_animation": "2936", + "death_animation": "2938", "name": "Jogre Champion", - "defence_level": "54", + "defence_level": "86", "safespot": null, - "lifepoints": "77", - "strength_level": "54", + "lifepoints": "120", + "strength_level": "86", "id": "3063", "aggressive": "true", "range_level": "1", - "attack_level": "54" + "attack_level": "86" }, { "examine": "Champion of the lesser demons.", "melee_animation": "64", "range_animation": "0", "combat_audio": "396,402,401", - "magic_level": "81", + "magic_level": "136", "respawn_delay": "60", "defence_animation": "65", "weakness": "5", @@ -28769,13 +28994,33 @@ "magic_animation": "0", "death_animation": "67", "name": "Lesser Demon Champion", - "defence_level": "81", + "defence_level": "142", "safespot": null, - "lifepoints": "115", - "strength_level": "1", + "lifepoints": "148", + "strength_level": "140", "id": "3064", "aggressive": "true", "range_level": "1", + "attack_level": "136" + }, + { + "examine": "Champion of the jogres.", + "melee_animation": "5485", + "range_animation": "5493", + "poisonous": "true", + "respawn_delay": "60", + "defence_animation": "5493", + "weakness": "9", + "magic_animation": "0", + "death_animation": "1444", + "name": "Skeleton Champion", + "defence_level": "54", + "safespot": null, + "lifepoints": "58", + "strength_level": "1", + "id": "3065", + "aggressive": "true", + "range_level": "36", "attack_level": "1" }, { @@ -36069,6 +36314,7 @@ "examine": "Animated bronze armour.", "melee_animation": "386", "range_animation": "386", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "20", "defence_animation": "388", @@ -36091,6 +36337,7 @@ "examine": "Animated iron armour.", "melee_animation": "386", "range_animation": "386", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "20", "defence_animation": "388", @@ -36113,6 +36360,7 @@ "examine": "Animated steel armour.", "melee_animation": "386", "range_animation": "386", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "20", "defence_animation": "388", @@ -36135,6 +36383,7 @@ "examine": "Animated black armour.", "melee_animation": "386", "range_animation": "386", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "20", "defence_animation": "388", @@ -36157,6 +36406,7 @@ "examine": "Animated mithril armour.", "melee_animation": "386", "range_animation": "386", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "20", "defence_animation": "388", @@ -36179,6 +36429,7 @@ "examine": "Animated adamant armour.", "melee_animation": "386", "range_animation": "386", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "20", "defence_animation": "388", @@ -36201,6 +36452,7 @@ "examine": "Animated rune armour.", "melee_animation": "386", "range_animation": "386", + "combat_audio": "2549,1979,512", "attack_speed": "4", "respawn_delay": "20", "defence_animation": "388", @@ -36219,11 +36471,42 @@ "range_level": "1", "attack_level": "120" }, + { + "examine": "The big door man.", + "name": "Ghommal", + "id": "4285" + }, + { + "examine": "Guild Master.", + "name": "Harrallak Menarous", + "id": "4286" + }, + { + "examine": "The guild engineer.", + "name": "Gamfred", + "id": "4287" + }, + { + "examine": "Used to be a black knight.", + "name": "Ajjat", + "id": "4288" + }, + { + "examine": "Blademistress, skillful female warrior.", + "name": "Kamfreena", + "id": "4289" + }, + { + "examine": "A warrior mage from the east.", + "name": "Shanomi", + "id": "4290" + }, { "examine": "A one-eyed man eater.", "slayer_task": "44", "melee_animation": "4652", "range_animation": "0", + "combat_audio": "448,451,450", "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", @@ -36249,6 +36532,7 @@ "slayer_task": "44", "melee_animation": "4652", "range_animation": "0", + "combat_audio": "448,451,450", "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", @@ -36269,6 +36553,41 @@ "range_level": "1", "attack_level": "65" }, + { + "examine": "Food shopkeeper.", + "name": "Lidio", + "id": "4293" + }, + { + "examine": "Potion shopkeeper.", + "name": "Lilly", + "id": "4294" + }, + { + "examine": "Armour shopkeeper.", + "name": "Anton", + "id": "4295" + }, + { + "examine": "Bank staff.", + "name": "Jade", + "id": "4296" + }, + { + "examine": "He looks like a strong warrior.", + "name": "Sloane", + "id": "4297" + }, + { + "examine": "He looks a bit drunk.", + "name": "Jimmy", + "id": "4298" + }, + { + "examine": "He looks fair and reliable.", + "name": "Ref", + "id": "4299" + }, { "examine": "He looks fair and reliable.", "melee_animation": "0", @@ -50062,7 +50381,7 @@ "examine": "He tries to keep order around here. His bizarre uniform isn't helping.", "melee_animation": "6489", "range_animation": "0", - "combat_audio": "511,513,512", + "combat_audio": "2548,1979,512", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "0", @@ -50083,7 +50402,7 @@ "examine": "He tries to keep order around here. His bizarre uniform isn't helping.", "melee_animation": "6489", "range_animation": "0", - "combat_audio": "511,513,512", + "combat_audio": "2548,1979,512", "attack_speed": "5", "respawn_delay": "60", "defence_animation": "0", @@ -51517,6 +51836,7 @@ }, { "melee_animation": "6559", + "combat_audio": "909,912,911", "respawn_delay": "60", "defence_animation": "6557", "slayer_exp": "74", @@ -51535,7 +51855,7 @@ "examine": "A vicious mountain wolf.", "melee_animation": "6579", "range_animation": "6579", - "combat_audio": "481,491,490", + "combat_audio": "909,912,911", "attack_speed": "6", "defence_animation": "6578", "slayer_exp": "34", @@ -71648,5 +71968,10 @@ "name": "Magpie Impling Puro", "id": "6062", "respawn_delay": "9999" + }, + { + "examine": "He looks dangerous!", + "name": "Turael", + "id": "8273" } ] \ No newline at end of file diff --git a/game/data/configs/npc_spawns.json b/game/data/configs/npc_spawns.json index b8f1c0c..f38c683 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,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}" + "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}" }, { "npc_id": "28", @@ -153,7 +153,7 @@ }, { "npc_id": "47", - "loc_data": "{2521,3331,0,1,3}-{2531,3325,0,1,3}-{2526,3328,0,1,3}-{2523,3331,0,1,4}-{2523,3334,0,1,1}-{2530,3327,0,1,5}-{2531,3329,0,1,5}-{2532,3333,0,1,5}-{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}" + "loc_data": "{2521,3331,0,1,3}-{2531,3325,0,1,3}-{2526,3328,0,1,3}-{2523,3331,0,1,4}-{2523,3334,0,1,1}-{2530,3327,0,1,5}-{2531,3329,0,1,5}-{2532,3333,0,1,5}-{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}-{2568,9620,0,1,0}-{2573,9612,0,1,0}-{2579,9631,0,1,0}-{2580,9600,0,1,0}-{2580,9614,0,1,0}-{2580,9620,0,1,0}-{2580,9626,0,1,0}-{2583,9632,0,1,0}-{2584,9625,0,1,0}-{2584,9637,0,1,0}-{2589,9644,0,1,0}-{2590,9601,0,1,0}-{2590,9638,0,1,0}-{2591,9601,0,1,0}-{2591,9621,0,1,0}-{2594,9636,0,1,0}-{2594,9644,0,1,0}-{2597,9604,0,1,0}-{2607,9615,0,1,0}-{2608,9628,0,1,0}-{2614,9651,0,1,0}-{2614,9656,0,1,0}-{2615,9647,0,1,0}-{2615,9661,0,1,0}-{2616,9633,0,1,0}-{2618,9630,0,1,0}" }, { "npc_id": "48", @@ -189,7 +189,7 @@ }, { "npc_id": "59", - "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}" + "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}-{2602,9640,0,1,0}-{2603,9635,0,1,0}-{2603,9638,0,1,0}-{2605,9637,0,1,0}-{2605,9639,0,1,0}-{2606,9635,0,1,0}-2606,9646,0,1,0}-{2607,9637,0,1,0}-{2607,9641,0,1,0}-{2607,9644,0,1,0}-{2607,9648,0,1,0}-{2608,9635,0,1,0}-{2608,9642,0,1,0}-{2609,9639,0,1,0}-{2609,9643,0,1,0}" }, { "npc_id": "60", @@ -273,7 +273,7 @@ }, { "npc_id": "88", - "loc_data": "{2601,9802,0,1,6}-{2594,9805,0,1,1}-{2587,9806,0,1,2}-{2585,9803,0,1,1}-{2584,9801,0,1,5}" + "loc_data": "{2601,9802,0,1,6}-{2594,9805,0,1,1}-{2587,9806,0,1,2}-{2585,9803,0,1,1}-{2584,9801,0,1,5}-{2573,9630,0,1,0}" }, { "npc_id": "89", @@ -321,15 +321,15 @@ }, { "npc_id": "100", - "loc_data": "{2551,3408,0,1,6}-{2553,3405,0,1,3}-{2559,3452,0,1,3}-{2567,3440,0,1,3}" + "loc_data": "{2551,3408,0,1,6}-{2553,3405,0,1,3}-{2559,3452,0,1,3}-{2567,3440,0,1,3}-{2564,9653,0,1,0}-{2565,9655,0,1,0}-{2566,9626,0,1,0}-{2567,9653,0,1,0}-{2569,9633,0,1,0}-{2607,9621,0,1,0}" }, { "npc_id": "101", - "loc_data": "{2555,3407,0,1,3}-{2624,3391,0,1,1}-{2622,3389,0,1,4}-{2619,3390,0,1,4}-{2553,3457,0,1,3}-{2573,3437,0,1,3}" + "loc_data": "{2555,3407,0,1,3}-{2624,3391,0,1,1}-{2622,3389,0,1,4}-{2619,3390,0,1,4}-{2553,3457,0,1,3}-{2573,3437,0,1,3}-{2562,9659,0,1,0}-{2563,9661,0,1,0}-{2599,9626,0,1,0}-{2601,9627,0,1,0}-{2605,9621,0,1,0}-{2610,9620,0,1,0}" }, { "npc_id": "102", - "loc_data": "{2622,3390,0,1,7}-{2622,3390,0,1,7}" + "loc_data": "{2622,3390,0,1,7}-{2622,3390,0,1,7}-{2562,9657,0,1,0}-{2571,9653,0,1,0}" }, { "npc_id": "103", @@ -349,7 +349,7 @@ }, { "npc_id": "107", - "loc_data": "{2602,3267,0,1,6}-{2603,3270,0,1,4}-{2607,3268,0,1,5}-{3275,3154,0,1,6}-{3038,9802,0,1,5}-{3041,9804,0,1,6}-{3040,9795,0,1,7}-{3055,9776,0,1,4}-{3039,9769,0,1,6}-{3049,9764,0,1,3}-{3050,9770,0,1,1}-{3039,9765,0,1,1}-{3048,9762,0,1,4}-{3044,9760,0,1,6}-{3048,9779,0,1,1}-{2870,3166,0,1,3}-{2868,3159,0,1,4}-{2867,3172,0,1,5}-{2813,3112,0,1,4}-{2858,3167,0,1,3}-{2846,3153,0,1,3}-{2851,3149,0,1,1}-{2789,2949,0,1,3}-{2787,2943,0,1,3}-{2781,2949,0,1,3}-{3253,9909,0,1,4}-{3300,3312,0,1,1}-{3300,3305,0,1,3}-{3298,3300,0,1,5}-{3298,3294,0,1,0}-{3299,3290,0,1,6}-{2645,9823,0,1,1}-{2641,9819,0,1,7}-{2641,9817,0,1,2}-{2642,9813,0,1,5}-{2639,9809,0,1,2}" + "loc_data": "{2602,3267,0,1,6}-{2603,3270,0,1,4}-{2607,3268,0,1,5}-{3275,3154,0,1,6}-{3038,9802,0,1,5}-{3041,9804,0,1,6}-{3040,9795,0,1,7}-{3055,9776,0,1,4}-{3039,9769,0,1,6}-{3049,9764,0,1,3}-{3050,9770,0,1,1}-{3039,9765,0,1,1}-{3048,9762,0,1,4}-{3044,9760,0,1,6}-{3048,9779,0,1,1}-{2870,3166,0,1,3}-{2868,3159,0,1,4}-{2867,3172,0,1,5}-{2813,3112,0,1,4}-{2858,3167,0,1,3}-{2846,3153,0,1,3}-{2851,3149,0,1,1}-{2789,2949,0,1,3}-{2787,2943,0,1,3}-{2781,2949,0,1,3}-{3253,9909,0,1,4}-{3300,3312,0,1,1}-{3300,3305,0,1,3}-{3298,3300,0,1,5}-{3298,3294,0,1,0}-{3299,3290,0,1,6}-{2645,9823,0,1,1}-{2641,9819,0,1,7}-{2641,9817,0,1,2}-{2642,9813,0,1,5}-{2639,9809,0,1,2}-{3256,3954,0,1,1}-{3249,3949,0,1,1}-{3246,3945,0,1,1}-{3239,3943,0,1,1}-{3231,3940,0,1,1}-{3225,3943,0,1,1}-{3234,3945,0,1,1}" }, { "npc_id": "108", @@ -377,7 +377,7 @@ }, { "npc_id": "115", - "loc_data": "{2587,9741,0,1,4}-{2585,9739,0,1,7}-{2582,9736,0,1,3}-{2589,9734,0,1,4}-{2582,9743,0,1,3}-{2576,9746,0,1,7}-{2579,9741,0,1,6}-{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}" + "loc_data": "{2587,9741,0,1,4}-{2585,9739,0,1,7}-{2582,9736,0,1,3}-{2589,9734,0,1,4}-{2582,9743,0,1,3}-{2576,9746,0,1,7}-{2579,9741,0,1,6}-{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}-{2585,9608,0,1,0}-{2586,9614,0,1,0}-{2588,9606,0,1,0}" }, { "npc_id": "116", @@ -401,7 +401,7 @@ }, { "npc_id": "122", - "loc_data": "{2996,9574,0,1,6}-{3007,9579,0,1,7}-{3001,9580,0,1,4}-{3018,9580,0,1,3}-{3021,9585,0,1,4}-{3024,9582,0,1,4}-{2507,3726,0,1,2}-{2523,3724,0,1,3}-{2535,9556,0,1,4}" + "loc_data": "{2996,9574,0,1,6}-{3007,9579,0,1,7}-{3001,9580,0,1,4}-{3018,9580,0,1,3}-{3021,9585,0,1,4}-{3024,9582,0,1,4}-{2507,3726,0,1,2}-{2523,3724,0,1,3}-{2535,9556,0,1,4}-{2566,9632,0,1,0}-{2573,9626,0,1,0}" }, { "npc_id": "123", @@ -421,11 +421,11 @@ }, { "npc_id": "127", - "loc_data": "{2955,9795,0,1,0}-{2956,9791,0,1,0}-{2962,9792,0,1,0}-{2966,9788,0,1,0}-{2959,9783,0,1,0}-{2964,9775,0,1,0}-{2954,9776,0,1,0}-{3193,3959,0,0,0}-{3188,3960,0,0,0}-{3190,3962,0,0,0}-{3187,3959,0,0,0}-{3192,3961,0,0,0}-{3187,3960,0,0,0}-{3193,3959,0,0,0}-{3187,3961,0,0,0}" + "loc_data": "{2955,9795,0,1,0}-{2956,9791,0,1,0}-{2962,9792,0,1,0}-{2966,9788,0,1,0}-{2959,9783,0,1,0}-{2964,9775,0,1,0}-{2954,9776,0,1,0}-{3193,3959,0,1,0}-{3188,3960,0,1,0}-{3190,3962,0,1,0}-{3187,3959,0,1,0}-{3192,3961,0,1,0}-{3187,3960,0,1,0}-{3193,3959,0,1,0}-{3187,3961,0,1,0}-{3193,3958,0,1,0}" }, { "npc_id": "128", - "loc_data": "{2610,3274,0,1,0}-{2610,3275,0,1,0}-{2615,3276,0,1,0}-{2616,3275,0,1,0}-{2616,3276,0,1,0}-{3193,3958,0,1,0}-{2877,3154,0,1,0}-{2878,3153,0,1,0}-{2870,3161,0,1,0}-{2822,3192,0,1,5}-{2770,3213,0,0,0}-{2759,3179,0,0,0}-{2741,3173,0,0,0}-{2757,3170,0,0,0}-{2746,3167,0,0,0}-{2781,3173,0,1,0}-{2746,3147,0,1,0}-{2733,3162,0,1,0}-{2730,3146,0,1,0}-{2782,3104,0,1,0}-{2782,3103,0,1,0}-{2777,3090,0,1,0}-{2773,3089,0,1,0}-{2803,3115,0,1,0}-{2808,3112,0,1,0}-{2887,3145,0,1,0}-{2824,3084,0,1,0}-{2821,3078,0,1,0}-{2817,3078,0,1,0}-{2837,3076,0,1,0}-{2844,3040,0,1,0}-{2840,3049,0,1,0}-{2837,3043,0,1,0}-{2834,3042,0,1,0}-{2827,3026,0,1,0}-{2824,3018,0,1,0}-{2830,3021,0,1,0}-{2832,3018,0,1,0}-{2925,2969,0,1,0}-{2939,2977,0,1,0}-{2936,2980,0,1,0}-{2933,2976,0,1,0}-{2930,2971,0,1,0}-{2928,2984,0,1,0}-{2942,2983,0,1,0}-{2936,2989,0,1,0}" + "loc_data": "{2610,3274,0,1,0}-{2610,3275,0,1,0}-{2615,3276,0,1,0}-{2616,3275,0,1,0}-{2616,3276,0,1,0}-{2877,3154,0,1,0}-{2878,3153,0,1,0}-{2870,3161,0,1,0}-{2822,3192,0,1,5}-{2770,3213,0,0,0}-{2759,3179,0,0,0}-{2741,3173,0,0,0}-{2757,3170,0,0,0}-{2746,3167,0,0,0}-{2781,3173,0,1,0}-{2746,3147,0,1,0}-{2733,3162,0,1,0}-{2730,3146,0,1,0}-{2782,3104,0,1,0}-{2782,3103,0,1,0}-{2777,3090,0,1,0}-{2773,3089,0,1,0}-{2803,3115,0,1,0}-{2808,3112,0,1,0}-{2887,3145,0,1,0}-{2824,3084,0,1,0}-{2821,3078,0,1,0}-{2817,3078,0,1,0}-{2837,3076,0,1,0}-{2844,3040,0,1,0}-{2840,3049,0,1,0}-{2837,3043,0,1,0}-{2834,3042,0,1,0}-{2827,3026,0,1,0}-{2824,3018,0,1,0}-{2830,3021,0,1,0}-{2832,3018,0,1,0}-{2925,2969,0,1,0}-{2939,2977,0,1,0}-{2936,2980,0,1,0}-{2933,2976,0,1,0}-{2930,2971,0,1,0}-{2928,2984,0,1,0}-{2942,2983,0,1,0}-{2936,2989,0,1,0}" }, { "npc_id": "131", @@ -627,6 +627,14 @@ "npc_id": "222", "loc_data": "{2851,3351,0,0,7}-{2849,3348,0,0,7}" }, + { + "npc_id": "223", + "loc_data": "{2569,3250,0,1,0}" + }, + { + "npc_id": "224", + "loc_data": "{2579,9655,0,1,0}-{2581,9656,0,1,0}-{2581,9659,0,1,0}-{2583,9659,0,1,0}-{2584,9656,0,1,0}-{2586,9659,0,1,0}-{2587,9656,0,1,0}-{2589,9654,0,1,0}-{2589,9658,0,1,0}-{2591,9656,0,1,0}-{2591,9659,0,1,0}" + }, { "npc_id": "225", "loc_data": "{2641,3437,0,0,0}" @@ -757,7 +765,7 @@ }, { "npc_id": "267", - "loc_data": "{2601,3168,0,0,3}" + "loc_data": "{2601,3168,0,1,3}" }, { "npc_id": "268", @@ -2653,11 +2661,11 @@ }, { "npc_id": "1073", - "loc_data": "{2900,3549,0,0,3}" + "loc_data": "{2900,3549,0,0,3}-{2897,3549,0,0,4}-{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}" }, { "npc_id": "1074", - "loc_data": "{2897,3549,0,0,4}" + "loc_data": "{2893,3569,1,1,3}" }, { "npc_id": "1076", @@ -2685,11 +2693,11 @@ }, { "npc_id": "1084", - "loc_data": "{2915,3549,0,0,0}" + "loc_data": "{2915,3549,0,1,0}" }, { "npc_id": "1085", - "loc_data": "{2921,3558,0,1,6}" + "loc_data": "{2927,3558,0,1,6}" }, { "npc_id": "1086", @@ -2697,15 +2705,15 @@ }, { "npc_id": "1087", - "loc_data": "{2911,3540,0,0,7}" + "loc_data": "{2911,3540,0,1,7}" }, { "npc_id": "1088", - "loc_data": "{2918,3545,0,0,0}" + "loc_data": "{2918,3545,0,1,0}" }, { "npc_id": "1089", - "loc_data": "{2919,3529,0,0,0}" + "loc_data": "{2919,3529,0,1,0}" }, { "npc_id": "1090", @@ -2715,6 +2723,10 @@ "npc_id": "1093", "loc_data": "{2817,3560,0,1,3}" }, + { + "npc_id": "1094", + "loc_data": "{2802,3841,0,1,0}-{2798,3842,0,1,0}-{2804,3843,0,1,0}-{2807,3843,0,1,0}" + }, { "npc_id": "1096", "loc_data": "{2852,3591,0,1,7}" @@ -2741,27 +2753,27 @@ }, { "npc_id": "1106", - "loc_data": "{2864,3594,0,1,1}-{2881,3592,0,1,5}-{2857,3587,0,1,7}-{2855,3596,0,1,4}-{2827,10078,1,1,6}-{2925,3626,0,1,0}-{2843,3682,0,1,1}" + "loc_data": "{2864,3594,0,1,1}-{2881,3592,0,1,5}-{2857,3587,0,1,7}-{2855,3596,0,1,4}-{2827,10078,1,1,6}-{2925,3626,0,1,0}-{2843,3682,0,1,1}-{2769,10149,0,1,0}-{2777,10142,0,1,0}" }, { "npc_id": "1107", - "loc_data": "{2874,3595,0,1,3}-{2875,3596,0,1,1}-{2873,3598,0,1,1}-{2836,10088,1,1,5}-{2845,3674,0,1,4}" + "loc_data": "{2874,3595,0,1,3}-{2875,3596,0,1,1}-{2873,3598,0,1,1}-{2836,10088,1,1,5}-{2845,3674,0,1,4}-{2781,10143,0,1,0}" }, { "npc_id": "1108", - "loc_data": "{2878,3592,0,1,6}-{2861,3586,0,1,6}-{2855,10058,2,1,4}-{2852,3673,0,1,2}" + "loc_data": "{2878,3592,0,1,6}-{2861,3586,0,1,6}-{2855,10058,2,1,4}-{2852,3673,0,1,2}-{2783,10140,0,1,0}" }, { "npc_id": "1109", - "loc_data": "{2875,3588,0,1,1}-{2883,3586,0,1,6}-{2825,10087,1,1,3}-{2836,10080,1,1,6}-{2784,10040,2,1,3}-{2920,3627,0,1,0}-{2923,10029,0,1,7}-{2851,3667,0,1,3}" + "loc_data": "{2875,3588,0,1,1}-{2883,3586,0,1,6}-{2825,10087,1,1,3}-{2836,10080,1,1,6}-{2784,10040,2,1,3}-{2920,3627,0,1,0}-{2923,10029,0,1,7}-{2851,3667,0,1,3}-{2784,10134,0,1,0}" }, { "npc_id": "1110", - "loc_data": "{2883,3591,0,1,4}-{2869,3594,0,1,3}-{2861,3587,0,1,4}-{2872,3594,0,1,5}-{2829,10080,1,1,6}-{2836,10097,2,1,4}-{2852,10110,2,1,4}" + "loc_data": "{2883,3591,0,1,4}-{2869,3594,0,1,3}-{2861,3587,0,1,4}-{2872,3594,0,1,5}-{2829,10080,1,1,6}-{2836,10097,2,1,4}-{2852,10110,2,1,4}-{2771,10143,0,1,0}" }, { "npc_id": "1111", - "loc_data": "{2863,3588,0,1,6}-{2865,3591,0,1,0}-{2866,3598,0,1,1}-{2840,10101,1,1,4}-{2857,10055,2,1,3}-{2836,10090,2,1,1}-{2925,10033,0,1,6}-{2855,3685,0,1,1}" + "loc_data": "{2863,3588,0,1,6}-{2865,3591,0,1,0}-{2866,3598,0,1,1}-{2840,10101,1,1,4}-{2857,10055,2,1,3}-{2836,10090,2,1,1}-{2925,10033,0,1,6}-{2855,3685,0,1,1}-{2788,10131,0,1,0}" }, { "npc_id": "1112", @@ -3315,6 +3327,14 @@ "npc_id": "1343", "loc_data": "{3145,5548,0,1,6}" }, + { + "npc_id": "1357", + "loc_data": "{2201,4942,0,1,4}" + }, + { + "npc_id": "1358", + "loc_data": "{2208,4959,0,1,6}" + }, { "npc_id": "1359", "loc_data": "{2612,3875,1,1,6}" @@ -3507,21 +3527,37 @@ "npc_id": "1555", "loc_data": "{2829,10096,1,0,0}" }, + { + "npc_id": "1558", + "loc_data": "{2800,3859,0,1,0}-{2803,3864,0,1,0}-{2805,3859,0,1,0}" + }, { "npc_id": "1560", - "loc_data": "{3150,5454,0,1,4}-{3144,5446,0,1,7}-{3166,5446,0,1,3}-{3158,5451,0,1,7}" + "loc_data": "{3150,5454,0,1,4}-{3144,5446,0,1,7}-{3166,5446,0,1,3}-{3158,5451,0,1,7}-{2775,10224,0,1,0}-{2783,10199,0,1,0}-{2784,10233,0,1,0}" }, { "npc_id": "1561", - "loc_data": "{3144,5450,0,1,1}-{3153,5454,0,1,5}-{3160,5450,0,1,5}-{3167,5450,0,1,3}-{3161,5451,0,1,1}" + "loc_data": "{3144,5450,0,1,1}-{3153,5454,0,1,5}-{3160,5450,0,1,5}-{3167,5450,0,1,3}-{3161,5451,0,1,1}-{2777,10224,0,1,0}-{2784,10231,0,1,0}-{2792,10222,0,1,0}" }, { "npc_id": "1562", - "loc_data": "{3147,5448,0,1,4}" + "loc_data": "{3147,5448,0,1,4}-{2772,10221,0,1,0}-{2785,10201,0,1,0}-{2787,10232,0,1,0}" }, { "npc_id": "1563", - "loc_data": "{3152,5453,0,1,0}" + "loc_data": "{3152,5453,0,1,0}-{2773,10220,0,1,0}-{2788,10198,0,1,0}-{2790,10220,0,1,0}-{2800,10218,0,1,0}" + }, + { + "npc_id": "1564", + "loc_data": "{2770,10219,0,1,0}-{2788,10230,0,1,0}-{2798,10216,0,1,0}" + }, + { + "npc_id": "1565", + "loc_data": "{2788,10221,0,1,0}-{2801,10216,0,1,0}" + }, + { + "npc_id": "1566", + "loc_data": "{2786,10199,0,1,0}-{2790,10222,0,1,0}-{2799,10214,0,1,0}" }, { "npc_id": "1582", @@ -4111,6 +4147,38 @@ "npc_id": "1930", "loc_data": "{3161,2985,0,0,6}-{3161,2983,0,0,6}-{3161,2982,0,0,6}-{3161,2981,0,0,6}-{3161,2984,0,0,6}" }, + { + "npc_id": "1935", + "loc_data": "{2841,3738,0,0,3}" + }, + { + "npc_id": "1936", + "loc_data": "{2852,3735,0,1,0}-{2855,3729,0,1,0}-{2861,3725,0,1,0}" + }, + { + "npc_id": "1937", + "loc_data": "{2850,3732,0,1,0}-{2857,3726,0,1,0}-{2865,3729,0,1,0}" + }, + { + "npc_id": "1938", + "loc_data": "{2849,3735,0,1,0}-{2853,3731,0,1,0}-{2859,3728,0,1,0}" + }, + { + "npc_id": "1939", + "loc_data": "{2856,3728,0,1,0}-{2862,3722,0,1,0}-{2864,3723,0,1,0}" + }, + { + "npc_id": "1940", + "loc_data": "{2853,3728,0,1,0}-{2856,3732,0,1,0}-{2863,3720,0,1,0}" + }, + { + "npc_id": "1941", + "loc_data": "{2854,3725,0,1,0}-{2862,3728,0,1,0}-{2862,3731,0,1,0}" + }, + { + "npc_id": "1942", + "loc_data": "{2855,3735,0,1,0}-{2858,3730,0,1,0}-{2865,3726,0,1,0}" + }, { "npc_id": "1951", "loc_data": "{2886,3723,0,1,3}-{2887,3720,0,1,4}-{2890,3721,0,1,7}-{2890,3724,0,1,1}-{2909,3736,0,1,5}-{2910,3736,0,1,2}-{2891,3724,0,1,7}" @@ -4727,6 +4795,14 @@ "npc_id": "2462", "loc_data": "{2596,4773,0,1,2}-{2602,4771,0,1,6}-{2596,4780,0,1,4}" }, + { + "npc_id": "2479", + "loc_data": "{3420,4777,0,0,0}" + }, + { + "npc_id": "2481", + "loc_data": "{3423,4777,0,0,5}" + }, { "npc_id": "2482", "loc_data": "{3057,3902,0,1,3}" @@ -4815,6 +4891,14 @@ "npc_id": "2549", "loc_data": "{3364,3001,0,0,6}" }, + { + "npc_id": "2564", + "loc_data": "{1936,4966,0,0,4}" + }, + { + "npc_id": "2565", + "loc_data": "{1939,4968,0,1,0}" + }, { "npc_id": "2568", "loc_data": "{2729,3495,0,0,6}-{2724,3495,0,0,6}-{2728,3495,0,0,6}-{2721,3495,0,0,6}" @@ -4967,6 +5051,10 @@ "npc_id": "2652", "loc_data": "{2868,3579,0,0,0}-{2851,3582,0,0,0}" }, + { + "npc_id": "2655", + "loc_data": "{2921,3558,0,1,6}" + }, { "npc_id": "2660", "loc_data": "{3208,3496,0,1,3}" @@ -6292,8 +6380,8 @@ "loc_data": "{2880,3546,0,0,4}" }, { - "npc_id": "4286", - "loc_data": "{2866,3543,0,1,1}" + "npc_id": "8267", + "loc_data": "{2866,3546,0,1,1}" }, { "npc_id": "4287", @@ -6469,7 +6557,7 @@ }, { "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}-{2045,5186,0,1,2}-{2044,5188,0,1,2}-{2042,5192,0,1,2}" + "loc_data": "{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", @@ -6477,7 +6565,7 @@ }, { "npc_id": "4392", - "loc_data": "{2033,5233,0,1,4}-{2033,5233,0,1,7}-{2026,5236,0,1,1}-{1984,5160,0,1,7}" + "loc_data": "{2033,5233,0,1,4}-{2033,5233,0,1,7}-{2026,5236,0,1,1}" }, { "npc_id": "4393", @@ -6803,6 +6891,10 @@ "npc_id": "4575", "loc_data": "{2441,3503,1,1,4}" }, + { + "npc_id": "4576", + "loc_data": "{2786,3862,0,1,0}" + }, { "npc_id": "4578", "loc_data": "{2933,2972,0,0,0}" @@ -8711,6 +8803,10 @@ "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": "6052", + "loc_data": "{2761,3863,0,1,0}-{2764,3858,0,1,0}-{2769,3854,0,1,0}-{2769,3861,0,1,0}" + }, { "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}-" @@ -10451,14 +10547,6 @@ "npc_id": "2159", "loc_data": "{2885,10196,0,1,0}" }, - { - "npc_id": "2565", - "loc_data": "{1937,4972,0,1,0}" - }, - { - "npc_id": "2564", - "loc_data": "{1935,4964,0,0,4}" - }, { "npc_id": "2321", "loc_data": "{2918,10194,0,0,3}" @@ -11123,14 +11211,6 @@ "npc_id": "3322", "loc_data": "{2384,4439,0,1,0}" }, - { - "npc_id": "223", - "loc_data": "{2569,3250,0,1,0}" - }, - { - "npc_id": "224", - "loc_data": "{2582,9656,0,1,0}-{2589,9657,0,1,0}-{2587,9658,0,1,0}-{2584,9657,0,1,0}-{2585,9656,0,1,0}-{2582,9658,0,1,0}-{2585,9653,0,1,0}-{2590,9658,0,1,0}-{2590,9655,0,1,0}" - }, { "npc_id": "1080", "loc_data": "{2900,3567,1,1,0}" diff --git a/game/data/configs/object_configs.json b/game/data/configs/object_configs.json index 4ee1d9a..d1c4e0b 100644 --- a/game/data/configs/object_configs.json +++ b/game/data/configs/object_configs.json @@ -20630,5 +20630,9 @@ { "examine": "There are some bandages on this table.", "ids": "36579,36586" + }, + { + "examine": "Rough but adequate.", + "ids": "14918" } ] \ No newline at end of file diff --git a/game/data/configs/ranged_weapon_configs.json b/game/data/configs/ranged_weapon_configs.json index a2790b6..03f8d60 100644 --- a/game/data/configs/ranged_weapon_configs.json +++ b/game/data/configs/ranged_weapon_configs.json @@ -1502,69 +1502,6 @@ "drop_ammo": "true", "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,78,4160" }, - { - "itemId": "14671", - "name": "Armadyl crossbow", - "ammo_slot": "13", - "weapon_type": "1", - "animation": "4230", - "drop_ammo": "true", - "ammunition": "877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243,9144,9291,9298,9305,9341,9244,9342,9245,9140,13280" - }, - { - "itemId": "14684", - "name": "Odium ward", - "ammo_slot": "13", - "weapon_type": "1", - "animation": "4230", - "drop_ammo": "true", - "ammunition": "8882,877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243" - }, - { - "itemId": "14685", - "name": "Odium shard 1", - "ammo_slot": "13", - "weapon_type": "1", - "animation": "4230", - "drop_ammo": "true", - "ammunition": "877,878,6061,6062,879,9236" - }, - { - "itemId": "14803", - "name": "Dark bow", - "ammo_slot": "13", - "weapon_type": "2", - "animation": "426", - "drop_ammo": "true", - "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160" - }, - { - "itemId": "14804", - "name": "Dark bow", - "ammo_slot": "13", - "weapon_type": "2", - "animation": "426", - "drop_ammo": "true", - "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160" - }, - { - "itemId": "14805", - "name": "Dark bow", - "ammo_slot": "13", - "weapon_type": "2", - "animation": "426", - "drop_ammo": "true", - "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160" - }, - { - "itemId": "14806", - "name": "Dark bow", - "ammo_slot": "13", - "weapon_type": "2", - "animation": "426", - "drop_ammo": "true", - "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160" - }, { "itemId": "14192", "name": "Bow (class 1)", diff --git a/game/data/configs/shops.json b/game/data/configs/shops.json index bcfb5db..e5113fb 100644 --- a/game/data/configs/shops.json +++ b/game/data/configs/shops.json @@ -519,7 +519,7 @@ "general_store": "false", "id": "59", "title": "Fancy Clothes Store", - "stock": "{1949,10,100}-{958,10,100}-{948,10,100}-{1733,10,100}-{1734,1000,100}-{1059,30,100}-{1061,10,100}-{1757,10,100}-{1013,10,100}-{1025,10,100}-{10088,0,100}-{10090,0,100}-{10091,0,100}-{10089,0,100}-{10087,0,100}-{11525,0,100}" + "stock": "{1949,0,100}-{579,10,100}-{1023,10,100}-{958,10,100}-{948,10,100}-{1733,10,100}-{1734,1000,100}-{1059,30,100}-{1061,10,100}-{428,10,100}-{426,10,100}-{1757,10,100}-{1013,10,100}-{1015,10,100}-{1011,10,100}-{1007,10,100}-{1025,10,100}-{10088,0,100}-{10090,0,100}-{10091,0,100}-{10089,0,100}-{10087,0,100}-{11525,0,100}" }, { "npcs": "548", @@ -1476,7 +1476,7 @@ "stock": "{8794,10,100}-{8790,300,100}-{4819,300,100}-{4820,300,100}-{1539,300,100}" }, { - "npcs": "1079", + "npcs": "1079,1357,1358", "high_alch": "0", "currency": "995", "general_store": "false", diff --git a/game/data/eco/.gitignore b/game/data/eco/.gitignore new file mode 100644 index 0000000..5e7d273 --- /dev/null +++ b/game/data/eco/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/game/server.jar b/game/server.jar index 64ac7c1..9b2292b 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 a2c60af..71a26a0 100644 --- a/game/worldprops/default.conf +++ b/game/worldprops/default.conf @@ -1,4 +1,10 @@ [server] +#Log Level - the level of verbosity used for logs. +#"verbose" - ALL logs are shown +#"detailed" - FINE logs are hidden, which is generally bulk/debug info. +#"cautious" - FINE, INFO logs are hidden, meaning this level only shows warnings and errors. +#"silent" - FINE, INFO, WARN logs are hidden, meaning this level only shows errors. +log_level = "verbose" #Secret key - this is sent by the client during login. #Client/Server MUST match or connection is refused. secret_key = "2009scape_development" @@ -13,10 +19,10 @@ 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 +watchdog_enabled = false [database] database_name = "global" @@ -25,6 +31,15 @@ database_password = "" database_address = "127.0.0.1" database_port = "3306" +[integrations] +grafana_logging = false +grafana_log_path = "@data/logs" +#how long grafana will keep old data for in days (anything older is pruned once on startup) +grafana_log_ttl_days = 7 +#discord_ge_webhook = "webhook link" +#discord_moderation_webhook = "webhook link" +#openrsc_integration_webhook = "webhook link" + [world] name = "2009scape" @@ -39,7 +54,7 @@ world_id = "1" country_id = "0" members = true #activity as displayed on the world list -activity = "2009scape classic." +activity = "Singleplayer" pvp = false default_xp_rate = 5.0 allow_slayer_reroll = false @@ -60,19 +75,24 @@ skillcape_perks = true increased_door_time = false enable_botting = false max_adv_bots = 100 -wild_pvp_enabled = false +enable_doubling_money_scammers = true +wild_pvp_enabled = true jad_practice_enabled = true +#minimum HA value for announcements of bots selling on ge +ge_announcement_limit = 500 +enable_castle_wars = false personalized_shops = true -bots_influence_ge_price = true +bots_influence_ge_price = false #verbose cutscene logging (for cutscenes in the new system) verbose_cutscene = false #show the rules the first time a player logs in -show_rules = false +show_rules = true #the number of revenants active at a time revenant_population = 30 #enable auto-buy/auto-sell on the GE. i_want_to_cheat = false - +#better agility pyramid gp reward (gp reward = 1000 + ((agility level / 99) * 9000)) +better_agility_pyramid_gp = true [paths] #path to the data folder, which contains the cache subfolder and such @@ -104,4 +124,3 @@ object_parser_path = "@data/ObjectParser.xml" logs_path = "@data/logs" bot_data = "@data/botdata" eco_data = "@data/eco" -