From 37a5024fcd199b8c1d1db2e9459b5781399f3105 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 13:22:42 +1300 Subject: [PATCH] more chest polish --- .../mineplex/core/reward/RewardManager.java | 18 +++++++++--------- .../src/mineplex/core/treasure/OldChest.java | 2 +- .../treasure/gui/BuyBasicChestButton.java | 3 +++ .../core/treasure/gui/TreasurePage.java | 19 ++++++++++++++++++- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java index ad1793e50..8ddf611c0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java @@ -74,7 +74,7 @@ public class RewardManager } // Gadgets - addReward(new InventoryReward(inventoryManager, "Paintball Gun Ammo", "Paintball Gun", + addReward(new InventoryReward(inventoryManager, "Paintballs", "Paintball Gun", (int)(100*(minValue/500)), (int)(100*(maxValue/500)), new ItemStack(Material.GOLD_BARDING), rarity, 1)); @@ -82,7 +82,7 @@ public class RewardManager (int)(50*(minValue/500)), (int)(50*(maxValue/500)), new ItemStack(Material.FIREWORK), rarity, 1)); - addReward(new InventoryReward(inventoryManager, "Melon Launcher Ammo", "Melon Launcher", + addReward(new InventoryReward(inventoryManager, "Melons", "Melon Launcher", (int)(50*(minValue/500)), (int)(50*(maxValue/500)), new ItemStack(Material.MELON_BLOCK), rarity, 1)); @@ -90,11 +90,11 @@ public class RewardManager (int)(40*(minValue/500)), (int)(40*(maxValue/500)), new ItemStack(Material.getMaterial(131)), rarity, 1)); - addReward(new InventoryReward(inventoryManager, "Ethereal Pearls", "Ethereal Pearl", + addReward(new InventoryReward(inventoryManager, "Pearls", "Ethereal Pearl", (int)(30*(minValue/500)), (int)(30*(maxValue/500)), new ItemStack(Material.ENDER_PEARL), rarity, 1)); - addReward(new InventoryReward(inventoryManager, "Bat Blaster Ammo", "Bat Blaster", + addReward(new InventoryReward(inventoryManager, "Bat Swarms", "Bat Blaster", (int)(20*(minValue/500)), (int)(20*(maxValue/500)), new ItemStack(Material.IRON_BARDING), rarity, 1)); @@ -118,7 +118,7 @@ public class RewardManager } // Gadgets - addReward(new InventoryReward(inventoryManager, "Paintball Gun Ammo", "Paintball Gun", + addReward(new InventoryReward(inventoryManager, "Paintballs", "Paintball Gun", (int)(100*(minValue/500)), (int)(100*(maxValue/500)), new ItemStack(Material.GOLD_BARDING), rarity, 250)); @@ -126,19 +126,19 @@ public class RewardManager (int)(50*(minValue/500)), (int)(50*(maxValue/500)), new ItemStack(Material.FIREWORK), rarity, 250)); - addReward(new InventoryReward(inventoryManager, "Melon Launcher Ammo", "Melon Launcher", + addReward(new InventoryReward(inventoryManager, "Melons", "Melon Launcher", (int)(50*(minValue/500)), (int)(50*(maxValue/500)), new ItemStack(Material.MELON_BLOCK), rarity, 250)); - addReward(new InventoryReward(inventoryManager, "Flesh Hook Ammo", "Flesh Hook", + addReward(new InventoryReward(inventoryManager, "Flesh Hooks", "Flesh Hook", (int)(40*(minValue/500)), (int)(40*(maxValue/500)), new ItemStack(Material.getMaterial(131)), rarity, 250)); - addReward(new InventoryReward(inventoryManager, "Ethereal Pearls", "Ethereal Pearl", + addReward(new InventoryReward(inventoryManager, "Pearls", "Ethereal Pearl", (int)(30*(minValue/500)), (int)(30*(maxValue/500)), new ItemStack(Material.ENDER_PEARL), rarity, 250)); - addReward(new InventoryReward(inventoryManager, "Bat Blaster Ammo", "Bat Blaster", + addReward(new InventoryReward(inventoryManager, "Bat Swarms", "Bat Blaster", (int)(20*(minValue/500)), (int)(20*(maxValue/500)), new ItemStack(Material.IRON_BARDING), rarity, 250)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java index 98a0f4f6d..b3c65dd94 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java @@ -11,7 +11,7 @@ public class OldChest extends SalesPackageBase { public OldChest() { - super("Old Chest", Material.CHEST, (byte) 0, new String[] { ChatColor.RESET + "Old Chest" }, 1000); + super("Old Chest", Material.CHEST, (byte) 0, new String[] {}, 1000); KnownPackage = false; OneTimePurchaseOnly = false; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java index 990211b26..dcd1cec1a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java @@ -41,5 +41,8 @@ public class BuyBasicChestButton implements IButton _page.Refresh(); } }, _page, new OldChest(), CurrencyType.Coins, player)); + + _inventoryManager.addItemToInventory(player, "Item", "Ancient Chest", 1); + _inventoryManager.addItemToInventory(player, "Item", "Mythical Chest", 1); } } \ No newline at end of file diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java index db7f85376..d392959c0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -49,6 +49,13 @@ public class TreasurePage extends ShopPageBase basicLore.add(" "); basicLore.add(F.value("Old Chests Owned", "" + basicCount)); basicLore.add(" "); + basicLore.add(C.cGray + "We've scoured the lands of Minecraft"); + basicLore.add(C.cGray + "and found these abandoned chests."); + basicLore.add(C.cGray + "The contents are unknown, but"); + basicLore.add(C.cGray + "according to the inscriptions on the"); + basicLore.add(C.cGray + "the straps they appear to contain"); + basicLore.add(C.cGray + "many kinds of loot."); + basicLore.add(" "); if (basicCount > 0) basicLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); else @@ -56,12 +63,15 @@ public class TreasurePage extends ShopPageBase basicLore.add(ChatColor.RESET + "Cost: " + C.cYellow + "1000 Coins"); basicLore.add(ChatColor.RESET + "Click to Purchase!"); } - List heroicLore = new ArrayList(); heroicLore.add(" "); heroicLore.add(F.value("Ancient Chests Owned", "" + heroicCount)); heroicLore.add(" "); + heroicLore.add(C.cGray + "Some of our bravest adventurers"); + heroicLore.add(C.cGray + "have discovered these chests within "); + heroicLore.add(C.cGray + "temples hidden in Minecrafts worlds."); + heroicLore.add(" "); if (heroicCount > 0) heroicLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); else @@ -73,6 +83,13 @@ public class TreasurePage extends ShopPageBase legendaryLore.add(" "); legendaryLore.add(F.value("Mythical Chests Owned", "" + legendaryCount)); legendaryLore.add(" "); + legendaryLore.add(C.cGray + "All our previous adventurers have"); + legendaryLore.add(C.cGray + "perished in search of these chests."); + legendaryLore.add(C.cGray + "However, legends of their existence"); + legendaryLore.add(C.cGray + "convinced Sterling, Chiss and Defek7"); + legendaryLore.add(C.cGray + "to venture out and discover the"); + legendaryLore.add(C.cGray + "location of these chests on their own."); + legendaryLore.add(" "); if (legendaryCount > 0) legendaryLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); else