Merge remote-tracking branch 'upstream/master'

This commit is contained in:
skelsoft
2021-07-28 09:15:20 +10:00
222 changed files with 3454 additions and 2975 deletions
+122 -85
View File
@@ -7863,7 +7863,32 @@
"maxAmount": "1"
}
],
"charm": [],
"charm": [
{
"minAmount": "1",
"weight": "85.0",
"id": "12158",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "7.0",
"id": "12159",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "7.0",
"id": "12160",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "12163",
"maxAmount": "1"
}
],
"ids": "117,4689,4690,4691,4692,4693",
"description": "",
"main": [
@@ -8552,7 +8577,7 @@
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "8.0",
"id": "1207",
"maxAmount": "1"
},
@@ -8576,13 +8601,13 @@
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "1241",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "1295",
"maxAmount": "1"
},
@@ -8606,13 +8631,13 @@
},
{
"minAmount": "2",
"weight": "25.0",
"weight": "8.0",
"id": "564",
"maxAmount": "2"
},
{
"minAmount": "3",
"weight": "25.0",
"weight": "8.0",
"id": "562",
"maxAmount": "3"
},
@@ -8624,7 +8649,7 @@
},
{
"minAmount": "2",
"weight": "25.0",
"weight": "8.0",
"id": "563",
"maxAmount": "2"
},
@@ -8632,7 +8657,7 @@
"minAmount": "4",
"weight": "50.0",
"id": "5318",
"maxAmount": "8"
"maxAmount": "4"
},
{
"minAmount": "4",
@@ -8648,25 +8673,25 @@
},
{
"minAmount": "3",
"weight": "50.0",
"weight": "25.0",
"id": "5320",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "25.0",
"id": "5323",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "8.0",
"id": "5294",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "8.0",
"id": "5293",
"maxAmount": "1"
},
@@ -8684,85 +8709,85 @@
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5306",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5311",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5104",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5105",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5106",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5280",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5281",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5100",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5296",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "12176",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5292",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5297",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "5299",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "8.0",
"id": "5301",
"maxAmount": "1"
},
@@ -8774,7 +8799,7 @@
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "8.0",
"id": "5295",
"maxAmount": "1"
},
@@ -8804,37 +8829,37 @@
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "25.0",
"id": "205",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "211",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "209",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "8.0",
"id": "207",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "8.0",
"id": "213",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "8.0",
"id": "215",
"maxAmount": "1"
},
@@ -8873,6 +8898,36 @@
"weight": "5.0",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "5300",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "5304",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "8.0",
"id": "1987",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "8.0",
"id": "1",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "995",
"maxAmount": "62"
}
]
},
@@ -26189,16 +26244,10 @@
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "4131",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1185",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
@@ -26217,63 +26266,45 @@
"id": "1353",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1303",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1373",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1319",
"maxAmount": "1"
},
{
"minAmount": "5",
"weight": "50.0",
"weight": "25.0",
"id": "560",
"maxAmount": "5"
},
{
"minAmount": "10",
"weight": "50.0",
"weight": "25.0",
"id": "560",
"maxAmount": "10"
},
{
"minAmount": "3",
"weight": "25.0",
"weight": "12.5",
"id": "562",
"maxAmount": "3"
},
{
"minAmount": "37",
"weight": "25.0",
"weight": "12.5",
"id": "562",
"maxAmount": "37"
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "25.0",
"id": "5281",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "25.0",
"id": "5297",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "25.0",
"id": "5280",
"maxAmount": "1"
},
@@ -26309,27 +26340,21 @@
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "8.0",
"id": "5303",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "8.0",
"id": "5302",
"maxAmount": "1"
},
{
"minAmount": "1144",
"minAmount": "10",
"weight": "50.0",
"id": "995",
"maxAmount": "1144"
},
{
"minAmount": "132",
"weight": "50.0",
"id": "995",
"maxAmount": "132"
"maxAmount": "460"
},
{
"minAmount": "1",
@@ -26351,19 +26376,13 @@
},
{
"minAmount": "1",
"weight": "5.0",
"id": "2363",
"weight": "8.0",
"id": "12070",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "2723",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "16.0",
"id": "31",
"maxAmount": "1"
},
@@ -26372,6 +26391,24 @@
"weight": "100.0",
"id": "0",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "8.0",
"id": "5300",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "8.0",
"id": "5304",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "5295",
"maxAmount": "1"
}
]
},
@@ -37532,7 +37569,7 @@
{
"minAmount": "1",
"weight": "5.0",
"id": "13467",
"id": "5680",
"maxAmount": "1"
},
{
+7 -6
View File
@@ -45809,6 +45809,7 @@
"low_alchemy": "34000",
"turn90ccw_anim": "1208",
"attack_speed": "6",
"two_handed": "true",
"turn180_anim": "1206",
"defence_anim": "420",
"equipment_slot": "3",
@@ -45945,7 +45946,7 @@
"high_alchemy": "124800",
"weight": "13",
"weapon_interface": "2",
"render_anim": "1426",
"render_anim": "134",
"name": "Dharok's greataxe"
},
{
@@ -47597,7 +47598,7 @@
"high_alchemy": "124800",
"weight": "13",
"weapon_interface": "2",
"render_anim": "1426",
"render_anim": "134",
"attack_audios": "1320,0,0,0",
"name": "Dharok's axe 100"
},
@@ -47625,7 +47626,7 @@
"high_alchemy": "124800",
"weight": "13",
"weapon_interface": "2",
"render_anim": "1426",
"render_anim": "134",
"attack_audios": "1320,0,0,0",
"name": "Dharok's axe 75"
},
@@ -47653,7 +47654,7 @@
"high_alchemy": "124800",
"weight": "13",
"weapon_interface": "2",
"render_anim": "1426",
"render_anim": "134",
"attack_audios": "1320,0,0,0",
"name": "Dharok's axe 50"
},
@@ -47681,7 +47682,7 @@
"high_alchemy": "124800",
"weight": "13",
"weapon_interface": "2",
"render_anim": "1426",
"render_anim": "134",
"attack_audios": "1320,0,0,0",
"name": "Dharok's axe 25"
},
@@ -47708,7 +47709,7 @@
"high_alchemy": "124800",
"weight": "13",
"weapon_interface": "2",
"render_anim": "1426",
"render_anim": "134",
"attack_audios": "1320,0,0,0",
"name": "Dharok's axe 0"
},
+92 -16
View File
@@ -12136,7 +12136,7 @@
"id": "1158",
"aggressive": "true",
"bonuses": "0,0,0,0,0,50,50,10,100,100,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -12160,7 +12160,7 @@
"id": "1160",
"aggressive": "true",
"bonuses": "0,0,0,0,0,100,100,100,10,10,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -34989,7 +34989,7 @@
"strength_level": "1",
"id": "3835",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -35006,7 +35006,7 @@
"strength_level": "1",
"id": "3836",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -57802,6 +57802,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6610",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -57811,6 +57812,7 @@
"examine": "A ghost of a knight slain during the god wars.",
"melee_animation": "7441",
"range_animation": "7522",
"poisonous": "true",
"magic_level": "80",
"poisonous": "true",
"defence_animation": "7443",
@@ -57896,6 +57898,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6615",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -57948,6 +57951,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6618",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58065,6 +58069,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6624",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58097,6 +58102,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6626",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58153,6 +58159,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6629",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58228,6 +58235,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6633",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58527,6 +58535,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6648",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58621,6 +58630,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6653",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58837,6 +58847,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6664",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58953,6 +58964,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6670",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -58986,6 +58998,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6672",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -59346,6 +59359,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6690",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -59461,6 +59475,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6696",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -59573,6 +59588,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6702",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -59787,6 +59803,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6713",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -60023,6 +60040,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6725",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -60097,6 +60115,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6729",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -86429,7 +86448,7 @@
"id": "1158",
"aggressive": "true",
"bonuses": "0,0,0,0,0,50,50,10,100,100,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -86453,7 +86472,7 @@
"id": "1160",
"aggressive": "true",
"bonuses": "0,0,0,0,0,100,100,100,10,10,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -109282,7 +109301,7 @@
"strength_level": "1",
"id": "3835",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -109299,7 +109318,7 @@
"strength_level": "1",
"id": "3836",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -132343,6 +132362,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6610",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -132352,6 +132372,7 @@
"examine": "A ghost of a knight slain during the god wars.",
"melee_animation": "7441",
"range_animation": "7522",
"poisonous": "true",
"magic_level": "80",
"poisonous": "true",
"defence_animation": "7443",
@@ -132437,6 +132458,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6615",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -132489,6 +132511,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6618",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -132606,6 +132629,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6624",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -132638,6 +132662,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6626",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -132694,6 +132719,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6629",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -132769,6 +132795,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6633",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -133068,6 +133095,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6648",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -133162,6 +133190,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6653",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -133378,6 +133407,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6664",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -133494,6 +133524,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6670",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -133527,6 +133558,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6672",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -133887,6 +133919,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6690",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -134002,6 +134035,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6696",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -134114,6 +134148,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6702",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -134328,6 +134363,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6713",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -134564,6 +134600,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6725",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -134638,6 +134675,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6729",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -160978,7 +161016,7 @@
"id": "1158",
"aggressive": "true",
"bonuses": "0,0,0,0,0,50,50,10,100,100,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -161002,7 +161040,7 @@
"id": "1160",
"aggressive": "true",
"bonuses": "0,0,0,0,0,100,100,100,10,10,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -183831,7 +183869,7 @@
"strength_level": "1",
"id": "3835",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -183848,7 +183886,7 @@
"strength_level": "1",
"id": "3836",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -206644,6 +206682,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6610",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -206653,6 +206692,7 @@
"examine": "A ghost of a knight slain during the god wars.",
"melee_animation": "7441",
"range_animation": "7522",
"poisonous": "true",
"magic_level": "80",
"poisonous": "true",
"defence_animation": "7443",
@@ -206738,6 +206778,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6615",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -206790,6 +206831,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6618",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -206907,6 +206949,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6624",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -206939,6 +206982,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6626",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -206995,6 +207039,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6629",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -207070,6 +207115,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6633",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -207369,6 +207415,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6648",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -207463,6 +207510,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6653",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -207679,6 +207727,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6664",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -207795,6 +207844,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6670",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -207828,6 +207878,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6672",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -208188,6 +208239,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6690",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -208303,6 +208355,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6696",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -208415,6 +208468,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6702",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -208629,6 +208683,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6713",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -208865,6 +208920,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6725",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -208939,6 +208995,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6729",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -235271,7 +235328,7 @@
"id": "1158",
"aggressive": "true",
"bonuses": "0,0,0,0,0,50,50,10,100,100,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -235295,7 +235352,7 @@
"id": "1160",
"aggressive": "true",
"bonuses": "0,0,0,0,0,100,100,100,10,10,0,0,0,0,0",
"range_level": "1",
"range_level": "1000",
"attack_level": "300"
},
{
@@ -258124,7 +258181,7 @@
"strength_level": "1",
"id": "3835",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -258141,7 +258198,7 @@
"strength_level": "1",
"id": "3836",
"aggressive": "true",
"range_level": "1",
"range_level": "1000",
"attack_level": "1"
},
{
@@ -281185,6 +281242,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6610",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -281194,6 +281252,7 @@
"examine": "A ghost of a knight slain during the god wars.",
"melee_animation": "7441",
"range_animation": "7522",
"poisonous": "true",
"magic_level": "80",
"poisonous": "true",
"defence_animation": "7443",
@@ -281279,6 +281338,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6615",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -281331,6 +281391,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6618",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -281448,6 +281509,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6624",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -281480,6 +281542,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6626",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -281536,6 +281599,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6629",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -281611,6 +281675,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6633",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -281910,6 +281975,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6648",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -282004,6 +282070,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6653",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -282220,6 +282287,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6664",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -282336,6 +282404,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6670",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -282369,6 +282438,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6672",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -282729,6 +282799,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6690",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -282844,6 +282915,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6696",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -282956,6 +283028,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6702",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -283170,6 +283243,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6713",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -283406,6 +283480,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6725",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
@@ -283480,6 +283555,7 @@
"lifepoints": "105",
"strength_level": "70",
"id": "6729",
"magic_level": "70",
"clue_level": "2",
"range_level": "70",
"attack_level": "70"
+1 -1
View File
@@ -6281,7 +6281,7 @@
},
{
"npc_id": "4383",
"loc_data": "{2321,5225,0,0,3}-{2321,5223,0,0,4}-{2317,5229,0,0,7}-{2322,5225,0,0,1}-{2325,5231,0,0,6}-{2321,5225,0,0,1}-{2314,5227,0,0,2}-{2312,5229,0,0,2}-{2330,5229,0,0,1}-{2324,5233,0,0,4}-{2320,5232,0,0,3}-{2324,5237,0,0,1}-{2329,5229,0,0,6}-{2315,5227,0,0,7}-{2318,5226,0,0,6}-{2322,5222,0,0,6}"
"loc_data": "{2321,5225,0,1,3}-{2321,5223,0,1,4}-{2317,5229,0,1,7}-{2322,5225,0,1,1}-{2325,5231,0,1,6}-{2321,5225,0,1,1}-{2314,5227,0,1,2}-{2312,5229,0,1,2}-{2330,5229,0,1,1}-{2324,5233,0,1,4}-{2320,5232,0,1,3}-{2324,5237,0,1,1}-{2329,5229,0,1,6}-{2315,5227,0,1,7}-{2318,5226,0,1,6}-{2322,5222,0,1,6}"
},
{
"npc_id": "4384",
+1 -1
View File
@@ -666,7 +666,7 @@
"stock": "{5376,10}-{6032,300}-{5418,10}-{6036,10}-{5354,100}-{5341,10}-{5329,10}-{5343,10}-{952,10}-{5325,10}-{1925,100}-{5331,30}-{12622,10}-{5996,0}-{6006,0}-{1965,0}-{5994,0}-{5931,0}-{6000,0}-{1957,0}-{5504,0}-{5986,0}-{1982,0}-{5982,0}-{6002,0}-{5998,0}"
},
{
"npcs": "1783",
"npcs": "2306",
"high_alch": "0",
"currency": "995",
"general_store": "false",