From f629cce1558c6ef6ae9c1c65e990ca19e3c49bab Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 29 Nov 2017 15:48:25 +0000 Subject: [PATCH] Add descriptions to all Christmas Cosmetics --- .../gadgets/arrowtrail/ArrowTrailPresent.java | 2 +- .../gadgets/doublejump/DoubleJumpPresent.java | 2 +- .../gadget/gadgets/morph/MorphFrostGolem.java | 9 +++------ .../gadgets/mount/types/MountSledge.java | 2 +- .../particle/christmas/ParticleBlizzard.java | 2 +- .../gadgets/taunts/FrostBreathTaunt.java | 13 +----------- .../gadget/set/suits/SetReindeerSuit.java | 2 +- .../powerplayclub/PowerPlayClubRewards.java | 1 + .../treasure/types/GingerbeardTreasure.java | 20 +++++++++++++++++-- .../hub/plugin/ChristmasHubPlugin.java | 2 +- 10 files changed, 29 insertions(+), 26 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailPresent.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailPresent.java index 70da7e8f3..230692bed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailPresent.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailPresent.java @@ -24,7 +24,7 @@ public class ArrowTrailPresent extends ArrowEffectGadget public ArrowTrailPresent(GadgetManager manager) { super(manager, "Present Arrows", - UtilText.splitLineToArray(C.cGray + "TODO", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Incoming gifts!!", LineFormat.LORE), CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.GLASS, (byte) 0); setDisplayItem(SkinData.PRESENT.getSkull()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpPresent.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpPresent.java index b60a60369..d327a67a9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpPresent.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpPresent.java @@ -31,7 +31,7 @@ public class DoubleJumpPresent extends DoubleJumpEffectGadget public DoubleJumpPresent(GadgetManager manager) { super(manager, "Present Leap", - UtilText.splitLineToArray(C.cGray + "TODO", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "A leap of joy on Christmas Day!", LineFormat.LORE), CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.GLASS, (byte) 0); setDisplayItem(SkinData.PRESENT.getSkull()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphFrostGolem.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphFrostGolem.java index 0078b88fb..3b2de18e1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphFrostGolem.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphFrostGolem.java @@ -17,7 +17,6 @@ import org.bukkit.util.Vector; import mineplex.core.common.util.C; import mineplex.core.common.util.LineFormat; -import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; @@ -55,9 +54,7 @@ public class MorphFrostGolem extends MorphGadget public MorphFrostGolem(GadgetManager manager) { - super(manager, "Frost Golem Morph", UtilText.splitLinesToArray(new String[] { - C.cGray + "TODO" - }, LineFormat.LORE), CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.GLASS, (byte) 0); + super(manager, "Frost Golem Morph", UtilText.splitLineToArray(C.cGray + "Snow day? No school!", LineFormat.LORE), CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.GLASS, (byte) 0); _ability = new HashMap<>(); @@ -110,8 +107,8 @@ public class MorphFrostGolem extends MorphGadget Location location = player.getLocation(); - UtilAction.velocity(player, UP); - _ability.put(location.clone().add(0, 4, 0), System.currentTimeMillis()); + player.teleport(location.add(0, 1, 0)); + _ability.put(location.clone().add(0, 3, 0), System.currentTimeMillis()); UtilBlock.getInRadius(location, RADIUS).forEach((block, scale) -> { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountSledge.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountSledge.java index 12b91f042..505e40778 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountSledge.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountSledge.java @@ -40,7 +40,7 @@ public class MountSledge extends Mount { super(manager, "Sledge Mount", UtilText.splitLineToArray(C.cGray + "TODO", LineFormat.LORE), - CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.SPRUCE_WOOD_STAIRS, (byte) 0); + CostConstants.POWERPLAY_BONUS, Material.SPRUCE_WOOD_STAIRS, (byte) 0); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/christmas/ParticleBlizzard.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/christmas/ParticleBlizzard.java index 7973a66b0..fb4753c56 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/christmas/ParticleBlizzard.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/christmas/ParticleBlizzard.java @@ -29,7 +29,7 @@ public class ParticleBlizzard extends ParticleGadget public ParticleBlizzard(GadgetManager manager) { super(manager, "Blizzard Aura", - UtilText.splitLineToArray(C.cGray + "TODO", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "It's cold outside, there's no kind of atmosphere?", LineFormat.LORE), CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.ICE, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/FrostBreathTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/FrostBreathTaunt.java index dc4e28406..c9ae90b5e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/FrostBreathTaunt.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/FrostBreathTaunt.java @@ -7,8 +7,6 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.inventory.ItemStack; import mineplex.core.common.util.C; @@ -43,7 +41,7 @@ public class FrostBreathTaunt extends TauntGadget public FrostBreathTaunt(GadgetManager manager) { super(manager, "Frost Breath Taunt", - UtilText.splitLineToArray(C.cGray + "TODO", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Send shiver's down the spine's of your enemies with this chilling taunt.", LineFormat.LORE), CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.PACKED_ICE, (byte) 0); } @@ -96,13 +94,4 @@ public class FrostBreathTaunt extends TauntGadget { } - - @EventHandler - public void debugCommand(PlayerCommandPreprocessEvent event) - { - if (event.getMessage().startsWith("/fb")) - { - onStart(event.getPlayer()); - } - } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetReindeerSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetReindeerSuit.java index a5de50994..99c11719f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetReindeerSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetReindeerSuit.java @@ -26,7 +26,7 @@ public class SetReindeerSuit extends GadgetSet { private static final Vector VELOCITY = new Vector(0, 2, 0); - private static final long COOLDOWN = TimeUnit.SECONDS.toMillis(10); + private static final long COOLDOWN = TimeUnit.SECONDS.toMillis(5); public SetReindeerSuit(GadgetManager manager) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java index ffc343b4c..e6c6bad7a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java @@ -44,6 +44,7 @@ public class PowerPlayClubRewards .put(YearMonth.of(2017, Month.SEPTEMBER), new UnknownSalesPackageItem("Tornado")) .put(YearMonth.of(2017, Month.OCTOBER), new UnknownSalesPackageItem("Ghast Morph")) .put(YearMonth.of(2017, Month.NOVEMBER), new UnknownSalesPackageItem("Tic Tac Toe")) + .put(YearMonth.of(2017, Month.DECEMBER), new UnknownSalesPackageItem("Sledge Mount")) .build(); public interface PowerPlayClubItem diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/GingerbeardTreasure.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/GingerbeardTreasure.java index f886b4bdd..70cddf468 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/GingerbeardTreasure.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/GingerbeardTreasure.java @@ -1,6 +1,9 @@ package mineplex.core.treasure.types; +import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailPresent; import mineplex.core.gadget.gadgets.death.DeathPresentDanger; +import mineplex.core.gadget.gadgets.doublejump.DoubleJumpPresent; +import mineplex.core.gadget.gadgets.morph.MorphFrostGolem; import mineplex.core.gadget.gadgets.outfit.freezesuit.OutfitFreezeSuitBoots; import mineplex.core.gadget.gadgets.outfit.freezesuit.OutfitFreezeSuitChestplate; import mineplex.core.gadget.gadgets.outfit.freezesuit.OutfitFreezeSuitHelmet; @@ -9,8 +12,11 @@ import mineplex.core.gadget.gadgets.outfit.reindeer.OutfitReindeerAntlers; import mineplex.core.gadget.gadgets.outfit.reindeer.OutfitReindeerChest; import mineplex.core.gadget.gadgets.outfit.reindeer.OutfitReindeerHooves; import mineplex.core.gadget.gadgets.outfit.reindeer.OutfitReindeerLegs; +import mineplex.core.gadget.gadgets.particle.christmas.ParticleBlizzard; import mineplex.core.gadget.gadgets.particle.christmas.ParticleChristmasTree; import mineplex.core.gadget.gadgets.particle.christmas.ParticleFidgetSpinner; +import mineplex.core.gadget.gadgets.particle.christmas.ParticleWingsChristmas; +import mineplex.core.gadget.gadgets.taunts.FrostBreathTaunt; import mineplex.core.gadget.gadgets.wineffect.WinEffectWinterWarfare; import mineplex.core.pet.PetType; import mineplex.core.reward.RewardType; @@ -48,22 +54,32 @@ public class GingerbeardTreasure extends Treasure // Particle addGadgetReward(getGadget(ParticleChristmasTree.class), rarity, 25); + + // Morph + addGadgetReward(getGadget(MorphFrostGolem.class), rarity, 35); } @Override protected void addLegendary(RewardRarity rarity) { - // Death Effect + // Present Set addGadgetReward(getGadget(DeathPresentDanger.class), rarity, 25); + addGadgetReward(getGadget(DoubleJumpPresent.class), rarity, 25); + addGadgetReward(getGadget(ArrowTrailPresent.class), rarity, 25); // Particle + addGadgetReward(getGadget(ParticleWingsChristmas.class), rarity, 20); + addGadgetReward(getGadget(ParticleBlizzard.class), rarity, 20); addGadgetReward(getGadget(ParticleFidgetSpinner.class), rarity, 20); // Pet - addPetReward(PetType.GINGERBREAD_MAN, rarity, 10); + addPetReward(PetType.GINGERBREAD_MAN, rarity, 20); // Win Effect addGadgetReward(getGadget(WinEffectWinterWarfare.class), rarity, 25); + + // Taunts + addGadgetReward(getGadget(FrostBreathTaunt.class), rarity, 20); } @Override diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/plugin/ChristmasHubPlugin.java b/Plugins/Mineplex.Hub/src/mineplex/hub/plugin/ChristmasHubPlugin.java index afc09a525..7bca9c673 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/plugin/ChristmasHubPlugin.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/plugin/ChristmasHubPlugin.java @@ -52,7 +52,7 @@ public class ChristmasHubPlugin extends HubPlugin @EventHandler public void updateNPC(UpdateEvent event) { - if (event.getType() != UpdateType.SEC) + if (event.getType() != UpdateType.SLOWER) { return; }