Minor weapon fixes
This commit is contained in:
@@ -103,44 +103,16 @@ public class UnitTypes implements ContentList{
|
|||||||
buildSpeed = 0.8f;
|
buildSpeed = 0.8f;
|
||||||
|
|
||||||
weapons.add(new Weapon("heal-weapon"){{
|
weapons.add(new Weapon("heal-weapon"){{
|
||||||
shootY = 1.5f;
|
shootY = 2f;
|
||||||
reload = 24f;
|
reload = 24f;
|
||||||
x = 3.5f;
|
x = 4.5f;
|
||||||
alternate = false;
|
alternate = false;
|
||||||
ejectEffect = Fx.none;
|
ejectEffect = Fx.none;
|
||||||
recoil = 2f;
|
recoil = 2f;
|
||||||
bullet = Bullets.healBullet;
|
bullet = Bullets.healBullet;
|
||||||
shootSound = Sounds.pew;
|
shootSound = Sounds.pew;
|
||||||
}});
|
}});
|
||||||
}
|
}};
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
float healRange = 60f;
|
|
||||||
float healAmount = 10f;
|
|
||||||
float healReload = 160f;
|
|
||||||
boolean wasHealed;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update(Unitc player){
|
|
||||||
|
|
||||||
if(player.timer().get(Player.timerAbility, healReload)){
|
|
||||||
wasHealed = false;
|
|
||||||
|
|
||||||
Units.nearby(player.team(), player.x, player.y, healRange, unit -> {
|
|
||||||
if(unit.health < unit.maxHealth()){
|
|
||||||
Fx.heal.at(unit);
|
|
||||||
wasHealed = true;
|
|
||||||
}
|
|
||||||
unit.heal(healAmount);
|
|
||||||
});
|
|
||||||
|
|
||||||
if(wasHealed){
|
|
||||||
Fx.healWave.at(player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
};
|
|
||||||
|
|
||||||
oculon = new UnitType("oculon"){{
|
oculon = new UnitType("oculon"){{
|
||||||
drillTier = 1;
|
drillTier = 1;
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
|
|||||||
Weapon weapon = mount.weapon;
|
Weapon weapon = mount.weapon;
|
||||||
mount.reload = Math.max(mount.reload - Time.delta(), 0);
|
mount.reload = Math.max(mount.reload - Time.delta(), 0);
|
||||||
|
|
||||||
|
//flip weapon shoot side for alternating weapons at half reload
|
||||||
if(weapon.otherSide != -1 && weapon.alternate && mount.side == weapon.flipSprite &&
|
if(weapon.otherSide != -1 && weapon.alternate && mount.side == weapon.flipSprite &&
|
||||||
mount.reload + Time.delta() > weapon.reload/2f && mount.reload <= weapon.reload/2f){
|
mount.reload + Time.delta() > weapon.reload/2f && mount.reload <= weapon.reload/2f){
|
||||||
mounts[weapon.otherSide].side = !mounts[weapon.otherSide].side;
|
mounts[weapon.otherSide].side = !mounts[weapon.otherSide].side;
|
||||||
|
|||||||
Reference in New Issue
Block a user