Merge branch 'master' into 'master'

Add: Jatizso Audit: Stats and Shops

See merge request 2009scape/2009scape!121
This commit is contained in:
Ceikry
2021-07-09 03:06:57 +00:00
2 changed files with 251 additions and 123 deletions
+224 -114
View File
@@ -47100,61 +47100,66 @@
{
"examine": "An ice troll youngling.",
"range_animation": "0",
"melee_animation": "284",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll runt",
"defence_level": "38",
"defence_level": "70",
"safespot": null,
"lifepoints": "54",
"strength_level": "38",
"lifepoints": "60",
"strength_level": "70",
"id": "5473",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "38"
"attack_level": "60"
},
{
"examine": "A male troll wielding a large club.",
"range_animation": "0",
"melee_animation": "284",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"death_animation": "287",
"name": "Ice troll male",
"defence_level": "49",
"defence_level": "40",
"safespot": null,
"lifepoints": "70",
"strength_level": "49",
"lifepoints": "80",
"strength_level": "80",
"id": "5474",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "49"
"attack_level": "80"
},
{
"examine": "An ice troll with a bag of rocks.",
"combat_style": "1",
"range_animation": "1142",
"melee_animation": "1142",
"melee_animation": "1142",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "0",
"magic_animation": "0",
"death_animation": "287",
"death_animation": "287",
"name": "Ice troll female",
"defence_level": "49",
"defence_level": "40",
"safespot": null,
"lifepoints": "70",
"strength_level": "36",
"lifepoints": "80",
"strength_level": "80",
"id": "5475",
"aggressive": "true",
"range_level": "49",
"projectile": "276",
"attack_level": "36"
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "80"
},
{
"examine": "A large ice troll.",
@@ -47344,101 +47349,132 @@
"attack_level": "1"
},
{
"melee_animation": "284",
"examine": "An ice troll youngling.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll runt",
"defence_level": "1",
"defence_level": "70",
"safespot": null,
"lifepoints": "60",
"strength_level": "1",
"strength_level": "70",
"id": "5521",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "1"
"attack_level": "60"
},
{
"melee_animation": "284",
"examine": "A male troll wielding a large club.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"death_animation": "287",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll male",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5522",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "1"
"attack_level": "80"
},
{
"examine": "An ice troll with a bag of rocks.",
"combat_style": "1",
"range_animation": "1142",
"melee_animation": "1142",
"melee_animation": "1142",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"death_animation": "287",
"weakness": "0",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll female",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5523",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"projectile": "276",
"attack_level": "1"
"attack_level": "80"
},
{
"melee_animation": "284",
"examine": "An ice troll youngling.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll runt",
"defence_level": "1",
"defence_level": "70",
"safespot": null,
"lifepoints": "60",
"strength_level": "1",
"strength_level": "70",
"id": "5525",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "1"
"attack_level": "60"
},
{
"melee_animation": "284",
"examine": "A male troll wielding a large club.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"death_animation": "287",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll male",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5526",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"projectile": "",
"attack_level": "1"
"attack_level": "80"
},
{
"examine": "An ice troll with a bag of rocks.",
"combat_style": "1",
"range_animation": "1142",
"melee_animation": "1142",
"melee_animation": "1142",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"death_animation": "287",
"weakness": "0",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll female",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5527",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"projectile": "276",
"attack_level": "1"
"attack_level": "80"
},
{
"examine": "A hairy, smelly, grazing animal.",
@@ -108584,46 +108620,50 @@
"attack_level": "1"
},
{
"examine": "Snake",
"examine": "Snake, snake, oh, it's a young snake.",
"slayer_task": "72",
"melee_animation": "3538",
"range_animation": "0",
"combat_audio": "3609,3608,3610",
"attack_speed": "4",
"poisonous": "true",
"respawn_delay": "60",
"defence_animation": "0",
"weakness": "1",
"magic_animation": "0",
"death_animation": "3540",
"name": "Sea Snake Young",
"defence_level": "45",
"defence_level": "70",
"safespot": null,
"lifepoints": "128",
"strength_level": "33",
"lifepoints": "85",
"strength_level": "70",
"id": "3939",
"aggressive": "true",
"range_level": "45",
"attack_level": "33"
"range_level": "1",
"attack_level": "90"
},
{
"examine": "A baby sea snake. Snaaaaaaake!",
"examine": "A baby sea snake. Snaaaaaaake!",
"slayer_task": "72",
"melee_animation": "3538",
"range_animation": "0",
"combat_audio": "3609,3608,3610",
"attack_speed": "4",
"poisonous": "true",
"respawn_delay": "60",
"defence_animation": "0",
"weakness": "1",
"magic_animation": "0",
"death_animation": "3540",
"name": "Sea Snake Hatchling",
"defence_level": "45",
"defence_level": "50",
"safespot": null,
"lifepoints": "100",
"strength_level": "33",
"lifepoints": "50",
"strength_level": "55",
"id": "3940",
"aggressive": "true",
"range_level": "45",
"attack_level": "33"
"range_level": "1",
"attack_level": "60"
},
{
"name": "Guard",
@@ -108656,24 +108696,26 @@
"attack_level": "1"
},
{
"examine": "A big snake that lives in the sea. How did it get in here?",
"examine": "A big snake that lives in the sea. How did it get there?",
"melee_animation": "4040",
"range_animation": "0",
"combat_audio": "3609,3608,3610",
"attack_speed": "4",
"poisonous": "true",
"respawn_delay": "60",
"defence_animation": "0",
"weakness": "1",
"magic_animation": "0",
"death_animation": "4039",
"name": "Giant Sea Snake",
"defence_level": "45",
"defence_level": "160",
"safespot": null,
"lifepoints": "385",
"strength_level": "33",
"lifepoints": "100",
"strength_level": "90",
"id": "3943",
"aggressive": "true",
"range_level": "45",
"attack_level": "33"
"range_level": "130",
"attack_level": "170"
},
{
"slayer_exp": "37",
@@ -120494,73 +120536,87 @@
"slayer_task": "83",
"melee_animation": "5374",
"range_animation": "0",
"magic_level": "65",
"magic_level": "1",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "0",
"weakness": "10",
"magic_animation": "0",
"death_animation": "5209",
"name": "Ice Troll King",
"defence_level": "65",
"defence_level": "80",
"safespot": null,
"lifepoints": "185",
"lifepoints": "150",
"strength_level": "65",
"id": "5472",
"aggressive": "true",
"range_level": "65",
"attack_level": "65"
"bonuses": "60,60,60,0,0,45,45,45,2000,2000,0,60,0,0,0",
"range_level": "1",
"attack_level": "100"
},
{
"examine": "An ice troll youngling.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "0",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll runt",
"defence_level": "38",
"defence_level": "70",
"safespot": null,
"lifepoints": "54",
"strength_level": "38",
"lifepoints": "60",
"strength_level": "70",
"id": "5473",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "38"
"attack_level": "60"
},
{
"examine": "A male troll wielding a large club.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "0",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll male",
"defence_level": "49",
"defence_level": "40",
"safespot": null,
"lifepoints": "70",
"strength_level": "49",
"lifepoints": "80",
"strength_level": "80",
"id": "5474",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "49"
"attack_level": "80"
},
{
"examine": "An ice troll with a bag of rocks.",
"combat_style": "1",
"range_animation": "0",
"range_animation": "1142",
"melee_animation": "1142",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "0",
"defence_animation": "285",
"weakness": "0",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll female",
"defence_level": "49",
"defence_level": "40",
"safespot": null,
"lifepoints": "70",
"strength_level": "36",
"lifepoints": "80",
"strength_level": "80",
"id": "5475",
"aggressive": "true",
"range_level": "49",
"attack_level": "36"
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"attack_level": "80"
},
{
"examine": "A large ice troll.",
@@ -120750,78 +120806,132 @@
"attack_level": "1"
},
{
"examine": "An ice troll youngling.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll runt",
"defence_level": "1",
"defence_level": "70",
"safespot": null,
"lifepoints": "60",
"strength_level": "1",
"strength_level": "70",
"id": "5521",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"respawn_delay": "60",
"attack_level": "1"
"attack_level": "60"
},
{
"examine": "A male troll wielding a large club.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll male",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5522",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"respawn_delay": "60",
"attack_level": "1"
"attack_level": "80"
},
{
"examine": "An ice troll with a bag of rocks.",
"combat_style": "1",
"range_animation": "1142",
"melee_animation": "1142",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "0",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll female",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5523",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"respawn_delay": "60",
"attack_level": "1"
"attack_level": "80"
},
{
"examine": "An ice troll youngling.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll runt",
"defence_level": "1",
"defence_level": "70",
"safespot": null,
"lifepoints": "60",
"strength_level": "1",
"strength_level": "70",
"id": "5525",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"respawn_delay": "60",
"attack_level": "1"
"attack_level": "60"
},
{
"examine": "A male troll wielding a large club.",
"range_animation": "0",
"melee_animation": "284",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "9",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll male",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5526",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"respawn_delay": "60",
"attack_level": "1"
"attack_level": "80"
},
{
"examine": "An ice troll with a bag of rocks.",
"combat_style": "1",
"range_animation": "1142",
"melee_animation": "1142",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "285",
"weakness": "0",
"magic_animation": "0",
"death_animation": "287",
"name": "Ice troll female",
"defence_level": "1",
"defence_level": "40",
"safespot": null,
"lifepoints": "80",
"strength_level": "1",
"strength_level": "80",
"id": "5527",
"aggressive": "true",
"bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0",
"range_level": "1",
"respawn_delay": "60",
"attack_level": "1"
"attack_level": "80"
},
{
"examine": "A hairy, smelly, grazing animal.",
+27 -9
View File
@@ -721,11 +721,11 @@
},
{
"npcs": "5487",
"high_alch": "0",
"high_alch": "1",
"currency": "995",
"general_store": "false",
"id": "82",
"title": "Keepa Kettilon's Store",
"title": "Keepa Kettilon's store",
"stock": "{361,20}-{329,20}-{339,20}-{379,10}-{373,0}-{385,0}"
},
{
@@ -1144,12 +1144,12 @@
},
{
"npcs": "5485",
"high_alch": "0",
"high_alch": "1",
"currency": "995",
"general_store": "false",
"id": "130",
"title": "Armour Shop",
"stock": "{1109,4}-{1159,4}-{1181,4}-{1197,4}-{1071,4}-{1085,4}-{1121,4}"
"stock": "{1109,4}-{1143,4}-{1159,4}-{1181,4}-{1197,4}-{1071,4}-{1085,4}-{1121,4}"
},
{
"npcs": "542",
@@ -1459,12 +1459,12 @@
},
{
"npcs": "5486",
"high_alch": "0",
"high_alch": "1",
"currency": "995",
"general_store": "false",
"id": "165",
"title": "Weapons Galore",
"stock": "{1315,10}-{1343,10}-{1369,10}-{1299,10}"
"title": "Weapons galore",
"stock": "{1299,4}-{1343,4}-{1369,4}-{3099,4}-{1315,4}"
},
{
"npcs": "4250",
@@ -1909,7 +1909,7 @@
},
{
"npcs": "5483",
"high_alch": "0",
"high_alch": "1",
"currency": "995",
"general_store": "false",
"id": "216",
@@ -2092,7 +2092,7 @@
"high_alch": "0",
"currency": "995",
"general_store": "false",
"id": "236",
"id": "236",
"title": "Keldagrim Stonemason",
"stock": "{3420,500}-{8786,30}-{8784,30}-{8788,30}"
},
@@ -2104,5 +2104,23 @@
"id": "237",
"title": "Lovecraft's Tackle",
"stock": "{303,10}-{307,10}-{309,10}-{311,1000}-{301,10}-{313,1000}-{314,1000}-{317,0}-{327,10}-{345,0}-{321,0}-{335,0}-{349,0}-{331,0}-{359,0}-{377,0}-{371,0}"
},
{
"npcs": "5484",
"high_alch": "0",
"currency": "995",
"general_store": "false",
"id": "238",
"title": "Flosi's Fishmongers",
"stock": "{377,5}-{359,20}-{331,20}-{341,20}-{383,0}"
},
{
"npcs": "5495",
"high_alch": "0",
"currency": "995",
"general_store": "false",
"id": "239",
"title": "Contraband yak produce.",
"stock": "{10818,25}-{10816,50}-{10814,50}-{10820,10}"
}
]