yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ceikry
2021-06-26 11:45:33 -05:00
parent f10c7dc059 4b4db66cc7
commit 8eb5f0bf15
4 changed files with 10742 additions and 10735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/data/configs/drop_tables.json
+55 -43
View File
@@ -15934,25 +15934,13 @@
{ {
"minAmount": "1", "minAmount": "1",
"weight": "50.0", "weight": "50.0",
"id": "1069", "id": "1365",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "1197",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1161",
"maxAmount": "1" "maxAmount": "1"
}, },
{ {
"minAmount": "1", "minAmount": "1",
"weight": "50.0", "weight": "50.0",
"id": "1365", "id": "1069",
"maxAmount": "1" "maxAmount": "1"
}, },
{ {
@@ -15967,6 +15955,24 @@
"id": "1243", "id": "1243",
"maxAmount": "1" "maxAmount": "1"
}, },
{
"minAmount": "1",
"weight": "25.0",
"id": "1197",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1145",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "1161",
"maxAmount": "1"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "25.0", "weight": "25.0",
@@ -15977,7 +15983,7 @@
"minAmount": "75", "minAmount": "75",
"weight": "50.0", "weight": "50.0",
"id": "555", "id": "555",
"maxAmount": "150" "maxAmount": "75"
}, },
{ {
"minAmount": "37", "minAmount": "37",
@@ -15987,52 +15993,34 @@
}, },
{ {
"minAmount": "15", "minAmount": "15",
"weight": "50.0", "weight": "25.0",
"id": "561", "id": "561",
"maxAmount": "15" "maxAmount": "15"
}, },
{ {
"minAmount": "30", "minAmount": "30",
"weight": "50.0", "weight": "25.0",
"id": "561", "id": "561",
"maxAmount": "30" "maxAmount": "30"
}, },
{
"minAmount": "75",
"weight": "5.0",
"id": "561",
"maxAmount": "75"
},
{ {
"minAmount": "3", "minAmount": "3",
"weight": "50.0", "weight": "50.0",
"id": "563", "id": "563",
"maxAmount": "3" "maxAmount": "3"
}, },
{
"minAmount": "1",
"weight": "50.0",
"id": "209",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "205",
"maxAmount": "1"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "25.0", "weight": "25.0",
"id": "199", "id": "199",
"maxAmount": "1" "maxAmount": "1"
}, },
{
"minAmount": "1",
"weight": "25.0",
"id": "211",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "215",
"maxAmount": "1"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "25.0", "weight": "25.0",
@@ -16045,18 +16033,42 @@
"id": "203", "id": "203",
"maxAmount": "1" "maxAmount": "1"
}, },
{
"minAmount": "1",
"weight": "25.0",
"id": "205",
"maxAmount": "1"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "25.0", "weight": "25.0",
"id": "207", "id": "207",
"maxAmount": "1" "maxAmount": "1"
}, },
{
"minAmount": "1",
"weight": "25.0",
"id": "209",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "211",
"maxAmount": "1"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "25.0", "weight": "25.0",
"id": "213", "id": "213",
"maxAmount": "1" "maxAmount": "1"
}, },
{
"minAmount": "1",
"weight": "25.0",
"id": "215",
"maxAmount": "1"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "25.0", "weight": "25.0",
@@ -16095,13 +16107,13 @@
}, },
{ {
"minAmount": "1", "minAmount": "1",
"weight": "5.0", "weight": "15.5",
"id": "31", "id": "31",
"maxAmount": "1" "maxAmount": "1"
}, },
{ {
"minAmount": "1", "minAmount": "1",
"weight": "100.0", "weight": "150.0",
"id": "0", "id": "0",
"maxAmount": "1" "maxAmount": "1"
} }
Server/data/configs/item_configs.json
+1 -1
View File
@@ -138885,7 +138885,7 @@
"archery_ticket_price": "0", "archery_ticket_price": "0",
"hat": "true", "hat": "true",
"id": "14650", "id": "14650",
"bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" "bonuses": "0,0,0,2,0,0,0,0,2,0,0,0,0,0,0"
}, },
{ {
"id": "14651", "id": "14651",
Server/data/configs/npc_configs.json
+57 -62
View File
@@ -3,25 +3,27 @@
"examine": "Servant of the Duke of Lumbridge.", "examine": "Servant of the Duke of Lumbridge.",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"attack_speed": "5", "attack_speed": "4",
"magic_level": "22",
"defence_animation": "404", "defence_animation": "404",
"magic_animation": "422", "magic_animation": "422",
"death_animation": "9055", "death_animation": "9055",
"name": "Hans", "name": "Hans",
"defence_level": "1", "defence_level": "14",
"safespot": "0", "safespot": "0",
"lifepoints": "12", "lifepoints": "12",
"strength_level": "1", "strength_level": "17",
"id": "0", "id": "0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "17"
}, },
{ {
"examine": "One of 2009Scape's many citizens.", "examine": "One of 2009Scape's many citizens.",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"attack_speed": "5", "attack_speed": "4",
"magic_level": "6",
"respawn_delay": "18", "respawn_delay": "18",
"defence_animation": "404", "defence_animation": "404",
"weakness": "9", "weakness": "9",
@@ -29,21 +31,21 @@
"magic_animation": "422", "magic_animation": "422",
"death_animation": "9055", "death_animation": "9055",
"name": "Man", "name": "Man",
"defence_level": "3", "defence_level": "5",
"safespot": null, "safespot": null,
"lifepoints": "10", "lifepoints": "10",
"strength_level": "1", "strength_level": "2",
"id": "1", "id": "1",
"clue_level": "0", "clue_level": "0",
"range_level": "1", "range_level": "1",
"attack_level": "3" "attack_level": "5"
}, },
{ {
"examine": "One of 2009Scape's many citizens.", "examine": "One of 2009Scape's many citizens.",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"attack_speed": "6", "attack_speed": "4",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "404", "defence_animation": "404",
"weakness": "9", "weakness": "9",
@@ -64,7 +66,7 @@
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"attack_speed": "5", "attack_speed": "4",
"defence_animation": "404", "defence_animation": "404",
"weakness": "9", "weakness": "9",
"slayer_exp": "0", "slayer_exp": "0",
@@ -85,7 +87,7 @@
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"combat_audio": "511,506,505", "combat_audio": "511,506,505",
"attack_speed": "5", "attack_speed": "4",
"defence_animation": "404", "defence_animation": "404",
"weakness": "9", "weakness": "9",
"magic_animation": "422", "magic_animation": "422",
@@ -105,7 +107,7 @@
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"combat_audio": "511,506,505", "combat_audio": "511,506,505",
"attack_speed": "5", "attack_speed": "4",
"defence_animation": "404", "defence_animation": "404",
"weakness": "9", "weakness": "9",
"magic_animation": "422", "magic_animation": "422",
@@ -127,7 +129,7 @@
"combat_audio": "511,506,505", "combat_audio": "511,506,505",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "0", "defence_animation": "404",
"weakness": "9", "weakness": "9",
"magic_animation": "0", "magic_animation": "0",
"death_animation": "836", "death_animation": "836",
@@ -146,7 +148,7 @@
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "0", "defence_animation": "404",
"weakness": "9", "weakness": "9",
"magic_animation": "0", "magic_animation": "0",
"death_animation": "836", "death_animation": "836",
@@ -163,8 +165,9 @@
"examine": "Known for his light-fingered qualities.", "examine": "Known for his light-fingered qualities.",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
"attack_speed": "4",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "0", "defence_animation": "425",
"weakness": "9", "weakness": "9",
"magic_animation": "0", "magic_animation": "0",
"death_animation": "836", "death_animation": "836",
@@ -179,10 +182,10 @@
}, },
{ {
"examine": "He tries to keep order around here.", "examine": "He tries to keep order around here.",
"melee_animation": "386", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"attack_speed": "5", "attack_speed": "4",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "0", "defence_animation": "0",
"weakness": "9", "weakness": "9",
@@ -2611,12 +2614,12 @@
"death_animation": "5329", "death_animation": "5329",
"name": "Poison spider", "name": "Poison spider",
"safespot": null, "safespot": null,
"defence_level": "70",
"lifepoints": "64", "lifepoints": "64",
"strength_level": "65",
"id": "134", "id": "134",
"aggressive": "true", "aggressive": "true",
"range_level": "45", "range_level": "45",
"defence_level": "70",
"strength_level": "65",
"attack_level": "60" "attack_level": "60"
}, },
{ {
@@ -3053,7 +3056,7 @@
"attack_level": "3" "attack_level": "3"
}, },
{ {
"examine": "A practicer of dark arts.", "examine": "He works evil magic.",
"combat_style": "2", "combat_style": "2",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
@@ -3333,6 +3336,7 @@
"examine": "An evil human cleric.", "examine": "An evil human cleric.",
"start_gfx": "99", "start_gfx": "99",
"combat_style": "2", "combat_style": "2",
"end_gfx": "101",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
@@ -3358,6 +3362,7 @@
"examine": "An evil human cleric.", "examine": "An evil human cleric.",
"start_gfx": "99", "start_gfx": "99",
"combat_style": "2", "combat_style": "2",
"end_gfx": "101",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
@@ -3383,6 +3388,7 @@
"examine": "An evil human cleric.", "examine": "An evil human cleric.",
"start_gfx": "99", "start_gfx": "99",
"combat_style": "2", "combat_style": "2",
"end_gfx": "101",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
@@ -5216,15 +5222,15 @@
{ {
"examine": "An annoying flappy thing.", "examine": "An annoying flappy thing.",
"slayer_task": "5", "slayer_task": "5",
"melee_animation": "4915",
"range_animation": "4915",
"attack_speed": "5", "attack_speed": "5",
"magic_level": "10", "magic_level": "10",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "4916",
"weakness": "4", "weakness": "4",
"slayer_exp": "8", "slayer_exp": "8",
"death_animation": "4918", "death_animation": "4918",
"melee_animation": "4915",
"range_animation": "4915",
"defence_animation": "4916",
"name": "Bat", "name": "Bat",
"defence_level": "2", "defence_level": "2",
"safespot": null, "safespot": null,
@@ -10253,12 +10259,12 @@
"death_animation": "5329", "death_animation": "5329",
"name": "Poison spider", "name": "Poison spider",
"safespot": null, "safespot": null,
"defence_level": "70",
"lifepoints": "64", "lifepoints": "64",
"strength_level": "65",
"id": "1009", "id": "1009",
"aggressive": "true", "aggressive": "true",
"range_level": "45", "range_level": "45",
"defence_level": "70",
"strength_level": "65",
"attack_level": "60" "attack_level": "60"
}, },
{ {
@@ -10433,6 +10439,7 @@
"examine": "An evil human cleric.", "examine": "An evil human cleric.",
"start_gfx": "99", "start_gfx": "99",
"combat_style": "2", "combat_style": "2",
"end_gfx": "101",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
@@ -10458,6 +10465,7 @@
"examine": "An evil human cleric.", "examine": "An evil human cleric.",
"start_gfx": "99", "start_gfx": "99",
"combat_style": "2", "combat_style": "2",
"end_gfx": "101",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
@@ -10483,6 +10491,7 @@
"examine": "An evil human cleric.", "examine": "An evil human cleric.",
"start_gfx": "99", "start_gfx": "99",
"combat_style": "2", "combat_style": "2",
"end_gfx": "101",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "0", "range_animation": "0",
@@ -16069,8 +16078,8 @@
"examine": "A spiky crawling critter. ", "examine": "A spiky crawling critter. ",
"melee_animation": "266", "melee_animation": "266",
"range_animation": "266", "range_animation": "266",
"poisonous": "true",
"attack_speed": "4", "attack_speed": "4",
"poisonous": "true",
"respawn_delay": "25", "respawn_delay": "25",
"defence_animation": "267", "defence_animation": "267",
"slayer_exp": "22", "slayer_exp": "22",
@@ -16090,8 +16099,8 @@
"examine": "A spiky crawling critter. ", "examine": "A spiky crawling critter. ",
"melee_animation": "266", "melee_animation": "266",
"range_animation": "266", "range_animation": "266",
"poisonous": "true",
"attack_speed": "4", "attack_speed": "4",
"poisonous": "true",
"respawn_delay": "25", "respawn_delay": "25",
"defence_animation": "267", "defence_animation": "267",
"slayer_exp": "22", "slayer_exp": "22",
@@ -16111,8 +16120,8 @@
"examine": "A spiky crawling critter. ", "examine": "A spiky crawling critter. ",
"melee_animation": "266", "melee_animation": "266",
"range_animation": "266", "range_animation": "266",
"poisonous": "true",
"attack_speed": "4", "attack_speed": "4",
"poisonous": "true",
"respawn_delay": "25", "respawn_delay": "25",
"defence_animation": "267", "defence_animation": "267",
"slayer_exp": "22", "slayer_exp": "22",
@@ -39057,71 +39066,58 @@
"attack_level": "1" "attack_level": "1"
}, },
{ {
"examine": "A wizard of the Dark Arts.", "examine": "He works evil magic.",
"start_gfx": "93",
"combat_style": "2", "combat_style": "2",
"end_gfx": "95",
"melee_animation": "810", "melee_animation": "810",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"magic_level": "6",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "425", "defence_animation": "425",
"magic_animation": "711", "magic_animation": "711",
"death_animation": "836", "death_animation": "836",
"name": "Dark wizard", "name": "Dark wizard",
"defence_level": "1", "defence_level": "5",
"safespot": null, "safespot": null,
"lifepoints": "12", "lifepoints": "12",
"strength_level": "1", "strength_level": "2",
"id": "4658",
"aggressive": "true",
"range_level": "1",
"attack_level": "1"
},
{
"examine": "A wizard of the Dark Arts.",
"combat_style": "2",
"melee_animation": "810",
"range_animation": "0",
"combat_audio": "511,513,512",
"respawn_delay": "60",
"defence_animation": "425",
"magic_animation": "711",
"death_animation": "836",
"name": "Dark wizard",
"defence_level": "1",
"safespot": null,
"lifepoints": "12",
"strength_level": "1",
"id": "4659", "id": "4659",
"aggressive": "true", "aggressive": "true",
"range_level": "1", "range_level": "1",
"attack_level": "1" "projectile": "94",
"attack_level": "5",
}, },
{ {
"examine": "A wizard of the Dark Arts.", "examine": "He works evil magic.",
"start_gfx": "96",
"combat_style": "2", "combat_style": "2",
"end_gfx": "98",
"melee_animation": "810", "melee_animation": "810",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"magic_level": "22",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "425", "defence_animation": "425",
"magic_animation": "711", "magic_animation": "711",
"death_animation": "836", "death_animation": "836",
"name": "Dark wizard", "name": "Dark wizard",
"defence_level": "1", "defence_level": "14",
"safespot": null, "safespot": null,
"lifepoints": "25", "lifepoints": "24",
"strength_level": "1", "strength_level": "17",
"id": "4660", "id": "4660",
"aggressive": "true", "aggressive": "true",
"range_level": "1", "range_level": "1",
"attack_level": "1" "projectile": "97",
"attack_level": "17",
}, },
{ {
"examine": "A wizard of the Dark Arts.", "examine": "He works evil magic.",
"start_gfx": "2713",
"combat_style": "2", "combat_style": "2",
"combat_audio": "511,513,512", "combat_audio": "511,513,512",
"attack_speed": "5", "attack_speed": "4",
"magic_level": "15", "magic_level": "15",
"respawn_delay": "20", "respawn_delay": "20",
"defence_animation": "404", "defence_animation": "404",
@@ -39134,9 +39130,8 @@
"strength_level": "1", "strength_level": "1",
"id": "4661", "id": "4661",
"aggressive": "true", "aggressive": "true",
"bonuses": "30,10,10,10,10,10,10,25,0,0,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"projectile": "2718", "projectile": "98",
"attack_level": "1" "attack_level": "1"
}, },
{ {
Server/data/configs/npc_spawns.json
+8 -8
View File
@@ -499,14 +499,6 @@
"npc_id": "170", "npc_id": "170",
"loc_data": "{2890,3175,0,1,4}" "loc_data": "{2890,3175,0,1,4}"
}, },
{
"npc_id": "172",
"loc_data": "{3225,3369,0,1,3}-{3226,3371,0,1,7}-{3230,3372,0,1,0}-{3230,3370,0,1,3}-{3229,3368,0,1,1}-{3227,3367,0,1,1}"
},
{
"npc_id": "174",
"loc_data": "{3095,3232,0,1,6}-{3095,3231,0,1,0}-{3225,3370,0,1,4}-{3230,3370,0,1,3}"
},
{ {
"npc_id": "175", "npc_id": "175",
"loc_data": "{3084,3495,0,1,4}-{2994,9549,0,1,6}-{2993,9551,0,1,6}-{2995,9555,0,1,6}-{2999,9548,0,1,0}-{3182,3365,0,1,6}" "loc_data": "{3084,3495,0,1,4}-{2994,9549,0,1,6}-{2993,9551,0,1,6}-{2995,9555,0,1,6}-{2999,9548,0,1,0}-{3182,3365,0,1,6}"
@@ -6731,6 +6723,14 @@
"npc_id": "4656", "npc_id": "4656",
"loc_data": "{2795,3414,0,1,6}-{3038,3192,0,1,3}-{2760,3238,0,1,3}" "loc_data": "{2795,3414,0,1,6}-{3038,3192,0,1,3}-{2760,3238,0,1,3}"
}, },
{
"npc_id": "4659",
"loc_data": "{3095,3232,0,1,6}-{3095,3231,0,1,0}-{3225,3370,0,1,4}-{3230,3370,0,1,3}"
},
{
"npc_id": "4660",
"loc_data": "{3225,3369,0,1,3}-{3226,3371,0,1,7}-{3230,3372,0,1,0}-{3230,3370,0,1,3}-{3229,3368,0,1,1}-{3227,3367,0,1,1}"
},
{ {
"npc_id": "4670", "npc_id": "4670",
"loc_data": "{3192,3832,0,1,6}-{3211,3813,0,1,6}" "loc_data": "{3192,3832,0,1,6}-{3211,3813,0,1,6}"