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

more prep

Browse Source
This commit is contained in:
Cheese 2015-12-07 13:42:59 +11:00
parent 97fe633e4c
commit 5486d8acf6
6 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/perks/PerkStoneWall.java
View File

@ -67,7 +67,7 @@ public class PerkStoneWall extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, GetName(), 24000, true, true))
if (!Recharge.Instance.use(player, GetName(), 20000, true, true))
return;
Recharge.Instance.setDisplayForce(player, GetName(), true);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
View File

@ -178,6 +178,8 @@ public class SnowFight extends TeamGame
@EventHandler
public void BlockDamage(BlockDamageEvent event)
{
System.out.println("DING");
Player player = event.getPlayer();
if (!InProgress())

18
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
View File

@ -9,6 +9,7 @@ import nautilus.game.arcade.kit.AbbreviatedKit;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.Perk;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
@ -30,6 +31,7 @@ public class KitMedic extends AbbreviatedKit
new String[]
{
"Throw warmth potions to heal allies!",
ChatColor.RESET + " ",
C.cGray + "Receive 1 Warmth Potion every 16 seconds. Maximum of 1.",
},
@ -47,10 +49,18 @@ public class KitMedic extends AbbreviatedKit
@Override
public void GiveItems(Player player)
{
player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(5, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
Potion potion = new Potion(PotionType.INSTANT_HEAL);
potion.setSplash(true);
ItemStack stack = potion.toItemStack(1);
ItemMeta meta = stack.getItemMeta();
meta.setDisplayName(ChatColor.RESET + "Warmth Potion");
stack.setItemMeta(meta);
player.getInventory().setItem(1, stack);
player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(5, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
}
@Override

12
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
View File

@ -1,5 +1,6 @@
package nautilus.game.arcade.game.games.snowfight.kits;
import org.bukkit.ChatColor;
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
@ -34,6 +35,7 @@ public class KitSportsman extends AbbreviatedKit
new String[]
{
"Trained to be the fastest on snow and ice.",
ChatColor.RESET + " ",
},
@ -41,7 +43,7 @@ public class KitSportsman extends AbbreviatedKit
{
new PerkSpeed(0),
new PerkFallDamage(-2),
new PerkDoubleJump("Snow Jump", 1, 0.8, true, 8000, true),
new PerkDoubleJump("Snow Jump", 1, 0.8, true, 6000, true),
},
EntityType.SKELETON,
new ItemStack(Material.SNOW_BALL));
@ -51,10 +53,10 @@ public class KitSportsman extends AbbreviatedKit
@Override
public void GiveItems(Player player)
{
player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(5, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(5, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
}
@Override

17
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
View File

@ -12,15 +12,12 @@ import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.perks.PerkConstructor;
import nautilus.game.arcade.kit.perks.PerkIronSkin;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.potion.Potion;
import org.bukkit.potion.PotionType;
public class KitTactician extends AbbreviatedKit
{
@ -31,10 +28,10 @@ public class KitTactician extends AbbreviatedKit
new String[]
{
"No Snowfight is complete without a tactical game!",
ChatColor.RESET + " ",
}, new Perk[]
{
new PerkIronSkin(0.25),
new PerkStoneWall("Ice Wall", Material.ICE, Material.CLAY_BALL),
},
EntityType.SKELETON,
@ -45,11 +42,11 @@ public class KitTactician extends AbbreviatedKit
@Override
public void GiveItems(Player player)
{
player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.CLAY_BALL, (byte)0, 1, "Ice Wall"));
player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(5, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, "Hearty Winter Stew"));
player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.CLAY_BALL, (byte)0, 1, ChatColor.RESET + "Ice Wall"));
player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(5, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP, (byte)0, 1, ChatColor.RESET + "Hearty Winter Stew"));
player.getInventory().setItem(7, ItemStackFactory.Instance.CreateStack(Material.COMPASS.getId(), (byte) 0, 1, "§a§lTracking Compass"));
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/HolidayManager.java
View File

@ -52,7 +52,7 @@ public class HolidayManager implements Listener
{
public enum HolidayType
{
Christmas(Material.CHEST, "Present", Sound.LEVEL_UP),
Christmas(Material.CHEST, "Present", Sound.CAT_MEOW),
Halloween(Material.PUMPKIN, "Pumpkin", Sound.ZOMBIE_REMEDY),
Easter(Material.CHEST, "Egg Basket", Sound.CAT_MEOW);
@ -175,7 +175,7 @@ public class HolidayManager implements Listener
}
else if (type == HolidayType.Christmas)
{
UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, block.getLocation().add(0.5, 0.2, 0.5), 0.3f, 0.2f, 0.3f, 0, 1,
UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, block.getLocation().add(0.5, 1, 0.5), 0.5f, 0.5f, 0.5f, 0, 3,
ViewDist.LONG, UtilServer.getPlayers());
}
}