Added sorter cross (#1566)

This commit is contained in:
Anuken
2020-03-26 17:39:23 -04:00
parent 152a987c3a
commit 0573160b2f
13 changed files with 635 additions and 614 deletions

View File

@@ -0,0 +1 @@
{version:1,fields:[{name:health,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:updateFlow,type:boolean,size:1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

View File

@@ -0,0 +1 @@
{version:2,fields:[{name:health,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

View File

@@ -221,3 +221,4 @@
63523=dart-ship-pad|block-dart-ship-pad-medium 63523=dart-ship-pad|block-dart-ship-pad-medium
63522=alpha-mech-pad|block-alpha-mech-pad-medium 63522=alpha-mech-pad|block-alpha-mech-pad-medium
63521=cliff|block-cliff-medium 63521=cliff|block-cliff-medium
63520=legacy-mech-pad|block-legacy-mech-pad-medium

Binary file not shown.

Before

Width:  |  Height:  |  Size: 732 B

After

Width:  |  Height:  |  Size: 736 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 693 KiB

After

Width:  |  Height:  |  Size: 483 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 KiB

After

Width:  |  Height:  |  Size: 241 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 KiB

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 867 KiB

After

Width:  |  Height:  |  Size: 704 KiB

View File

@@ -69,11 +69,15 @@ public class Sorter extends Block{
public void draw(){ public void draw(){
super.draw(); super.draw();
if(sortItem == null) return; if(sortItem == null){
Draw.rect("cross", x, y);
}else{
Draw.color(sortItem.color);
Draw.rect("center", x, y);
Draw.color();
}
Draw.color(sortItem.color);
Draw.rect("center", x, y);
Draw.color();
} }
@Override @Override

View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=dd0f2c60c53919ce97c987e502acf94af3a9a2b4 archash=670ff2275995a11566a81a9cdaeb1468e7cf2042