2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 00:31:51 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Added Shop assistants, Fixed #551 and #563 (#564)

Browse Source 
* Updated all shops to correct quanities

* fixed shop quantities

Fixed Diango, Keldagrim, Lighthouse, Ape Atoll, and Mage Arena

* Updated shop items, quantities, and names

Updated Castle Wars, Lletya, Void Knight Outpost, and Mos Le' Harmless

* Updated shop names, items, and quantities

touchups

* Added shop assistants, fixed issues #551 and #563

Added shop assistants to Al-Kharid, Edgeville, Falador, Karamja, Lumbridge, Rimmington, Varrock, and Zanaris.
Changed Lumbridge assistant to Varrock Swordshop assistant
Changed Varrock assistant's shop from Lumby to Varrock

* Added shop assistants, fixed issues #551 and #563

Added shop assistants to Al-Kharid, Edgeville, Falador, Karamja, Lumbridge, Rimmington, Varrock, and Zanaris.
Changed Lumbridge assistant to Varrock Swordshop assistant
Changed Varrock assistant's shop from Lumby to Varrock
This commit is contained in:
halogod35
2023-01-29 16:57:46 -05:00
committed by GitHub
parent ccf628f0b1
commit 15d6b9f35a
2 changed files with 224 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/data/cfg/spawns.json
+186 -116
View File
@@ -399,6 +399,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2335,
"y": 3181,
"id": 2352,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -789,6 +799,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2752,
"y": 2774,
"id": 1436,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -993,49 +1013,9 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2752,
"y": 2774,
"id": 1436,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2614,
"y": 3293,
"id": 590,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3176,
"y": 2987,
"id": 1917,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3479,
"y": 3494,
"id": 1040,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2806,
"y": 3433,
"id": 563,
"x": 3315,
"y": 3180,
"id": 521,
"walk": 1,
"height": 0
},
@@ -1049,6 +1029,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3081,
"y": 3512,
"id": 523,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1059,6 +1049,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2956,
"y": 3389,
"id": 525,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1073,29 +1073,9 @@
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2868,
"y": 10190,
"id": 2154,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2509,
"y": 3638,
"id": 1334,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2335,
"y": 3181,
"id": 2352,
"x": 2902,
"y": 3145,
"id": 527,
"walk": 1,
"height": 0
},
@@ -1109,6 +1089,76 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3211,
"y": 3249,
"id": 529,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2949,
"y": 3214,
"id": 530,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2948,
"y": 3217,
"id": 531,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3216,
"y": 3416,
"id": 532,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3217,
"y": 3413,
"id": 533,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2377,
"y": 4446,
"id": 534,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2376,
"y": 4449,
"id": 535,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1169,16 +1219,6 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2949,
"y": 3214,
"id": 530,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1219,26 +1259,6 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3216,
"y": 3416,
"id": 532,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3217,
"y": 3413,
"id": 552,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1249,16 +1269,6 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2377,
"y": 4446,
"id": 534,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1289,6 +1299,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3205,
"y": 3403,
"id": 552,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1299,6 +1319,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2806,
"y": 3433,
"id": 563,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -1349,6 +1379,16 @@
"walk": 0,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3176,
"y": 2987,
"id": 1917,
"walk": 1,
"height": 0
},
{
"maxHit": 10,
"strength": 80,
@@ -12549,6 +12589,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3479,
"y": 3494,
"id": 1040,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -19229,6 +19279,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2509,
"y": 3638,
"id": 1334,
"walk": 1,
"height": 0
},
{
"maxHit": 7,
"strength": 60,
@@ -20139,6 +20199,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2614,
"y": 3293,
"id": 590,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -20249,6 +20319,16 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 2868,
"y": 10190,
"id": 2154,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
@@ -20729,16 +20809,6 @@
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3211,
"y": 3249,
"id": 552,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java
+38 -36
View File
@@ -13,46 +13,48 @@ import com.rs2.game.players.Player;
public class Shops {
public enum Shop {
SHOP1(588, 2), SHOP2(550, 3), SHOP3(575, 4), SHOP4(2356, 5),
SHOP5(3796, 6), SHOP6(1860, 7), SHOP7(559, 9), SHOP8(562, 10),
SHOP9(581, 11), SHOP10(548, 12), SHOP11(554, 13), SHOP12(601, 14),
SHOP13(1301, 15), SHOP14(1039, 16), SHOP15(2353, 17), SHOP16(3166, 18),
SHOP17(2161, 19), SHOP18(2162, 20), SHOP19(600, 21), SHOP20(603, 22),
SHOP21(593, 23), SHOP22(545, 24), SHOP23(585, 25), SHOP24(2305, 26),
SHOP25(2307, 27), SHOP26(2304, 28), SHOP27(2306, 29), SHOP28(517, 30),
SHOP29(558, 31), SHOP30(576, 32), SHOP31(1369, 33), SHOP32(1038, 35),
SHOP33(1433, 36), SHOP34(584, 37), SHOP35(540, 38), SHOP36(2157, 39),
SHOP37(538, 40), SHOP38(1303, 41), SHOP39(578, 42), SHOP40(587, 43),
SHOP41(1398, 44), SHOP42(556, 45), SHOP43(1865, 46), SHOP44(543, 47),
SHOP45(2198, 48), SHOP46(580, 49), SHOP47(1862, 50), SHOP48(583, 51),
SHOP49(553, 52), SHOP50(461, 53), SHOP51(903, 54), SHOP551(2258, 55),
SHOP52(1435, 56), SHOP53(3800, 57), SHOP54(2623, 58), SHOP55(594, 59),
SHOP56(579, 60), SHOP57(2160, 61), SHOP58(2191, 61), SHOP59(589, 62),
SHOP60(549, 63), SHOP61(542, 64), SHOP62(3038, 65), SHOP63(544, 66),
SHOP64(541, 67), SHOP65(1434, 68), SHOP66(577, 69), SHOP67(539, 70),
SHOP68(1980, 71), SHOP69(546, 72), SHOP70(382, 73), SHOP71(3541, 74),
SHOP72(520, 75), SHOP73(1436, 76), SHOP74(590, 77), SHOP75(971, 78),
SHOP76(1917, 79), SHOP77(1040, 80), SHOP78(563, 81), SHOP79(522, 82),
SHOP80(524, 83), SHOP81(526, 84), SHOP82(2154, 85), SHOP83(1334, 86),
SHOP84(2552, 87), SHOP85(528, 88), SHOP86(1254, 89), SHOP87(2086, 90),
SHOP88(3824, 91), SHOP89(1866, 92), SHOP90(1699, 93), SHOP91(1282, 94),
SHOP92(530, 95), SHOP93(516, 96), SHOP94(560, 97), SHOP95(471, 98),
SHOP97(532, 100), SHOP98(3797, 101), SHOP99(534, 102), SHOP100(836, 103),
SHOP101(551, 104), SHOP102(586, 105), SHOP103(564, 106), SHOP104(747, 107),
SHOP105(573, 108), SHOP106(1316, 108), SHOP114(1787, 110), SHOP115(568, 113),
SHOP116(1526, 112), SHOP117(1972, 226), SHOP118(1083, 114), SHOP119(735, 115),
SHOP120(793, 116), SHOP121(794, 116), SHOP122(1079, 117), SHOP123(682, 119),
SHOP124(683, 120), SHOP125(692, 121), SHOP126(1658, 122), SHOP127(461, 123),
SHOP130(904, 126), SHOP131(2152, 127), SHOP132(2153, 128), SHOP133(2151, 129),
SHOP134(2158, 130), SHOP135(2156, 131), SHOP136(2159, 132), SHOP137(851, 133),
SHOP138(602, 134), SHOP139(596, 135), SHOP140(597, 136), SHOP141(1784, 137),
SHOP142(2620, 138), SHOP143(2622, 139), SHOP144(552, 88), SHOP145(1778, 140),
SHOP1(588, 2), SHOP2(550, 3), SHOP3(575, 4), SHOP4(2356, 5),
SHOP5(3796, 6), SHOP6(1860, 7), SHOP7(559, 9), SHOP8(562, 10),
SHOP9(581, 11), SHOP10(548, 12), SHOP11(554, 13), SHOP12(601, 14),
SHOP13(1301, 15), SHOP14(1039, 16), SHOP15(2353, 17), SHOP16(3166, 18),
SHOP17(2161, 19), SHOP18(2162, 20), SHOP19(600, 21), SHOP20(603, 22),
SHOP21(593, 23), SHOP22(545, 24), SHOP23(585, 25), SHOP24(2305, 26),
SHOP25(2307, 27), SHOP26(2304, 28), SHOP27(2306, 29), SHOP28(517, 30),
SHOP29(558, 31), SHOP30(576, 32), SHOP31(1369, 33), SHOP32(1038, 35),
SHOP33(1433, 36), SHOP34(584, 37), SHOP35(540, 38), SHOP36(2157, 39),
SHOP37(538, 40), SHOP38(1303, 41), SHOP39(578, 42), SHOP40(587, 43),
SHOP41(1398, 44), SHOP42(556, 45), SHOP43(1865, 46), SHOP44(543, 47),
SHOP45(2198, 48), SHOP46(580, 49), SHOP47(1862, 50), SHOP48(583, 51),
SHOP49(553, 52), SHOP50(461, 53), SHOP51(903, 54), SHOP551(2258, 55),
SHOP52(1435, 56), SHOP53(3800, 57), SHOP54(2623, 58), SHOP55(594, 59),
SHOP56(579, 60), SHOP57(2160, 61), SHOP58(2191, 61), SHOP59(589, 62),
SHOP60(549, 63), SHOP61(542, 64), SHOP62(3038, 65), SHOP63(544, 66),
SHOP64(541, 67), SHOP65(1434, 68), SHOP66(577, 69), SHOP67(539, 70),
SHOP68(1980, 71), SHOP69(546, 72), SHOP70(382, 73), SHOP71(3541, 74),
SHOP72(520, 75), SHOP73(521,75), SHOP74(1436, 76), SHOP75(590, 77),
SHOP76(971, 78), SHOP77(1917, 79), SHOP78(1040, 80), SHOP79(563, 81),
SHOP80(522, 82), SHOP81(523, 82), SHOP82(524, 83), SHOP83(525, 83),
SHOP84(526, 84), SHOP85(527, 84), SHOP86(2154, 85), SHOP87(1334, 86),
SHOP88(2552, 87), SHOP89(528, 88), SHOP90(529, 88), SHOP91(1254, 89),
SHOP92(2086, 90), SHOP93(3824, 91), SHOP94(1866, 92), SHOP95(1699, 93),
SHOP96(1282, 94), SHOP97(530, 95), SHOP98(531, 95), SHOP99(516, 96),
SHOP100(560, 97), SHOP101(471, 98), SHOP102(532, 100), SHOP103(533,100),
SHOP104(3797, 101), SHOP105(534, 102), SHOP106(535, 102), SHOP107(836, 103),
SHOP108(551, 104), SHOP109(552, 104), SHOP110(586, 105), SHOP111(564, 106),
SHOP112(747, 107), SHOP113(573, 108), SHOP114(1316, 108), SHOP115(1787, 110),
SHOP116(1526, 112), SHOP117(568, 113), SHOP118(1972, 226), SHOP119(1083, 114),
SHOP120(735, 115), SHOP121(793, 116), SHOP122(794, 116), SHOP123(1079, 117),
SHOP124(682, 119), SHOP125(683, 120), SHOP126(692, 121), SHOP127(1658, 122),
SHOP128(461, 123), SHOP130(904, 126), SHOP131(2152, 127), SHOP132(2153, 128),
SHOP133(2151, 129), SHOP134(2158, 130), SHOP135(2156, 131), SHOP136(2159, 132),
SHOP137(851, 133), SHOP138(602, 134), SHOP139(596, 135), SHOP140(597, 136),
SHOP141(1784, 137), SHOP142(2620, 138), SHOP143(2622, 139), SHOP145(1778, 140),
SHOP146(1782, 141), SHOP147(849, 142), SHOP148(970, 145), SHOP149(555, 220),
SHOP150(1688, 284);
private final int npcId, shopId;
public static HashMap<Integer, Shop> npc = new HashMap<Integer, Shop>();
public static Shop forId(int id) {
@@ -76,7 +78,7 @@ public class Shops {
public int getShop() {
return shopId;
}
}
public static void dialogueShop(Player c, int npcClick) {