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

Hub text changes

Browse Source 
Hub animal spawns
Hub spawn invisibility
Smash kit balances
This commit is contained in:
Chiss 2013-08-31 18:19:23 +10:00
parent 68b7e0e3fa
commit dab3f33cbf
15 changed files with 213 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -1,5 +1,8 @@
package mineplex.hub;
import java.util.HashSet;
import java.util.Iterator;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
@ -7,8 +10,13 @@ import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Chicken;
import org.bukkit.entity.Cow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Pig;
import org.bukkit.entity.Player;
import org.bukkit.entity.Sheep;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockBreakEvent;
@ -53,6 +61,8 @@ public class HubManager extends MiniClientPlugin<HubClient>
private int _scoreboardTick = 0;
private String _pigStacker = "0 - Nobody";
private HashSet<LivingEntity> _mobs = new HashSet<LivingEntity>();
public HubManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager)
{
@ -61,7 +71,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
_clientManager = clientManager;
_donationManager = donationManager;
_spawn = new Location(UtilWorld.getWorld("world"), 0, 74, 0);
_spawn = new Location(UtilWorld.getWorld("world"), 0.5, 74, 0.5);
new TextCreator(this);
}
@ -69,7 +79,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
@EventHandler
public void PlayerRespawn(PlayerRespawnEvent event)
{
event.setRespawnLocation(GetRandomSpawn());
event.setRespawnLocation(GetSpawn());
}
@EventHandler(priority = EventPriority.LOW)
@ -84,7 +94,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
event.setJoinMessage(null);
//Teleport
player.teleport(GetRandomSpawn());
player.teleport(GetSpawn());
//Allow Double Jump
player.setAllowFlight(true);
@ -155,7 +165,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
public void Damage(EntityDamageEvent event)
{
if (event.getEntity() instanceof Player && event.getCause() == DamageCause.VOID)
event.getEntity().teleport(GetRandomSpawn());
event.getEntity().teleport(GetSpawn());
event.setCancelled(true);
}
@ -181,6 +191,9 @@ public class HubManager extends MiniClientPlugin<HubClient>
@EventHandler
public void BlockBreak(BlockBreakEvent event)
{
if (event.getPlayer().getGameMode() == GameMode.CREATIVE)
return;
event.setCancelled(true);
}
@ -193,6 +206,9 @@ public class HubManager extends MiniClientPlugin<HubClient>
@EventHandler
public void BlockPlace(BlockPlaceEvent event)
{
if (event.getPlayer().getGameMode() == GameMode.CREATIVE)
return;
event.setCancelled(true);
}
@ -332,7 +348,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
*/
//Stacker
obj.getScore(Bukkit.getOfflinePlayer(C.cGray + C.Bold + "Pig Stacker")).setScore(line--);
obj.getScore(Bukkit.getOfflinePlayer(C.cGray + C.Bold + "Stacker")).setScore(line--);
player.getScoreboard().resetScores(Bukkit.getOfflinePlayer(Get(player).BestPig));
Get(player).BestPig = _pigStacker;
obj.getScore(Bukkit.getOfflinePlayer(Get(player).BestPig)).setScore(line--);
@ -405,13 +421,74 @@ public class HubManager extends MiniClientPlugin<HubClient>
return _donationManager;
}
public Location GetRandomSpawn()
{
return GetSpawn().add(12 - UtilMath.r(24), 0, 12 - UtilMath.r(24));
}
public Location GetSpawn()
{
return _spawn.clone();
}
@EventHandler
public void UpdateVisibility(UpdateEvent event)
{
if (event.getType() != UpdateType.FAST)
return;
for (Player player : UtilServer.getPlayers())
{
for (Player other : UtilServer.getPlayers())
{
if (player.equals(other))
continue;
if (UtilMath.offset(player.getLocation(), GetSpawn()) < 4)
{
other.hidePlayer(player);
}
else
{
other.showPlayer(player);
}
}
}
}
@EventHandler
public void SpawnAnimals(UpdateEvent event)
{
if (event.getType() != UpdateType.SLOW)
return;
Iterator<LivingEntity> entIterator = _mobs.iterator();
while (entIterator.hasNext())
{
LivingEntity ent = entIterator.next();
if (!ent.isValid())
{
ent.remove();
entIterator.remove();
}
}
if (_mobs.size() > 24)
return;
//Loc
double r = Math.random();
Location loc = GetSpawn();
if (r > 0.75) loc.add(32, 0.5, 0);
else if (r > 0.5) loc.add(0, 0.5, 32);
else if (r > 0.25) loc.add(-32, 0.5, 0);
else loc.add(0, 0.5, -32);
//Spawn
r = Math.random();
if (r > 0.75) _mobs.add(loc.getWorld().spawn(loc, Cow.class));
else if (r > 0.5) _mobs.add(loc.getWorld().spawn(loc, Pig.class));
else if (r > 0.25) _mobs.add(loc.getWorld().spawn(loc, Sheep.class));
else _mobs.add(loc.getWorld().spawn(loc, Chicken.class));
}
}

