Zombie changes

This commit is contained in:
Sam 2017-05-01 13:48:09 +01:00
parent cc3ac9800b
commit 110d8946d5

View File

@ -42,9 +42,11 @@ public class PerkDeathsGrasp extends Perk
{
private Map<UUID, Long> _live = new HashMap<>();
private HashMap<LivingEntity, Long> _weakness = new HashMap<>();
private long _leapDuration;
private long _weaknessDuration;
private int _cooldown;
private int _damage;
private int _leapDuration;
private int _weaknessDuration;
public PerkDeathsGrasp()
{
@ -58,6 +60,8 @@ public class PerkDeathsGrasp extends Perk
@Override
public void setupValues()
{
_cooldown = getPerkTime("Cooldown");
_damage = getPerkInt("Damage");
_leapDuration = getPerkInt("Leap Duration (ms)");
_weaknessDuration = getPerkInt("Weakness Duration (ms)");
}
@ -82,7 +86,7 @@ public class PerkDeathsGrasp extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, GetName(), 12000, true, true))
if (!Recharge.Instance.use(player, GetName(), _cooldown, true, true))
return;
UtilAction.velocity(player, player.getLocation().getDirection(), 1.4, false, 0, 0.2, 1.2, true);
@ -104,7 +108,6 @@ public class PerkDeathsGrasp extends Perk
{
return;
}
//Leap End & Collide
for(Iterator<Entry<UUID, Long>> it = _live.entrySet().iterator(); it.hasNext();)
@ -162,7 +165,7 @@ public class PerkDeathsGrasp extends Perk
{
//Damage Event
Manager.GetDamage().NewDamageEvent(damagee, damager, null,
DamageCause.CUSTOM, 6, false, true, false,
DamageCause.CUSTOM, _damage, false, true, false,
damager.getName(), GetName());
UtilAction.velocity(damagee, UtilAlg.getTrajectory2d(damagee, damager), 1.6, false, 0, 1.2, 1.8, true);