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

Unit repair tower sprite/effects

Browse Source
This commit is contained in:
Anuken
2022-04-30 23:24:28 -04:00
parent 1c84e6d7ea
commit 8ea9c094ab
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/units/unit-repair-tower-glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
core/assets-raw/sprites/blocks/units/unit-repair-tower.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

3
core/src/mindustry/content/Blocks.java
View File

@@ -4311,9 +4311,10 @@ public class Blocks{
size = 2; size = 2;
range = 100f; range = 100f;
healAmount = 2f;
consumePower(1f); consumePower(1f);
consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeLiquid(Liquids.ozone, 3f / 60f);
}}; }};
//endregion //endregion

16
core/src/mindustry/world/blocks/units/RepairTower.java
View File

@@ -5,6 +5,7 @@ import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.*; import mindustry.entities.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
@@ -17,9 +18,10 @@ public class RepairTower extends Block{
static final float refreshInterval = 6f; static final float refreshInterval = 6f;
public float range = 80f; public float range = 80f;
public Color circleColor = Pal.heal; public Color circleColor = Pal.heal, glowColor = Pal.heal.cpy().a(0.5f);
public float circleSpeed = 120f, circleStroke = 3f; public float circleSpeed = 120f, circleStroke = 3f, squareRad = 3f, squareSpinScl = 0.8f, glowMag = 0.5f, glowScl = 8f;
public float healAmount = 1f; public float healAmount = 1f;
public @Load("@-glow") TextureRegion glow;
public RepairTower(String name){ public RepairTower(String name){
super(name); super(name);
@@ -63,7 +65,7 @@ public class RepairTower extends Block{
} }
} }
warmup = Mathf.lerpDelta(warmup, any ? efficiency : 0f, 0.1f); warmup = Mathf.lerpDelta(warmup, any ? efficiency : 0f, 0.08f);
totalProgress += Time.delta / circleSpeed; totalProgress += Time.delta / circleSpeed;
} }
@@ -76,12 +78,18 @@ public class RepairTower extends Block{
public void draw(){ public void draw(){
super.draw(); super.draw();
if(warmup <= 0.001f) return;
Draw.z(Layer.effect); Draw.z(Layer.effect);
float mod = totalProgress % 1f; float mod = totalProgress % 1f;
Draw.color(circleColor); Draw.color(circleColor);
Lines.stroke(circleStroke * (1f - mod)); Lines.stroke(circleStroke * (1f - mod) * warmup);
Lines.circle(x, y, range * mod); Lines.circle(x, y, range * mod);
Draw.color(Pal.heal);
Fill.square(x, y, squareRad * warmup, Time.time / squareSpinScl);
Draw.reset(); Draw.reset();
Drawf.additive(glow, glowColor, warmup * (1f - glowMag + Mathf.absin(Time.time, glowScl, glowMag)), x, y, 0f, Layer.blockAdditive);
} }
@Override @Override