JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add descriptions to all Christmas Cosmetics

Browse Source
This commit is contained in:
Sam 2017-11-29 15:48:25 +00:00 committed by Alexander Meech
parent 0f8c00bb1f
commit f629cce155
10 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailPresent.java
View File

@ -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());

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpPresent.java
View File

@ -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());

9
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphFrostGolem.java
View File

@ -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) ->
{

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountSledge.java
View File

@ -40,7 +40,7 @@ public class MountSledge extends Mount<MountSledgeData>
{
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

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/christmas/ParticleBlizzard.java
View File

@ -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);
}

13
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/FrostBreathTaunt.java
View File

@ -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());
}
}
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetReindeerSuit.java
View File

@ -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)
{

1
Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java
View File

@ -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

20
Plugins/Mineplex.Core/src/mineplex/core/treasure/types/GingerbeardTreasure.java
View File

@ -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

2
Plugins/Mineplex.Hub/src/mineplex/hub/plugin/ChristmasHubPlugin.java
View File

@ -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;
}