From f5b4f288480ce156d009738ae8d71533b1ab7dc5 Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Mon, 26 Oct 2015 00:25:33 -0400 Subject: [PATCH] - Fixed achievements - Various balance patches/audio changes --- .../src/mineplex/core/achievement/Achievement.java | 8 ++++---- .../arcade/game/games/common/CaptureTheFlag.java | 12 ++++++++++++ .../game/arcade/game/games/common/ctf_data/Flag.java | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java index 5521dcd7e..ab96df04a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java @@ -295,25 +295,25 @@ public enum Achievement AchievementCategory.CHAMPIONS), CHAMPIONS_ASSASSINATION("Assassination", 1000, - new String[]{"Champions Domination.Assassination", "Champions TDM.Assassination"}, + new String[]{"Champions Domination.Assassination", "Champions TDM.Assassination", "Champions Capture the Flag.Assassination"}, new String[]{"Kill 40 players with Backstab without", "taking any damage from them"}, new int[]{40}, AchievementCategory.CHAMPIONS), CHAMPIONS_MASS_ELECTROCUTION("Mass Electrocution", 1200, - new String[]{"Champions Domination.MassElectrocution", "Champions TDM.MassElectrocution"}, + new String[]{"Champions Domination.MassElectrocution", "Champions TDM.MassElectrocution", "Champions Capture the Flag.MassElectrocution"}, new String[]{"Hit 4 enemies with a Lightning Orb"}, new int[]{1}, AchievementCategory.CHAMPIONS), CHAMPIONS_THE_LONGEST_SHOT("The Longest Shot", 1200, - new String[]{"Champions Domination.TheLongestShot", "Champions TDM.TheLongestShot"}, + new String[]{"Champions Domination.TheLongestShot", "Champions TDM.TheLongestShot", "Champions Capture the Flag.TheLongestShot"}, new String[]{"Kill someone using Longshot who", "is over 64 Blocks away from you"}, new int[]{1}, AchievementCategory.CHAMPIONS), CHAMPIONS_EARTHQUAKE("Earthquake", 1200, - new String[]{"Champions Domination.Earthquake", "Champions TDM.Earthquake"}, + new String[]{"Champions Domination.Earthquake", "Champions TDM.Earthquake", "Champions Capture the Flag.Earthquake"}, new String[]{"Launch 5 enemies using Seismic Slam"}, new int[]{1}, AchievementCategory.CHAMPIONS), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java index 930e8d3e4..f28fe44c6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java @@ -493,6 +493,12 @@ public class CaptureTheFlag extends TeamGame @Override public double GetKillsGems(Player killer, Player killed, boolean assist) { + if (assist) + return .5; + + if (_suddenDeath) + return 2; + return 1; } @@ -586,6 +592,12 @@ public class CaptureTheFlag extends TeamGame event.setCancelled(true); event.setCancelMessage("You cannot change kits while holding a flag!"); } + + if (_suddenDeath) + { + event.setCancelled(true); + event.setCancelMessage("You cannot change kits during Sudden Death!"); + } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java index 860e38fca..603041ee6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java @@ -210,7 +210,7 @@ public class Flag if (_holding.hasPotionEffect(PotionEffectType.SLOW)) _holding.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 1000000, 1)); - _holding.getWorld().playSound(_holding.getLocation(), Sound.NOTE_STICKS, 2f, 1f); + //_holding.getWorld().playSound(_holding.getLocation(), Sound.NOTE_STICKS, 2f, 1f); score(_holding); } }