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

Revert "Make Perks not static, this fixings all kits having the same stats 😨"

Browse Source 
This reverts commit 1d0f28689f.
This commit is contained in:
Sam 2017-04-24 17:40:48 +01:00
parent 1d0f28689f
commit 5bc2b9d34c
6 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,14 @@ import nautilus.game.arcade.kit.perks.PerkDoubleJump;
public class KitCreeper extends SmashKit
{
private static final Perk[] PERKS = {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkCreeperElectricity(),
new PerkCreeperSulphurBomb(),
new PerkCreeperExplode(),
new SmashCreeper()
};
private static final ItemStack IN_HAND = new ItemStack(Material.TNT);
@ -75,14 +83,7 @@ public class KitCreeper extends SmashKit
public KitCreeper(ArcadeManager manager)
{
super(manager, "Creeper", KitAvailability.Gem, 4000, new Perk[] {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkCreeperElectricity(),
new PerkCreeperSulphurBomb(),
new PerkCreeperExplode(),
new SmashCreeper()
}, EntityType.CREEPER, IN_HAND, DisguiseCreeper.class);
super(manager, "Creeper", KitAvailability.Gem, 4000, PERKS, EntityType.CREEPER, IN_HAND, DisguiseCreeper.class);
}
@Override

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

@ -86,14 +86,7 @@ public class KitEnderman extends SmashKit
public KitEnderman(ArcadeManager manager)
{
super(manager, "Enderman", KitAvailability.Gem, 3000, new Perk[] {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkBlink("Blink"),
new PerkBlockToss(),
new PerkEndermanTeleport(),
new SmashEnderman()
}, EntityType.ENDERMAN, IN_HAND, DisguiseEnderman.class);
super(manager, "Enderman", KitAvailability.Gem, 3000, PERKS, EntityType.ENDERMAN, IN_HAND, DisguiseEnderman.class);
}
@Override

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

@ -26,6 +26,16 @@ import nautilus.game.arcade.kit.perks.PerkSlow;
public class KitGolem extends SmashKit
{
private static final Perk[] PERKS = {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkSlow(0),
new PerkFissure(),
new PerkIronHook(),
new PerkSeismicSlam(),
new SmashGolem()
};
private static final ItemStack IN_HAND = new ItemStack(Material.IRON_BLOCK);
private static final ItemStack[] PLAYER_ITEMS = {
@ -68,15 +78,7 @@ public class KitGolem extends SmashKit
public KitGolem(ArcadeManager manager)
{
super(manager, "Iron Golem", KitAvailability.Free, new Perk[] {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkSlow(0),
new PerkFissure(),
new PerkIronHook(),
new PerkSeismicSlam(),
new SmashGolem()
}, EntityType.IRON_GOLEM, IN_HAND, DisguiseIronGolem.class);
super(manager, "Iron Golem", KitAvailability.Free, PERKS, EntityType.IRON_GOLEM, IN_HAND, DisguiseIronGolem.class);
}
@Override

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

@ -34,6 +34,17 @@ public class KitSkeleton extends SmashKit
private static double ARROW_DAMAGE = 6;
private static final Perk[] PERKS = {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkFletcher(),
new PerkKnockbackArrow(),
new PerkBoneExplosion(),
new PerkRopedArrow("Roped Arrow"),
new PerkBarrage(),
new SmashSkeleton()
};
private static final ItemStack IN_HAND = new ItemStack(Material.BOW);
private static final ItemStack[] PLAYER_ITEMS = {
@ -79,16 +90,7 @@ public class KitSkeleton extends SmashKit
public KitSkeleton(ArcadeManager manager)
{
super(manager, "Skeleton", KitAvailability.Free, new Perk[] {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkFletcher(),
new PerkKnockbackArrow(),
new PerkBoneExplosion(),
new PerkRopedArrow("Roped Arrow"),
new PerkBarrage(),
new SmashSkeleton()
}, EntityType.SKELETON, IN_HAND, DisguiseSkeleton.class);
super(manager, "Skeleton", KitAvailability.Free, PERKS, EntityType.SKELETON, IN_HAND, DisguiseSkeleton.class);
}
@Override

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

@ -24,6 +24,14 @@ import nautilus.game.arcade.kit.perks.PerkDoubleJump;
public class KitSlime extends SmashKit
{
private static final Perk[] PERKS = {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkSlimeSlam(),
new PerkSlimeRocket(),
new SmashSlime()
};
private static final ItemStack IN_HAND = new ItemStack(Material.SLIME_BALL);
private static final ItemStack[] PLAYER_ITEMS = {
@ -66,13 +74,7 @@ public class KitSlime extends SmashKit
public KitSlime(ArcadeManager manager)
{
super(manager, "Slime", KitAvailability.Free, new Perk[] {
new PerkSmashStats(),
new PerkDoubleJump("Double Jump"),
new PerkSlimeSlam(),
new PerkSlimeRocket(),
new SmashSlime()
}, EntityType.SLIME, IN_HAND, DisguiseSlime.class);
super(manager, "Slime", KitAvailability.Free, PERKS, EntityType.SLIME, IN_HAND, DisguiseSlime.class);
}
@Override

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

@ -25,6 +25,14 @@ import nautilus.game.arcade.kit.Perk;
public class KitSpider extends SmashKit
{
private static final Perk[] PERKS = {
new PerkSmashStats(),
new PerkSpiderLeap(),
new PerkNeedler(),
new PerkWebShot(),
new SmashSpider()
};
private static final ItemStack IN_HAND = new ItemStack(Material.WEB);
private static final ItemStack[] PLAYER_ITEMS = {
@ -80,13 +88,7 @@ public class KitSpider extends SmashKit
public KitSpider(ArcadeManager manager)
{
super(manager, "Spider", KitAvailability.Free, new Perk[] {
new PerkSmashStats(),
new PerkSpiderLeap(),
new PerkNeedler(),
new PerkWebShot(),
new SmashSpider()
}, EntityType.SPIDER, IN_HAND, DisguiseSpider.class);
super(manager, "Spider", KitAvailability.Free, PERKS, EntityType.SPIDER, IN_HAND, DisguiseSpider.class);
}
@Override