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

Shop update (#566)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java
+40 -40
View File
@@ -4,6 +4,7 @@ import java.util.HashMap;
import com.rs2.game.content.randomevents.RandomEventHandler;
import com.rs2.game.players.Player;
import static com.rs2.game.content.StaticNpcList.*;
/**
* Shops
@@ -13,48 +14,47 @@ 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(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);
SHOP1(DAVON, 2), SHOP2(LOWE, 3), SHOP3(HICKTON, 4), SHOP4(DALLDAV, 5), SHOP5(SQUIRE_3796, 6),
SHOP6(BRIAN_1860, 7), SHOP7(BRIAN, 9), SHOP8(CANDLE_MAKER, 10), SHOP9(WAYNE, 11), SHOP10(THESSALIA, 12),
SHOP11(FANCY_DRESS_SHOP_OWNER, 13), SHOP12(ROMETTI, 14), SHOP13(YRSA, 15), SHOP14(BARKER, 16),
SHOP15(ORONWEN, 17), SHOP16(MIKE, 18), SHOP17(AGMUNDI, 19), SHOP18(VERMUNDI, 20), SHOP19(HUDO, 21),
SHOP20(HECKEL_FUNCH, 22), SHOP21(FRENITA, 23), SHOP22(DOMMIK, 24), SHOP23(ROMMIK, 25), SHOP24(VANESSA, 26),
SHOP25(ALICE, 27), SHOP26(SARAH, 28), SHOP27(RICHARD_2306, 29), SHOP28(FERNAHEI, 30), SHOP29(GERRANT, 31),
SHOP30(HARRY, 32), SHOP31(FISHMONGER, 33), SHOP32(RUFUS, 35), SHOP33(SOLIHIB, 36), SHOP34(HERQUIN, 37),
SHOP35(GEM_TRADER, 38), SHOP36(HERVI, 39), SHOP37(PEKSA, 40), SHOP38(SKULGRIMEN, 41), SHOP39(FRINCOS, 42),
SHOP40(JATIX, 43), SHOP41(GARDENER_GUNNHILD, 44), SHOP42(GRUM, 45), SHOP43(ALI_THE_KEBAB_SELLER, 46),
SHOP44(KARIM, 47), SHOP45(KJUT, 48), SHOP46(FLYNN, 49), SHOP47(ALI_MORRISANE, 50), SHOP48(BETTY, 51),
SHOP49(AUBURY, 52), SHOP50(MAGIC_STORE_OWNER, 53), SHOP51(LUNDAIL, 54), SHOP551(MAGE_OF_ZAMORAK, 55),
SHOP52(TUTAB, 56), SHOP53(SQUIRE_3800, 57), SHOP54(TZHAARMEJROH, 58), SHOP55(NURMOF, 59),
SHOP56(DROGO_DWARF, 60), SHOP57(TATI, 61), SHOP58(SUNE, 61), SHOP59(ZENESHA, 62), SHOP60(HORVIK, 63),
SHOP61(LOUIE_LEGS, 64), SHOP62(SEDDU, 65), SHOP63(RANAEL, 66), SHOP64(ZEKE, 67), SHOP65(DAGA, 68),
SHOP66(CASSIE, 69), SHOP67(SILK_TRADER, 70), SHOP68(EMBALMER, 71), SHOP69(ZAFF, 72), SHOP70(DWARF_382, 73),
SHOP71(AUREL, 74), SHOP72(SHOP_KEEPER, 75), SHOP73(SHOP_ASSISTANT, 75), SHOP74(IFABA, 76), SHOP75(AEMAD, 77),
SHOP76(CHADWELL, 78), SHOP77(BANDIT_SHOPKEEPER, 79), SHOP78(FIDELIO, 80), SHOP79(ARHEIN, 81),
SHOP80(SHOP_KEEPER_522, 82), SHOP81(SHOP_ASSISTANT_523, 82), SHOP82(SHOP_KEEPER_524, 83),
SHOP83(SHOP_ASSISTANT_525, 83), SHOP84(SHOP_KEEPER_526, 84), SHOP85(SHOP_ASSISTANT_527, 84),
SHOP86(GUNSLIK, 85), SHOP87(JOSSIK, 86), SHOP88(EUDAV, 87), SHOP89(SHOP_KEEPER_528, 88),
SHOP90(SHOP_ASSISTANT_529, 88), SHOP91(RAZMIRE_KEELGAN, 89), SHOP92(KAZGAR, 90), SHOP93(ARNOLD_LYDSPOR, 91),
SHOP94(MARKET_SELLER, 92), SHOP95(GHOST_SHOPKEEPER, 93), SHOP96(SIGMUND_THE_MERCHANT, 94),
SHOP97(SHOP_KEEPER_530, 95), SHOP98(SHOP_ASSISTANT_531, 95), SHOP99(OBLI, 96), SHOP100(JIMINUA, 97),
SHOP101(BOLKOY, 98), SHOP102(QUARTERMASTER, 99), SHOP103(SHOP_KEEPER_532, 100),
SHOP104(SHOP_ASSISTANT_533, 100), SHOP105(SQUIRE, 101), SHOP106(SQUIRE_3797, 101),
SHOP107(FAIRY_SHOP_KEEPER, 102), SHOP108(FAIRY_SHOP_ASSISTANT, 102), SHOP109(SHANTAY, 103),
SHOP110(SHOP_KEEPER_551, 104), SHOP111(SHOP_ASSISTANT_552, 104), SHOP112(GAIUS, 105), SHOP113(JUKAT, 106),
SHOP114(OZIACH, 107), SHOP115(FUR_TRADER, 108), SHOP116(FUR_TRADER_1316, 108), SHOP117(SAM_1787, 110),
SHOP118(LANTHUS, 112), SHOP119(ZAMBO, 113), SHOP120(RASOLO, 226), SHOP121(WISTAN, 114),
SHOP122(BARTENDER_735, 115), SHOP123(ALFONSE_THE_WAITER, 116), SHOP124(CHARLIE_THE_COOK, 116),
SHOP125(TOSTIG, 117), SHOP126(ARMOUR_SALESMAN, 119), SHOP127(BOW_AND_ARROW_SALESMAN, 120),
SHOP128(TRIBAL_WEAPON_SALESMAN, 121), SHOP129(ROBE_STORE_OWNER, 122), SHOP130(MAGIC_STORE_OWNER, 123),
SHOP131(CHAMBER_GUARDIAN, 126), SHOP132(SANTIRI, 127), SHOP133(SARO, 128), SHOP134(VIGR, 129),
SHOP135(NOLAR, 130), SHOP136(RANDIVOR, 131), SHOP137(GULLDAMAR, 132), SHOP138(GNOME_WAITER, 133),
SHOP139(GULLUCK, 134), SHOP140(FAT_TONY, 135), SHOP141(NOTERAZZO, 136), SHOP142(NEIL, 137),
SHOP143(TZHAARHURTEL, 138), SHOP144(TZHAARHURLEK, 139), SHOP145(WILLIAM, 140), SHOP146(EDWARD, 141),
SHOP147(BARMAN_849, 142), SHOP148(DIANGO, 145), SHOP149(SHOP_KEEPER_555, 220), SHOP150(AKHARANU, 284);
private final int npcId, shopId;
public static HashMap<Integer, Shop> npc = new HashMap<Integer, Shop>();
public static Shop forId(int id) {
@@ -78,7 +78,7 @@ public class Shops {
public int getShop() {
return shopId;
}
}
public static void dialogueShop(Player c, int npcClick) {