diff --git a/Mineplex.Core/src/mineplex/core/game/kit/GameKit.java b/Mineplex.Core/src/mineplex/core/game/kit/GameKit.java index a9dfe5e4..efc91f41 100644 --- a/Mineplex.Core/src/mineplex/core/game/kit/GameKit.java +++ b/Mineplex.Core/src/mineplex/core/game/kit/GameKit.java @@ -939,8 +939,10 @@ public enum GameKit "Stand your ground, we got this!", C.blankLine, click(false, "your sword") + " to give buffs to nearby humans and wolves", - "Wolves receive " + C.cGreen + "Speed I" + C.cGray + " and Humans receive " + C.cGreen + "Resistance I", - "Take " + C.cGreen + "10%" + C.cGray + " less damage from attacks", + "Wolves receive " + C.cGreen + "Speed I " + C.cGray + "for 8 seconds", + C.cGray + "Humans receive " + C.cGreen + "Resistance I " + C.cGray + "and " + + C.cGreen + "Regeneration I " + C.cGray + "for 8 seconds", + "You take " + C.cGreen + "10%" + C.cGray + " less damage from attacks", }, new KitEntityData<> ( @@ -1048,7 +1050,8 @@ public enum GameKit { "Say hello to my little friend.", C.blankLine, - click(false, "your eggs to spawn undead mobs to help you fight") + click(false, "your eggs to spawn undead mobs to help you fight"), + "You take " + C.cGreen + "-1" + C.cGray + " damage from attacks" }, new KitEntityData<> ( diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class index 3482dff8..da04712f 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class differ diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class index f6c66c84..454c213b 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class differ diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class index 97ca9c06..bf31cfac 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class differ diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class index 39260557..4aeb4070 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class differ diff --git a/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java b/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java index b55a6363..39b05265 100644 --- a/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java +++ b/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java @@ -46,7 +46,7 @@ public class CustomDamageEvent extends Event implements Cancellable private boolean _damageeBrute = false; private boolean _damageToLevel = true; private boolean _arrowShow = true; - private boolean _projectileDamageSelf = false; + private boolean _projectileDamageSelf = true; public CustomDamageEvent(LivingEntity damagee, LivingEntity damager, Projectile projectile, Location knockbackOrigin, DamageCause cause, double damage, boolean knockback, boolean ignoreRate, boolean ignoreArmor, String initialSource, diff --git a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/damage/CustomDamageEvent.class b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/damage/CustomDamageEvent.class index 1eabc735..a5d761a0 100644 Binary files a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/damage/CustomDamageEvent.class and b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/damage/CustomDamageEvent.class differ diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java index 28f9afd1..e926beaa 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java @@ -16,6 +16,7 @@ import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.FirstBloodEvent; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.PlayerGameRespawnEvent; +import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; import nautilus.game.arcade.game.games.Beta; @@ -58,7 +59,6 @@ import static org.bukkit.event.entity.EntityDamageEvent.DamageCause.ENTITY_EXPLO public class BetaCastleSiege extends TeamGame { - //tics to seconds private static final int EIGHT_TICKS = 8 * 20; @@ -136,6 +136,8 @@ public class BetaCastleSiege extends TeamGame private Kit _wolfKit; + private CustomDamageEvent Damage; + public BetaCastleSiege(ArcadeManager manager) { @@ -165,6 +167,10 @@ public class BetaCastleSiege extends TeamGame InventoryClick = true; SplitKitXP = true; + //Self Damage (?) + DamageTeamSelf = true; + DamageSelf = true; + manager.GetCreature().SetDisableCustomDrops(true); registerStatTrackers( @@ -251,6 +257,10 @@ public class BetaCastleSiege extends TeamGame public void DisplayCSTips(UpdateEvent event) { + if(!Beta.enableBeta){ + return; + } + if (showDefTip && !showGenTips) { if (!inLobby() || event.getType() != UpdateType.SLOWER) { return; diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.java index f06b1f3f..7cb168d2 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.java @@ -9,6 +9,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.game.games.castlesiegebeta.perks.BetaMobPotion; import nautilus.game.arcade.game.games.castlesiegebeta.perks.BetaPerkMobPotions; import nautilus.game.arcade.kit.Perk; +import nautilus.game.arcade.kit.perks.PerkIronSkin; import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; @@ -35,6 +36,7 @@ public class BetaKitUndeadSummoner extends BetaKitCastleSiege private static final Perk[] PERKS = { new BetaPerkMobPotions(TimeUnit.SECONDS.toMillis(28), SILVER_FISH, ZOMBIE, SPIDER), + new PerkIronSkin(1) }; public BetaKitUndeadSummoner(ArcadeManager manager) diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java index b2249d49..7ecf7e86 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java @@ -139,8 +139,6 @@ public class CastleSiegeNew extends TeamGame }, CSDESCRIPTION); - _help = TIPS; - // AnticheatDisabled = true; // StrictAntiHack = true; HungerSet = 20; @@ -280,6 +278,37 @@ public class CastleSiegeNew extends TeamGame Scoreboard.draw(); } + @EventHandler + public void DisplayCSTips(UpdateEvent event) { + + if (!Beta.enableBeta) { + return; + } + + if (!inLobby() || event.getType() != UpdateType.SLOWER) { + return; + } + + if (Manager.GetGameHostManager().isCommunityServer()) { + return; + } + + generalTipColor = generalTipColor == ChatColor.YELLOW ? ChatColor.GOLD : ChatColor.YELLOW; + String gen = C.cWhiteB + "TIP> " + ChatColor.RESET + generalTipColor + TIPS[_generalIndex]; + + for (Player player : UtilServer.getPlayersCollection()) { + if (!Manager.getPreferences().get(player).isActive(Preference.GAME_TIPS)) { + continue; + } + + player.playSound(player.getLocation(), Sound.CHICKEN_EGG_POP, 1f, 1f); + UtilPlayer.message(player, gen); + + } + + _generalIndex = (_generalIndex + 1) % TIPS.length; + } + @EventHandler public void prepare(GameStateChangeEvent event) { diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class index b9a57573..987dfd6b 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.class index ad8f23f7..8d58ddc6 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/kits/BetaKitUndeadSummoner.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class index 6ee231de..eca25c79 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class differ diff --git a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar index 4cca4e11..c118318c 100644 Binary files a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar and b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar differ