mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Semi-usable sprites

Browse Source
This commit is contained in:
Anuken 2018-11-13 22:10:41 -05:00
parent 4cb78f55d1
commit a9df64f861
9 changed files with 948 additions and 950 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/power/power-node-large.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 397 B

BIN
core/assets-raw/sprites/blocks/power/power-node.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 B

After

Width:  |  Height:  |  Size: 264 B

BIN
core/assets-raw/sprites/blocks/production/itemvoid.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 B

After

Width:  |  Height:  |  Size: 219 B

BIN
core/assets-raw/sprites/blocks/turrets/turrets/duo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 242 B

BIN
core/assets-raw/sprites/blocks/turrets/turrets/hail.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 221 B

1890
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 KiB

After

Width:  |  Height:  |  Size: 343 KiB

2
core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
View File

@ -129,8 +129,6 @@ public abstract class Turret extends Block{
@Override @Override
public void draw(Tile tile){ public void draw(Tile tile){
Draw.rect(baseRegion, tile.drawx(), tile.drawy()); Draw.rect(baseRegion, tile.drawx(), tile.drawy());
Draw.color(tile.getTeam().color, Color.WHITE, 0.45f);
Draw.rect(baseTopRegion, tile.drawx(), tile.drawy());
Draw.color(); Draw.color();
} }

6
core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
View File

@ -241,8 +241,8 @@ public class PowerNode extends PowerBlock{
float angle1 = Angles.angle(x1, y1, x2, y2); float angle1 = Angles.angle(x1, y1, x2, y2);
float angle2 = angle1 + 180f; float angle2 = angle1 + 180f;
t1.trns(angle1, tile.block().size * tilesize / 2f - 1f); t1.trns(angle1, tile.block().size * tilesize / 2f - 1.5f);
t2.trns(angle2, target.block().size * tilesize / 2f - 1f); t2.trns(angle2, target.block().size * tilesize / 2f - 1.5f);
x1 += t1.x; x1 += t1.x;
y1 += t1.y; y1 += t1.y;
@ -254,7 +254,7 @@ public class PowerNode extends PowerBlock{
int segments = Mathf.ceil(space / segscl); int segments = Mathf.ceil(space / segscl);
Draw.color(Palette.power, Palette.powerLight, Mathf.absin(Timers.time(), 5f, 1f)); Draw.color(Palette.powerLight);
Lines.stroke(1f); Lines.stroke(1f);
Lines.beginLine(); Lines.beginLine();