Shop update (#566)

* Updated shops

* Updated shops

* Updated shops

* Updated shops

* Updated shops

forgot to beautify

* Updated Shops

Replaced IDs with NPC IDs (Credit: Matthew Bishop)
This commit is contained in:
halogod35
2023-01-30 14:36:47 -05:00
committed by GitHub
parent d5490bd39d
commit 32947bbd15
4 changed files with 209 additions and 246 deletions
+27 -20
View File
@@ -991,7 +991,7 @@
},
{
"hitpoints": 0,
"name": "Gnome shop keeper",
"name": "Gnome Shop keeper",
"combat": 0,
"id": 165
},
@@ -3121,31 +3121,31 @@
},
{
"hitpoints": 0,
"name": "Shop Keeper",
"name": "Shop keeper",
"combat": 0,
"id": 520
},
{
"hitpoints": 0,
"name": "Shop Assistant",
"name": "Shop assistant",
"combat": 0,
"id": 521
},
{
"hitpoints": 0,
"name": "Shop Keeper",
"name": "Shop keeper",
"combat": 0,
"id": 522
},
{
"hitpoints": 0,
"name": "Shop Assistant",
"name": "Shop assistant",
"combat": 0,
"id": 523
},
{
"hitpoints": 0,
"name": "Shop Keeper",
"name": "Shop keeper",
"combat": 0,
"id": 524
},
@@ -3157,61 +3157,61 @@
},
{
"hitpoints": 0,
"name": "Shop Keeper",
"name": "Shop keeper",
"combat": 0,
"id": 526
},
{
"hitpoints": 0,
"name": "Shop Assistant",
"name": "Shop assistant",
"combat": 0,
"id": 527
},
{
"hitpoints": 0,
"name": "Shop Keeper",
"name": "Shop keeper",
"combat": 0,
"id": 528
},
{
"hitpoints": 0,
"name": "Shop Assistant",
"name": "Shop assistant",
"combat": 0,
"id": 529
},
{
"hitpoints": 0,
"name": "Shop Keeper",
"name": "Shop keeper",
"combat": 0,
"id": 530
},
{
"hitpoints": 0,
"name": "Shop Assistant",
"name": "Shop assistant",
"combat": 0,
"id": 531
},
{
"hitpoints": 0,
"name": "Shop Keeper",
"name": "Shop keeper",
"combat": 0,
"id": 532
},
{
"hitpoints": 0,
"name": "Shop Assistant",
"name": "Shop assistant",
"combat": 0,
"id": 533
},
{
"hitpoints": 0,
"name": "Fairy Shop Keeper",
"name": "Fairy shop keeper",
"combat": 0,
"id": 534
},
{
"hitpoints": 0,
"name": "Fairy Shop assistant",
"name": "Fairy shop assistant",
"combat": 0,
"id": 535
},
@@ -3253,7 +3253,7 @@
},
{
"hitpoints": 0,
"name": "Louie legs",
"name": "Louie Legs",
"combat": 0,
"id": 542
},
@@ -3325,7 +3325,7 @@
},
{
"hitpoints": 0,
"name": "Fancy dress shop owner",
"name": "Fancy-dress shop owner",
"combat": 0,
"id": 554
},
@@ -10207,7 +10207,7 @@
},
{
"hitpoints": 0,
"name": "Ghost Shopkeeper",
"name": "Ghost shopkeeper",
"combat": 0,
"id": 1699
},
@@ -16217,6 +16217,12 @@
"combat": 0,
"id": 3109
},
{
"hitpoints": 0,
"name": "Mike",
"combat": 0,
"id": 3166
},
{
"hitpoints": 250,
"name": "Chaos Elemental",
@@ -16583,6 +16589,7 @@
"combat": 140,
"id": 3068
},
{
"hitpoints": 7,
"name": "Drunken Man",
@@ -16643,4 +16650,4 @@
"combat": 0,
"id": 3790
}
]
]
+94 -138
View File
@@ -372,7 +372,7 @@
"sellModifier": 2,
"name": "Bob's Brilliant Axes.",
"id": 8,
"items": [
"items": [
{
"itemId": 1265,
"itemAmount": 5
@@ -2615,7 +2615,7 @@
}
]
},
{
{
"buyModifier": 2,
"sellModifier": 2,
"name": "Flynn's Mace Market.",
@@ -2709,7 +2709,7 @@
"name": "Betty's Magic Emporium.",
"id": 51,
"items": [
{
{
"itemId": 554,
"itemAmount": 5000
},
@@ -2923,35 +2923,35 @@
"items": [
{
"itemId": 554,
"itemAmount": 100
"itemAmount": 1000
},
{
"itemId": 555,
"itemAmount": 100
"itemAmount": 1000
},
{
"itemId": 556,
"itemAmount": 100
"itemAmount": 1000
},
{
"itemId": 557,
"itemAmount": 100
},
{
"itemId": 559,
"itemAmount": 100
"itemAmount": 1000
},
{
"itemId": 558,
"itemAmount": 100
"itemAmount": 1000
},
{
"itemId": 562,
"itemAmount": 30
"itemAmount": 500
},
{
"itemId": 560,
"itemAmount": 30
"itemAmount": 500
},
{
"itemId": 565,
"itemAmount": 500
}
]
},
@@ -3414,12 +3414,12 @@
{
"buyModifier": 2,
"sellModifier": 2,
"name": "The Spice is Right.",
"name": "The Spice Is Right.",
"id": 71,
"items": [
{
"itemId": 1931,
"itemAmount": 30
"itemAmount": 5
},
{
"itemId": 2169,
@@ -3429,9 +3429,17 @@
"itemId": 5970,
"itemAmount": 0
},
{
"itemId": 4689,
"itemAmount": 0
},
{
"itemId": 4687,
"itemAmount": 0
},
{
"itemId": 175,
"itemAmount": 10
"itemAmount": 20
}
]
},
@@ -3528,10 +3536,6 @@
{
"itemId": 353,
"itemAmount": 10
},
{
"itemId": 952,
"itemAmount": 10
}
]
},
@@ -3670,52 +3674,56 @@
"id": 78,
"items": [
{
"itemId": 10,
"itemAmount": 954
"itemId": 1931,
"itemAmount": 3
},
{
"itemId": 10,
"itemAmount": 1265
"itemId": 954,
"itemAmount": 3
},
{
"itemId": 10,
"itemAmount": 1925
"itemId": 1265,
"itemAmount": 2
},
{
"itemId": 30,
"itemAmount": 590
"itemId": 1925,
"itemAmount": 2
},
{
"itemId": 10,
"itemAmount": 1415
"itemId": 590,
"itemAmount": 2
},
{
"itemId": 10,
"itemAmount": 1061
"itemId": 2347,
"itemAmount": 3
},
{
"itemId": 10,
"itemAmount": 841
"itemId": 1061,
"itemAmount": 2
},
{
"itemId": 10,
"itemAmount": 882
"itemId": 839,
"itemAmount": 2
},
{
"itemId": 100,
"itemAmount": 329
"itemId": 882,
"itemAmount": 20
},
{
"itemId": 10,
"itemAmount": 2327
"itemId": 329,
"itemAmount": 10
},
{
"itemId": 10,
"itemAmount": 2309
"itemId": 2327,
"itemAmount": 10
},
{
"itemId": 10,
"itemAmount": 2142
"itemId": 2309,
"itemAmount": 5
},
{
"itemId": 2142,
"itemAmount": 10
}
]
},
@@ -4189,25 +4197,25 @@
"itemId": 1925,
"itemAmount": 2
},
{
"itemId": 1923,
"itemAmount": 10
},
{
"itemId": 1887,
"itemAmount": 10
},
{
"itemId": 590,
"itemAmount": 2
},
{
"itemId": 1755,
"itemAmount": 10
"itemAmount": 2
},
{
"itemId": 2347,
"itemAmount": 10
"itemAmount": 5
},
{
"itemId": 952,
"itemAmount": 5
},
{
"itemId": 946,
"itemAmount": 4
}
]
},
@@ -4253,7 +4261,7 @@
"itemId": 1755,
"itemAmount": 2
},
{
{
"itemId": 952,
"itemAmount": 5
},
@@ -4370,36 +4378,44 @@
{
"buyModifier": 1,
"sellModifier": 1,
"name": "Arnold's Ecletic Supplies",
"name": "Arnold's Eclectic Supplies.",
"id": 91,
"items": [
{
"itemId": 303,
"itemAmount": 10
"itemAmount": 2
},
{
"itemId": 311,
"itemAmount": 2
},
{
"itemId": 7944,
"itemAmount": 1
},
{
"itemId": 2309,
"itemAmount": 10
"itemId": 7946,
"itemAmount": 0
},
{
"itemId": 1925,
"itemAmount": 30
"itemId": 2309,
"itemAmount": 1
},
{
"itemId": 1931,
"itemAmount": 4
},
{
"itemId": 1927,
"itemAmount": 10
"itemAmount": 1
},
{
"itemId": 1733,
"itemAmount": 10
"itemAmount": 3
},
{
"itemId": 1734,
"itemAmount": 1000
"itemAmount": 15
},
{
"itemId": 1917,
@@ -4407,11 +4423,11 @@
},
{
"itemId": 1785,
"itemAmount": 10
"itemAmount": 2
},
{
"itemId": 946,
"itemAmount": 10
"itemAmount": 1
}
]
},
@@ -4894,24 +4910,24 @@
{
"buyModifier": 1,
"sellModifier": 1,
"name": "Quartermaster's Store",
"name": "Quartermaster's Stores",
"id": 99,
"items": [
{
"itemId": 1931,
"itemAmount": 30
"itemAmount": 5
},
{
"itemId": 1935,
"itemAmount": 10
"itemAmount": 2
},
{
"itemId": 1735,
"itemAmount": 10
"itemAmount": 3
},
{
"itemId": 590,
"itemAmount": 10
"itemAmount": 3
},
{
"itemId": 2309,
@@ -4935,19 +4951,19 @@
},
{
"itemId": 3198,
"itemAmount": 10
"itemAmount": 7
},
{
"itemId": 3200,
"itemAmount": 10
"itemAmount": 7
},
{
"itemId": 3202,
"itemAmount": 10
"itemAmount": 7
},
{
"itemId": 3204,
"itemAmount": 10
"itemAmount": 5
}
]
},
@@ -5100,8 +5116,8 @@
]
},
{
"buyModifier": 2,
"sellModifier": 2,
"buyModifier": 1,
"sellModifier": 1,
"name": "Shantay Pass Shop",
"id": 103,
"items": [
@@ -9845,66 +9861,6 @@
}
]
},
{
"buyModifier": 2,
"sellModifier": 2,
"name": "Quartermaster's Stores",
"id": 288,
"items": [
{
"itemId": 1931,
"itemAmount": 5
},
{
"itemId": 1935,
"itemAmount": 2
},
{
"itemId": 1735,
"itemAmount": 3
},
{
"itemId": 590,
"itemAmount": 3
},
{
"itemId": 2309,
"itemAmount": 10
},
{
"itemId": 3190,
"itemAmount": 10
},
{
"itemId": 3192,
"itemAmount": 10
},
{
"itemId": 3194,
"itemAmount": 10
},
{
"itemId": 3196,
"itemAmount": 10
},
{
"itemId": 3198,
"itemAmount": 7
},
{
"itemId": 3200,
"itemAmount": 7
},
{
"itemId": 3202,
"itemAmount": 7
},
{
"itemId": 3204,
"itemAmount": 5
}
]
},
{
"buyModifier": 2,
"sellModifier": 2,
+48 -48
View File
@@ -503,8 +503,8 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2820,
"y": 3461,
"x": 2819,
"y": 3460,
"id": 2305,
"walk": 1,
"height": 0
@@ -523,8 +523,8 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3039,
"y": 3295,
"x": 3305,
"y": 3294,
"id": 2304,
"walk": 1,
"height": 0
@@ -733,7 +733,7 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2950,
"x": 2949,
"y": 3386,
"id": 580,
"walk": 1,
@@ -823,7 +823,7 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2460,
"x": 2459,
"y": 5125,
"id": 2623,
"walk": 1,
@@ -839,16 +839,6 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3026,
"y": 9809,
"id": 579,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -984,7 +974,7 @@
"strength": 0,
"attack": 0,
"x": 2998,
"y": 9827,
"y": 9820,
"id": 382,
"walk": 1,
"height": 0
@@ -1124,7 +1114,7 @@
"strength": 0,
"attack": 0,
"x": 3216,
"y": 3416,
"y": 3415,
"id": 532,
"walk": 1,
"height": 0
@@ -1214,7 +1204,7 @@
"strength": 0,
"attack": 0,
"x": 2643,
"y": 3673,
"y": 3679,
"id": 1282,
"walk": 1,
"height": 0
@@ -1354,7 +1344,7 @@
"strength": 0,
"attack": 0,
"x": 2640,
"y": 3376,
"y": 3676,
"id": 1316,
"walk": 0,
"height": 0
@@ -6929,6 +6919,16 @@
"walk": 1,
"height": 1
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3112,
"y": 3327,
"id": 285,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -6993,19 +6993,19 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3081,
"y": 3247,
"id": 970,
"walk": 2,
"x": 3100,
"y": 3259,
"id": 743,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3100,
"y": 3259,
"id": 743,
"x": 3126,
"y": 3245,
"id": 919,
"walk": 1,
"height": 0
},
@@ -7023,9 +7023,19 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3126,
"y": 3245,
"id": 919,
"x": 3081,
"y": 3247,
"id": 970,
"walk": 2,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2467,
"y": 3285,
"id": 971,
"walk": 1,
"height": 0
},
@@ -7039,16 +7049,6 @@
"walk": 3,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3112,
"y": 3327,
"id": 285,
"walk": 1,
"height": 0
},
{
"maxHit": 3,
"strength": 15,
@@ -12583,8 +12583,8 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3304,
"y": 3123,
"x": 3303,
"y": 3124,
"id": 836,
"walk": 1,
"height": 0
@@ -15894,7 +15894,7 @@
"strength": 0,
"attack": 0,
"x": 2482,
"y": 3510,
"y": 3509,
"id": 601,
"walk": 1,
"height": 1
@@ -19003,8 +19003,8 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2803,
"y": 3155,
"x": 2804,
"y": 3150,
"id": 588,
"walk": 1,
"height": 0
@@ -20215,7 +20215,7 @@
"attack": 0,
"x": 3034,
"y": 9845,
"id": 594,
"id": 579,
"walk": 1,
"height": 0
},
@@ -23583,8 +23583,8 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2977,
"y": 3343,
"x": 2651,
"y": 2664,
"id": 606,
"walk": 1,
"height": 0