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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-10-30 09:24:09 -04:00
parent 782307374f c0d1ff0f08
commit 513ccfe581
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/graphics/MenuRenderer.java
View File

@@ -244,7 +244,7 @@ public class MenuRenderer implements Disposable{
float size = Math.max(icon.width, icon.height) * Draw.scl * 1.6f; float size = Math.max(icon.width, icon.height) * Draw.scl * 1.6f;
flyers((x, y) -> { flyers((x, y) -> {
Draw.rect(flyerType.region, x - 12f, y - 13f, flyerRot - 90); Draw.rect(icon, x - 12f, y - 13f, flyerRot - 90);
}); });
flyers((x, y) -> { flyers((x, y) -> {
@@ -264,7 +264,7 @@ public class MenuRenderer implements Disposable{
(engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f); (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f);
Draw.color(); Draw.color();
Draw.rect(flyerType.region, x, y, flyerRot - 90); Draw.rect(icon, x, y, flyerRot - 90);
}); });
} }

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

@@ -19,6 +19,7 @@ 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 @Load("@-top") TextureRegion topRegion;
public boolean extinguish = true;
public LiquidTurret(String name){ public LiquidTurret(String name){
super(name); super(name);
@@ -86,7 +87,7 @@ public class LiquidTurret extends Turret{
@Override @Override
protected void findTarget(){ protected void findTarget(){
if(liquids.current().canExtinguish()){ if(extinguish && liquids.current().canExtinguish()){
int tr = (int)(range / tilesize); int tr = (int)(range / tilesize);
for(int x = -tr; x <= tr; x++){ for(int x = -tr; x <= tr; x++){
for(int y = -tr; y <= tr; y++){ for(int y = -tr; y <= tr; y++){