25
Plugins/Mineplex.Hub/src/mineplex/hub/Stacker.java
View File

@ -8,10 +8,8 @@ import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Pig;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
@ -59,7 +57,7 @@ public class Stacker extends MiniPlugin implements IThrown
_disabled.add(player.getName());
UtilPlayer.message(player, F.main("Stacker", "You are no longer stackable... boring..."));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.PORK, (byte)0, 1, C.cGreen + "Enable Pig Stacker"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.PORK, (byte)0, 1, C.cGreen + "Enable Stacker"));
UtilInv.Update(player);
event.setCancelled(true);
@ -67,9 +65,9 @@ public class Stacker extends MiniPlugin implements IThrown
else if (UtilGear.isMat(player.getItemInHand(), Material.PORK))
{
_disabled.remove(player.getName());
UtilPlayer.message(player, F.main("Stacker", "You are back in the pig games! Squeeeee!"));
UtilPlayer.message(player, F.main("Stacker", "You are back in the stacking games! Squeeeee!"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.GRILLED_PORK, (byte)0, 1, C.cRed + "Disable Pig Stacker"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.GRILLED_PORK, (byte)0, 1, C.cRed + "Disable Stacker"));
UtilInv.Update(player);
event.setCancelled(true);
@ -79,7 +77,7 @@ public class Stacker extends MiniPlugin implements IThrown
@EventHandler
public void PlayerJoin(PlayerJoinEvent event)
{
event.getPlayer().getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.GRILLED_PORK, (byte)0, 1, C.cRed + "Disable Pig Stacker"));
event.getPlayer().getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.GRILLED_PORK, (byte)0, 1, C.cRed + "Disable Stacker"));
}
@EventHandler
@ -88,19 +86,6 @@ public class Stacker extends MiniPlugin implements IThrown
_disabled.remove(event.getPlayer().getName());
_tempStackShift.remove(event.getPlayer());
}
@EventHandler
public void CreatePig(PlayerDropItemEvent event)
{
if (!event.getPlayer().getName().equals("Chiss"))
return;
if (event.getItemDrop().getItemStack().getTypeId() == 320)
{
event.setCancelled(true);
event.getPlayer().getWorld().spawn(event.getPlayer().getLocation(), Pig.class);
}
}
@EventHandler
public void GrabEntity(PlayerInteractEntityEvent event)
@ -246,4 +231,6 @@ public class Stacker extends MiniPlugin implements IThrown
{
}
}

129
Plugins/Mineplex.Hub/src/mineplex/hub/TextCreator.java
View File

