diff --git a/src/main/java/com/comandante/creeper/ConfigureNpc.java b/src/main/java/com/comandante/creeper/ConfigureNpc.java
index 7d1b43fa9a3b6894209418cbf12cc8aaababd90a..872fc539b0e528e514a6449308eb260603c25e35 100755
--- a/src/main/java/com/comandante/creeper/ConfigureNpc.java
+++ b/src/main/java/com/comandante/creeper/ConfigureNpc.java
@@ -131,6 +131,24 @@ public class ConfigureNpc {
blackbeardItems.put(5, new MerchantItemForSale(ItemType.SMELTING_CRUCIBLE, 8000000));
blackbeardItems.put(6, new MerchantItemForSale(ItemType.LEATHER_SHOES, 8000000));
+ Map<Integer, MerchantItemForSale> wentworthItems = Maps.newHashMap();
+ wentworthItems.put(1, new MerchantItemForSale(ItemType.GENTLEMANS_TOP_HAT, 8000000));
+ wentworthItems.put(2, new MerchantItemForSale(ItemType.LEATHER_GLOVES, 8000000));
+ wentworthItems.put(3, new MerchantItemForSale(ItemType.WOOL_SCARF, 8000000));
+ wentworthItems.put(4, new MerchantItemForSale(ItemType.LEATHER_BELT, 8000000));
+ wentworthItems.put(5, new MerchantItemForSale(ItemType.SILK_SASH, 8000000));
+ wentworthItems.put(6, new MerchantItemForSale(ItemType.LEATHER_SCABBARD, 8000000));
+ wentworthItems.put(7, new MerchantItemForSale(ItemType.BYSENSKIN_SCABBARD, 19000000));
+ wentworthItems.put(8, new MerchantItemForSale(ItemType.IRON_SPECTACLES, 8000000));
+ wentworthItems.put(9, new MerchantItemForSale(ItemType.GOLDEN_SPECTACLES, 40000000));
+ wentworthItems.put(10, new MerchantItemForSale(ItemType.NOBLEMANS_SHOULDER_CLASP, 200000000));
+ wentworthItems.put(11, new MerchantItemForSale(ItemType.WOODSMANS_TUNIC, 8000000));
+ wentworthItems.put(12, new MerchantItemForSale(ItemType.PLAIN_WHITE_ROBE, 8000000));
+ wentworthItems.put(13, new MerchantItemForSale(ItemType.FINE_POWDERED_WIG, 30000000));
+ wentworthItems.put(14, new MerchantItemForSale(ItemType.HABROK_FEATHER_HAT, 10000000));
+ wentworthItems.put(15, new MerchantItemForSale(ItemType.POLISHED_IRON_CODPIECE, 30000000));
+ wentworthItems.put(16, new MerchantItemForSale(ItemType.GOLDEN_CODPIECE, 950000000));
+
BlackbeardRogue rogueshop = new BlackbeardRogue(gameManager, new Loot(18, 26, Sets.<ItemType>newHashSet()), blackbeardItems);
gameManager.getRoomManager().addMerchant(864, rogueshop);
@@ -148,6 +166,9 @@ public class ConfigureNpc {
GrimulfWizard grimulfWizard = new GrimulfWizard(gameManager, new Loot(18, 26, Sets.<ItemType>newHashSet()), grimulfItems);
gameManager.getRoomManager().addMerchant(102, grimulfWizard);
+ WentworthTailor wentworthTailor = new WentworthTailor(gameManager, new Loot(18, 26, Sets.<ItemType>newHashSet()), wentworthItems);
+ gameManager.getRoomManager().addMerchant(865, wentworthTailor);
+
KetilCommissary ketilCommissary = new KetilCommissary(gameManager, new Loot(18, 26, Sets.<ItemType>newHashSet()), ketilItems);
gameManager.getRoomManager().addMerchant(420, ketilCommissary);
diff --git a/src/main/java/com/comandante/creeper/Items/ItemType.java b/src/main/java/com/comandante/creeper/Items/ItemType.java
index 162168f189fb078d86801603c816f3d40aad6945..d0f064236b1f59b5a5b82802450b2bdd3aeff216 100755
--- a/src/main/java/com/comandante/creeper/Items/ItemType.java
+++ b/src/main/java/com/comandante/creeper/Items/ItemType.java
@@ -1356,8 +1356,186 @@ public enum ItemType {
60,
false,
Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ GENTLEMANS_TOP_HAT(123, Arrays.asList("gentleman's top hat", "top hat", "hat", "g", "t", "h"),
+ Color.WHITE + "gentleman's" + Color.RESET + Color.CYAN + " top hat" + Color.RESET,
+ "a " + Color.WHITE + "gentleman's" + Color.RESET + Color.CYAN + " top hat " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "gentleman's" + Color.RESET + Color.CYAN + " top hat " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ LEATHER_GLOVES(124, Arrays.asList("leather gloves", "leather", "gloves", "l", "g"),
+ Color.WHITE + "leather" + Color.RESET + Color.CYAN + " gloves " + Color.RESET,
+ "a pair of " + Color.WHITE + "leather" + Color.RESET + Color.CYAN + " gloves " + Color.RESET + "is on the ground.",
+ "a pair of " + Color.WHITE + "leather" + Color.RESET + Color.CYAN + " gloves " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ WOOL_SCARF(125, Arrays.asList("wool scarf", "wool", "scarf", "w", "s"),
+ Color.WHITE + "wool" + Color.RESET + Color.CYAN + " scarf " + Color.RESET,
+ "a " + Color.WHITE + "wool" + Color.RESET + Color.CYAN + " scarf " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "wool" + Color.RESET + Color.CYAN + " scarf " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ LEATHER_BELT(126, Arrays.asList("leather belt", "leather", "belt", "l", "b"),
+ Color.WHITE + "leather" + Color.RESET + Color.CYAN + " belt " + Color.RESET,
+ "a " + Color.WHITE + "leather" + Color.RESET + Color.CYAN + " belt " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "leather" + Color.RESET + Color.CYAN + " belt " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ SILK_SASH(127, Arrays.asList("silk sash", "silk", "sash", "s"),
+ Color.WHITE + "silk" + Color.RESET + Color.CYAN + " sash " + Color.RESET,
+ "a " + Color.WHITE + "silk" + Color.RESET + Color.CYAN + " sash " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "silk" + Color.RESET + Color.CYAN + " sash " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ LEATHER_SCABBARD(128, Arrays.asList("leather scabbard", "leather", "scabbard", "s", "l"),
+ Color.WHITE + "leather" + Color.RESET + Color.CYAN + " scabbard " + Color.RESET,
+ "a " + Color.WHITE + "leather" + Color.RESET + Color.CYAN + " scabbard " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "leather" + Color.RESET + Color.CYAN + " scabbard " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ BYSENSKIN_SCABBARD(129, Arrays.asList("bysen skin scabbard", "bysen skin", "scabbard", "s", "b"),
+ Color.WHITE + "bysen skin" + Color.RESET + Color.CYAN + " scabbard " + Color.RESET,
+ "a " + Color.WHITE + "bysen skin" + Color.RESET + Color.CYAN + " scabbard " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "bysen skin" + Color.RESET + Color.CYAN + " scabbard " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ IRON_SPECTACLES(130, Arrays.asList("iron spectacles", "iron", "spectacles", "i", "s"),
+ Color.WHITE + "iron" + Color.RESET + Color.CYAN + " spectacles " + Color.RESET,
+ "a pair of " + Color.WHITE + "iron" + Color.RESET + Color.CYAN + " spectacles " + Color.RESET + "are on the ground.",
+ "a pair of " + Color.WHITE + "iron" + Color.RESET + Color.CYAN + " spectacles " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ GOLDEN_SPECTACLES(131, Arrays.asList("golden spectacles", "golden", "spectacles", "s", "g"),
+ Color.YELLOW + "golden" + Color.RESET + Color.CYAN + " spectacles " + Color.RESET,
+ "a pair of " + Color.YELLOW + "golden" + Color.RESET + Color.CYAN + " spectacles " + Color.RESET + "are on the ground.",
+ "a pair of " + Color.YELLOW + "golden" + Color.RESET + Color.CYAN + " spectacles " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ NOBLEMANS_SHOULDER_CLASP(132, Arrays.asList("nobleman's shoulder clasp", "nobleman's", "shoulder clasp", "clasp", "n", "s", "c"),
+ Color.MAGENTA + "nobleman's" + Color.RESET + Color.CYAN + " shoulder clasp " + Color.RESET,
+ "a " + Color.MAGENTA + "nobleman's" + Color.RESET + Color.CYAN + " shoulder clasp " + Color.RESET + "is on the ground.",
+ "a " + Color.MAGENTA + "nobleman's" + Color.RESET + Color.CYAN + " shoulder clasp " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ WOODSMANS_TUNIC(133, Arrays.asList("woodsman's tunic", "woodsman's", "tunic", "w", "t"),
+ Color.WHITE + "woodsman's" + Color.RESET + Color.CYAN + " tunic " + Color.RESET,
+ "a " + Color.WHITE + "woodsman's" + Color.RESET + Color.CYAN + " tunic " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "woodsman's" + Color.RESET + Color.CYAN + " tunic " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ PLAIN_WHITE_ROBE(134, Arrays.asList("plain white robe", "white robe", "robe", "w", "r"),
+ Color.WHITE + "plain white" + Color.RESET + Color.CYAN + " robe " + Color.RESET,
+ "a " + Color.WHITE + "plain white" + Color.RESET + Color.CYAN + " robe " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "plain white" + Color.RESET + Color.CYAN + " robe " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ FINE_POWDERED_WIG(135, Arrays.asList("fine powdered wig", "powdered wig", "wig", "p", "w"),
+ Color.WHITE + "fine powdered" + Color.RESET + Color.CYAN + " wig " + Color.RESET,
+ "a " + Color.WHITE + "fine powdered" + Color.RESET + Color.CYAN + " wig " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "fine powdered" + Color.RESET + Color.CYAN + " wig " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ HABROK_FEATHER_HAT(136, Arrays.asList("habrok feather hat", "feather hat", "hat", "f", "h"),
+ Color.WHITE + "habrok feather" + Color.RESET + Color.CYAN + " hat " + Color.RESET,
+ "a " + Color.WHITE + "habrok feather" + Color.RESET + Color.CYAN + " hat " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "habrok feather" + Color.RESET + Color.CYAN + " hat " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ POLISHED_IRON_CODPIECE(137, Arrays.asList("polished iron codpiece", "iron codpiece", "codpiece", "i", "c"),
+ Color.WHITE + "polished iron" + Color.RESET + Color.CYAN + " codpiece " + Color.RESET,
+ "a " + Color.WHITE + "polished iron" + Color.RESET + Color.CYAN + " codpiece " + Color.RESET + "is on the ground.",
+ "a " + Color.WHITE + "polished iron" + Color.RESET + Color.CYAN + " codpiece " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
+ 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()),
+
+ GOLDEN_CODPIECE(138, Arrays.asList("golden codpiece", "codpiece", "golden", "g", "c"),
+ Color.YELLOW + "golden" + Color.RESET + Color.CYAN + " codpiece " + Color.RESET,
+ "a shimmering " + Color.YELLOW + "golden" + Color.RESET + Color.CYAN + " codpiece " + Color.RESET + "is on the ground.",
+ "a shimmering " + Color.YELLOW + "golden" + Color.RESET + Color.CYAN + " codpiece " + Color.RESET,
+ false,
+ 0,
+ 60,
+ false,
+ Rarity.LEGENDARY,
8000000, Sets.<TimeTracker.TimeOfDay>newHashSet());
+
+
private final Integer itemTypeCode;
private final List<String> itemTriggers;
private final String restingName;
diff --git a/src/main/java/com/comandante/creeper/merchant/WentworthTailor.java b/src/main/java/com/comandante/creeper/merchant/WentworthTailor.java
new file mode 100644
index 0000000000000000000000000000000000000000..1888b0a0fa28f941f2b0839a748024cf40ef30e0
--- /dev/null
+++ b/src/main/java/com/comandante/creeper/merchant/WentworthTailor.java
@@ -0,0 +1,27 @@
+package com.comandante.creeper.merchant;
+
+import com.comandante.creeper.Items.Loot;
+import com.comandante.creeper.managers.GameManager;
+import com.comandante.creeper.server.Color;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static com.comandante.creeper.server.Color.BOLD_ON;
+
+public class WentworthTailor extends Merchant {
+ private final static long phraseIntervalMs = 300000;
+ private final static String NAME = "wentworth";
+ private final static String welcomeMessage = "Welcome to WENTWORTH's TAILOR SHOP.\r\n";
+ private final static Set<String> validTriggers = new HashSet<String>(Arrays.asList(new String[]
+ {"wentworth", "w", "tailor", "t", NAME}
+ ));
+
+ private final static String colorName = BOLD_ON + Color.CYAN + NAME + Color.RESET ;
+
+ public WentworthTailor(GameManager gameManager, Loot loot, Map<Integer, MerchantItemForSale> merchantItemForSales) {
+ super(gameManager, NAME, colorName, validTriggers, merchantItemForSales, welcomeMessage);
+ }
+}