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

The on-going consumer disaster

Browse Source
This commit is contained in:
Anuken
2022-02-20 23:00:25 -05:00
parent 8b916d03af
commit 19828410a9
68 changed files with 371 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/draw/DrawAnimation.java
View File

@@ -15,7 +15,7 @@ public class DrawAnimation extends DrawBlock{
public TextureRegion liquid, top;
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y);
Draw.rect(
sine ?

2
core/src/mindustry/world/draw/DrawArcSmelter.java
View File

@@ -22,7 +22,7 @@ public class DrawArcSmelter extends DrawBlock{
public Blending blending = Blending.additive;
@Override
public void drawBase(Building build){
public void draw(Building build){
if(drawBottom) Draw.rect(bottom, build.x, build.y);
if(build.warmup() > 0f && flameColor.a > 0.001f){

4
core/src/mindustry/world/draw/DrawBlock.java
View File

@@ -23,12 +23,12 @@ public class DrawBlock{
}
/** Draws the block itself. */
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y, build.drawrot());
}
/** Draws any extra light for the block. */
public void drawLights(Building build){
public void drawLight(Building build){
}

2
core/src/mindustry/world/draw/DrawBlurSpin.java
View File

@@ -23,7 +23,7 @@ public class DrawBlurSpin extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Drawf.spinSprite(build.warmup() > blurThresh ? blurRegion : region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed);
}

2
core/src/mindustry/world/draw/DrawBubbles.java
View File

@@ -21,7 +21,7 @@ public class DrawBubbles extends DrawPartial{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
if(build.warmup() <= 0.001f) return;
Draw.color(color);

2
core/src/mindustry/world/draw/DrawCells.java
View File

@@ -16,7 +16,7 @@ public class DrawCells extends DrawBlock{
public float range = 4f, recurrence = 6f, radius = 3f, lifetime = 60f;
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(bottom, build.x, build.y);

2
core/src/mindustry/world/draw/DrawCircles.java
View File

@@ -22,7 +22,7 @@ public class DrawCircles extends DrawPartial{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
if(build.warmup() <= 0.001f) return;
Draw.color(color, build.warmup() * color.a);

2
core/src/mindustry/world/draw/DrawCrucibleFlame.java
View File

@@ -17,7 +17,7 @@ public class DrawCrucibleFlame extends DrawPartial{
public Interp particleInterp = new PowIn(1.5f);
@Override
public void drawBase(Building build){
public void draw(Building build){
if(build.warmup() > 0f && flameColor.a > 0.001f){
Lines.stroke(circleStroke * build.warmup());

2
core/src/mindustry/world/draw/DrawCultivator.java
View File

@@ -21,7 +21,7 @@ public class DrawCultivator extends DrawBlock{
public TextureRegion top;
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y);
Drawf.liquid(middle, build.x, build.y, build.warmup(), plantColor);

2
core/src/mindustry/world/draw/DrawGlow.java
View File

@@ -12,7 +12,7 @@ public class DrawGlow extends DrawBlock{
public TextureRegion top;
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y);
Draw.alpha(Mathf.absin(build.totalProgress(), glowScale, glowAmount) * build.warmup());
Draw.rect(top, build.x, build.y);

2
core/src/mindustry/world/draw/DrawGlowRegion.java
View File

@@ -36,7 +36,7 @@ public class DrawGlowRegion extends DrawPartial{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
if(build.warmup() <= 0.001f) return;
float z = Draw.z();

2
core/src/mindustry/world/draw/DrawHeatInput.java
View File

@@ -31,7 +31,7 @@ public class DrawHeatInput extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.z(Layer.blockAdditive);
if(build instanceof HeatConsumer hc){

2
core/src/mindustry/world/draw/DrawHeatOutput.java
View File

@@ -26,7 +26,7 @@ public class DrawHeatOutput extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
if(drawRegion) Draw.rect(build.block.region, build.x, build.y);
Draw.rect(build.rotation > 1 ? top2 : top1, build.x, build.y, build.rotdeg());

2
core/src/mindustry/world/draw/DrawHeatRegion.java
View File

@@ -25,7 +25,7 @@ public class DrawHeatRegion extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.z(Layer.blockAdditive);
if(build instanceof HeatCrafterBuild hc && hc.heat > 0){

2
core/src/mindustry/world/draw/DrawLiquid.java
View File

@@ -22,7 +22,7 @@ public class DrawLiquid extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y);
GenericCrafter type = (GenericCrafter)build.block;

2
core/src/mindustry/world/draw/DrawLiquidOutputs.java
View File

@@ -13,7 +13,7 @@ public class DrawLiquidOutputs extends DrawBlock{
public TextureRegion[][] liquidOutputRegions;
@Override
public void drawBase(Building build){
public void draw(Building build){
GenericCrafter crafter = (GenericCrafter)build.block;
if(crafter.outputLiquids == null) return;

2
core/src/mindustry/world/draw/DrawLiquidRegion.java
View File

@@ -23,7 +23,7 @@ public class DrawLiquidRegion extends DrawPartial{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
if(!build.block.hasLiquids) return;
Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current();

2
core/src/mindustry/world/draw/DrawLiquidTile.java
View File

@@ -23,7 +23,7 @@ public class DrawLiquidTile extends DrawPartial{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current();
LiquidBlock.drawTiledFrames(build.block.size, build.x, build.y, padding, drawn, build.liquids.get(drawn) / build.block.liquidCapacity * alpha);
}

2
core/src/mindustry/world/draw/DrawMixer.java
View File

@@ -22,7 +22,7 @@ public class DrawMixer extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
GenericCrafter crafter = (GenericCrafter)build.block;
float rotation = build.block.rotate ? build.rotdeg() : 0;
Draw.rect(bottom, build.x, build.y, rotation);

8
core/src/mindustry/world/draw/DrawMulti.java
View File

@@ -32,9 +32,9 @@ public class DrawMulti extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
for(var draw : drawers){
draw.drawBase(build);
draw.draw(build);
}
}
@@ -46,9 +46,9 @@ public class DrawMulti extends DrawBlock{
}
@Override
public void drawLights(Building build){
public void drawLight(Building build){
for(var draw : drawers){
draw.drawLights(build);
draw.drawLight(build);
}
}

2
core/src/mindustry/world/draw/DrawMultiWeave.java
View File

@@ -15,7 +15,7 @@ public class DrawMultiWeave extends DrawBlock{
public float pulse = 0.3f, pulseScl = 10f;
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(weave, build.x, build.y, build.totalProgress() * rotateSpeed);
Draw.rect(weave, build.x, build.y, build.totalProgress() * rotateSpeed * rotateSpeed2);

2
core/src/mindustry/world/draw/DrawParticles.java
View File

@@ -20,7 +20,7 @@ public class DrawParticles extends DrawBlock{
public Blending blending = Blending.normal;
@Override
public void drawBase(Building build){
public void draw(Building build){
if(build.warmup() > 0f){

2
core/src/mindustry/world/draw/DrawPistons.java
View File

@@ -19,7 +19,7 @@ public class DrawPistons extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
for(int i = 0; i < sides; i++){
float len = Mathf.absin(build.totalProgress() + sinOffset + sideOffset * sinScl * i, sinScl, sinMag) + lenOffset;
float angle = i * 360f / sides;

2
core/src/mindustry/world/draw/DrawPulseShape.java
View File

@@ -25,7 +25,7 @@ public class DrawPulseShape extends DrawPartial{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
float pz = Draw.z();
if(layer > 0) Draw.z(layer);

2
core/src/mindustry/world/draw/DrawPump.java
View File

@@ -11,7 +11,7 @@ public class DrawPump extends DrawBlock{
public TextureRegion liquid;
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y);
if(!(build instanceof PumpBuild pump) || pump.liquidDrop == null) return;

2
core/src/mindustry/world/draw/DrawRegion.java
View File

@@ -26,7 +26,7 @@ public class DrawRegion extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
float z = Draw.z();
if(layer > 0) Draw.z(layer);
if(spinSprite){

2
core/src/mindustry/world/draw/DrawRotator.java
View File

@@ -20,7 +20,7 @@ public class DrawRotator extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y);
if(drawSpinSprite){
Drawf.spinSprite(rotator, build.x, build.y, build.totalProgress() * spinSpeed);

2
core/src/mindustry/world/draw/DrawShape.java
View File

@@ -12,7 +12,7 @@ public class DrawShape extends DrawPartial{
public boolean useWarmupRadius = false;
@Override
public void drawBase(Building build){
public void draw(Building build){
float pz = Draw.z();
if(layer > 0) Draw.z(layer);

2
core/src/mindustry/world/draw/DrawSideRegion.java
View File

@@ -19,7 +19,7 @@ public class DrawSideRegion extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
if(drawRegion) Draw.rect(build.block.region, build.x, build.y);
Draw.rect(build.rotation > 1 ? top2 : top1, build.x, build.y, build.rotdeg());

4
core/src/mindustry/world/draw/DrawSmelter.java
View File

@@ -29,7 +29,7 @@ public class DrawSmelter extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(build.block.region, build.x, build.y, build.block.rotate ? build.rotdeg() : 0);
if(build.warmup() > 0f && flameColor.a > 0.001f){
@@ -54,7 +54,7 @@ public class DrawSmelter extends DrawBlock{
}
@Override
public void drawLights(Building build){
public void drawLight(Building build){
Drawf.light(build.team, build.x, build.y, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
}
}

2
core/src/mindustry/world/draw/DrawSpikes.java
View File

@@ -19,7 +19,7 @@ public class DrawSpikes extends DrawPartial{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
if(build.warmup() <= 0.001f) return;
Draw.color(color, build.warmup() * color.a);

4
core/src/mindustry/world/draw/DrawTurbines.java
View File

@@ -18,9 +18,7 @@ public class DrawTurbines extends DrawBlock{
}
@Override
public void drawBase(Building build){
if(!turbines[0].found()) return;
public void draw(Building build){
float totalTime = build.totalProgress();
Draw.rect(turbines[0], build.x, build.y, totalTime * turbineSpeed);
Draw.rect(turbines[1], build.x, build.y, -totalTime * turbineSpeed);

2
core/src/mindustry/world/draw/DrawTurret.java
View File

@@ -44,7 +44,7 @@ public class DrawTurret extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Turret turret = (Turret)build.block;
TurretBuild tb = (TurretBuild)build;

2
core/src/mindustry/world/draw/DrawWarmupRegion.java
View File

@@ -20,7 +20,7 @@ public class DrawWarmupRegion extends DrawBlock{
}
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.color(color);
Draw.alpha(build.warmup() * (1f - sinMag) + Mathf.absin(Time.time, sinScl, sinMag) * build.warmup());
Draw.rect(region, build.x, build.y);

2
core/src/mindustry/world/draw/DrawWeave.java
View File

@@ -12,7 +12,7 @@ public class DrawWeave extends DrawBlock{
public TextureRegion weave, bottom;
@Override
public void drawBase(Building build){
public void draw(Building build){
Draw.rect(bottom, build.x, build.y);
Draw.rect(weave, build.x, build.y, build.totalProgress());