diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java index ae53ec3e3..1e2f66abf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java @@ -24,6 +24,8 @@ import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import mineplex.core.achievement.Achievement; +import mineplex.core.achievement.AchievementCategory; import mineplex.core.common.util.C; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilEnt; @@ -86,6 +88,11 @@ public class CastleSiegeNew extends TeamGame "Wolves must wait 6 seconds in between respawns.", "Coordination and teamwork are important to winning as Defenders." }; + private static final Achievement[] ACHIEVEMENTS = Achievement.getByCategory(AchievementCategory.CASTLE_SIEGE).toArray(new Achievement[0]); + public static Achievement[] getGameAchievements() + { + return ACHIEVEMENTS; + } private static final int START_TIME = 14000; private static final int UNDEAD_BURN_TIME = 24000; private static final int DEFENDER_WIN_TIME = UNDEAD_BURN_TIME + 200; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java index fd9546a39..96306832b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java @@ -3,6 +3,7 @@ package nautilus.game.arcade.game.games.castlesiegenew.kits; import mineplex.core.common.util.C; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.games.castlesiegenew.CastleSiegeNew; import nautilus.game.arcade.game.games.castlesiegenew.perks.PerkPaladinBoost; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; @@ -134,7 +135,7 @@ public class KitHumanPaladin extends KitCastleSiege { super(manager, "Castle Paladin", KitAvailability.Free, DESCRIPTION, PERKS, UPGRADES, EntityType.ZOMBIE, IN_HAND); - //setAchievementRequirements(CastleSiegeNew.getGameAchievements()); + setAchievementRequirements(CastleSiegeNew.getGameAchievements()); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java index 8b7f03e3c..14713b155 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java @@ -1,23 +1,25 @@ package nautilus.game.arcade.game.games.castlesiegenew.kits; +import java.util.concurrent.TimeUnit; + +import org.bukkit.Material; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import mineplex.core.achievement.Achievement; +import mineplex.core.achievement.AchievementCategory; import mineplex.core.common.util.C; import mineplex.core.common.util.UtilEnt; import mineplex.core.disguise.disguises.DisguiseSkeleton; import mineplex.core.itemstack.ItemBuilder; + import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.game.games.castlesiegenew.CastleSiegeNew; import nautilus.game.arcade.game.games.castlesiegenew.perks.MobPotion; import nautilus.game.arcade.game.games.castlesiegenew.perks.PerkMobPotions; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; -import org.bukkit.Material; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; - -import java.util.concurrent.TimeUnit; public class KitUndeadSummoner extends KitCastleSiege { @@ -33,17 +35,14 @@ public class KitUndeadSummoner extends KitCastleSiege private static final MobPotion SILVER_FISH = new MobPotion( new ItemBuilder(Material.MONSTER_EGG, UtilEnt.getEntityEggData(EntityType.SLIME)) .setTitle(C.cGreen + "Slime Potion") - .addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 0, 0)) .build(), EntityType.SLIME, 3); private static final MobPotion ZOMBIE = new MobPotion( new ItemBuilder(Material.MONSTER_EGG, UtilEnt.getEntityEggData(EntityType.ZOMBIE)) .setTitle(C.cGreen + "Zombie Potion") - .addPotionEffect(new PotionEffect(PotionEffectType.POISON, 0, 0)) .build(), EntityType.ZOMBIE, 1); private static final MobPotion SPIDER = new MobPotion( new ItemBuilder(Material.MONSTER_EGG, UtilEnt.getEntityEggData(EntityType.SPIDER)) .setTitle(C.cGreen + "Spider Egg") - .addPotionEffect(new PotionEffect(PotionEffectType.HARM, 0, 0)) .build(), EntityType.SPIDER, 1); private static final Perk[][] PERKS = { @@ -91,7 +90,7 @@ public class KitUndeadSummoner extends KitCastleSiege { super(manager, "Undead Summoner", KitAvailability.Free, DESCRIPTION, PERKS, UPGRADES, EntityType.SKELETON, IN_HAND); - //setAchievementRequirements(CastleSiegeNew.getGameAchievements()); + setAchievementRequirements(CastleSiegeNew.getGameAchievements()); _witherSkeleton = true; }