@ -1,12 +1,16 @@
package mineplex.hub;
import mineplex.core.MiniPlugin;
import mineplex.core.common.util.UtilText;
import mineplex.core.common.util.UtilText.TextAlign;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;
import org.bukkit.event.EventHandler;
public class TextCreator
public class TextCreator extends MiniPlugin
{
public HubManager Manager;
@ -19,10 +23,16 @@ public class TextCreator
BlockFace faceArcade = BlockFace.WEST;
BlockFace faceSurvival = BlockFace.NORTH;
BlockFace faceOther = BlockFace.EAST;
String[] arcadeGames;
int arcadeIndex = 0;
int smashIndex = 0;
public TextCreator(HubManager manager)
{
super("Text Creator", manager.GetPlugin());
Manager = manager;
locComp = manager.GetSpawn().add(40, 10, 0);
@ -30,65 +40,106 @@ public class TextCreator
locSurvival = manager.GetSpawn().add(-40, 10, 0);
locOther = manager.GetSpawn().add(0, 10, -40);
arcadeGames = new String[]
{
"ONE IN THE QUIVER",
"ZOMBIE SURVIVAL",
"SUPER SPLEEF",
"TURF FORTS",
"EVOLUTION",
"MINEKART",
"DRAGONS",
"RUNNER"
};
CreateText();
}
public void CreateText()
{
//Comp
UtilText.MakeText("COMPETITIVE", locComp, faceComp, 159, (byte)14, TextAlign.CENTER);
UtilText.MakeText("COMPETITIVE", locComp.clone().add(1, 0, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("CHAMPIONS", locComp, faceComp, 159, (byte)5, TextAlign.CENTER);
UtilText.MakeText("CHAMPIONS", locComp.clone().add(1, 0, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("DOMINATION", locComp.clone().add(16, 14, 0), faceComp, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText("DOMINATION", locComp.clone().add(16, 14, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("DOMINATE", locComp.clone().add(15, 14, 0), faceComp, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText("DOMINATE", locComp.clone().add(16, 14, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
/*
UtilText.MakeText("DEATHMATCH", locComp.clone().add(16, 21, 0), faceComp, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText("DEATHMATCH", locComp.clone().add(16, 21, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("CAPTURE THE PIG", locComp.clone().add(15, 21, 0), faceComp, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText("CAPTURE THE PIG", locComp.clone().add(16, 21, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("CAPTURE THE PIG", locComp.clone().add(16, 28, 0), faceComp, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText("CAPTURE THE PIG", locComp.clone().add(16, 28, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
*/
UtilText.MakeText("DEATHMATCH", locComp.clone().add(15, 28, 0), faceComp, 159, (byte)14, TextAlign.CENTER);
UtilText.MakeText("DEATHMATCH", locComp.clone().add(16, 28, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
//Arcade
UtilText.MakeText("ARCADE", locArcade, faceArcade, 159, (byte)14, TextAlign.CENTER);
UtilText.MakeText("ARCADE", locArcade, faceArcade, 159, (byte)5, TextAlign.CENTER);
UtilText.MakeText("ARCADE", locArcade.clone().add(0, 0, 1), faceArcade, 159, (byte)15, TextAlign.CENTER);
//Arcade Minigames
UtilText.MakeText("MINIGAMES ", locArcade.clone().add(0, 12, 15), faceArcade, 159, (byte)4, TextAlign.RIGHT);
UtilText.MakeText("MINIGAMES ", locArcade.clone().add(0, 12, 16), faceArcade, 159, (byte)15, TextAlign.RIGHT);
UtilText.MakeText("super spleef ", locArcade.clone().add(0, 26, 30), faceArcade, 159, (byte)5, TextAlign.RIGHT);
UtilText.MakeText("one in the quiver ", locArcade.clone().add(0, 32, 30), faceArcade, 159, (byte)5, TextAlign.RIGHT);
UtilText.MakeText("dragon ", locArcade.clone().add(0, 38, 30), faceArcade, 159, (byte)5, TextAlign.RIGHT);
//UtilText.MakeText("mineware ", locArcade.clone().add(0, 44, 30), faceArcade, 159, (byte)5, TextAlign.RIGHT);
//UtilText.MakeText("arctic brawl ", locArcade.clone().add(0, 50, 30), faceArcade, 159, (byte)5, TextAlign.RIGHT);
//Aracde Megagames
UtilText.MakeText(" MEGAGAMES", locArcade.clone().add(0, 12, 15), faceArcade, 159, (byte)4, TextAlign.LEFT);
UtilText.MakeText(" MEGAGAMES", locArcade.clone().add(0, 12, 16), faceArcade, 159, (byte)15, TextAlign.LEFT);
UtilText.MakeText(" castle siege", locArcade.clone().add(0, 26, 30), faceArcade, 159, (byte)5, TextAlign.LEFT);
UtilText.MakeText(" zombie survival", locArcade.clone().add(0, 32, 30), faceArcade, 159, (byte)5, TextAlign.LEFT);
//UtilText.MakeText(" snow fight", locArcade.clone().add(0, 38, 30), faceArcade, 159, (byte)5, TextAlign.LEFT);
//Survival
UtilText.MakeText("SURVIVAL", locSurvival, faceSurvival, 159, (byte)14, TextAlign.CENTER);
UtilText.MakeText("SURVIVAL", locSurvival.clone().add(-1, 0, 0), faceSurvival, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("BATTLE", locSurvival, faceSurvival, 159, (byte)5, TextAlign.CENTER);
UtilText.MakeText("BATTLE", locSurvival.clone().add(-1, 0, 0), faceSurvival, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("THE BRIDGES", locSurvival.clone().add(-15, 14, 0), faceSurvival, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText("THE BRIDGES", locSurvival.clone().add(-16, 14, 0), faceSurvival, 159, (byte)15, TextAlign.CENTER);
//UtilText.MakeText("HUNGER GAMES", locSurvival.clone().add(-15, 21, 0), faceSurvival, 159, (byte)4, TextAlign.CENTER);
//UtilText.MakeText("HUNGER GAMES", locSurvival.clone().add(-16, 21, 0), faceSurvival, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("CASTLE SIEGE", locSurvival.clone().add(-15, 21, 0), faceSurvival, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText("CASTLE SIEGE", locSurvival.clone().add(-16, 21, 0), faceSurvival, 159, (byte)15, TextAlign.CENTER);
//Other
UtilText.MakeText("CLASSICS", locOther, faceOther, 159, (byte)14, TextAlign.CENTER);
UtilText.MakeText("CLASSICS", locOther, faceOther, 159, (byte)5, TextAlign.CENTER);
UtilText.MakeText("CLASSICS", locOther.add(0, 0, -1), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("MINEKART", locOther.clone().add(0, 14, -15), faceOther, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText("MINEKART", locOther.clone().add(0, 14, -16), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 14, -15), faceOther, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 14, -16), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("MINEKART", locOther.clone().add(0, 21, -15), faceOther, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText("MINEKART", locOther.clone().add(0, 21, -16), faceOther, 159, (byte)15, TextAlign.CENTER);
}
@EventHandler
public void UpdateArcadeGames(UpdateEvent event)
{
if (event.getType() != UpdateType.SLOW)
return;
UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 15), faceArcade, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 16), faceArcade, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 15), faceArcade, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 16), faceArcade, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 15), faceArcade, 159, (byte)14, TextAlign.CENTER);
UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 16), faceArcade, 159, (byte)15, TextAlign.CENTER);
arcadeIndex = (arcadeIndex + 3)%arcadeGames.length;
}
public String GetArcadeText(int offset)
{
int index = (arcadeIndex + offset)%arcadeGames.length;
return arcadeGames[index];
}
@EventHandler
public void UpdateNew(UpdateEvent event)
{
if (event.getType() != UpdateType.FAST)
return;
smashIndex = (smashIndex+1)%2;
byte color = 4;
if (smashIndex == 1) color = 0;
//UtilText.MakeText("SUPER SMASH MOBS", locOther, faceOther, 159, color, TextAlign.CENTER);
//UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 0, -1), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 14, -15), faceOther, 159, color, TextAlign.CENTER);
UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 14, -16), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("DOMINATE", locComp.clone().add(15, 14, 0), faceComp, 159, color, TextAlign.CENTER);
UtilText.MakeText("DOMINATE", locComp.clone().add(16, 14, 0), faceComp, 159, (byte)15, TextAlign.CENTER);
}
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/SoloGame.java
View File

@ -32,7 +32,7 @@ public abstract class SoloGame extends Game
if (event.GetState() != GameState.Recruit)
return;
this.GetTeamList().get(0).SetColor(ChatColor.DARK_GREEN);
this.GetTeamList().get(0).SetColor(ChatColor.YELLOW);
this.GetTeamList().get(0).SetName("Players");
}

26
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java
View File

@ -12,6 +12,7 @@ import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.event.entity.PlayerDeathEvent;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilPlayer;
@ -21,8 +22,8 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.events.PlayerDeathOutEvent;
import nautilus.game.arcade.game.SoloGame;
import nautilus.game.arcade.game.GameTeam.PlayerState;
import nautilus.game.arcade.game.standalone.smash.kits.*;
import nautilus.game.arcade.kit.Kit;
@ -44,17 +45,19 @@ public class SuperSmash extends SoloGame
new KitChicken(manager),
new KitGolem(manager),
new KitSnowman(manager),
new KitSpider(manager),
//new KitSpider(manager),
new KitSlime(manager),
},
new String[]
{
"Each player has 3 lives",
"Each player has 3 respawns",
"Last player alive wins!"
});
this.DeathOut = false;
this.DeathDropItems = false;
this.DamageTeamSelf = true;
@ -62,6 +65,8 @@ public class SuperSmash extends SoloGame
this.HungerSet = 20;
this.PrepareFreeze = false;
this.CompassEnabled = true;
}
@EventHandler(priority = EventPriority.HIGH)
@ -75,10 +80,12 @@ public class SuperSmash extends SoloGame
}
@EventHandler
public void PlayerOut(PlayerDeathOutEvent event)
public void PlayerOut(PlayerDeathEvent event)
{
if (LoseLife(event.GetPlayer()))
event.setCancelled(true);
if (!LoseLife(event.getEntity()))
{
this.SetPlayerState(event.getEntity(), PlayerState.OUT);
}
}
private int GetLives(Player player)
@ -152,6 +159,13 @@ public class SuperSmash extends SoloGame
}
}
@EventHandler(priority = EventPriority.LOWEST)
public void FallDamage(CustomDamageEvent event)
{
if (event.GetCause() == DamageCause.FALL)
event.SetCancelled("No Fall Damage");
}
@EventHandler(priority = EventPriority.HIGH)
public void Knockback(CustomDamageEvent event)
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java
View File

@ -47,10 +47,8 @@ public class KitChicken extends SmashKit
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD, (byte)0, 1, C.cYellow + C.Bold + "Hold Block" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Egg Blaster"));
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE, (byte)0, 1, C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Chicken Missile"));
player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET));
player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE));
player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS));
player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS));
//Disguise
DisguiseChicken disguise = new DisguiseChicken(player);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java
View File

