diff --git a/src/main/java/com/comandante/creeper/ConfigureNpc.java b/src/main/java/com/comandante/creeper/ConfigureNpc.java index 51631dec30c53a1d45cf5067e0b58d561b19a2b0..724c2344f2473d91ad8ee2d22e7f2890a4d959e4 100755 --- a/src/main/java/com/comandante/creeper/ConfigureNpc.java +++ b/src/main/java/com/comandante/creeper/ConfigureNpc.java @@ -4,6 +4,7 @@ import com.comandante.creeper.Items.*; import com.comandante.creeper.entity.EntityManager; import com.comandante.creeper.managers.GameManager; import com.comandante.creeper.merchant.*; +import com.comandante.creeper.merchant.GrimulfWizard; import com.comandante.creeper.npc.Npc; import com.comandante.creeper.npc.NpcExporter; import com.comandante.creeper.spawner.ItemSpawner; @@ -105,8 +106,8 @@ public class ConfigureNpc { grimulfItems.put(2, new MerchantItemForSale(ItemType.TAPPERHET_SWORD, 60000)); grimulfItems.put(3, new MerchantItemForSale(ItemType.BIGGERS_SKIN_SATCHEL, 250000)); grimulfItems.put(4, new MerchantItemForSale(ItemType.DWARF_BOOTS_OF_AGILITY, 10000)); - grimulfItems.put(5, new MerchantItemForSale(ItemType.GOLDEN_WAND, 4000000000)); - grimulfItems.put(6, new MerchantItemForSale(ItemType.MITHAEM_LEAF, 1400000000)); + // grimulfItems.put(5, new MerchantItemForSale(ItemType.GOLDEN_WAND, 4000000000)); + grimulfItems.put(5, new MerchantItemForSale(ItemType.MITHAEM_LEAF, 1400000000)); Map<Integer, MerchantItemForSale> ketilItems = Maps.newHashMap(); ketilItems.put(1, new MerchantItemForSale(ItemType.BEER, 12)); diff --git a/src/main/java/com/comandante/creeper/Items/ItemType.java b/src/main/java/com/comandante/creeper/Items/ItemType.java index ea7600d196c5d2e892606a03013ca9b495551d30..2ee534baa7ab40e89a93b686a7c62555ca07b877 100755 --- a/src/main/java/com/comandante/creeper/Items/ItemType.java +++ b/src/main/java/com/comandante/creeper/Items/ItemType.java @@ -1279,7 +1279,7 @@ public enum ItemType { 60, false, Rarity.LEGENDARY, - 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()); + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), PYAMITE_ICEAXE(116, Arrays.asList("pyamite ice axe", "ice axe", "axe", "p", "ice", "a"), Color.BOLD_ON + Color.GREEN + "pyamite" + Color.RESET + Color.CYAN + " ice " + Color.RESET + "axe", @@ -1290,7 +1290,7 @@ public enum ItemType { 60, false, Rarity.LEGENDARY, - 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()); private final Integer itemTypeCode; private final List<String> itemTriggers; diff --git a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java old mode 100644 new mode 100755 index a19ee260d783340ec6aff12a8326e8d2519efa69..19a45f77d72853987038e2179bf076415c70a47c --- a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java +++ b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java @@ -9,13 +9,11 @@ import com.google.common.collect.Sets; import org.apache.commons.io.FileUtils; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; -import sun.management.BaseOperatingSystemImpl; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/comandante/creeper/merchant/GrimulfWizard.java b/src/main/java/com/comandante/creeper/merchant/GrimulfWizard.java new file mode 100755 index 0000000000000000000000000000000000000000..0eabfd859324f9d3bb5df2bb4690466fbafb5aee --- /dev/null +++ b/src/main/java/com/comandante/creeper/merchant/GrimulfWizard.java @@ -0,0 +1,28 @@ +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 GrimulfWizard extends Merchant { + private final static long phraseIntervalMs = 300000; + private final static String NAME = "grimulf the wizard"; + private final static String welcomeMessage = "Welcome to my den.\r\n"; + private final static Set<String> validTriggers = new HashSet<String>(Arrays.asList(new String[] + {"grimulf", "g", "wizard", "w", NAME} + )); + + private final static String colorName = BOLD_ON + Color.CYAN + NAME + Color.RESET ; + + public GrimulfWizard(GameManager gameManager, Loot loot, Map<Integer, MerchantItemForSale> merchantItemForSales) { + super(gameManager, NAME, colorName, validTriggers, merchantItemForSales, welcomeMessage); + } +} diff --git a/src/main/java/com/comandante/creeper/merchant/KetilCommissary.java b/src/main/java/com/comandante/creeper/merchant/KetilCommissary.java new file mode 100755 index 0000000000000000000000000000000000000000..d03a59652d0f2ebbee413b1df9b4c79a5cd5762b --- /dev/null +++ b/src/main/java/com/comandante/creeper/merchant/KetilCommissary.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 KetilCommissary extends Merchant { + private final static long phraseIntervalMs = 300000; + private final static String NAME = "ketil"; + private final static String welcomeMessage = "Welcome to the Ketil Commissary.\r\n"; + private final static Set<String> validTriggers = new HashSet<String>(Arrays.asList(new String[] + {"ketil", "k", "commissary", "c", NAME} + )); + + private final static String colorName = BOLD_ON + Color.CYAN + NAME + Color.RESET ; + + public KetilCommissary(GameManager gameManager, Loot loot, Map<Integer, MerchantItemForSale> merchantItemForSales) { + super(gameManager, NAME, colorName, validTriggers, merchantItemForSales, welcomeMessage); + } +}