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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-08-08 23:06:26 -05:00
parent 3f54881a3e fb19e93992
commit 3d909b7cbe
6 changed files with 30 additions and 9 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/micro/Micro.java
View File

@ -192,5 +192,7 @@ public class Micro extends TeamGame
return; return;
event.AddMod(GetName(), "Projectile Reduce", -2, false); event.AddMod(GetName(), "Projectile Reduce", -2, false);
event.AddKnockback("Increase", 1.6d);
} }
} }

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/kits/KitArcher.java
View File

@ -5,6 +5,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.C;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
@ -20,7 +21,11 @@ public class KitArcher extends Kit
new String[] new String[]
{ {
"Shoot shoot!" "Shoot shoot!",
" ",
C.cGreen + "Wood Sword",
C.cGreen + "Bow",
C.cGreen + "3 Apples",
}, },
new Perk[] new Perk[]

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/kits/KitFighter.java
View File

@ -5,6 +5,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.C;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
@ -20,12 +21,14 @@ public class KitFighter extends Kit
new String[] new String[]
{ {
"HE LIKES TO FIGHT!" "HE LIKES TO FIGHT!",
" ",
C.cGreen + "Stone Sword",
C.cGreen + "5 Apples",
}, },
new Perk[] new Perk[]
{ {
new PerkIronSkin(1)
}, },
EntityType.ZOMBIE, EntityType.ZOMBIE,
new ItemStack(Material.STONE_SWORD)); new ItemStack(Material.STONE_SWORD));
@ -35,7 +38,7 @@ public class KitFighter extends Kit
@Override @Override
public void GiveItems(Player player) public void GiveItems(Player player)
{ {
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.WOOD_SWORD)); player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_SWORD));
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.APPLE, 5)); player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.APPLE, 5));
} }
} }

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/kits/KitWorker.java
View File

@ -5,6 +5,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.C;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
@ -19,7 +20,12 @@ public class KitWorker extends Kit
new String[] new String[]
{ {
"DIG DIG!" "DIG DIG!",
" ",
C.cGreen + "Wood Sword",
C.cGreen + "Stone Spade",
C.cGreen + "Stone Pickaxe",
C.cGreen + "4 Apples",
}, },
new Perk[] new Perk[]

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
View File

@ -174,6 +174,8 @@ public class SurvivalGamesTeams extends TeamGame
this.CompassEnabled = false; //XXX this.CompassEnabled = false; //XXX
this.InventoryClick = true;
//Blocks //Blocks
this.BlockBreakAllow.add(46); //TNT this.BlockBreakAllow.add(46); //TNT
this.BlockPlaceAllow.add(46); this.BlockPlaceAllow.add(46);

11
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
View File

@ -1139,12 +1139,15 @@ public class GameLobbyManager implements IPacketRunnable, Listener
for (Player player : UtilServer.getPlayers()) for (Player player : UtilServer.getPlayers())
{ {
int gemBoosters = Manager.getInventoryManager().Get(player).Items.containsKey("Gem Booster") ? Manager.getInventoryManager().Get(player).Items.get("Gem Booster").Count : 0; int boosters = Manager.getInventoryManager().Get(player).getItemCount("Gem Booster");
player.getInventory().setItem( player.getInventory().setItem(
7, 7,
ItemStackFactory.Instance.CreateStack(Material.EMERALD, (byte) 0, 1, (short) 0, C.cGreen ItemStackFactory.Instance.CreateStack(Material.EMERALD, (byte) 0, Math.max(1, boosters), (short) 0, C.cGreen
+ "Gem Booster", + boosters + " Gem Boosters" +
(Manager.GetGame().GemBoosters.size() < 4 && boosters > 0 ?
C.cWhite + " - " + C.cYellow + "Click for " + C.cGreen + (100-Manager.GetGame().GemBoosters.size()*25) + "%" + C.cYellow + " Boost" :
C.cWhite + " - " + C.cRed + "Purchase in the Hub"),
new String[] new String[]
{ {
C.cYellow + "Click for " + C.cGreen + (100-Manager.GetGame().GemBoosters.size()*25) + "%" + C.cYellow + " Boost", C.cYellow + "Click for " + C.cGreen + (100-Manager.GetGame().GemBoosters.size()*25) + "%" + C.cYellow + " Boost",
@ -1152,7 +1155,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener
ChatColor.RESET + "Boosts Gems earned for", ChatColor.RESET + "Boosts Gems earned for",
ChatColor.RESET + "everyone in the game.", ChatColor.RESET + "everyone in the game.",
" ", " ",
C.cWhite + "Your Gem Boosters: " + C.cGreen + gemBoosters, C.cWhite + "Your Gem Boosters: " + C.cGreen + boosters,
} }
) )
); );