From b4e8b4f1ac2c7cefbcdd45125e8b3620b48a85d0 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 11 Aug 2015 08:24:28 +0200 Subject: [PATCH 1/4] cant go spinnin while its a countin! --- .../nautilus/game/arcade/managers/GameManager.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java index cfed7e11b..ab07870ab 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java @@ -3,6 +3,7 @@ package nautilus.game.arcade.managers; import java.util.ArrayList; import java.util.Iterator; +import mineplex.core.bonuses.event.CarlSpinnerEvent; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilFirework; @@ -130,7 +131,17 @@ public class GameManager implements Listener UtilTextBottom.displayProgress("Game Start", percentage, UtilTime.MakeStr(Math.max(0, game.PrepareTime - (System.currentTimeMillis() - game.GetStateTime()))), player); } - + + @EventHandler + public void cancelCarlSpinner(CarlSpinnerEvent event) + { + Game game = Manager.GetGame(); + if (game == null) return; + + if (game.GetCountdown() <= 0) + event.setCancelled(true); + } + @EventHandler public void StateUpdate(UpdateEvent event) { From 66f2a5df5e0b2233b49537aa198a3e490e509765 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Tue, 11 Aug 2015 08:32:12 +0200 Subject: [PATCH 2/4] renamed GAME --- .../Mineplex.Core/src/mineplex/core/reward/RewardManager.java | 4 ++-- .../Mineplex.Core/src/mineplex/core/reward/RewardRarity.java | 2 +- .../Mineplex.Core/src/mineplex/core/reward/RewardType.java | 4 ++-- .../src/mineplex/core/reward/rewards/ExperienceReward.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java index 386eba7ad..1b49623f7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java @@ -66,8 +66,8 @@ public class RewardManager public void addGame(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, StatsManager statsManager) { - addReward(new GemReward(donationManager, 100, 500, 100, RewardRarity.GAME)); - addReward(new ExperienceReward(statsManager, 100, 5000, 100, RewardRarity.GAME)); + addReward(new GemReward(donationManager, 100, 500, 100, RewardRarity.CARL_EXTRA)); + addReward(new ExperienceReward(statsManager, 100, 5000, 100, RewardRarity.CARL_EXTRA)); } public void addCommon(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, double minValue, double maxValue) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java index 1f56de46a..971084562 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java @@ -20,7 +20,7 @@ public enum RewardRarity OTHER("Other", cWhite, Material.STAINED_GLASS_PANE, (byte) 0), COMMON("Common", cWhite, Material.STAINED_GLASS_PANE, (byte) 0), - GAME("Game", cYellow, Material.STAINED_GLASS_PANE, (byte) 4), + CARL_EXTRA("Game", cYellow, Material.STAINED_GLASS_PANE, (byte) 4), UNCOMMON("Uncommon", cAqua, Material.STAINED_GLASS_PANE, (byte) 3), RARE("Rare", cPurple, Material.STAINED_GLASS_PANE, (byte) 10), LEGENDARY("Legendary", cGreen, Material.STAINED_GLASS_PANE, (byte) 5), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java index 90b201c08..6d9234391 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java @@ -3,7 +3,7 @@ package mineplex.core.reward; public enum RewardType { //% Chances Mythic Legend Rare Uncommon - GameLoot( 0.000001, 0.00001, 0.0001, 3, 10), + GameLoot( 0.000001, 0.00001, 0.0001, 3, 0), OldChest( 0, 0.05, 0.4, 5, 0), AncientChest( 0, 1, 4, 25, 0), @@ -37,7 +37,7 @@ public enum RewardType else if (rand <= _legendaryChance) rarity = RewardRarity.LEGENDARY; else if (rand <= _rareChance) rarity = RewardRarity.RARE; else if (rand <= _uncommonChance || requiresUncommon) rarity = RewardRarity.UNCOMMON; - else if (rand <= _gameChance) rarity = RewardRarity.GAME; + else if (rand <= _gameChance) rarity = RewardRarity.CARL_EXTRA; return rarity; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java index a96245c6f..7c2811608 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java @@ -35,13 +35,13 @@ public class ExperienceReward extends Reward _statsManager.incrementStat(player, "Global.ExpEarned", experience); - return new RewardData(getRarity().getColor() + experience + " Experience", new ItemStack(Material.EXP_BOTTLE), RewardRarity.GAME); + return new RewardData(getRarity().getColor() + experience + " Experience", new ItemStack(Material.EXP_BOTTLE), RewardRarity.CARL_EXTRA); } @Override public RewardData getFakeRewardData(Player player) { - return new RewardData(getRarity().getColor() + "Experience", new ItemStack(Material.EXP_BOTTLE), RewardRarity.GAME); + return new RewardData(getRarity().getColor() + "Experience", new ItemStack(Material.EXP_BOTTLE), RewardRarity.CARL_EXTRA); } @Override From d833385df425197436eaf58f9a196b91d2d6a7aa Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Tue, 11 Aug 2015 00:35:02 -0600 Subject: [PATCH 3/4] Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes --- Plugins/.idea/misc.xml | 2 +- Plugins/.idea/modules.xml | 1 - .../mineplex/core/bonuses/BonusAmount.java | 5 ++- .../mineplex/core/bonuses/BonusManager.java | 43 ++++++++----------- .../core/bonuses/BonusRepository.java | 42 ++++++++++++++++++ .../core/bonuses/commands/TicketCommand.java | 30 +++++++++---- .../bonuses/gui/buttons/DailyBonusButton.java | 6 +-- .../core/bonuses/gui/buttons/VoteButton.java | 10 ++--- 8 files changed, 94 insertions(+), 45 deletions(-) diff --git a/Plugins/.idea/misc.xml b/Plugins/.idea/misc.xml index 3a9b4c67e..aeea575e6 100644 --- a/Plugins/.idea/misc.xml +++ b/Plugins/.idea/misc.xml @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml index bcc0470f4..f7936ba2e 100644 --- a/Plugins/.idea/modules.xml +++ b/Plugins/.idea/modules.xml @@ -11,7 +11,6 @@ - diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusAmount.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusAmount.java index d2cfef1f8..bb6d8c9f3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusAmount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusAmount.java @@ -2,6 +2,8 @@ package mineplex.core.bonuses; import java.util.List; +import org.bukkit.ChatColor; + import mineplex.core.common.util.C; public class BonusAmount @@ -138,6 +140,7 @@ public class BonusAmount public void addLore(List lore) { + lore.add(C.cYellow + "Rewards"); addLore(lore, getTickets(), 0, "Carl Spin Ticket" + (getTickets() > 1 ? "s" : "")); addLore(lore, getCoins(), getBonusCoins(), "Coins"); addLore(lore, getGems(), getBonusGems(), "Gems"); @@ -148,7 +151,7 @@ public class BonusAmount private void addLore(List lore, int amount, int bonus, String suffix) { if (amount > 0) - lore.add(C.cYellow + "Reward: " + C.cWhite + amount + " " + suffix); + lore.add(" " + C.cWhite + amount + " " + suffix); // if (bonus > 0) // lore.add(C.cYellow + "Streak Bonus: " + C.cWhite + bonus + " " + suffix); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java index 9b4a4ee52..81121d59e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java @@ -43,6 +43,7 @@ import mineplex.core.bonuses.gui.SpinGui; import mineplex.core.poll.PollManager; import mineplex.serverdata.commands.ServerCommandManager; +import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.jooq.impl.DSL; import org.bukkit.Bukkit; @@ -419,35 +420,23 @@ public class BonusManager extends MiniClientPlugin implements I { CarlSpinnerEvent event = new CarlSpinnerEvent(player); Bukkit.getServer().getPluginManager().callEvent(event); - final BonusManager manager = this; if (!event.isCancelled()) { final int accountId = _clientManager.Get(player).getAccountId(); - runAsync(new Runnable() + _repository.attemptAddTickets(accountId, clientData, -1, new Callback() { @Override - public void run() + public void run(Boolean data) { - try + if (data) { - final int newTickets = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL).update(Tables.bonus).set(Tables.bonus.tickets, Tables.bonus.tickets.sub(1)). - where(Tables.bonus.accountId.eq(accountId)).returning(Tables.bonus.tickets).fetchOne().getTickets(); - - runSync(new Runnable() - { - @Override - public void run() - { - clientData.setTickets(newTickets); - new SpinGui(getPlugin(), player, _rewardManager, manager).openInventory(); - } - }); + new SpinGui(_plugin, player, _rewardManager, BonusManager.this).openInventory(); } - catch (Exception e) + else { - UtilPlayer.message(player, F.main("Carl", "There was an error processing your request")); + UtilPlayer.message(player, F.main("Carl", "There waa an error processing your request. Try again later")); } } }); @@ -816,6 +805,7 @@ public class BonusManager extends MiniClientPlugin implements I if (canVote(player)) availableRewards++; if (canRank(player)) availableRewards++; if (canDaily(player)) availableRewards++; + if (getPollManager().getNextPoll(_pollManager.Get(player), _clientManager.Get(player).GetRank()) != null) availableRewards++; Hologram hologram; @@ -898,14 +888,15 @@ public class BonusManager extends MiniClientPlugin implements I if (clientData.getHologram() != null) clientData.getHologram().stop(); - runAsync(new Runnable() - { - @Override - public void run() - { - clientData.getRecord().store(); - } - }); + // This shouldnt be necessary anymore +// runAsync(new Runnable() +// { +// @Override +// public void run() +// { +// clientData.getRecord().store(); +// } +// }); super.UnloadPlayer(event); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java index d97a76cc5..2606705df 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java @@ -7,7 +7,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import com.sun.org.apache.xpath.internal.operations.Bool; +import mineplex.core.bonuses.gui.SpinGui; import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.database.DBPool; import mineplex.core.database.RepositoryBase; import mineplex.core.database.ResultSetCallable; @@ -17,7 +21,9 @@ import mineplex.database.Tables; import mineplex.database.tables.records.BonusRecord; import org.jooq.DSLContext; import org.jooq.Record2; +import org.jooq.SQLDialect; import org.jooq.TableField; +import org.jooq.impl.DSL; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -95,6 +101,42 @@ public class BonusRepository extends RepositoryBase }); } + public void attemptAddTickets(final int accountId, final BonusClientData client, final int tickets, final Callback callback) + { + if (client.getTickets() + tickets < 0) + callback.run(false); + + Bukkit.getScheduler().runTaskAsynchronously(_manager.getPlugin(), new Runnable() + { + @Override + public void run() + { + try + { + DSLContext create = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL); + create.update(Tables.bonus).set(Tables.bonus.tickets, Tables.bonus.tickets.add(tickets)). + where(Tables.bonus.accountId.eq(accountId)).execute(); + final int newTickets = create.select(Tables.bonus.tickets).from(Tables.bonus).where(Tables.bonus.accountId.eq(accountId)).fetchOne().value1(); + + Bukkit.getScheduler().runTask(_manager.getPlugin(), new Runnable() + { + @Override + public void run() + { + client.setTickets(newTickets); + callback.run(true); + } + }); + } + catch (Exception e) + { + e.printStackTrace(); + callback.run(false); + } + } + }); + } + public void attemptDailyBonus(final Player player, final Callback result) { final int accountId = _manager.getClientManager().Get(player).getAccountId(); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/TicketCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/TicketCommand.java index 20aa7ad66..62cefef27 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/TicketCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/TicketCommand.java @@ -2,6 +2,7 @@ package mineplex.core.bonuses.commands; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.bonuses.BonusManager; @@ -36,15 +37,28 @@ public class TicketCommand extends CommandBase { try { - int tickets = Integer.parseInt(ticketString); - Plugin.Get(target).setTickets(Plugin.Get(targetName).getTickets() + tickets); - - UtilPlayer.message(caller, F.main("Carl", "You gave " + F.elem(tickets + " Carl Tickets") + " to " + F.name(targetName) + ".")); - - if (target != null) + final int tickets = Integer.parseInt(ticketString); + int accountId = Plugin.getClientManager().getAccountId(target); + Plugin.getRepository().attemptAddTickets(accountId, Plugin.Get(target), tickets, new Callback() { - UtilPlayer.message(target, F.main("Carl", F.name(caller.getName()) + " gave you " + F.elem(tickets + " Carl Tickets") + ".")); - } + @Override + public void run(Boolean data) + { + if (data) + { + UtilPlayer.message(caller, F.main("Carl", "You gave " + F.elem(tickets + " Carl Tickets") + " to " + F.name(targetName) + ".")); + + if (target != null && !target.equals(caller)) + { + UtilPlayer.message(target, F.main("Carl", F.name(caller.getName()) + " gave you " + F.elem(tickets + " Carl Tickets") + ".")); + } + } + else + { + UtilPlayer.message(caller, F.main("Carl", "Failed to give tickets. Try again later!")); + } + } + }); } catch (Exception e) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/DailyBonusButton.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/DailyBonusButton.java index 8efb10fa5..2c09f41c4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/DailyBonusButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/DailyBonusButton.java @@ -144,9 +144,7 @@ public class DailyBonusButton implements GuiItem, Listener lore.add(" "); lore.add(C.cYellow + "Current Streak: " + C.cWhite + client.getDailyStreak()); - lore.add(C.cYellow + "Streak Bonus: " + C.cWhite + _bonusManager.getDailyMultiplier(_player) + "%"); - lore.add(" "); - lore.add(C.cYellow + "Highest Streak: " + C.cWhite + client.getMaxDailyStreak()); + lore.add(C.cYellow + "Streak Bonus: " + C.cWhite + "+" + _bonusManager.getDailyMultiplier(_player) + "%"); if (client.getDailyTime() != null) { @@ -159,6 +157,8 @@ public class DailyBonusButton implements GuiItem, Listener } } + lore.add(" "); + lore.add(C.cYellow + "Highest Streak: " + C.cWhite + client.getMaxDailyStreak()); StreakRecord streakRecord = _bonusManager.getDailyStreak(); if (streakRecord != null) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java index b05c3dad0..50ed5afee 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java @@ -131,10 +131,7 @@ public class VoteButton implements GuiItem, Listener { lore.add(" "); lore.add(C.cYellow + "Current Streak: " + C.cWhite + client.getVoteStreak()); - lore.add(C.cYellow + "Streak Bonus: " + C.cWhite + _bonusManager.getVoteMultiplyer(_player) + "%"); - lore.add(" "); - lore.add(C.cYellow + "Highest Streak: " + C.cWhite + client.getMaxVoteStreak()); - + lore.add(C.cYellow + "Streak Bonus: " + C.cWhite + "+" + _bonusManager.getVoteMultiplyer(_player) + "%"); if (client.getVoteTime() != null) { long lastBonus = _bonusManager.getLocalTime(client.getVoteTime().getTime()); @@ -146,6 +143,9 @@ public class VoteButton implements GuiItem, Listener { } } + lore.add(" "); + lore.add(C.cYellow + "Highest Streak: " + C.cWhite + client.getMaxVoteStreak()); + StreakRecord streakRecord = _bonusManager.getVoteStreak(); if (streakRecord != null) { @@ -185,4 +185,4 @@ public class VoteButton implements GuiItem, Listener { { return _gui; } -} +} \ No newline at end of file From 5d3503b73306ef8be4ab45fd1fbb87a145f8678a Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Tue, 11 Aug 2015 01:55:27 -0500 Subject: [PATCH 4/4] Carl rewards --- .../mineplex/core/bonuses/BonusManager.java | 13 ++++- .../mineplex/core/reward/RewardManager.java | 56 +++++++++++++------ .../mineplex/core/reward/RewardRarity.java | 2 +- .../src/mineplex/core/reward/RewardType.java | 2 +- .../core/reward/rewards/ExperienceReward.java | 4 +- .../core/treasure/TreasureManager.java | 10 +++- .../src/mineplex/hub/HubManager.java | 11 +--- .../game/arcade/managers/GameLootManager.java | 2 +- 8 files changed, 65 insertions(+), 35 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java index 81121d59e..eb98b5137 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java @@ -24,8 +24,10 @@ import mineplex.core.database.DBPool; import mineplex.core.donation.DonationManager; import mineplex.core.hologram.Hologram; import mineplex.core.hologram.HologramManager; +import mineplex.core.inventory.InventoryManager; import mineplex.core.npc.Npc; import mineplex.core.npc.NpcManager; +import mineplex.core.pet.PetManager; import mineplex.core.reward.RewardManager; import mineplex.core.stats.StatsManager; import mineplex.core.updater.UpdateType; @@ -123,7 +125,7 @@ public class BonusManager extends MiniClientPlugin implements I private StreakRecord _dailyStreak; private StreakRecord _voteStreak; - public BonusManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, RewardManager rewardManager, StatsManager statsManager) + public BonusManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, StatsManager statsManager, InventoryManager inventoryManager, PetManager petManager) { super("Bonus", plugin); _repository = new BonusRepository(plugin, this, donationManager); @@ -131,7 +133,14 @@ public class BonusManager extends MiniClientPlugin implements I _donationManager = donationManager; _npcManager = npcManager; _hologramManager = hologramManager; - _rewardManager = rewardManager; + + _rewardManager = new RewardManager(clientManager, donationManager, inventoryManager, petManager, statsManager, + 100, 250, + 500, 1000, + 4000, 6000, + 12000, 32000, + true, true); + _pollManager = pollManager; _statsManager = statsManager; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java index 1b49623f7..61db7e1eb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java @@ -32,6 +32,7 @@ public class RewardManager private JavaPlugin _plugin; private HashMap> _treasureMap; private Random _random; + private boolean _carlSpinner; private CoreClientManager _clientManager; @@ -42,7 +43,7 @@ public class RewardManager int uncommonValueMin, int uncommonValueMax, int rareValueMin, int rareValueMax, int legendValueMin, int legendValueMax, - boolean doubleGadgetValue) + boolean doubleGadgetValue, boolean carlSpinner) { _plugin = donationManager.getPlugin(); _treasureMap = new HashMap>(); @@ -56,21 +57,15 @@ public class RewardManager _clientManager = clientManager; _doubleGadgetValue = doubleGadgetValue; + _carlSpinner = carlSpinner; - addGame(donationManager, inventoryManager, petManager, statsManager); - addCommon(donationManager, inventoryManager, petManager, commonValueMin, commonValueMax); - addUncommon(donationManager, inventoryManager, petManager, uncommonValueMin, uncommonValueMax); - addRare(donationManager, inventoryManager, petManager, rareValueMin, rareValueMax); - addLegendary(donationManager, inventoryManager, petManager, legendValueMin, legendValueMax); + addCommon(donationManager, inventoryManager, petManager, statsManager, commonValueMin, commonValueMax); + addUncommon(donationManager, inventoryManager, petManager, statsManager, uncommonValueMin, uncommonValueMax); + addRare(donationManager, inventoryManager, petManager, statsManager, rareValueMin, rareValueMax); + addLegendary(donationManager, inventoryManager, petManager, statsManager, legendValueMin, legendValueMax); } - public void addGame(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, StatsManager statsManager) - { - addReward(new GemReward(donationManager, 100, 500, 100, RewardRarity.CARL_EXTRA)); - addReward(new ExperienceReward(statsManager, 100, 5000, 100, RewardRarity.CARL_EXTRA)); - } - - public void addCommon(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, double minValue, double maxValue) + public void addCommon(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, StatsManager statsManager, double minValue, double maxValue) { RewardRarity rarity = RewardRarity.COMMON; @@ -112,9 +107,16 @@ public class RewardManager addReward(new InventoryReward(inventoryManager, "TNT", "TNT", (int)(20*(minValue/500)), (int)(20*(maxValue/500)), new ItemStack(Material.TNT), rarity, 10)); + + if (_carlSpinner) + { + addReward(new GemReward(donationManager, 0, 0, 25, rarity)); + addReward(new CoinReward(donationManager, 0, 0, 25, rarity)); + addReward(new ExperienceReward(statsManager, 0, 0, 25, rarity)); + } } - public void addUncommon(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, double minValue, double maxValue) + public void addUncommon(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, StatsManager statsManager, double minValue, double maxValue) { RewardRarity rarity = RewardRarity.UNCOMMON; @@ -198,9 +200,16 @@ public class RewardManager // new ItemStack(2266), rarity, 25)); addReward(new UnknownPackageReward(donationManager, "Wait Disc", "Wait Disc", new ItemStack(2267), rarity, 25)); + + if (_carlSpinner) + { + addReward(new GemReward(donationManager, 0, 0, 1300, rarity)); + addReward(new CoinReward(donationManager, 0, 0, 1300, rarity)); + addReward(new ExperienceReward(statsManager, 0, 0, 1300, rarity)); + } } - public void addRare(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, double minValue, double maxValue) + public void addRare(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, StatsManager statsManager, double minValue, double maxValue) { RewardRarity rarity = RewardRarity.RARE; @@ -250,14 +259,20 @@ public class RewardManager addReward(new UnknownPackageReward(donationManager, "Space Boots", "Space Boots", new ItemStack(Material.GOLD_BOOTS), rarity, 50)); + if (_carlSpinner) + { + addReward(new GemReward(donationManager, 0, 0, 390, rarity)); + addReward(new CoinReward(donationManager, 0, 0, 390, rarity)); + addReward(new ExperienceReward(statsManager, 0, 0, 390, rarity)); + } } - public void addLegendary(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, double minValue, double maxValue) + public void addLegendary(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, StatsManager statsManager, double minValue, double maxValue) { RewardRarity rarity = RewardRarity.LEGENDARY; // Coins - addReward(new CoinReward(donationManager, (int)minValue, (int)maxValue, 25, RewardRarity.LEGENDARY)); + addReward(new CoinReward(donationManager, (int)minValue, (int)maxValue, 25, rarity)); // Mounts addReward(new UnknownPackageReward(donationManager, "Infernal Horror", "Infernal Horror", @@ -286,6 +301,13 @@ public class RewardManager new ItemStack(Material.APPLE), rarity, 4)); addReward(new UnknownPackageReward(donationManager, "Heart Particles", "I Heart You", new ItemStack(Material.BLAZE_POWDER), rarity, 2)); + + if (_carlSpinner) + { + addReward(new GemReward(donationManager, 0, 0, 70, rarity)); + addReward(new CoinReward(donationManager, 0, 0, 70, rarity)); + addReward(new ExperienceReward(statsManager, 0, 0, 70, rarity)); + } } public void addReward(Reward reward) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java index 971084562..43072cbe4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java @@ -20,7 +20,7 @@ public enum RewardRarity OTHER("Other", cWhite, Material.STAINED_GLASS_PANE, (byte) 0), COMMON("Common", cWhite, Material.STAINED_GLASS_PANE, (byte) 0), - CARL_EXTRA("Game", cYellow, Material.STAINED_GLASS_PANE, (byte) 4), +// CARL_EXTRA("Game", cYellow, Material.STAINED_GLASS_PANE, (byte) 4), UNCOMMON("Uncommon", cAqua, Material.STAINED_GLASS_PANE, (byte) 3), RARE("Rare", cPurple, Material.STAINED_GLASS_PANE, (byte) 10), LEGENDARY("Legendary", cGreen, Material.STAINED_GLASS_PANE, (byte) 5), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java index 6d9234391..4cbc5f6ec 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java @@ -37,7 +37,7 @@ public enum RewardType else if (rand <= _legendaryChance) rarity = RewardRarity.LEGENDARY; else if (rand <= _rareChance) rarity = RewardRarity.RARE; else if (rand <= _uncommonChance || requiresUncommon) rarity = RewardRarity.UNCOMMON; - else if (rand <= _gameChance) rarity = RewardRarity.CARL_EXTRA; +// else if (rand <= _gameChance) rarity = RewardRarity.CARL_EXTRA; return rarity; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java index 7c2811608..ad1ad3b5b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ExperienceReward.java @@ -35,13 +35,13 @@ public class ExperienceReward extends Reward _statsManager.incrementStat(player, "Global.ExpEarned", experience); - return new RewardData(getRarity().getColor() + experience + " Experience", new ItemStack(Material.EXP_BOTTLE), RewardRarity.CARL_EXTRA); + return new RewardData(getRarity().getColor() + experience + " Experience", new ItemStack(Material.EXP_BOTTLE), getRarity()); } @Override public RewardData getFakeRewardData(Player player) { - return new RewardData(getRarity().getColor() + "Experience", new ItemStack(Material.EXP_BOTTLE), RewardRarity.CARL_EXTRA); + return new RewardData(getRarity().getColor() + "Experience", new ItemStack(Material.EXP_BOTTLE), getRarity()); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java index 5746bc978..2afbb1ca3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java @@ -20,6 +20,7 @@ import mineplex.core.pet.PetManager; import mineplex.core.reward.Reward; import mineplex.core.reward.RewardManager; import mineplex.core.reward.RewardType; +import mineplex.core.stats.StatsManager; /** * Created by Shaun on 8/27/2014. @@ -32,14 +33,19 @@ public class TreasureManager extends MiniPlugin private HologramManager _hologramManager; private List _treasureLocations; - public TreasureManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, BlockRestore blockRestore, HologramManager hologramManager, RewardManager rewardManager) + public TreasureManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, BlockRestore blockRestore, HologramManager hologramManager, StatsManager statsManager) { super("Treasure", plugin); _inventoryManager = inventoryManager; _blockRestore = blockRestore; _hologramManager = hologramManager; - _rewardManager = rewardManager; + _rewardManager = new RewardManager(clientManager, donationManager, _inventoryManager, petManager, statsManager, + 100, 250, + 500, 1000, + 4000, 6000, + 12000, 32000, + true, false);; World world = Bukkit.getWorlds().get(0); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index f09e21e1f..8d58d26b1 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -190,14 +190,7 @@ public class HubManager extends MiniClientPlugin new BenefitManager(plugin, clientManager, _inventoryManager); _gadgetManager = new GadgetManager(_plugin, clientManager, donationManager, _inventoryManager, _mountManager, petManager, preferences, disguiseManager, blockRestore, new ProjectileManager(plugin), achievementManager); - RewardManager rewardManager = new RewardManager(clientManager, donationManager, _inventoryManager, petManager, statsManager, - 100, 250, - 500, 1000, - 4000, 6000, - 12000, 32000, - true); - - _treasureManager = new TreasureManager(_plugin, clientManager, donationManager, _inventoryManager, petManager, _blockRestore, hologramManager, rewardManager); + _treasureManager = new TreasureManager(_plugin, clientManager, donationManager, _inventoryManager, petManager, _blockRestore, hologramManager, statsManager); new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager); new SoccerManager(this, _gadgetManager); @@ -222,7 +215,7 @@ public class HubManager extends MiniClientPlugin ((CraftWorld)Bukkit.getWorlds().get(0)).getHandle().pvpMode = true; - new BonusManager(plugin, clientManager, donationManager, pollManager , npcManager, hologramManager, rewardManager, statsManager); + new BonusManager(plugin, clientManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager); // NotificationManager notificationManager = new NotificationManager(plugin, clientManager, donationManager); 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 91e3ae9ec..e018a834d 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 @@ -55,7 +55,7 @@ public class GameLootManager implements Listener 500, 1000, 1500, 2500, 6000, 12000, - false); + false, false); //Chest _rewardManager.addReward(new InventoryReward(Manager.getInventoryManager(), "Old Chest", "Old Chest", 1, 1,