Changes to make evolving easier

• Speed 1 on kill
• Evolve chargeup decreases 1.5 seconds per kill.
This commit is contained in:
Mysticate 2015-08-17 10:36:28 -04:00
parent 993ed0a92d
commit 75a4b3d568
2 changed files with 23 additions and 1 deletions

View File

@ -11,6 +11,7 @@ public class EvoToken implements Comparable<EvoToken>
public final Player Player;
public int Level = 0;
public int LifeKills = 0;
public EvoToken(Player player)
{

View File

@ -320,6 +320,9 @@ public class Evolution extends SoloGame
if (!IsLive())
return;
if (!IsAlive(event.getEntity()))
return;
if (_evolutionsAvailable.contains(event.getEntity()))
{
_evolutionsAvailable.remove(event.getEntity());
@ -334,6 +337,11 @@ public class Evolution extends SoloGame
{
removeEvolvingEffects(event.getEntity());
}
if (_tokens.containsKey(event.getEntity().getName()))
{
_tokens.get(event.getEntity().getName()).LifeKills = 0;
}
}
@EventHandler
@ -368,6 +376,15 @@ public class Evolution extends SoloGame
if (_chargingExp.containsKey(player.getName()))
_chargingExp.remove(player.getName());
}
if (_tokens.containsKey(player.getName()))
{
_tokens.get(player.getName()).LifeKills++;
}
//Buffs
Manager.GetCondition().Factory().Speed("Kill", player, null, 2, 0, true, false, false);
UtilPlayer.health(player, player.getMaxHealth() / 2);
}
@Override
@ -483,6 +500,8 @@ public class Evolution extends SoloGame
EvoToken token = _tokens.get(player.getName());
token.LifeKills = 0;
EvoKit from = (EvoKit) GetKits()[token.Level];
EvoKit to = (EvoKit) GetKits()[token.Level + 1 >= GetKits().length ? token.Level : token.Level + 1]; //Account for the score increase after evolve
@ -493,7 +512,9 @@ public class Evolution extends SoloGame
if (!hasEvolvingEffects(player))
addEvolvingEffects(player);
_chargingExp.put(player.getName(), Math.min(exp + .012F, .9999F));
int kills = _tokens.get(player.getName()).LifeKills;
_chargingExp.put(player.getName(), (float) Math.min(exp + Math.max(.002, .012F - .003 * kills), .9999F));
UtilTextMiddle.display("", UtilTextMiddle.progress(_chargingExp.get(player.getName())).trim(), player);