diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java index f70a6a468..475a4812c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java @@ -4,6 +4,6 @@ import java.util.HashSet; public class BenefitData { - public HashSet Benefits = new HashSet(); + public HashSet Benefits = new HashSet(); public boolean Loaded = false; } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java index 662520e8f..f640e6181 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java @@ -67,7 +67,7 @@ public class Illusion extends SkillActive "Invisibility ends if you release Block", "or your Illusion is killed.", "", - "Illusion lasts up to #2#2 seconds.", + "Illusion lasts up to #2#1 seconds.", "", "Gives Slow 2 for up to 4 seconds", "to nearby players upon ending." @@ -79,7 +79,7 @@ public class Illusion extends SkillActive @Override public String GetEnergyString() { - return "Energy: #40#-3 and #12#-0.5 per Second"; + return "Energy: #40#-3 and #12.5#-0.5 per Second"; } @Override @@ -130,7 +130,7 @@ public class Illusion extends SkillActive Factory.Disguise().disguise(disguise, disguiseList); //Invis - Factory.Condition().Factory().Cloak(GetName(), player, player, 2 + 2*level, false, true); + Factory.Condition().Factory().Cloak(GetName(), player, player, 2 + 1*level, false, true); _active.put(player, skel); @@ -153,7 +153,7 @@ public class Illusion extends SkillActive if (Factory.Condition().GetActiveCondition(cur, ConditionType.CLOAK) == null || !cur.isBlocking() || - !Factory.Energy().Use(cur, GetName(), 0.6 - (getLevel(cur) * 0.025), true, true) || + !Factory.Energy().Use(cur, GetName(), 0.625 - (getLevel(cur) * 0.025), true, true) || skel == null || !skel.isValid()) { diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java index 2227b4c53..a637324df 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java @@ -80,8 +80,8 @@ public class SeismicSlam extends SkillActive SetDesc(new String[] { "Jump up and slam back into the ground.", - "Players within #6#0.5 Blocks take up to", - "#2#1 damage and are thrown into the air.", + "Players within #5.5#0.5 Blocks take up to", + "#1#1 damage and are thrown into the air.", }); } @@ -137,7 +137,7 @@ public class SeismicSlam extends SkillActive _live.remove(player); //Action - HashMap targets = UtilEnt.getInRadius(player.getLocation(), 6d + 0.5 * level); + HashMap targets = UtilEnt.getInRadius(player.getLocation(), 5.5d + 0.5 * level); for (LivingEntity cur : targets.keySet()) { if (cur.equals(player)) @@ -145,13 +145,13 @@ public class SeismicSlam extends SkillActive //Damage Event Factory.Damage().NewDamageEvent(cur, player, null, - DamageCause.CUSTOM, (2+level) * targets.get(cur) + 0.5, false, true, false, + DamageCause.CUSTOM, (1+level) * targets.get(cur) + 0.5, false, true, false, player.getName(), GetName()); //Velocity UtilAction.velocity(cur, UtilAlg.getTrajectory2d(player.getLocation().toVector(), cur.getLocation().toVector()), - 1.8 * targets.get(cur), true, 0, 0.4 + 1.0 * targets.get(cur), 1.6, true); + 0.2 + 1.6 * targets.get(cur), true, 0, 0.2 + 1.2 * targets.get(cur), 1.6, true); //Condition Factory.Condition().Factory().Falling(GetName(), cur, player, 10, false, true); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java index bc2b56728..fafc9bbc0 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java @@ -55,10 +55,10 @@ public class ExplosiveShot extends SkillActive { "Prepare an explosive shot;", "Your next arrow will explode on", - "impact, dealing up to 12 damage", + "impact, dealing up to 10 damage", "and knockback. ", " ", - "Explosion radius of #5#1", + "Explosion radius of #4.5#0.5", }); setAchievementSkill(true); @@ -210,7 +210,7 @@ public class ExplosiveShot extends SkillActive return; //Velocity Players - HashMap hitMap = UtilPlayer.getInRadius(loc, 5 + (level)); + HashMap hitMap = UtilPlayer.getInRadius(loc, 4.5 + (level * 0.5)); for (Player cur : hitMap.keySet()) { double range = hitMap.get(cur); @@ -220,7 +220,7 @@ public class ExplosiveShot extends SkillActive //Damage Event Factory.Damage().NewDamageEvent(cur, player, null, - DamageCause.CUSTOM, 2 + 10 * range, false, true, false, + DamageCause.CUSTOM, 10 * range, false, true, false, player.getName(), GetName()); //Velocity diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java index 4b8b188a9..8862b10b0 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java @@ -170,8 +170,8 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory AddSkill(new Illusion(this, "Illusion", ClassType.Assassin, SkillType.Sword, 1, 4, - 40, -3, - 40000, -3000, true, + 50, -4, + 20000, -1000, true, new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); @@ -257,7 +257,7 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory AddSkill(new SeismicSlam(this, "Seismic Slam", ClassType.Brute, SkillType.Axe, 1, 5, 0, 0, - 30000, -3000, true, + 30000, -2000, true, new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index bab474a95..c89318c7c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -230,11 +230,11 @@ public abstract class Game implements Listener public boolean SoupEnabled = true; public boolean TeamArmor = false; - public boolean TeamArmorHotbar = false; + public boolean TeamArmorHotbar = false; - public boolean GiveClock = true; + public boolean GiveClock = true; - public boolean AllowParticles = true; + public boolean AllowParticles = true; public double GemMultiplier = 1; public boolean GemHunterEnabled = true; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java index bcd38eebf..475b6452e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java @@ -5,6 +5,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import mineplex.core.common.util.UtilPlayer; +import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index b0fe440c1..ebf0bf3a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -521,7 +521,7 @@ public class HideSeek extends TeamGame { if (event.getType() != UpdateType.TICK) return; - + if (!InProgress()) return; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java index 107a0ef9b..e6ffa73cb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java @@ -78,6 +78,8 @@ public class Quiver extends SoloGame this.BlockBreakAllow.add(102); this.BlockBreakAllow.add(20); + this.DeathSpectateSecs = 4; + _scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Kills", "dummy"); _scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java index 162adbeda..ef28ec4bb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java @@ -151,6 +151,8 @@ public class SheepGame extends TeamGame this.TeamArmor = true; this.TeamArmorHotbar = true; + + this.DeathSpectateSecs = 4; registerStatTrackers( new SheepThiefStatTracker(this), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java index ed8aef2ad..1cd31fe34 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java @@ -87,8 +87,10 @@ public class SuperSmash extends SoloGame this.CompassEnabled = true; + this.DeathSpectateSecs = 6; + this.SpawnDistanceRequirement = 16; - + // Add stat table here // Example //Manager.GetStatsManager().addTable("SuperSmashMobStats", "Kills", "Deaths", "Wins", "Losses"); @@ -374,16 +376,15 @@ public class SuperSmash extends SoloGame @EventHandler(priority = EventPriority.MONITOR) public void HungerRestore(CustomDamageEvent event) { - if (event.IsCancelled()) return; - if (event.GetDamagerPlayer(true) == null) - return; - Player damager = event.GetDamagerPlayer(true); if (damager == null) return; + + if (damager.equals(event.GetDamageeEntity())) + return; if (!Recharge.Instance.use(damager, "Hunger Restore", 250, false, false)) return; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index 491429b3d..d67fd7969 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -134,6 +134,7 @@ public class TurfForts extends TeamGame this.ItemDrop = false; this.ItemPickup = false; this.DamageSelf = false; + this.DeathSpectateSecs = 4; registerStatTrackers( new BlockShreadStatTracker(this),