From e3974b92288053ea01423fd2d7fe2feea64f3fdf Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Thu, 16 Mar 2017 19:56:52 -0300 Subject: [PATCH] Fixed lores --- .../src/mineplex/core/cosmetic/ui/page/GadgetPage.java | 5 +++++ .../src/mineplex/core/cosmetic/ui/page/MountPage.java | 5 +++++ .../src/mineplex/core/cosmetic/ui/page/PetPage.java | 5 +++++ .../gadgets/outfit/stpatricks/OutfitStPatricksBoots.java | 2 +- .../outfit/stpatricks/OutfitStPatricksChestplate.java | 2 +- .../gadgets/outfit/stpatricks/OutfitStPatricksHat.java | 2 +- .../gadgets/outfit/stpatricks/OutfitStPatricksLeggings.java | 2 +- .../mineplex/core/gadget/set/suits/SetStPatricksSuit.java | 2 +- .../src/mineplex/core/mount/types/MountStPatricksHorse.java | 4 ++-- .../src/mineplex/core/treasure/gui/TreasurePage.java | 2 +- 10 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java index d6dd97153..713429dc6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java @@ -175,6 +175,11 @@ public class GadgetPage extends ShopPageBase itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Love Chests"); } + else if (gadget.getCost(GlobalCurrency.TREASURE_SHARD) == -18) + { + itemLore.add(C.cBlack); + itemLore.add(C.cBlue + "Found in St Patrick's Chests"); + } //Rank Unlocks else if (gadget.getCost(GlobalCurrency.TREASURE_SHARD) == -10) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java index 990d2905b..6e670effc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java @@ -113,6 +113,11 @@ public class MountPage extends ShopPageBase itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Thankful Treasure"); } + else if (mount.getCost(GlobalCurrency.TREASURE_SHARD) == -18) + { + itemLore.add(C.cBlack); + itemLore.add(C.cBlue + "Found in St Patrick's Chests"); + } else if (mount.getCost(GlobalCurrency.TREASURE_SHARD) == -14) { itemLore.add(C.cBlack); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java index 4feb82934..f7b831eca 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java @@ -113,6 +113,11 @@ public class PetPage extends ShopPageBase itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Haunted Chests"); } + else if (pet.getPrice() == -18) + { + itemLore.add(C.cBlack); + itemLore.add(C.cBlue + "Found in St Patrick's Chests"); + } else if (pet.getPrice() == -14) { itemLore.add(C.cBlack); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksBoots.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksBoots.java index 27c01b350..411b87a74 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksBoots.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksBoots.java @@ -9,7 +9,7 @@ public class OutfitStPatricksBoots extends OutfitStPatricksSuit public OutfitStPatricksBoots(GadgetManager manager) { - super(manager, "St Patrick's Boots", -18, ArmorSlot.BOOTS, Material.LEATHER_BOOTS, (byte) 0); + super(manager, "Leprechaun's Boots", -18, ArmorSlot.BOOTS, Material.LEATHER_BOOTS, (byte) 0); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksChestplate.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksChestplate.java index edc9f75f2..f7020af70 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksChestplate.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksChestplate.java @@ -9,7 +9,7 @@ public class OutfitStPatricksChestplate extends OutfitStPatricksSuit public OutfitStPatricksChestplate(GadgetManager manager) { - super(manager, "St Patrick's Chest", -18, ArmorSlot.CHEST, Material.LEATHER_CHESTPLATE, (byte) 0); + super(manager, "Leprechaun's Chest", -18, ArmorSlot.CHEST, Material.LEATHER_CHESTPLATE, (byte) 0); } } \ No newline at end of file diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksHat.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksHat.java index f1b9a91a6..624e3b58b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksHat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksHat.java @@ -9,7 +9,7 @@ public class OutfitStPatricksHat extends OutfitStPatricksSuit public OutfitStPatricksHat(GadgetManager manager) { - super(manager, "St Patrick's Hat", -18, ArmorSlot.HELMET, Material.LEATHER_HELMET, (byte) 0); + super(manager, "Leprechaun's Hat", -18, ArmorSlot.HELMET, Material.LEATHER_HELMET, (byte) 0); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksLeggings.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksLeggings.java index 6b80314fc..56261a534 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksLeggings.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/stpatricks/OutfitStPatricksLeggings.java @@ -9,7 +9,7 @@ public class OutfitStPatricksLeggings extends OutfitStPatricksSuit public OutfitStPatricksLeggings(GadgetManager manager) { - super(manager, "St Patrick's Pants", -18, ArmorSlot.LEGS, Material.LEATHER_LEGGINGS, (byte) 0); + super(manager, "Leprechaun's Pants", -18, ArmorSlot.LEGS, Material.LEATHER_LEGGINGS, (byte) 0); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetStPatricksSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetStPatricksSuit.java index 1e04f08f9..2ae0e1ed7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetStPatricksSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetStPatricksSuit.java @@ -12,7 +12,7 @@ public class SetStPatricksSuit extends GadgetSet public SetStPatricksSuit(GadgetManager manager) { - super(manager, "St Patrick's Suit", "Placeholder", + super(manager, "St Patrick's Suit", "You're so rich that gold falls out of your pocket with every step!", manager.getGadget(OutfitStPatricksHat.class), manager.getGadget(OutfitStPatricksChestplate.class), manager.getGadget(OutfitStPatricksLeggings.class), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountStPatricksHorse.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountStPatricksHorse.java index ad17c2f0d..2c20e68fe 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountStPatricksHorse.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountStPatricksHorse.java @@ -35,9 +35,9 @@ public class MountStPatricksHorse extends HorseMount public MountStPatricksHorse(MountManager manager) { - super(manager, "St Patrick's Mount", + super(manager, "Rainbow Horse", UtilText.splitLinesToArray(new String[]{C.cGray + "You know the cow that jumped over the moon? Total show off."}, LineFormat.LORE), - Material.CAULDRON_ITEM, (byte) 0, -7, Horse.Color.WHITE, Horse.Style.WHITE, Horse.Variant.HORSE, 1, null); + Material.CAULDRON_ITEM, (byte) 0, -18, Horse.Color.WHITE, Horse.Style.WHITE, Horse.Variant.HORSE, 1, null); } @Override 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 0d55ba94e..ac82b4b25 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -413,7 +413,7 @@ public class TreasurePage extends ShopPageBase stpatricksLore.add(" "); stpatricksLore.add(F.value("St Patrick's Chests Owned", "" + stpatricksCount)); stpatricksLore.add(" "); - stpatricksLore.addAll(UtilText.splitLines(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE)); + stpatricksLore.addAll(UtilText.splitLines(new String[]{C.cGray + "Happy St. Patrick's Day! Get your Pot's of Gold and Luck of the Irish in this chest! 7 items, no duplicates."}, LineFormat.LORE)); stpatricksLore.add(" "); if (stpatricksCount > 0) {