2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 'master'

Browse source 
JSON: Pet Shop, misc examines and fixes

See merge request 2009scape/2009scape!316
This commit is contained in:
Ceikry 2021-10-22 19:38:45 +00:00
commit 28cc1add11
3 changed files with 99 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

204
Server/data/configs/npc_configs.json
View file

@ -16286,6 +16286,7 @@
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
@ -16307,6 +16308,7 @@
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
@ -16578,6 +16580,7 @@
"range_animation": "9471",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9473",
"magic_animation": "9471",
"death_animation": "9472",
@ -16597,6 +16600,7 @@
"range_animation": "9471",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9473",
"magic_animation": "9471",
"death_animation": "9472",
@ -16654,6 +16658,7 @@
"range_animation": "9471",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9473",
"magic_animation": "9471",
"death_animation": "9472",
@ -16674,6 +16679,7 @@
"range_animation": "9471",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9473",
"magic_animation": "9471",
"death_animation": "9472",
@ -16694,6 +16700,7 @@
"range_animation": "9471",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9473",
"magic_animation": "9471",
"death_animation": "9472",
@ -16714,6 +16721,7 @@
"range_animation": "9471",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9473",
"magic_animation": "9471",
"death_animation": "9472",
@ -16734,6 +16742,7 @@
"range_animation": "9471",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9473",
"magic_animation": "9471",
"death_animation": "9472",
@ -34984,6 +34993,7 @@
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "15",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
@ -86918,48 +86928,6 @@
"projectile": "335",
"attack_level": "1"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "1608",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "1609",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "Flies like a rock.",
"melee_animation": "9454",
@ -104449,27 +104417,6 @@
"range_level": "1",
"attack_level": "1"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "4229",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "A denizen of the Abyss!",
"slayer_task": "1",
@ -151540,48 +151487,6 @@
"projectile": "335",
"attack_level": "1"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "1608",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "1609",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "Flies like a rock.",
"melee_animation": "9454",
@ -169403,27 +169308,6 @@
"range_level": "1",
"attack_level": "1"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "4229",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "A denizen of the Abyss!",
"slayer_task": "1",
@ -216949,48 +216833,6 @@
"projectile": "335",
"attack_level": "1"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "1608",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "1609",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "Flies like a rock.",
"melee_animation": "9454",
@ -234480,27 +234322,6 @@
"range_level": "1",
"attack_level": "1"
},
{
"examine": "Large, heavy, with sharp things attached to its head.",
"melee_animation": "9439",
"range_animation": "9439",
"attack_speed": "4",
"magic_level": "1",
"defence_animation": "9441",
"slayer_exp": "97",
"magic_animation": "9439",
"death_animation": "9440",
"name": "Kurask",
"defence_level": "105",
"safespot": null,
"lifepoints": "97",
"strength_level": "105",
"id": "4229",
"aggressive": "true",
"bonuses": "0,0,0,0,0,0,20,20,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "67"
},
{
"examine": "A denizen of the Abyss!",
"slayer_task": "1",
@ -267893,5 +267714,10 @@
"examine": "Owner of this homestead.",
"name": "Mrs. Winkin",
"id": "7132"
},
{
"examine": "The lady of the pet shop.",
"name": "Pet shop owner",
"id": "6750"
}
]

12
Server/data/configs/npc_spawns.json
View file

@ -2027,6 +2027,18 @@
"npc_id": "784",
"loc_data": "{3155,3406,0,0,0}"
},
{
"npc_id": "785",
"loc_data": "{2470,3312,0,1,0}-{2479,3315,0,1,0}"
},
{
"npc_id": "786",
"loc_data": "{2482,3313,0,1,0}-{2477,3311,0,1,0}"
},
{
"npc_id": "787",
"loc_data": "{2486,3315,0,1,0}-{2479,3313,0,1,0}"
},
{
"npc_id": "788",
"loc_data": "{2773,3187,0,0,6}"

72
Server/data/configs/object_configs.json
View file

@ -20526,5 +20526,77 @@
{
"examine": "Looks like part of the entrance is blocked by rubble.",
"ids": "15767"
},
{
"examine": "They know how much that dog in the window is.",
"ids": "28351"
},
{
"examine": "Lots of things for a growing fish.",
"ids": "28355"
},
{
"examine": "It's a basket for dogs.",
"ids": "28338"
},
{
"examine": "Enough baskets for any dog's needs.",
"ids": "28339"
},
{
"examine": "Made by the A. Wilson Company.",
"ids": "28345"
},
{
"examine": "Sure it's gilded, but would you want to live in it?",
"ids": "28335"
},
{
"examine": "It's covered in hairs.",
"ids": "28361"
},
{
"examine": "It's good for bedding and stuffing.",
"ids": "28343"
},
{
"examine": "Lots of little fishies.",
"ids": "28340"
},
{
"examine": "Fetch!",
"ids": "28360"
},
{
"examine": "It's a basket for cats.",
"ids": "28337"
},
{
"examine": "It seems to be sat happily on the counter.",
"ids": "28356"
},
{
"examine": "Lots of things for a growing pup.",
"ids": "28353"
},
{
"examine": "Lots of things for a growing kitten.",
"ids": "28354"
},
{
"examine": "Lots of things for a growing pup/kitten/fish.",
"ids": "28357"
},
{
"examine": "Things are cheaper by the pound.",
"ids": "28344"
},
{
"examine": "It incubates eggs.",
"ids": "28336"
},
{
"examine": "There are a lot of pet supplies here.",
"ids": "28363"
}
]