Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented liquid turrets with ammo / Implemented flamer turret

Browse Source
This commit is contained in:
Anuken
2018-04-03 23:06:39 -04:00
parent 636da8f95f
commit 397220e682
18 changed files with 355 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/io/anuke/mindustry/resource/AmmoType.java
View File

@@ -8,18 +8,37 @@ public class AmmoType {
private static Array<AmmoType> allTypes = new Array<>();
public final byte id;
/**The item used. Always null if liquid isn't.*/
public final Item item;
/**The liquid used. Always null if item isn't.*/
public final Liquid liquid;
/**The resulting bullet.*/
public final BulletType bullet;
public final int quantityMultiplier;
/**For item ammo, this is amount given per ammo item.
* For liquid ammo, this is amount used per shot.*/
public final float quantityMultiplier;
/**Turret shoot speed multiplier.*/
public final float speedMultiplier;
public AmmoType(Item item, BulletType result, int multiplier, float speedMultiplier){
{
this.id = (byte)(lastID++);
allTypes.add(this);
}
public AmmoType(Item item, BulletType result, float multiplier, float speedMultiplier){
this.item = item;
this.liquid = null;
this.bullet = result;
this.quantityMultiplier = multiplier;
this.speedMultiplier = speedMultiplier;
}
public AmmoType(Liquid liquid, BulletType result, float multiplier, float speedMultiplier){
this.item = null;
this.liquid = liquid;
this.bullet = result;
this.quantityMultiplier = multiplier;
this.speedMultiplier = speedMultiplier;
this.id = (byte)(lastID++);
allTypes.add(this);
}
public static Array<AmmoType> getAllTypes() {