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

Unbroke wave sprite

Browse Source
This commit is contained in:
Anuken
2020-09-26 22:20:02 -04:00
parent 0a11482b55
commit 7b98628084
8 changed files with 943 additions and 927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/game/DefaultWaves.java
View File

@@ -211,5 +211,13 @@ public class DefaultWaves{
//- main progression of units, up to wave ~20
//- changes from
//- extra periodic patterns
//max reasonable wave, after which everything gets boring
int cap = 300;
for(int i = 0; i < cap; i++){
}
}
}

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

@@ -1,6 +1,5 @@
package mindustry.world.blocks.defense.turrets;
import arc.*;
import arc.graphics.g2d.*;
import arc.struct.*;
import mindustry.annotations.Annotations.*;
@@ -12,7 +11,7 @@ import mindustry.world.consumers.*;
import mindustry.world.meta.*;
import mindustry.world.meta.values.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
public class LiquidTurret extends Turret{
public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>();
@@ -54,23 +53,18 @@ public class LiquidTurret extends Turret{
});
}
@Override
public TextureRegion[] icons(){
return Core.atlas.isFound(topRegion) ? new TextureRegion[]{baseRegion, region, topRegion} : super.icons();
}
public class LiquidTurretBuild extends TurretBuild{
@Override
public void draw(){
super.draw();
if(Core.atlas.isFound(liquidRegion)){
if(liquidRegion.found()){
Draw.color(liquids.current().color);
Draw.alpha(liquids.total() / liquidCapacity);
Draw.rect(liquidRegion, x + tr2.x, y + tr2.y, rotation - 90);
Draw.reset();
}
if(Core.atlas.isFound(topRegion)) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90);
if(topRegion.found()) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90);
}
@Override