@ -37,7 +37,7 @@ public class KitEnderman extends SmashKit
new Perk[]
{
new PerkDoubleJump("Double Jump", 0.8, 0.8, false),
new PerkDoubleJump("Double Jump", 0.9, 0.9, false),
new PerkDamageSet(7),
new PerkKnockbackMultiplier(1.3),
new PerkBlink("Blink", 12, 6000),

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java
View File

@ -25,7 +25,7 @@ public class KitGolem extends SmashKit
new Perk[]
{
new PerkDoubleJump("Double Jump", 0.8, 0.8, false),
new PerkDoubleJump("Double Jump", 0.9, 0.9, false),
new PerkDamageSet(7),
new PerkKnockbackMultiplier(1),
new PerkSlow(0),

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java
View File

@ -32,7 +32,7 @@ public class KitSkeleton extends SmashKit
new Perk[]
{
new PerkDoubleJump("Double Jump", 0.8, 0.8, false),
new PerkDoubleJump("Double Jump", 0.9, 0.9, false),
new PerkDamageSet(5),
new PerkKnockbackMultiplier(1.25),
new PerkFletcher(1, 2, false),

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java
View File

@ -13,7 +13,6 @@ import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.SmashKit;
import nautilus.game.arcade.kit.perks.PerkDamageSet;
import nautilus.game.arcade.kit.perks.PerkDoubleJump;
import nautilus.game.arcade.kit.perks.PerkJump;
import nautilus.game.arcade.kit.perks.PerkKnockbackMultiplier;
import nautilus.game.arcade.kit.perks.PerkSlimeRocket;
import nautilus.game.arcade.kit.perks.PerkSlimeSlam;
@ -30,10 +29,9 @@ public class KitSlime extends SmashKit
new Perk[]
{
new PerkDoubleJump("Double Jump", 1, 0.9, false),
new PerkDoubleJump("Double Jump", 1.2, 1, false),
new PerkDamageSet(6),
new PerkKnockbackMultiplier(1.75),
new PerkJump(1),
new PerkSlimeSlam(),
new PerkSlimeRocket(),
},

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java
View File

@ -31,7 +31,7 @@ public class KitSnowman extends SmashKit
new Perk[]
{
new PerkDoubleJump("Double Jump", 0.8, 0.8, false),
new PerkDoubleJump("Double Jump", 0.9, 0.9, false),
new PerkDamageSet(6),
new PerkKnockbackMultiplier(1.4),
new PerkKnockbackSnow(1.5),

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java
View File

@ -27,7 +27,7 @@ public class KitSpider extends SmashKit
new Perk[]
{
new PerkDoubleJump("Double Jump", 0.8, 0.8, false),
new PerkDoubleJump("Double Jump", 0.9, 0.9, false),
new PerkDamageSet(7),
new PerkKnockbackMultiplier(1.6),
},

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockToss.java
View File

@ -71,8 +71,7 @@ public class PerkBlockToss extends Perk implements IThrown
//Event
PerkBlockGrabEvent blockEvent = new PerkBlockGrabEvent(player, grab.getTypeId(), grab.getData());
UtilServer.getServer().getPluginManager().callEvent(blockEvent);
System.out.println("grab event");
//Block to Item
FallingBlock block = player.getWorld().spawnFallingBlock(player.getEyeLocation(), event.getClickedBlock().getType(), (byte)0);
Manager.GetBlockRestore().Add(event.getClickedBlock(), 0, (byte)0, 10000);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBoneExplosion.java
View File

@ -64,7 +64,7 @@ public class PerkBoneExplosion extends Perk
UtilPlayer.message(player, F.main("Game", F.elem(Manager.GetColor(player) + player.getName()) + " used " + F.skill(GetName()) + "."));
//Velocity
UtilAction.velocity(other, UtilAlg.getTrajectory(player, other), 0.4 + 1.2 * nearby.get(other), false, 0, 0.2 + 0.6 * nearby.get(other), 1.2, true);
UtilAction.velocity(other, UtilAlg.getTrajectory(player, other), 1 + 1 * nearby.get(other), false, 0, 0.6 + 0.6 * nearby.get(other), 1.2, true);
}
//Inform

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeRocket.java
View File

@ -57,7 +57,7 @@ public class PerkSlimeRocket extends Perk implements IThrown
if (player.isBlocking())
return;
player.setExp((float) Math.min(0.999, player.getExp()+0.003));
player.setExp((float) Math.min(0.999, player.getExp()+0.005));
}
}