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

Merge branch 'master' into 'master'

Browse source 
Fix: Morytania QA Pass 1, misc fixes

See merge request 2009scape/2009scape!231
This commit is contained in:
Ceikry 2021-08-21 00:48:42 +00:00
commit 01734bbd2f
4 changed files with 191 additions and 1019 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Server/data/configs/item_configs.json
View file

@ -31513,7 +31513,7 @@
"id": "2956"
},
{
"examine": "A druid pouch.",
"examine": "An empty druid pouch.",
"durability": null,
"name": "Druid pouch",
"low_alchemy": "2",

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

File diff suppressed because it is too large Load diff

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

@ -2961,7 +2961,7 @@
},
{
"npc_id": "1228",
"loc_data": "{3420,3302,0,1,1}-{3424,3296,0,1,4}-{3509,3440,0,1,4}-{3518,3454,0,1,1}-{3504,3406,0,1,4}-{3497,3404,0,1,1}"
"loc_data": "{3469,3346,0,1,0}-{3494,3447,0,1,0}-{3530,3440,0,1,0}-{3556,3453,0,1,0}"
},
{
"npc_id": "1229",
@ -2973,7 +2973,7 @@
},
{
"npc_id": "1231",
"loc_data": "{3426,3271,0,1,4}-{3435,3268,0,1,7}-{3443,3266,0,1,7}-{3442,3319,0,1,1}-{3445,3318,0,1,6}-{3518,3397,0,1,4}-{3519,3408,0,1,2}-{3516,3410,0,1,2}-{3489,3391,0,1,2}-{3487,3409,0,1,3}"
"loc_data": "{3504,3437,0,1,0}-{3509,3437,0,1,0}-{3498,3419,0,1,0}-{3493,3413,0,1,0}-{3524,3397,0,1,0}-{3438,3354,0,1,0}-{3429,3313,0,1,0}-{3429,3314,0,1,0}-{3437,3312,0,1,0}-{3437,3311,0,1,0}-{3451,3308,0,1,0}-{3447,3268,0,1,0}"
},
{
"npc_id": "1232",
@ -2981,7 +2981,7 @@
},
{
"npc_id": "1233",
"loc_data": "{3432,3285,0,1,4}-{3434,3288,0,1,5}-{3428,3290,0,1,3}-{3440,3295,0,1,4}-{3436,3288,0,1,1}-{3446,3289,0,1,3}-{3514,3415,0,1,6}-{3509,3415,0,1,1}-{3516,3402,0,1,2}-{3492,3393,0,1,7}-{3493,3401,0,1,6}-{3487,3406,0,1,3}"
"loc_data": "{3485,3443,0,1,0}-{3516,3441,0,1,0}-{3537,3428,0,1,0}"
},
{
"npc_id": "1234",
@ -4359,6 +4359,10 @@
"npc_id": "2310",
"loc_data": "{3025,3312,0,1,4}-{3043,3308,0,1,6}-{3023,3297,0,1,5}-{2928,3282,0,1,1}-{2927,3269,0,1,1}"
},
{
"npc_id": "2311",
"loc_data": "{3035,3296,0,0,0}"
},
{
"npc_id": "2312",
"loc_data": "{3014,3292,0,0,0}"

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

@ -5584,7 +5584,7 @@
"ids": "3514,3515"
},
{
"examine": "A dark dank entrance to below..",
"examine": "A dark dank entrance to below.",
"ids": "3516"
},
{
@ -17025,7 +17025,7 @@
},
{
"examine": "Better not eat them!",
"ids": "12094,12095,12096,12097,12098,12099"
"ids": "12094,12095,12096,12097,12098,12099,14121"
},
{
"examine": "A hot furnace.",
@ -20413,7 +20413,7 @@
},
{
"examine": "Storage for all needs.",
"ids": "40047"
"ids": "40047,30648,30649,30650"
},
{
"examine": "A wooden barrel for storage.",
@ -20530,5 +20530,33 @@
{
"examine": "Looking good!",
"ids": "40065"
},
{
"examine": "It looks slightly different from the rest.",
"ids": "30532"
},
{
"examine": "'Here lies...' is all I can read.",
"ids": "30671,30672"
},
{
"examine": "The inscription is worn away and unreadable.",
"ids": "30667,30669"
},
{
"examine": "Whoever bought this must have really cared for the inhabitant.",
"ids": "30668"
},
{
"examine": "Make a wish.",
"ids": "28715"
},
{
"examine": "Contains no summoning energy.",
"ids": "28720,28721"
},
{
"examine": "Glowing with barely-suppressed energies.",
"ids": "28719"
}
]