From af95d3ba4efc13e5432506e4e7db6997eb28068d Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 12:09:37 +1300 Subject: [PATCH 1/9] Treasure update --- .../mineplex/core/reward/RewardManager.java | 14 +++++-- .../src/mineplex/core/reward/RewardType.java | 6 +-- .../src/mineplex/core/treasure/Treasure.java | 2 +- .../core/treasure/TreasureLocation.java | 2 +- .../mineplex/core/treasure/TreasureType.java | 6 +-- .../animation/BlockChangeAnimation.java | 4 +- .../animation/ChestSpawnAnimation.java | 6 +-- .../treasure/gui/BuyBasicChestButton.java | 37 +++++++++++++++++ .../core/treasure/gui/TreasurePage.java | 40 +++++++++++-------- 9 files changed, 85 insertions(+), 32 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java index cb8db6608..ad1793e50 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java @@ -291,10 +291,11 @@ public class RewardManager int currentReward = 0; Reward[] rewards = new Reward[4]; boolean hasUncommon = false; + boolean canGiveMythical = true; while (currentReward < 4) { - Reward reward = nextReward(player, rewards, currentReward == 3 && !hasUncommon, type); + Reward reward = nextReward(player, rewards, currentReward == 3 && !hasUncommon, type, canGiveMythical); if (reward == null) { @@ -305,6 +306,13 @@ public class RewardManager { hasUncommon = true; } + + //Only allow 1 Mythical + if (reward.getRarity().ordinal() >= RewardRarity.MYTHICAL.ordinal()) + { + canGiveMythical = false; + } + rewards[currentReward] = reward; currentReward++; } @@ -328,14 +336,14 @@ public class RewardManager // return nextReward(player, excludedRewards, false, isChestOpening); // } - public Reward nextReward(Player player, Reward[] excludedRewards, boolean requiresUncommon, RewardType type) + public Reward nextReward(Player player, Reward[] excludedRewards, boolean requiresUncommon, RewardType type, boolean canGiveMythical) { RewardRarity rarity = type.generateRarity(requiresUncommon); //Dont give Rank Upgrade if already has Legend if (rarity == RewardRarity.MYTHICAL) { - if (_clientManager.Get(player).GetRank().Has(Rank.LEGEND)) + if (!canGiveMythical || _clientManager.Get(player).GetRank().Has(Rank.LEGEND)) { rarity = RewardRarity.LEGENDARY; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java index 8dc398882..4eebb1db8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java @@ -4,9 +4,9 @@ public enum RewardType { //% Chances Mythic Legend Rare Uncommon GameLoot( 0.000001, 0.001, 0.004, 3), - BasicChest( 0, 0.01, 0.04, 5), - HeroicChest( 0, 1, 4, 25), - LegendaryChest( 0.5, 2.5, 10, 40); + OldChest( 0, 0.01, 0.04, 5), + AncientChest( 0, 1, 4, 25), + MythicalChest( 0.5, 2.5, 10, 40); private double _mythicalChance; private double _legendaryChance; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java index 43584d990..30fd5d00b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java @@ -91,7 +91,7 @@ public class Treasure _chestData[i] = new ChestData(chestBlocks[i]); } - if (_treasureType == TreasureType.HEROIC || _treasureType == TreasureType.LEGENDARY) + if (_treasureType == TreasureType.ANCIENT || _treasureType == TreasureType.MYTHICAL) _animations.add(new BlockChangeAnimation(this, _otherBlockInfo)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java index 60b3f1338..60571e757 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java @@ -99,7 +99,7 @@ public class TreasureLocation implements Listener setHoloChestVisible(false); - if (treasureType == TreasureType.HEROIC || treasureType == TreasureType.LEGENDARY) + if (treasureType == TreasureType.ANCIENT || treasureType == TreasureType.MYTHICAL) Bukkit.broadcastMessage(F.main("Treasure", F.name(player.getName()) + " is opening a " + treasureType.getName())); Reward[] rewards = _treasureManager.getRewards(player, treasureType.getRewardType()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java index 6cff3e970..79bd3537d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java @@ -7,11 +7,11 @@ import mineplex.core.reward.RewardType; public enum TreasureType { - BASIC(C.cYellow + "Basic Chest", "Basic Chest", RewardType.BasicChest, Material.CHEST, TreasureStyle.BASIC), + OLD(C.cYellow + "Basic Chest", "Basic Chest", RewardType.OldChest, Material.CHEST, TreasureStyle.BASIC), - HEROIC(C.cGold + "Heroic Chest", "Heroic Chest", RewardType.HeroicChest, Material.TRAPPED_CHEST, TreasureStyle.HEROIC), + ANCIENT(C.cGold + "Heroic Chest", "Heroic Chest", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.HEROIC), - LEGENDARY(C.cRed + "Legendary Chest", "Legendary Chest", RewardType.LegendaryChest, Material.ENDER_CHEST, TreasureStyle.LEGENDARY); + MYTHICAL(C.cRed + "Legendary Chest", "Legendary Chest", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.LEGENDARY); private final String _name; private final RewardType _rewardType; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java index 8cf206761..39849dbb1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java @@ -51,13 +51,13 @@ public class BlockChangeAnimation extends Animation } else if (b.getType() == Material.SMOOTH_BRICK) { - Material newMaterial = getTreasure().getTreasureType() == TreasureType.HEROIC ? Material.NETHER_BRICK : Material.QUARTZ_BLOCK; + Material newMaterial = getTreasure().getTreasureType() == TreasureType.ANCIENT ? Material.NETHER_BRICK : Material.QUARTZ_BLOCK; _blockInfoList.add(new BlockInfo(b)); b.setType(newMaterial); } else if (b.getType() == Material.SMOOTH_STAIRS || b.getType() == Material.COBBLESTONE_STAIRS) { - Material newMaterial = getTreasure().getTreasureType() == TreasureType.HEROIC ? Material.NETHER_BRICK_STAIRS : Material.QUARTZ_STAIRS; + Material newMaterial = getTreasure().getTreasureType() == TreasureType.ANCIENT ? Material.NETHER_BRICK_STAIRS : Material.QUARTZ_STAIRS; _blockInfoList.add(new BlockInfo(b)); b.setType(newMaterial); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java index eff3d533a..cc12d2eb0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java @@ -80,11 +80,11 @@ public class ChestSpawnAnimation extends Animation _particleLocation.add(_particleDirection); //Play Particels - if (getTreasure().getTreasureType() == TreasureType.BASIC) + if (getTreasure().getTreasureType() == TreasureType.OLD) { UtilParticle.PlayParticle(getTreasure().getTreasureType().getStyle().getSecondaryParticle(), _centerLocation, 0.1f, 0.1f, 0.1f, 0, 1); } - else if (getTreasure().getTreasureType() == TreasureType.HEROIC) + else if (getTreasure().getTreasureType() == TreasureType.ANCIENT) { float x = (float) (Math.sin(getTicks()/4D)); float z = (float) (Math.cos(getTicks()/4D)); @@ -95,7 +95,7 @@ public class ChestSpawnAnimation extends Animation UtilParticle.PlayParticle(getTreasure().getTreasureType().getStyle().getSecondaryParticle(), newLoc, 0f, 0f, 0f, 0, 1); } - else if (getTreasure().getTreasureType() == TreasureType.LEGENDARY) + else if (getTreasure().getTreasureType() == TreasureType.MYTHICAL) { float y = 5 * scale; double width = 0.7 * ((double) getTicks() / (double) ANIMATION_DURATION); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java new file mode 100644 index 000000000..97b0a335f --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java @@ -0,0 +1,37 @@ +package mineplex.core.treasure.gui; + +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.ClickType; + +import mineplex.core.inventory.InventoryManager; +import mineplex.core.shop.item.IButton; + +public class BuyBasicChestButton implements IButton +{ + private Player _player; + + private InventoryManager _inventoryManager; + + public BuyBasicChestButton(Player player, InventoryManager inventoryManager) + { + _player = player; + + _inventoryManager = inventoryManager; + } + + @Override + public void onClick(Player player, ClickType clickType) + { + //need to do this :o +// Shop.OpenPageForPlayer(player, new ConfirmationPage(Plugin, Shop, ClientManager, DonationManager, new Runnable() +// { +// public void run() +// { +// _inventoryManager.addItemToInventory(player, "Item", "Old Chest", 1); +// Refresh(); +// } +// }, this, new TreasureKey(), CurrencyType.Coins, Player)); + + _inventoryManager.addItemToInventory(player, "Item", "Old 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 d8ebf78c9..014c514c1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -36,38 +36,46 @@ public class TreasurePage extends ShopPageBase @Override protected void BuildPage() { - int basicCount = _inventoryManager.Get(Player).getItemCount(TreasureType.BASIC.getItemName()); - int heroicCount = _inventoryManager.Get(Player).getItemCount(TreasureType.HEROIC.getItemName()); - int legendaryCount = _inventoryManager.Get(Player).getItemCount(TreasureType.LEGENDARY.getItemName()); + int basicCount = _inventoryManager.Get(Player).getItemCount(TreasureType.OLD.getItemName()); + int heroicCount = _inventoryManager.Get(Player).getItemCount(TreasureType.ANCIENT.getItemName()); + int legendaryCount = _inventoryManager.Get(Player).getItemCount(TreasureType.MYTHICAL.getItemName()); List basicLore = new ArrayList(); basicLore.add(" "); - basicLore.add(F.value("Basic Chests Owned", "" + basicCount)); + basicLore.add(F.value("Old Chests Owned", "" + basicCount)); basicLore.add(" "); if (basicCount > 0) - basicLore.add(ChatColor.RESET + "Click to open!"); + basicLore.add(ChatColor.RESET + "Click to Open!"); + else + { + 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("Heroic Chests Owned", "" + heroicCount)); + heroicLore.add(F.value("Ancient Chests Owned", "" + heroicCount)); heroicLore.add(" "); if (heroicCount > 0) - heroicLore.add(ChatColor.RESET + "Click to open!"); + heroicLore.add(ChatColor.RESET + "Click to Open!"); List legendaryLore = new ArrayList(); legendaryLore.add(" "); - legendaryLore.add(F.value("Legendary Chests Owned", "" + legendaryCount)); + legendaryLore.add(F.value("Mythical Chests Owned", "" + legendaryCount)); legendaryLore.add(" "); if (legendaryCount > 0) - legendaryLore.add(ChatColor.RESET + "Click to open!"); + legendaryLore.add(ChatColor.RESET + "Click to Open!"); + ShopItem basic = new ShopItem(Material.CHEST, C.cGreen + C.Bold + "Old Chest", basicLore.toArray(new String[0]), 0, false, false); + ShopItem heroic = new ShopItem(Material.TRAPPED_CHEST, C.cGold + C.Bold + "Ancient Chest", heroicLore.toArray(new String[0]), 0, false, false); + ShopItem legendary = new ShopItem(Material.ENDER_CHEST, C.cRed + C.Bold + "Mythical Chest", legendaryLore.toArray(new String[0]), 0, false, false); - ShopItem basic = new ShopItem(Material.CHEST, C.cGreen + C.Bold + "Basic Chest", basicLore.toArray(new String[0]), 0, false, false); - ShopItem heroic = new ShopItem(Material.TRAPPED_CHEST, C.cGold + C.Bold + "Heroic Chest", heroicLore.toArray(new String[0]), 0, false, false); - ShopItem legendary = new ShopItem(Material.ENDER_CHEST, C.cRed + C.Bold + "Legendary Chest", legendaryLore.toArray(new String[0]), 0, false, false); - - AddButton(2, basic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.BASIC)); - AddButton(4, heroic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.HEROIC)); - AddButton(6, legendary, new OpenTreasureButton(Player, _treasureLocation, TreasureType.LEGENDARY)); + if (basicCount > 0) + AddButton(2, basic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.OLD)); + else + AddButton(2, basic, new BuyBasicChestButton(Player, _inventoryManager)); + AddButton(4, heroic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.ANCIENT)); + AddButton(6, legendary, new OpenTreasureButton(Player, _treasureLocation, TreasureType.MYTHICAL)); } } From 6bbf9bd321bbd14ba6a7a6f4baa07b7ece7e12be Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 12:23:11 +1300 Subject: [PATCH 2/9] Ability to purchase old chests --- .../src/mineplex/core/treasure/OldChest.java | 25 ++++++++++++++ .../treasure/gui/BuyBasicChestButton.java | 33 ++++++++++++------- .../core/treasure/gui/TreasurePage.java | 7 +++- 3 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java new file mode 100644 index 000000000..98a0f4f6d --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/OldChest.java @@ -0,0 +1,25 @@ +package mineplex.core.treasure; + +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.entity.Player; + +import mineplex.core.common.CurrencyType; +import mineplex.core.shop.item.SalesPackageBase; + +public class OldChest extends SalesPackageBase +{ + public OldChest() + { + super("Old Chest", Material.CHEST, (byte) 0, new String[] { ChatColor.RESET + "Old Chest" }, 1000); + + KnownPackage = false; + OneTimePurchaseOnly = false; + } + + @Override + public void Sold(Player player, CurrencyType currencyType) + { + + } +} 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 97b0a335f..3bcf384b4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java @@ -3,8 +3,14 @@ package mineplex.core.treasure.gui; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; +import mineplex.core.account.CoreClientManager; +import mineplex.core.common.CurrencyType; +import mineplex.core.donation.DonationManager; import mineplex.core.inventory.InventoryManager; import mineplex.core.shop.item.IButton; +import mineplex.core.shop.page.ConfirmationPage; +import mineplex.core.treasure.OldChest; +import mineplex.core.treasure.TreasureManager; public class BuyBasicChestButton implements IButton { @@ -12,26 +18,29 @@ public class BuyBasicChestButton implements IButton private InventoryManager _inventoryManager; - public BuyBasicChestButton(Player player, InventoryManager inventoryManager) + private TreasurePage _page; + + public BuyBasicChestButton(Player player, InventoryManager inventoryManager, TreasurePage page) { _player = player; _inventoryManager = inventoryManager; + + _page = page; } @Override - public void onClick(Player player, ClickType clickType) + public void onClick(final Player player, ClickType clickType) { //need to do this :o -// Shop.OpenPageForPlayer(player, new ConfirmationPage(Plugin, Shop, ClientManager, DonationManager, new Runnable() -// { -// public void run() -// { -// _inventoryManager.addItemToInventory(player, "Item", "Old Chest", 1); -// Refresh(); -// } -// }, this, new TreasureKey(), CurrencyType.Coins, Player)); - - _inventoryManager.addItemToInventory(player, "Item", "Old Chest", 1); + _page.getShop().OpenPageForPlayer(player, new ConfirmationPage( + _page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), new Runnable() + { + public void run() + { + _inventoryManager.addItemToInventory(player, "Item", "Old Chest", 1); + _page.Refresh(); + } + }, _page, new OldChest(), CurrencyType.Coins, player)); } } \ 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 014c514c1..b47e34a4b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -8,12 +8,17 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import mineplex.core.account.CoreClientManager; +import mineplex.core.common.CurrencyType; import mineplex.core.common.util.C; import mineplex.core.common.util.F; +import mineplex.core.cosmetic.CosmeticManager; +import mineplex.core.cosmetic.ui.CosmeticShop; import mineplex.core.donation.DonationManager; import mineplex.core.inventory.InventoryManager; import mineplex.core.shop.item.ShopItem; +import mineplex.core.shop.page.ConfirmationPage; import mineplex.core.shop.page.ShopPageBase; +import mineplex.core.treasure.TreasureKey; import mineplex.core.treasure.TreasureLocation; import mineplex.core.treasure.TreasureManager; import mineplex.core.treasure.TreasureType; @@ -74,7 +79,7 @@ public class TreasurePage extends ShopPageBase if (basicCount > 0) AddButton(2, basic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.OLD)); else - AddButton(2, basic, new BuyBasicChestButton(Player, _inventoryManager)); + AddButton(2, basic, new BuyBasicChestButton(Player, _inventoryManager, this)); AddButton(4, heroic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.ANCIENT)); AddButton(6, legendary, new OpenTreasureButton(Player, _treasureLocation, TreasureType.MYTHICAL)); } From edddff503e8e35739180279a0a282b7467089c7a Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 12:38:08 +1300 Subject: [PATCH 3/9] Treasure ready ;o --- .../src/mineplex/core/treasure/TreasureType.java | 6 +++--- .../core/treasure/gui/BuyBasicChestButton.java | 1 - .../mineplex/core/treasure/gui/TreasurePage.java | 14 +++++++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java index 79bd3537d..5680cca86 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java @@ -7,11 +7,11 @@ import mineplex.core.reward.RewardType; public enum TreasureType { - OLD(C.cYellow + "Basic Chest", "Basic Chest", RewardType.OldChest, Material.CHEST, TreasureStyle.BASIC), + OLD(C.cYellow + "Old Chest", "Old Chest", RewardType.OldChest, Material.CHEST, TreasureStyle.BASIC), - ANCIENT(C.cGold + "Heroic Chest", "Heroic Chest", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.HEROIC), + ANCIENT(C.cGold + "Ancient Chest", "Ancient Chest", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.HEROIC), - MYTHICAL(C.cRed + "Legendary Chest", "Legendary Chest", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.LEGENDARY); + MYTHICAL(C.cRed + "Mythical Chest", "Mythical Chest", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.LEGENDARY); private final String _name; private final RewardType _rewardType; 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 3bcf384b4..990211b26 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java @@ -32,7 +32,6 @@ public class BuyBasicChestButton implements IButton @Override public void onClick(final Player player, ClickType clickType) { - //need to do this :o _page.getShop().OpenPageForPlayer(player, new ConfirmationPage( _page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), new Runnable() { 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 b47e34a4b..96b455d81 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -50,7 +50,7 @@ public class TreasurePage extends ShopPageBase basicLore.add(F.value("Old Chests Owned", "" + basicCount)); basicLore.add(" "); if (basicCount > 0) - basicLore.add(ChatColor.RESET + "Click to Open!"); + basicLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); else { basicLore.add(ChatColor.RESET + "Cost: " + C.cYellow + "1000 Coins"); @@ -63,14 +63,22 @@ public class TreasurePage extends ShopPageBase heroicLore.add(F.value("Ancient Chests Owned", "" + heroicCount)); heroicLore.add(" "); if (heroicCount > 0) - heroicLore.add(ChatColor.RESET + "Click to Open!"); + heroicLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); + else + { + basicLore.add(ChatColor.RESET + "Purchase at: " + C.cYellow + "www.mineplex.com/shop"); + } List legendaryLore = new ArrayList(); legendaryLore.add(" "); legendaryLore.add(F.value("Mythical Chests Owned", "" + legendaryCount)); legendaryLore.add(" "); if (legendaryCount > 0) - legendaryLore.add(ChatColor.RESET + "Click to Open!"); + legendaryLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); + else + { + basicLore.add(ChatColor.RESET + "Purchase at: " + C.cYellow + "www.mineplex.com/shop"); + } ShopItem basic = new ShopItem(Material.CHEST, C.cGreen + C.Bold + "Old Chest", basicLore.toArray(new String[0]), 0, false, false); ShopItem heroic = new ShopItem(Material.TRAPPED_CHEST, C.cGold + C.Bold + "Ancient Chest", heroicLore.toArray(new String[0]), 0, false, false); From 04d0a1cba136a9076ff33d9ca8897257aafab6ef Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 12:40:51 +1300 Subject: [PATCH 4/9] fixed lore --- .../src/mineplex/core/treasure/gui/TreasurePage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 96b455d81..db7f85376 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -66,7 +66,7 @@ public class TreasurePage extends ShopPageBase heroicLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); else { - basicLore.add(ChatColor.RESET + "Purchase at: " + C.cYellow + "www.mineplex.com/shop"); + heroicLore.add(ChatColor.RESET + "Purchase at: " + C.cYellow + "www.mineplex.com/shop"); } List legendaryLore = new ArrayList(); @@ -77,7 +77,7 @@ public class TreasurePage extends ShopPageBase legendaryLore.add(ChatColor.RESET + C.cGreen + "Click to Open!"); else { - basicLore.add(ChatColor.RESET + "Purchase at: " + C.cYellow + "www.mineplex.com/shop"); + legendaryLore.add(ChatColor.RESET + "Purchase at: " + C.cYellow + "www.mineplex.com/shop"); } ShopItem basic = new ShopItem(Material.CHEST, C.cGreen + C.Bold + "Old Chest", basicLore.toArray(new String[0]), 0, false, false); From 37a5024fcd199b8c1d1db2e9459b5781399f3105 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 13:22:42 +1300 Subject: [PATCH 5/9] 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 From cb9246281ce2d15058825c11b11a2d72d9b21e33 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 16:49:50 +1300 Subject: [PATCH 6/9] TEASURE! +R --- .../Mineplex.Core/src/mineplex/core/treasure/Treasure.java | 3 +-- .../core/treasure/animation/BlockChangeAnimation.java | 6 ++++++ .../src/mineplex/core/treasure/gui/BuyBasicChestButton.java | 3 --- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java index 30fd5d00b..463224286 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java @@ -91,8 +91,7 @@ public class Treasure _chestData[i] = new ChestData(chestBlocks[i]); } - if (_treasureType == TreasureType.ANCIENT || _treasureType == TreasureType.MYTHICAL) - _animations.add(new BlockChangeAnimation(this, _otherBlockInfo)); + _animations.add(new BlockChangeAnimation(this, _otherBlockInfo)); } public int getFinishedTickCount() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java index 39849dbb1..aef2e303f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java @@ -51,12 +51,18 @@ public class BlockChangeAnimation extends Animation } else if (b.getType() == Material.SMOOTH_BRICK) { + if (getTreasure().getTreasureType() == TreasureType.OLD) + continue; + Material newMaterial = getTreasure().getTreasureType() == TreasureType.ANCIENT ? Material.NETHER_BRICK : Material.QUARTZ_BLOCK; _blockInfoList.add(new BlockInfo(b)); b.setType(newMaterial); } else if (b.getType() == Material.SMOOTH_STAIRS || b.getType() == Material.COBBLESTONE_STAIRS) { + if (getTreasure().getTreasureType() == TreasureType.OLD) + continue; + Material newMaterial = getTreasure().getTreasureType() == TreasureType.ANCIENT ? Material.NETHER_BRICK_STAIRS : Material.QUARTZ_STAIRS; _blockInfoList.add(new BlockInfo(b)); b.setType(newMaterial); 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 dcd1cec1a..990211b26 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyBasicChestButton.java @@ -41,8 +41,5 @@ 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 From 336ba50f595e90d1264ca0589c9f6925d624c2a7 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Mon, 9 Feb 2015 23:24:43 -0500 Subject: [PATCH 7/9] Rename some enum values for treasures, update my packet change --- .../server/v1_7_R4/PacketPlayOutPlayerInfo.java | 7 ++++++- .../src/mineplex/core/treasure/TreasureStyle.java | 15 +++------------ .../src/mineplex/core/treasure/TreasureType.java | 6 +++--- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java b/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java index 28744fa09..67f811440 100644 --- a/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java +++ b/Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java @@ -61,11 +61,16 @@ public class PacketPlayOutPlayerInfo extends Packet { } public static PacketPlayOutPlayerInfo updateDisplayName(EntityPlayer player) { + return updateDisplayName(player, getFormattedName(player)); + } + + public static PacketPlayOutPlayerInfo updateDisplayName(EntityPlayer player, String displayName) + { PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(); packet.action = 3; packet.username = player.listName; packet.player = player.getProfile(); - packet._tabName = getFormattedName(player); + packet._tabName = displayName; return packet; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java index f2ce6e985..f6f91a858 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java @@ -1,33 +1,24 @@ package mineplex.core.treasure; -import org.bukkit.Material; import org.bukkit.Sound; import mineplex.core.common.util.UtilParticle.ParticleType; -/** - * Created by Shaun on 8/28/2014. - */ public enum TreasureStyle { - /** - * These are examples, not final! - */ - - - BASIC( + OLD( ParticleType.EXPLODE, ParticleType.EXPLODE, Sound.FIZZ, Sound.HORSE_ARMOR), - HEROIC( + ANCIENT( ParticleType.FLAME, ParticleType.LAVA, Sound.LAVA_POP, Sound.EXPLODE), - LEGENDARY( + MYTHICAL( ParticleType.HAPPY_VILLAGER, ParticleType.LARGE_EXPLODE, Sound.PORTAL_TRAVEL, diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java index 5680cca86..861f47a91 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java @@ -7,11 +7,11 @@ import mineplex.core.reward.RewardType; public enum TreasureType { - OLD(C.cYellow + "Old Chest", "Old Chest", RewardType.OldChest, Material.CHEST, TreasureStyle.BASIC), + OLD(C.cYellow + "Old Chest", "Old Chest", RewardType.OldChest, Material.CHEST, TreasureStyle.OLD), - ANCIENT(C.cGold + "Ancient Chest", "Ancient Chest", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.HEROIC), + ANCIENT(C.cGold + "Ancient Chest", "Ancient Chest", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.ANCIENT), - MYTHICAL(C.cRed + "Mythical Chest", "Mythical Chest", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.LEGENDARY); + MYTHICAL(C.cRed + "Mythical Chest", "Mythical Chest", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.MYTHICAL); private final String _name; private final RewardType _rewardType; From 884df4869582b7bf9d703ac9632bdd49c2059cf5 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 19:08:54 +1300 Subject: [PATCH 8/9] disguise command (not yet working fully) --- .../nautilus/game/arcade/ArcadeManager.java | 2 + .../game/arcade/command/DisguiseCommand.java | 56 +++++++++++++++++++ .../game/arcade/managers/GameLootManager.java | 2 +- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index be778390d..ee2794c13 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -84,6 +84,7 @@ import mineplex.minecraft.game.core.fire.Fire; import nautilus.game.arcade.addons.CompassAddon; import nautilus.game.arcade.addons.SoupAddon; import nautilus.game.arcade.addons.TeamArmorAddon; +import nautilus.game.arcade.command.DisguiseCommand; import nautilus.game.arcade.command.GameCommand; import nautilus.game.arcade.command.WriteCommand; import nautilus.game.arcade.command.YoutubeCommand; @@ -306,6 +307,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation addCommand(new GameCommand(this)); addCommand(new WriteCommand(this)); addCommand(new YoutubeCommand(this)); + addCommand(new DisguiseCommand(this)); } public GameServerConfig GetServerConfig() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java new file mode 100644 index 000000000..ebcc7f31c --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java @@ -0,0 +1,56 @@ +package nautilus.game.arcade.command; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; + +import nautilus.game.arcade.ArcadeManager; +import net.minecraft.util.com.mojang.authlib.GameProfile; +import mineplex.core.command.CommandBase; +import mineplex.core.common.Rank; +import mineplex.core.common.util.C; +import mineplex.core.common.util.ProfileLoader; +import mineplex.core.common.util.UUIDFetcher; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.disguise.disguises.DisguisePlayer; + +public class DisguiseCommand extends CommandBase +{ + public DisguiseCommand(ArcadeManager plugin) + { + super(plugin, Rank.OWNER, new Rank[] {Rank.OWNER}, "disguise"); + } + + @Override + public void Execute(final Player caller, final String[] args) + { + if (args.length == 0) + { + UtilPlayer.message(caller, C.cRed + C.Bold + "/disguise "); + return; + } + + Bukkit.getServer().getScheduler().runTaskAsynchronously(Plugin.GetPlugin(), new Runnable() + { + @Override + public void run() + { + try + { + GameProfile profile = new ProfileLoader(UUIDFetcher.getUUIDOf(args[0]).toString(), args[0]).loadProfile(); + + + DisguisePlayer playerDisguise = new DisguisePlayer(caller, profile); + Plugin.GetDisguise().disguise(playerDisguise); + + UtilPlayer.message(caller, C.cGreen + C.Bold + "Disguise Active: " + ChatColor.RESET + args[0]); + } + catch (Exception e) + { + UtilPlayer.message(caller, C.cRed + C.Bold + "Invalid Disguise Name: " + ChatColor.RESET + args[0]); + return; + } + }} + ); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java index 38c161767..c9d54e003 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java @@ -162,7 +162,7 @@ public class GameLootManager implements Listener return false; } - Reward reward = _rewardManager.nextReward(player, null, false, RewardType.GameLoot); + Reward reward = _rewardManager.nextReward(player, null, false, RewardType.GameLoot, true); RewardData rewardData = reward.giveReward("GameLoot", player); From d9521bd05a4c701e02d2c6db1f10e0b69d423c81 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 10 Feb 2015 23:26:37 +1300 Subject: [PATCH 9/9] lowered gameloot chances --- .../src/mineplex/core/reward/RewardType.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java index 4eebb1db8..1ac3424f1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java @@ -2,11 +2,11 @@ package mineplex.core.reward; public enum RewardType { - //% Chances Mythic Legend Rare Uncommon - GameLoot( 0.000001, 0.001, 0.004, 3), - OldChest( 0, 0.01, 0.04, 5), - AncientChest( 0, 1, 4, 25), - MythicalChest( 0.5, 2.5, 10, 40); + //% Chances Mythic Legend Rare Uncommon + GameLoot( 0.000001, 0.00001, 0.0001, 3), + OldChest( 0, 0.01, 0.04, 5), + AncientChest( 0, 1, 4, 25), + MythicalChest( 0.5, 2.5, 10, 40); private double _mythicalChance; private double _legendaryChance;