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

Merge pull request #2738 from Voz-Duh/top-for-liquid-turrets

Browse Source 
Top For Liquid Turrets
This commit is contained in:
Anuken
2020-09-26 20:16:38 -04:00
committed by GitHub
parent f785f97e87 55081785d0
commit f4b6600a6d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/turrets/wave-top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

10
core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@@ -17,6 +17,7 @@ import static mindustry.Vars.tilesize;
public class LiquidTurret extends Turret{ public class LiquidTurret extends Turret{
public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>(); public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>();
public @Load("@-liquid") TextureRegion liquidRegion; public @Load("@-liquid") TextureRegion liquidRegion;
public @Load("@-top") TextureRegion topRegion;
public LiquidTurret(String name){ public LiquidTurret(String name){
super(name); super(name);
@@ -53,8 +54,12 @@ public class LiquidTurret extends Turret{
}); });
} }
public class LiquidTurretBuild extends TurretBuild{ @Override
public TextureRegion[] icons(){
return Core.atlas.isFound(topRegion) ? new TextureRegion[]{baseRegion, region, topRegion} : super.icons();
}
public class LiquidTurretBuild extends TurretBuild{
@Override @Override
public void draw(){ public void draw(){
super.draw(); super.draw();
@@ -63,8 +68,9 @@ public class LiquidTurret extends Turret{
Draw.color(liquids.current().color); Draw.color(liquids.current().color);
Draw.alpha(liquids.total() / liquidCapacity); Draw.alpha(liquids.total() / liquidCapacity);
Draw.rect(liquidRegion, x + tr2.x, y + tr2.y, rotation - 90); Draw.rect(liquidRegion, x + tr2.x, y + tr2.y, rotation - 90);
Draw.color(); Draw.reset();
} }
if(Core.atlas.isFound(topRegion)) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90);
} }
@Override @Override