mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-21 20:18:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor weapon fixes

Browse Source
This commit is contained in:
Anuken 2020-07-02 23:19:44 -04:00
parent f4a7108382
commit efa8d8a0d7
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/mindustry/content/UnitTypes.java
View File

@ -103,44 +103,16 @@ public class UnitTypes implements ContentList{
buildSpeed = 0.8f;
weapons.add(new Weapon("heal-weapon"){{
shootY = 1.5f;
shootY = 2f;
reload = 24f;
x = 3.5f;
x = 4.5f;
alternate = false;
ejectEffect = Fx.none;
recoil = 2f;
bullet = Bullets.healBullet;
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"){{
drillTier = 1;

1
core/src/mindustry/entities/comp/WeaponsComp.java
View File

@ -84,6 +84,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
Weapon weapon = mount.weapon;
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 &&
mount.reload + Time.delta() > weapon.reload/2f && mount.reload <= weapon.reload/2f){
mounts[weapon.otherSide].side = !mounts[weapon.otherSide].side;