From a351a8f1ed9cbe5abf17d8ee87cb21cfd8f2802c Mon Sep 17 00:00:00 2001 From: Mysticate Date: Wed, 26 Aug 2015 13:47:01 -0600 Subject: [PATCH] Minor improvements. --- .../game/arcade/game/games/evolution/Evolution.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java index e55646c8e..1ddfc81f1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java @@ -23,6 +23,7 @@ import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.combat.CombatComponent; +import mineplex.minecraft.game.core.combat.CombatManager.AttackReason; import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; import mineplex.minecraft.game.core.condition.Condition.ConditionType; import mineplex.minecraft.game.core.condition.ConditionActive; @@ -145,6 +146,8 @@ public class Evolution extends SoloGame DeathMessages = false; + Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.Attack); + registerStatTrackers( new WinWithoutDyingStatTracker(this, "NoDeaths"), new NoDamageWhileEvolvingTracker(this), @@ -429,10 +432,11 @@ public class Evolution extends SoloGame if (_tokens.containsKey(player.getName())) { - int kills = _tokens.get(player.getName()).LifeKills++; + EvoToken token = _tokens.get(player.getName()); + token.LifeKills++; UtilPlayer.message(player, ""); - UtilPlayer.message(player, F.main("Game", F.elem(kills + " Kills") + " - " + F.elem(Math.min(1.0, 6.0 - (1.5 * (kills - 1))) + " Second ") + "evolve")); + UtilPlayer.message(player, F.main("Game", F.elem(token.LifeKills + " Kills") + " - " + F.elem(Math.min(1.0, 6.0 - (1.5 * (token.LifeKills - 1))) + " Second ") + "evolve speed" + (token.SupplementKit instanceof KitEvolveSpeed ? C.cGreen + " - 30% (Quick Evolver)" : ""))); UtilPlayer.message(player, ""); }