mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2025-12-21 09:02:07 -07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
ceikry
commit
cd641fdaaf
8 changed files with 175 additions and 292 deletions
|
|
@ -62638,11 +62638,17 @@
|
|||
"weight": "100.0",
|
||||
"id": "526",
|
||||
"maxAmount": "1"
|
||||
},
|
||||
{
|
||||
"minAmount": "1",
|
||||
"weight": "1.0",
|
||||
"id": "1591",
|
||||
"maxAmount": "1"
|
||||
}
|
||||
],
|
||||
"charm": [],
|
||||
"ids": "201",
|
||||
"description": "",
|
||||
"description": "Jailer (Taverley Dungeon, drops Jail key)",
|
||||
"main": []
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2106,22 +2106,25 @@
|
|||
"melee_animation": "6254",
|
||||
"range_animation": "0",
|
||||
"combat_audio": "3611,3612,3610",
|
||||
"attack_speed": "4",
|
||||
"poisonous": "true",
|
||||
"respawn_delay": "60",
|
||||
"respawn_delay": "15",
|
||||
"defence_animation": "6255",
|
||||
"weakness": "0",
|
||||
"slayer_exp": "23",
|
||||
"poison_amount": "3",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "6256",
|
||||
"name": "Poison Scorpion",
|
||||
"defence_level": "35",
|
||||
"defence_level": "15",
|
||||
"safespot": null,
|
||||
"lifepoints": "17",
|
||||
"strength_level": "1",
|
||||
"lifepoints": "23",
|
||||
"strength_level": "17",
|
||||
"id": "108",
|
||||
"aggressive": "true",
|
||||
"range_level": "35",
|
||||
"attack_level": "1"
|
||||
"bonuses": "0,0,0,0,0,5,15,15,0,5,0,0,0,0,0",
|
||||
"range_level": "1",
|
||||
"attack_level": "16"
|
||||
},
|
||||
{
|
||||
"examine": "Tiny",
|
||||
|
|
@ -2509,20 +2512,21 @@
|
|||
"examine": "A magic axe with a mind of its own.",
|
||||
"melee_animation": "185",
|
||||
"range_animation": "0",
|
||||
"respawn_delay": "60",
|
||||
"attack_speed": "4",
|
||||
"respawn_delay": "18",
|
||||
"defence_animation": "0",
|
||||
"weakness": "6",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "188",
|
||||
"name": "Magic axe",
|
||||
"defence_level": "53",
|
||||
"defence_level": "29",
|
||||
"safespot": null,
|
||||
"lifepoints": "75",
|
||||
"strength_level": "53",
|
||||
"lifepoints": "44",
|
||||
"strength_level": "38",
|
||||
"id": "127",
|
||||
"aggressive": "true",
|
||||
"range_level": "1",
|
||||
"attack_level": "53"
|
||||
"attack_level": "38"
|
||||
},
|
||||
{
|
||||
"examine": "A slithering serpent.",
|
||||
|
|
@ -3229,23 +3233,26 @@
|
|||
"start_gfx": "105",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"attack_speed": "5",
|
||||
"magic_level": "20",
|
||||
"attack_speed": "4",
|
||||
"magic_level": "10",
|
||||
"end_gfx": "107",
|
||||
"respawn_delay": "15",
|
||||
"defence_animation": "404",
|
||||
"weakness": "3",
|
||||
"slayer_exp": "0",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Chaos druid",
|
||||
"defence_level": "10",
|
||||
"defence_level": "12",
|
||||
"safespot": null,
|
||||
"lifepoints": "20",
|
||||
"strength_level": "20",
|
||||
"strength_level": "8",
|
||||
"id": "181",
|
||||
"aggressive": "true",
|
||||
"range_level": "10",
|
||||
"bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
|
||||
"range_level": "1",
|
||||
"projectile": "106",
|
||||
"attack_level": "20"
|
||||
"attack_level": "8"
|
||||
},
|
||||
{
|
||||
"melee_animation": "422",
|
||||
|
|
@ -10601,6 +10608,7 @@
|
|||
},
|
||||
{
|
||||
"examine": "Arrghhh... A Ghast.",
|
||||
"death_gfx": "265",
|
||||
"range_animation": "0",
|
||||
"melee_animation": "1087",
|
||||
"attack_speed": "4",
|
||||
|
|
@ -10610,7 +10618,6 @@
|
|||
"weakness": "9",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "1089",
|
||||
"death_gfx": "265",
|
||||
"name": "Ghast",
|
||||
"defence_level": "18",
|
||||
"safespot": null,
|
||||
|
|
@ -76429,29 +76436,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "It has a very vicious looking tail.",
|
||||
"slayer_task": "71",
|
||||
"melee_animation": "6254",
|
||||
"range_animation": "0",
|
||||
"combat_audio": "3611,3612,3610",
|
||||
"poisonous": "true",
|
||||
"respawn_delay": "60",
|
||||
"defence_animation": "6255",
|
||||
"weakness": "0",
|
||||
"poison_amount": "3",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "6256",
|
||||
"name": "Poison Scorpion",
|
||||
"defence_level": "35",
|
||||
"safespot": null,
|
||||
"lifepoints": "17",
|
||||
"strength_level": "1",
|
||||
"id": "108",
|
||||
"aggressive": "true",
|
||||
"range_level": "35",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Tiny",
|
||||
"slayer_task": "71",
|
||||
|
|
@ -76833,25 +76817,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A magic axe with a mind of its own.",
|
||||
"melee_animation": "185",
|
||||
"range_animation": "0",
|
||||
"respawn_delay": "60",
|
||||
"defence_animation": "0",
|
||||
"weakness": "6",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "188",
|
||||
"name": "Magic axe",
|
||||
"defence_level": "53",
|
||||
"safespot": null,
|
||||
"lifepoints": "75",
|
||||
"strength_level": "53",
|
||||
"id": "127",
|
||||
"aggressive": "true",
|
||||
"range_level": "1",
|
||||
"attack_level": "53"
|
||||
},
|
||||
{
|
||||
"examine": "A slithering serpent.",
|
||||
"melee_animation": "275",
|
||||
|
|
@ -77552,29 +77517,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "8"
|
||||
},
|
||||
{
|
||||
"examine": "A crazy, evil druid.",
|
||||
"start_gfx": "105",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"attack_speed": "5",
|
||||
"magic_level": "20",
|
||||
"end_gfx": "107",
|
||||
"defence_animation": "404",
|
||||
"weakness": "3",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Chaos druid",
|
||||
"defence_level": "10",
|
||||
"safespot": null,
|
||||
"lifepoints": "20",
|
||||
"strength_level": "20",
|
||||
"id": "181",
|
||||
"aggressive": "true",
|
||||
"range_level": "10",
|
||||
"projectile": "106",
|
||||
"attack_level": "20"
|
||||
},
|
||||
{
|
||||
"melee_animation": "422",
|
||||
"combat_audio": "703,705,704",
|
||||
|
|
@ -150477,29 +150419,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "It has a very vicious looking tail.",
|
||||
"slayer_task": "71",
|
||||
"melee_animation": "6254",
|
||||
"range_animation": "0",
|
||||
"combat_audio": "3611,3612,3610",
|
||||
"poisonous": "true",
|
||||
"respawn_delay": "60",
|
||||
"defence_animation": "6255",
|
||||
"weakness": "0",
|
||||
"poison_amount": "3",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "6256",
|
||||
"name": "Poison Scorpion",
|
||||
"defence_level": "35",
|
||||
"safespot": null,
|
||||
"lifepoints": "17",
|
||||
"strength_level": "1",
|
||||
"id": "108",
|
||||
"aggressive": "true",
|
||||
"range_level": "35",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Tiny",
|
||||
"slayer_task": "71",
|
||||
|
|
@ -150881,25 +150800,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A magic axe with a mind of its own.",
|
||||
"melee_animation": "185",
|
||||
"range_animation": "0",
|
||||
"respawn_delay": "60",
|
||||
"defence_animation": "0",
|
||||
"weakness": "6",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "188",
|
||||
"name": "Magic axe",
|
||||
"defence_level": "53",
|
||||
"safespot": null,
|
||||
"lifepoints": "75",
|
||||
"strength_level": "53",
|
||||
"id": "127",
|
||||
"aggressive": "true",
|
||||
"range_level": "1",
|
||||
"attack_level": "53"
|
||||
},
|
||||
{
|
||||
"examine": "A slithering serpent.",
|
||||
"melee_animation": "275",
|
||||
|
|
@ -151600,29 +151500,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "8"
|
||||
},
|
||||
{
|
||||
"examine": "A crazy, evil druid.",
|
||||
"start_gfx": "105",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"attack_speed": "5",
|
||||
"magic_level": "20",
|
||||
"end_gfx": "107",
|
||||
"defence_animation": "404",
|
||||
"weakness": "3",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Chaos druid",
|
||||
"defence_level": "10",
|
||||
"safespot": null,
|
||||
"lifepoints": "20",
|
||||
"strength_level": "20",
|
||||
"id": "181",
|
||||
"aggressive": "true",
|
||||
"range_level": "10",
|
||||
"projectile": "106",
|
||||
"attack_level": "20"
|
||||
},
|
||||
{
|
||||
"melee_animation": "422",
|
||||
"combat_audio": "703,705,704",
|
||||
|
|
@ -224269,29 +224146,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "It has a very vicious looking tail.",
|
||||
"slayer_task": "71",
|
||||
"melee_animation": "6254",
|
||||
"range_animation": "0",
|
||||
"combat_audio": "3611,3612,3610",
|
||||
"poisonous": "true",
|
||||
"respawn_delay": "60",
|
||||
"defence_animation": "6255",
|
||||
"weakness": "0",
|
||||
"poison_amount": "3",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "6256",
|
||||
"name": "Poison Scorpion",
|
||||
"defence_level": "35",
|
||||
"safespot": null,
|
||||
"lifepoints": "17",
|
||||
"strength_level": "1",
|
||||
"id": "108",
|
||||
"aggressive": "true",
|
||||
"range_level": "35",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "Tiny",
|
||||
"slayer_task": "71",
|
||||
|
|
@ -224673,25 +224527,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "1"
|
||||
},
|
||||
{
|
||||
"examine": "A magic axe with a mind of its own.",
|
||||
"melee_animation": "185",
|
||||
"range_animation": "0",
|
||||
"respawn_delay": "60",
|
||||
"defence_animation": "0",
|
||||
"weakness": "6",
|
||||
"magic_animation": "0",
|
||||
"death_animation": "188",
|
||||
"name": "Magic axe",
|
||||
"defence_level": "53",
|
||||
"safespot": null,
|
||||
"lifepoints": "75",
|
||||
"strength_level": "53",
|
||||
"id": "127",
|
||||
"aggressive": "true",
|
||||
"range_level": "1",
|
||||
"attack_level": "53"
|
||||
},
|
||||
{
|
||||
"examine": "A slithering serpent.",
|
||||
"melee_animation": "275",
|
||||
|
|
@ -225392,29 +225227,6 @@
|
|||
"range_level": "1",
|
||||
"attack_level": "8"
|
||||
},
|
||||
{
|
||||
"examine": "A crazy, evil druid.",
|
||||
"start_gfx": "105",
|
||||
"melee_animation": "422",
|
||||
"range_animation": "422",
|
||||
"attack_speed": "5",
|
||||
"magic_level": "20",
|
||||
"end_gfx": "107",
|
||||
"defence_animation": "404",
|
||||
"weakness": "3",
|
||||
"magic_animation": "422",
|
||||
"death_animation": "9055",
|
||||
"name": "Chaos druid",
|
||||
"defence_level": "10",
|
||||
"safespot": null,
|
||||
"lifepoints": "20",
|
||||
"strength_level": "20",
|
||||
"id": "181",
|
||||
"aggressive": "true",
|
||||
"range_level": "10",
|
||||
"projectile": "106",
|
||||
"attack_level": "20"
|
||||
},
|
||||
{
|
||||
"melee_animation": "422",
|
||||
"combat_audio": "703,705,704",
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@
|
|||
},
|
||||
{
|
||||
"npc_id": "47",
|
||||
"loc_data": "{3108, 9754, 0, 1, 5}-{3110, 9754, 0, 1, 5}-{3108, 9750, 0, 1, 5}-{3097,3364,0,1,3}-{3102,3363,0,1,5}-{3341,3267,0,1,5}-{3235,3224,0,1,3}-{3229,3220,0,1,4}-{3211,3211,0,1,3}-{3225,3220,0,1,1}-{3237,3215,0,1,5}-{3211,3210,0,1,7}-{3227,3220,0,1,7}-{3233,3227,0,1,5}-{3227,3210,0,1,6}-{3228,3222,0,1,4}-{3229,3226,0,1,0}-{3127,3487,0,1,4}-{3125,3486,0,1,6}-{3127,3486,0,1,4}-{3019,3292,0,1,7}-{3018,3295,0,1,7}-{3001,3202,0,1,5}-{3021,3205,0,1,6}-{3026,3174,0,1,5}-{3019,3176,0,1,7}-{3076,3282,0,1,5}-{3089,3266,0,1,4}-{3091,3266,0,1,4}-{3243,3687,0,1,5}-{3249,3669,0,1,3}-{3252,3675,0,1,4}-{3252,3680,0,1,3}-{3259,3683,0,1,0}-{3276,9871,0,1,1}-{3277,9871,0,1,3}-{3225,9862,0,1,4}-{3222,9861,0,1,6}-{3220,9860,0,1,6}-{3219,9865,0,1,6}-{3237,9862,0,1,4}-{3236,3217,0,1,4}-{3259,3230,0,1,4}-{3158,3226,0,1,5}-{3160,3202,0,1,4}-{3233,3237,0,1,7}-{2821,3170,0,1,1}-{2801,3158,0,1,2}-{2852,9642,0,1,6}-{2858,9632,0,1,3}-{2536,2982,0,1,3}-{2531,2980,0,1,0}-{2522,2981,0,1,4}-{2545,2989,0,1,4}-{2523,2970,0,1,2}-{2603,9480,0,1,1}-{2600,9477,0,1,0}-{2579,9496,0,1,4}-{2580,9508,0,1,0}-{2571,9522,0,1,4}-{2654,9640,0,1,6}-{2655,9637,0,1,4}-{2656,9639,0,1,7}-{2651,9636,0,1,5}-{2648,9637,0,1,4}-{2651,9642,0,1,1}-{2654,9640,0,1,0}-{2654,9635,0,1,6}-{2655,9635,0,1,3}-{2664,9626,0,1,6}-{2664,9624,0,1,1}-{2661,9623,0,1,1}-{2663,9623,0,1,3}-{2664,9626,0,1,6}-{2592,9831,0,1,3}-{2588,9825,0,1,6}-{2583,9829,0,1,4}-{2581,9841,0,1,0}-{2597,9823,0,1,2}-{2579,9805,0,1,3}-{2576,9804,0,1,0}-{2573,9805,0,1,5}-{2571,9808,0,1,3}-{2576,9810,0,1,2}-{2587,9802,0,1,2}-{2592,9800,0,1,4}-{2596,9805,0,1,6}-{2601,9802,0,1,5}-{2585,9801,0,1,7}-{2594,9803,0,1,0}-{2590,9806,0,1,3}-{2612,9808,0,1,6}-{2604,9810,0,1,6}-{2579,9821,0,1,2}-{2576,9812,0,1,6}-{2580,9813,0,1,6}-{2600,9813,0,1,4}-{2599,9809,0,1,4}-{2514,3193,0,1,6}-{2518,3192,0,1,3}-{2507,3181,0,1,3}-{2508,3178,0,1,6}-{2511,3183,0,1,3}-{2515,3182,0,1,1}-{2565,9505,0,1,1}-{2566,9510,0,1,6}-{2594,9497,0,1,4}-{3475,9840,0,1,6}-{3481,9842,0,1,1}-{3486,9843,0,1,7}-{3483,9824,0,1,4}-{3496,9808,0,0,5}-{3490,9815,0,1,1}-{3478,9834,0,0,3}-{3490,9824,0,1,4}"
|
||||
"loc_data": "{3108, 9754, 0, 1, 5}-{3110, 9754, 0, 1, 5}-{3108, 9750, 0, 1, 5}-{2930,9699,0,1,0}-{2933,9697,0,1,0}-{2932,9685,0,1,0}-{2930,9693,0,1,0}-{3097,3364,0,1,3}-{3102,3363,0,1,5}-{3341,3267,0,1,5}-{3235,3224,0,1,3}-{3229,3220,0,1,4}-{3211,3211,0,1,3}-{3225,3220,0,1,1}-{3237,3215,0,1,5}-{3211,3210,0,1,7}-{3227,3220,0,1,7}-{3233,3227,0,1,5}-{3227,3210,0,1,6}-{3228,3222,0,1,4}-{3229,3226,0,1,0}-{3127,3487,0,1,4}-{3125,3486,0,1,6}-{3127,3486,0,1,4}-{3019,3292,0,1,7}-{3018,3295,0,1,7}-{3001,3202,0,1,5}-{3021,3205,0,1,6}-{3026,3174,0,1,5}-{3019,3176,0,1,7}-{3076,3282,0,1,5}-{3089,3266,0,1,4}-{3091,3266,0,1,4}-{3243,3687,0,1,5}-{3249,3669,0,1,3}-{3252,3675,0,1,4}-{3252,3680,0,1,3}-{3259,3683,0,1,0}-{3276,9871,0,1,1}-{3277,9871,0,1,3}-{3225,9862,0,1,4}-{3222,9861,0,1,6}-{3220,9860,0,1,6}-{3219,9865,0,1,6}-{3237,9862,0,1,4}-{3236,3217,0,1,4}-{3259,3230,0,1,4}-{3158,3226,0,1,5}-{3160,3202,0,1,4}-{3233,3237,0,1,7}-{2821,3170,0,1,1}-{2801,3158,0,1,2}-{2852,9642,0,1,6}-{2858,9632,0,1,3}-{2536,2982,0,1,3}-{2531,2980,0,1,0}-{2522,2981,0,1,4}-{2545,2989,0,1,4}-{2523,2970,0,1,2}-{2603,9480,0,1,1}-{2600,9477,0,1,0}-{2579,9496,0,1,4}-{2580,9508,0,1,0}-{2571,9522,0,1,4}-{2654,9640,0,1,6}-{2655,9637,0,1,4}-{2656,9639,0,1,7}-{2651,9636,0,1,5}-{2648,9637,0,1,4}-{2651,9642,0,1,1}-{2654,9640,0,1,0}-{2654,9635,0,1,6}-{2655,9635,0,1,3}-{2664,9626,0,1,6}-{2664,9624,0,1,1}-{2661,9623,0,1,1}-{2663,9623,0,1,3}-{2664,9626,0,1,6}-{2592,9831,0,1,3}-{2588,9825,0,1,6}-{2583,9829,0,1,4}-{2581,9841,0,1,0}-{2597,9823,0,1,2}-{2579,9805,0,1,3}-{2576,9804,0,1,0}-{2573,9805,0,1,5}-{2571,9808,0,1,3}-{2576,9810,0,1,2}-{2587,9802,0,1,2}-{2592,9800,0,1,4}-{2596,9805,0,1,6}-{2601,9802,0,1,5}-{2585,9801,0,1,7}-{2594,9803,0,1,0}-{2590,9806,0,1,3}-{2612,9808,0,1,6}-{2604,9810,0,1,6}-{2579,9821,0,1,2}-{2576,9812,0,1,6}-{2580,9813,0,1,6}-{2600,9813,0,1,4}-{2599,9809,0,1,4}-{2514,3193,0,1,6}-{2518,3192,0,1,3}-{2507,3181,0,1,3}-{2508,3178,0,1,6}-{2511,3183,0,1,3}-{2515,3182,0,1,1}-{2565,9505,0,1,1}-{2566,9510,0,1,6}-{2594,9497,0,1,4}-{3475,9840,0,1,6}-{3481,9842,0,1,1}-{3486,9843,0,1,7}-{3483,9824,0,1,4}-{3496,9808,0,0,5}-{3490,9815,0,1,1}-{3478,9834,0,0,3}-{3490,9824,0,1,4}"
|
||||
},
|
||||
{
|
||||
"npc_id": "48",
|
||||
|
|
@ -348,8 +348,8 @@
|
|||
"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}-{2585,3479,0,1,1}-{2578,3476,0,1,7}-{2588,3485,0,1,3}"
|
||||
},
|
||||
{
|
||||
"npc_id": "108",
|
||||
"loc_data": "{2715,3218,0,1,0}-{2719,3223,0,1,0}-{2720,3212,0,1,0}-{2722,3220,0,1,0}-{2724,3215,0,1,0}-{2729,3224,0,1,0}-{2733,3225,0,1,0}-{2936,9777,0,1,0}-{2934,9765,0,1,0}-{2932,9755,0,1,0}-{2726,3217,0,1,0}-{2728,3218,0,1,0}-{2735,3219,0,1,0}-{2723,3212,0,1,0}-{2721,3216,0,1,0}-{2716,3219,0,1,0}-{2725,3227,0,1,0}"
|
||||
"npc_id": "108",
|
||||
"loc_data": "{2941,9779,0,1,0}-{2934,9776,0,1,0}-{2934,9768,0,1,0}-{2934,9757,0,1,0}-{2930,9752,0,1,0}"
|
||||
},
|
||||
{
|
||||
"npc_id": "109",
|
||||
|
|
@ -385,7 +385,7 @@
|
|||
},
|
||||
{
|
||||
"npc_id": "118",
|
||||
"loc_data": "{3042,3465,0,1,1}-{3035,3443,0,1,6}-{3042,3468,0,1,3}-{3008,3449,0,1,4}-{3000,9842,0,1,2}-{2996,9844,0,1,4}-{3003,9828,0,1,1}-{2995,9811,0,1,3}-{3002,9811,0,1,3}-{2994,9809,0,1,5}-{3004,9813,0,1,6}-{2998,9828,0,1,4}-{3004,9799,0,1,4}-{2997,9809,0,1,0}-{3019,9813,0,1,4}-{2983,9807,0,1,6}-{3012,9812,0,1,3}-{3010,9811,0,1,3}-{2964,9811,0,1,1}-{3025,9801,0,1,4}-{3026,9824,0,1,1}-{3018,9819,0,1,6}-{3028,9815,0,1,3}-{3024,9811,0,1,4}-{3021,9826,0,1,5}-{3022,9832,0,1,1}-{3023,9833,0,1,6}-{3027,9833,0,1,3}-{3028,9828,0,1,6}-{3023,9814,0,1,6}-{3042,9831,0,1,4}-{3024,9824,0,1,6}-{3019,9847,0,1,0}-{3034,9847,0,1,7}-{3021,9851,0,1,5}-{3043,9824,0,1,3}-{3038,9821,0,1,1}-{3044,9818,0,1,4}-{3047,9814,0,1,4}-{3037,9814,0,1,6}-{2603,3056,0,1,0}-{2598,3064,0,1,3}-{2589,3068,0,1,5}"
|
||||
"loc_data": "{2930,9703,0,1,0}-{2933,9702,0,1,0}-{3042,3465,0,1,1}-{3035,3443,0,1,6}-{3042,3468,0,1,3}-{3008,3449,0,1,4}-{3000,9842,0,1,2}-{2996,9844,0,1,4}-{3003,9828,0,1,1}-{2995,9811,0,1,3}-{3002,9811,0,1,3}-{2994,9809,0,1,5}-{3004,9813,0,1,6}-{2998,9828,0,1,4}-{3004,9799,0,1,4}-{2997,9809,0,1,0}-{3019,9813,0,1,4}-{2983,9807,0,1,6}-{3012,9812,0,1,3}-{3010,9811,0,1,3}-{2964,9811,0,1,1}-{3025,9801,0,1,4}-{3026,9824,0,1,1}-{3018,9819,0,1,6}-{3028,9815,0,1,3}-{3024,9811,0,1,4}-{3021,9826,0,1,5}-{3022,9832,0,1,1}-{3023,9833,0,1,6}-{3027,9833,0,1,3}-{3028,9828,0,1,6}-{3023,9814,0,1,6}-{3042,9831,0,1,4}-{3024,9824,0,1,6}-{3019,9847,0,1,0}-{3034,9847,0,1,7}-{3021,9851,0,1,5}-{3043,9824,0,1,3}-{3038,9821,0,1,1}-{3044,9818,0,1,4}-{3047,9814,0,1,4}-{3037,9814,0,1,6}-{2603,3056,0,1,0}-{2598,3064,0,1,3}-{2589,3068,0,1,5}"
|
||||
},
|
||||
{
|
||||
"npc_id": "119",
|
||||
|
|
@ -417,7 +417,7 @@
|
|||
},
|
||||
{
|
||||
"npc_id": "127",
|
||||
"loc_data": "{2956,9794,0,0,0}-{2954,9786,0,0,0}-{2966,9790,0,0,0}-{2963,9781,0,0,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,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}"
|
||||
},
|
||||
{
|
||||
"npc_id": "128",
|
||||
|
|
@ -521,7 +521,7 @@
|
|||
},
|
||||
{
|
||||
"npc_id": "181",
|
||||
"loc_data": "{3105,9942,0,1,3}-{3106,9934,0,1,3}-{3109,9930,0,1,1}-{2937,9847,0,0,0}-{2930,9850,0,0,0}-{2934,9846,0,0,0}-{2930,9845,0,0,0}-{2563,3355,0,1,4}-{2561,3355,0,1,3}-{2561,3357,0,1,1}-{2563,3358,0,1,4}"
|
||||
"loc_data": "{2937,9847,0,1,0}-{2934,9846,0,1,0}-{2929,9848,0,1,0}-{2931,9846,0,1,0}-{2937,9849,0,1,0}-{2936,9850,0,1,0}-{3105,9942,0,1,3}-{3106,9934,0,1,3}-{3109,9930,0,1,1}-{2563,3355,0,1,4}-{2561,3355,0,1,3}-{2561,3357,0,1,1}-{2563,3358,0,1,4}"
|
||||
},
|
||||
{
|
||||
"npc_id": "182",
|
||||
|
|
@ -2047,6 +2047,10 @@
|
|||
"npc_id": "797",
|
||||
"loc_data": "{2900,3511,1,1,6}"
|
||||
},
|
||||
{
|
||||
"npc_id": "798",
|
||||
"loc_data": "{2930,9686,0,1,0}"
|
||||
},
|
||||
{
|
||||
"npc_id": "799",
|
||||
"loc_data": "{2778,3197,0,1,4}-{2777,3194,0,1,4}-{2777,3199,0,1,3}-{2771,3193,0,1,3}-{2761,3192,0,1,5}-{2775,3190,0,1,4}-{2803,3195,0,1,4}"
|
||||
|
|
|
|||
|
|
@ -20493,7 +20493,7 @@
|
|||
},
|
||||
{
|
||||
"examine": "I can climb down this.",
|
||||
"ids": "40027"
|
||||
"ids": "40027,20987"
|
||||
},
|
||||
{
|
||||
"examine": "Storage for cookery items.",
|
||||
|
|
@ -20558,5 +20558,33 @@
|
|||
{
|
||||
"examine": "Glowing with barely-suppressed energies.",
|
||||
"ids": "28719"
|
||||
},
|
||||
{
|
||||
"examine": "Looks kind of like a man made of metal.",
|
||||
"ids": "32292"
|
||||
},
|
||||
{
|
||||
"examine": "Technically a bed.",
|
||||
"ids": "32031"
|
||||
},
|
||||
{
|
||||
"examine": "A really bad portrait of the King.",
|
||||
"ids": "32326"
|
||||
},
|
||||
{
|
||||
"examine": "A tatty old standard.",
|
||||
"ids": "32295"
|
||||
},
|
||||
{
|
||||
"examine": "I can climb this.",
|
||||
"ids": "32015"
|
||||
},
|
||||
{
|
||||
"examine": "An old crate for storage.",
|
||||
"ids": "31137,31139,31140"
|
||||
},
|
||||
{
|
||||
"examine": "A wooden barrel for storage.",
|
||||
"ids": "31136"
|
||||
}
|
||||
]
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
"general_store": "true",
|
||||
"id": "13",
|
||||
"title": "General Store (Canifis)",
|
||||
"stock": "{1931,30}-{1935,30}-{1735,10}-{1925,10}-{1923,10}-{1887,10}-{590,10}-{1755,10}-{2347,10}-{550,10}-{9003,10}"
|
||||
"stock": "{1931,30}-{1935,30}-{1735,10}-{1925,10}-{1923,10}-{1887,10}-{590,10}-{1755,10}-{2347,10}-{550,10}-{9003,10}-{3377,10}"
|
||||
},
|
||||
{
|
||||
"npcs": "563",
|
||||
|
|
|
|||
|
|
@ -1,59 +1,59 @@
|
|||
package core.game.node.entity.npc.other;
|
||||
|
||||
import core.game.node.entity.combat.DeathTask;
|
||||
import core.game.node.entity.npc.AbstractNPC;
|
||||
import core.game.world.map.Location;
|
||||
import core.plugin.Initializable;
|
||||
import core.tools.RandomFunction;
|
||||
|
||||
/**
|
||||
* Handles the sheep npc's.
|
||||
* @author 'Vexia
|
||||
*/
|
||||
@Initializable
|
||||
public class SheepNPC extends AbstractNPC {
|
||||
|
||||
/**
|
||||
* The NPC ids of NPCs using this plugin.
|
||||
*/
|
||||
private static final int[] ID = { 42, 43, 1271, 1272, 1529, 1762, 1763, 1764, 1765, 2311, 2377, 2378, 2379, 2380, 3310, 3311, 3579, 5148, 5149, 5150, 5151, 5152, 5153, 5154, 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, 5172, 5173 };
|
||||
|
||||
/**
|
||||
* Constructs a new {@code AlKharidWarriorPlugin} {@code Object}.
|
||||
*/
|
||||
public SheepNPC() {
|
||||
super(0, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs a new {@code AlKharidWarriorPlugin} {@code Object}.
|
||||
* @param id The NPC id.
|
||||
* @param location The location.
|
||||
*/
|
||||
private SheepNPC(int id, Location location) {
|
||||
super(id, location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractNPC construct(int id, Location location, Object... objects) {
|
||||
return new SheepNPC(id, location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
if (getProperties().getCombatPulse().isAttacking() || DeathTask.isDead(this)) {
|
||||
super.tick();
|
||||
return;
|
||||
}
|
||||
if (RandomFunction.random(35) == 5) {
|
||||
sendChat("Baa!");
|
||||
}
|
||||
super.tick();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getIds() {
|
||||
return ID;
|
||||
}
|
||||
|
||||
}
|
||||
package core.game.node.entity.npc.other;
|
||||
|
||||
import core.game.node.entity.combat.DeathTask;
|
||||
import core.game.node.entity.npc.AbstractNPC;
|
||||
import core.game.world.map.Location;
|
||||
import core.plugin.Initializable;
|
||||
import core.tools.RandomFunction;
|
||||
|
||||
/**
|
||||
* Handles the sheep npc's.
|
||||
* @author 'Vexia
|
||||
*/
|
||||
@Initializable
|
||||
public class SheepNPC extends AbstractNPC {
|
||||
|
||||
/**
|
||||
* The NPC ids of NPCs using this plugin.
|
||||
*/
|
||||
private static final int[] ID = { 42, 43, 1271, 1272, 1529, 1762, 1763, 1764, 1765, 2377, 2378, 2379, 2380, 3310, 3311, 3579, 5148, 5149, 5150, 5151, 5152, 5153, 5154, 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, 5172, 5173 };
|
||||
|
||||
/**
|
||||
* Constructs a new {@code AlKharidWarriorPlugin} {@code Object}.
|
||||
*/
|
||||
public SheepNPC() {
|
||||
super(0, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs a new {@code AlKharidWarriorPlugin} {@code Object}.
|
||||
* @param id The NPC id.
|
||||
* @param location The location.
|
||||
*/
|
||||
private SheepNPC(int id, Location location) {
|
||||
super(id, location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractNPC construct(int id, Location location, Object... objects) {
|
||||
return new SheepNPC(id, location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
if (getProperties().getCombatPulse().isAttacking() || DeathTask.isDead(this)) {
|
||||
super.tick();
|
||||
return;
|
||||
}
|
||||
if (RandomFunction.random(35) == 5) {
|
||||
sendChat("Baa!");
|
||||
}
|
||||
super.tick();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getIds() {
|
||||
return ID;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,10 +113,10 @@ public final class SlayerManager {
|
|||
flags.setCompletedTasks(flags.getCompletedTasks() + 1);
|
||||
if ((flags.getCompletedTasks() > 4 || flags.canEarnPoints() ) && flags.getMaster() != Master.TURAEL && flags.getPoints() < 64000) {
|
||||
int points = flags.getMaster().getTaskPoints()[0];
|
||||
if (flags.getTaskStreak() % 10 == 0) {
|
||||
points = flags.getMaster().getTaskPoints()[1];
|
||||
} else if (flags.getTaskStreak() % 50 == 0) {
|
||||
if (flags.getTaskStreak() % 50 == 0) {
|
||||
points = flags.getMaster().getTaskPoints()[2];
|
||||
} else if (flags.getTaskStreak() % 10 == 0) {
|
||||
points = flags.getMaster().getTaskPoints()[1];
|
||||
}
|
||||
flags.incrementPoints(points);
|
||||
if (flags.getPoints() > 64000) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
package rs09.game.interaction.region
|
||||
|
||||
import core.game.node.entity.impl.ForceMovement
|
||||
import core.game.world.map.Direction
|
||||
import api.ContentAPI
|
||||
import core.game.node.entity.skill.agility.AgilityHandler
|
||||
import core.game.system.task.Pulse
|
||||
import core.game.world.map.Location
|
||||
import core.game.world.update.flag.context.Animation
|
||||
import core.game.world.update.flag.context.Graphics
|
||||
import rs09.game.interaction.InteractionListener
|
||||
import kotlin.random.Random
|
||||
|
||||
/**
|
||||
* File to be used for anything Morytania related.
|
||||
|
|
@ -19,8 +22,12 @@ class MorytaniaListeners : InteractionListener() {
|
|||
val GROTTO_BRIDGE = 3522
|
||||
val outside = Location.create(3439, 3337, 0)
|
||||
val inside = Location.create(3442, 9734, 1)
|
||||
private val RUNNING_ANIM = Animation(1995)
|
||||
private val JUMP_ANIM = Animation(1603)
|
||||
|
||||
private val swimAnim = Animation(6988)
|
||||
private val jumpAnim = Animation(1603)
|
||||
private val failWater = Location(3439,3330)
|
||||
private val failMessage = "You nearly drown in the disgusting swamp."
|
||||
private val splashGFX = Graphics(68)
|
||||
|
||||
override fun defineListeners() {
|
||||
/* on(GROTTO_ENTRANCE,SCENERY,"enter"){ player, node ->
|
||||
|
|
@ -34,10 +41,36 @@ class MorytaniaListeners : InteractionListener() {
|
|||
}
|
||||
|
||||
on(GROTTO_BRIDGE,SCENERY,"jump"){ player, node ->
|
||||
if (player.location.y == 3328) {
|
||||
ForceMovement.run(player, node.location, node.location.transform(0, 3, 0), RUNNING_ANIM, JUMP_ANIM, Direction.NORTH, 15).endAnimation = Animation.RESET
|
||||
} else if (player.location.y == 3332){
|
||||
ForceMovement.run(player, node.location, node.location.transform(0, -3, 0), RUNNING_ANIM, JUMP_ANIM, Direction.SOUTH, 15).endAnimation = Animation.RESET
|
||||
val start = node.location
|
||||
var failLand = Location(3438,3331)
|
||||
var failAnim = Animation(770)
|
||||
var fromGrotto = false
|
||||
|
||||
ContentAPI.lock(player,10)
|
||||
|
||||
// Switch to south facing animations if jumping from Grotto
|
||||
if (start.y == 3331) {
|
||||
fromGrotto = true
|
||||
failAnim = Animation(771)
|
||||
failLand = Location(3438,3328)
|
||||
}
|
||||
if (AgilityHandler.hasFailed(player, 1, 0.1)) {
|
||||
val end = if (fromGrotto) failWater else start
|
||||
AgilityHandler.forceWalk(player, -1, start, end, failAnim, 15, 0.0, null,0).endAnimation = swimAnim
|
||||
AgilityHandler.forceWalk(player, -1, failWater, failLand, swimAnim, 15, 2.0, null,3)
|
||||
ContentAPI.submitIndividualPulse(player, object : Pulse(2){
|
||||
override fun pulse(): Boolean {
|
||||
ContentAPI.visualize(player,failAnim,splashGFX)
|
||||
ContentAPI.teleport(player,failWater)
|
||||
// Deal 1-6 damage but wait until the player is back on land
|
||||
AgilityHandler.fail(player,0,failLand,swimAnim,Random.nextInt(1,7),failMessage)
|
||||
return true
|
||||
}
|
||||
})
|
||||
}
|
||||
else{
|
||||
val end = if (fromGrotto) start.transform(0,-3,0) else start.transform(0,3,0)
|
||||
AgilityHandler.forceWalk(player, -1, start, end, jumpAnim, 15, 15.0, null,0)
|
||||
}
|
||||
return@on true
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue