From 0bd07866d8bdcd427fdd684f502d7b49914506c8 Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Wed, 21 Oct 2020 19:51:32 -0700 Subject: [PATCH] m hm --- .../entities/abilities/MovementLightningAbility.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/entities/abilities/MovementLightningAbility.java b/core/src/mindustry/entities/abilities/MovementLightningAbility.java index 633ad1e369..38ab8ca3f0 100644 --- a/core/src/mindustry/entities/abilities/MovementLightningAbility.java +++ b/core/src/mindustry/entities/abilities/MovementLightningAbility.java @@ -1,17 +1,18 @@ package mindustry.entities.abilities; import arc.util.*; +import arc.audio.*; import arc.math.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.gen.*; -import static mindustry.Vars.*; public class MovementLightningAbility extends Ability{ public float damage = 35f, reload = 0.15f; - public int length = 12f; + public int length = 12; public float minSpeed = 0.8f, maxSpeed = 1.2f; - public Effect shootEffect = Fx.lightningShoot; + public Effect shootEffect = Fx.sparkShoot; + public Sound shootSound = Sounds.spark; MovementLightningAbility(){} @@ -28,7 +29,8 @@ public class MovementLightningAbility extends Ability{ float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed)); if(Mathf.chance(Time.delta * (reload * scl))){ shootEffect.at(unit.x, unit.y, unit.rotation, unit.team.color); - Lightning.create(unit.team, unit.team.color, damage * Vars.state.rules.playerDamageMultiplie, unit.x + unit.vel().x, unit.y + unit.vel().y, unit.rotation, length); + Lightning.create(unit.team, unit.team.color, damage, unit.x + unit.vel().x, unit.y + unit.vel().y, unit.rotation, length); + shootSound.at(unit.x, unit.y); } } } \ No newline at end of file