Register crater emoji via ui folder

#1458
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-27 19:33:36 +01:00
parent 038fc72d7b
commit 6eb6870bb6
7 changed files with 811 additions and 858 deletions

View File

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

View File

@@ -219,4 +219,4 @@
63525=cryofluid|liquid-cryofluid-icon 63525=cryofluid|liquid-cryofluid-icon
63524=underflow-gate|block-underflow-gate-medium 63524=underflow-gate|block-underflow-gate-medium
63523=plastanium-conveyor|block-plastanium-conveyor-medium 63523=plastanium-conveyor|block-plastanium-conveyor-medium
63522=crater|item-crater-icon 63522=crater|crater

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 724 KiB

After

Width:  |  Height:  |  Size: 726 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 898 KiB

After

Width:  |  Height:  |  Size: 895 KiB

View File

@@ -7,7 +7,7 @@ import mindustry.type.ItemType;
public class Items implements ContentList{ public class Items implements ContentList{
public static Item scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, phasefabric, surgealloy, public static Item scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, phasefabric, surgealloy,
sporePod, sand, blastCompound, pyratite, metaglass, crater; sporePod, sand, blastCompound, pyratite, metaglass;
@Override @Override
public void load(){ public void load(){
@@ -97,10 +97,5 @@ public class Items implements ContentList{
flammability = 1.4f; flammability = 1.4f;
explosiveness = 0.4f; explosiveness = 0.4f;
}}; }};
// this is just to add the crater emoji, can't live without <3
crater = new Item("crater", Color.valueOf("989aa3")){
public boolean isHidden(){return true;}
};
} }
} }

View File

@@ -36,7 +36,7 @@ public class CraterConveyor extends BaseConveyor{
start = Core.atlas.find(name + "-5-0"); start = Core.atlas.find(name + "-5-0");
end = Core.atlas.find(name + "-6-0"); end = Core.atlas.find(name + "-6-0");
crater = Core.atlas.find("item-crater"); crater = Core.atlas.find("crater");
} }
@Override @Override