Various Additions and Fixes (#571)

* Updated and Added various drops

Added global drops to Al-Kharid and Lumbridge

* Added Uglug and Roachey

* Update npc.json

* Update shops.json

* Update Shops.java
This commit is contained in:
halogod35
2023-02-01 21:48:04 -05:00
committed by GitHub
parent d7a70fdfdc
commit fa7418929e
4 changed files with 215 additions and 228 deletions
+69 -20
View File
@@ -95,7 +95,7 @@
"amount": "1",
"itemX": 3205,
"id": 882,
"itemY": 3228
"itemY": 3227
},
{
"amount": "1",
@@ -115,18 +115,6 @@
"id": 1203,
"itemY": 3245
},
{
"amount": "1",
"itemX": 3233,
"id": 1944,
"itemY": 3297
},
{
"amount": "1",
"itemX": 3233,
"id": 1944,
"itemY": 3295
},
{
"amount": "1",
"itemX": 3226,
@@ -135,21 +123,21 @@
},
{
"amount": "1",
"itemX": 3227,
"itemX": 3229,
"id": 1944,
"itemY": 3299
},
{
"amount": "1",
"itemX": 3229,
"itemX": 3231,
"id": 1944,
"itemY": 3295
"itemY": 3301
},
{
"amount": "1",
"itemX": 3231,
"itemX": 3233,
"id": 1944,
"itemY": 3294
"itemY": 3300
},
{
"amount": "1",
@@ -1697,7 +1685,7 @@
"amount": "1",
"itemX": 3302,
"id": 1061,
"itemY": 3192
"itemY": 3190
},
{
"amount": "1",
@@ -1923,5 +1911,66 @@
"itemX": 3277,
"id": 753,
"itemY": 3372
},
{
"amount": "1",
"itemX": 3285,
"id": 1965,
"itemY": 3175
},
{
"amount": "1",
"itemX": 3302,
"id": 1937,
"itemY": 3170
},
{
"amount": "1",
"itemX": 3213,
"id": 1205,
"itemY": 3216,
"height": 1
},
{
"amount": "1",
"itemX": 3205,
"id": 1511,
"itemY": 3224,
"height": 2
},
{
"amount": "1",
"itemX": 3205,
"id": 1511,
"itemY": 3226,
"height": 2
},
{
"amount": "1",
"itemX": 3208,
"id": 1511,
"itemY": 3225,
"height": 2
},
{
"amount": "1",
"itemX": 3209,
"id": 1511,
"itemY": 3224,
"height": 2
},
{
"amount": "1",
"itemX": 3229,
"id": 1265,
"itemY": 3223,
"height": 2
},
{
"amount": "1",
"itemX": 3229,
"id": 1265,
"itemY": 3215,
"height": 2
}
]
]
+15 -9
View File
@@ -4,6 +4,7 @@
"sellModifier": 2,
"name": "Davon's Amulet Store.",
"id": 2,
"id": 2,
"items": [
{
"itemId": 1718,
@@ -6863,6 +6864,18 @@
}
]
},
{
"buyModifier": 2,
"sellModifier": 2,
"name": "Pelters' Veg Stall",
"id": 146,
"items": [
{
"itemId": 2518,
"itemAmount": 2000
}
]
},
{
"buyModifier": 2,
"sellModifier": 2,
@@ -6936,13 +6949,6 @@
"id": 152,
"items": []
},
{
"buyModifier": 2,
"sellModifier": 2,
"name": "Prospector Percy's Nugget Shop",
"id": 156,
"items": []
},
{
"buyModifier": 1,
"sellModifier": 1,
@@ -7002,7 +7008,7 @@
{
"buyModifier": 2,
"sellModifier": 2,
"name": "Uglug's Stuffsies",
"name": "~ Uglug's stuffsies ~",
"id": 165,
"items": [
{
@@ -7948,7 +7954,7 @@
{
"buyModifier": 2,
"sellModifier": 2,
"name": "Fishing Guild Shop",
"name": "Fishing Guild Shop.",
"id": 190,
"items": [
{
+92 -162
View File
@@ -499,6 +499,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3305,
"y": 3294,
"id": 2304,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -523,9 +533,9 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3305,
"y": 3294,
"id": 2304,
"x": 2444,
"y": 3050,
"id": 2309,
"walk": 1,
"height": 0
},
@@ -8623,8 +8633,8 @@
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3285,
"y": 3172,
"x": 3282,
"y": 3176,
"id": 18,
"walk": 1,
"height": 0
@@ -8633,8 +8643,8 @@
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3288,
"y": 3169,
"x": 3284,
"y": 3174,
"id": 18,
"walk": 1,
"height": 0
@@ -8643,7 +8653,7 @@
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3295,
"x": 3284,
"y": 3170,
"id": 18,
"walk": 1,
@@ -8653,38 +8663,8 @@
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3297,
"y": 3175,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3300,
"y": 3171,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3302,
"y": 3167,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3301,
"y": 3164,
"x": 3288,
"y": 3168,
"id": 18,
"walk": 1,
"height": 0
@@ -8694,100 +8674,50 @@
"strength": 20,
"attack": 20,
"x": 3295,
"y": 3161,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3290,
"y": 3161,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3286,
"y": 3164,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3283,
"y": 3161,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3286,
"y": 3163,
"id": 18,
"walk": 1,
"height": 1
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3287,
"y": 3168,
"id": 18,
"walk": 1,
"height": 1
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3285,
"x": 3292,
"y": 3169,
"id": 18,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3301,
"y": 3174,
"id": 18,
"walk": 1,
"height": 1
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3298,
"y": 3164,
"x": 3301,
"y": 3177,
"id": 18,
"walk": 1,
"height": 1
"height": 0
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3294,
"y": 3162,
"x": 3301,
"y": 3170,
"id": 18,
"walk": 1,
"height": 1
},
{
"maxHit": 3,
"strength": 20,
"attack": 20,
"x": 3287,
"y": 3160,
"id": 18,
"walk": 1,
"height": 1
"height": 0
},
{
"maxHit": 3,
@@ -22413,8 +22343,8 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2603,
"y": 3402,
"x": 2801,
"y": 4706,
"id": 219,
"walk": 1,
"height": 0
@@ -22515,7 +22445,7 @@
"attack": 0,
"x": 2596,
"y": 3403,
"id": 1972,
"id": 592,
"walk": 0,
"height": 0
},
@@ -23649,8 +23579,8 @@
"walk": 1,
"height": 0
}
,
{
,
{
"maxHit": 7,
"strength": 25,
"attack": 20,
@@ -23660,8 +23590,8 @@
"walk": 1,
"height": 0
}
,
{
,
{
"maxHit": 7,
"strength": 25,
"attack": 20,
@@ -23671,8 +23601,8 @@
"walk": 1,
"height": 0
}
,
{
,
{
"maxHit": 7,
"strength": 25,
"attack": 20,
@@ -23682,8 +23612,8 @@
"walk": 1,
"height": 0
}
,
{
,
{
"maxHit": 7,
"strength": 25,
"attack": 20,
@@ -23693,7 +23623,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23703,7 +23633,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23713,7 +23643,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23723,7 +23653,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23733,7 +23663,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23743,7 +23673,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23753,7 +23683,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23763,7 +23693,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23773,7 +23703,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23783,7 +23713,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23793,7 +23723,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23803,7 +23733,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23813,7 +23743,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23823,7 +23753,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 3,
"strength": 5,
"attack": 5,
@@ -23833,7 +23763,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23843,7 +23773,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 2,
"strength": 2,
"attack": 2,
@@ -23853,7 +23783,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 2,
"strength": 2,
"attack": 2,
@@ -23863,7 +23793,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23873,7 +23803,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23883,7 +23813,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23893,7 +23823,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 1,
"strength": 1,
"attack": 1,
@@ -23903,7 +23833,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23913,7 +23843,7 @@
"walk": 0,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23953,7 +23883,7 @@
"walk": 0,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23963,7 +23893,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23973,7 +23903,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23983,7 +23913,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -23993,7 +23923,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24003,7 +23933,7 @@
"walk": 0,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24013,7 +23943,7 @@
"walk": 0,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24023,7 +23953,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24033,7 +23963,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24043,7 +23973,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24083,7 +24013,7 @@
"walk": 1,
"height": 1
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24093,7 +24023,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24103,7 +24033,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24113,7 +24043,7 @@
"walk": 0,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24123,7 +24053,7 @@
"walk": 0,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24133,7 +24063,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24143,7 +24073,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24153,7 +24083,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,
@@ -24163,7 +24093,7 @@
"walk": 1,
"height": 0
},
{
{
"maxHit": 0,
"strength": 0,
"attack": 0,