mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-14 17:57:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Moved block icons to UI atlas

Browse Source
This commit is contained in:
Anuken
2019-07-08 15:49:47 -04:00
parent 1c38e73290
commit d8d04f2ac3
8 changed files with 6849 additions and 5203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12033
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: 1.0 MiB

After

Width:  |  Height:  |  Size: 676 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 KiB

After

Width:  |  Height:  |  Size: 276 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 KiB

After

Width:  |  Height:  |  Size: 254 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 459 KiB

5
core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java
View File

@ -82,6 +82,7 @@ public class MinerDrone extends BaseDrone implements MinerTrait{
public void update(){
if(item.amount == 0 || item.item.type != ItemType.material){
clearItem();
setState(mine);
return;
}
@ -93,11 +94,11 @@ public class MinerDrone extends BaseDrone implements MinerTrait{
TileEntity tile = (TileEntity)target;
if(dst(target) < type.range){
if(tile.tile.block().acceptStack(item.item, item.amount, tile.tile, MinerDrone.this) == item.amount){
if(tile.tile.block().acceptStack(item.item, item.amount, tile.tile, MinerDrone.this) > 0){
Call.transferItemTo(item.item, item.amount, x, y, tile.tile);
item.amount = 0;
}
clearItem();
setState(mine);
}

6
core/src/io/anuke/mindustry/world/Block.java
View File

@ -591,7 +591,8 @@ public class Block extends BlockStorage{
public TextureRegion icon(Icon icon){
if(icons[icon.ordinal()] == null){
icons[icon.ordinal()] = Core.atlas.find(name + "-icon-" + icon.name(), icon == Icon.full ? getGeneratedIcons()[0] : Core.atlas.find(name + "-icon-full", getGeneratedIcons()[0]));
icons[icon.ordinal()] = Core.atlas.find(name + "-icon-" + icon.name(), icon == Icon.full ?
getGeneratedIcons()[0] : Core.atlas.find(name + "-icon-full", getGeneratedIcons()[0]));
}
return icons[icon.ordinal()];
}
@ -701,10 +702,11 @@ public class Block extends BlockStorage{
}
public enum Icon{
//these are stored in the UI atlases
small(8 * 3),
medium(8 * 4),
large(8 * 6),
/** uses whatever the size of the block is */
/** uses whatever the size of the block is. this is always stored in the main game atlas! */
full(0);
public final int size;

8
tools/src/io/anuke/mindustry/Generators.java
View File

@ -143,17 +143,15 @@ public class Generators{
}
}
if(regions.length > 1){
image.save(block.name + "-icon-full");
}
image.save(block.name + "-icon-full");
image.save("../editor/" + block.name + "-icon-editor");
for(Icon icon : Icon.values()){
if(icon.size == 0 || (icon.size == image.width && icon.size == image.height)) continue;
if(icon.size == 0) continue;
Image scaled = new Image(icon.size, icon.size);
scaled.drawScaled(image);
scaled.save(block.name + "-icon-" + icon.name());
scaled.save("../ui/" + block.name + "-icon-" + icon.name());
}
Color average = new Color();