mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-28 00:19:57 +07:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
244a587db8
@ -22,9 +22,9 @@ First, make sure you have [JDK 14](https://adoptopenjdk.net/) installed. Open a
|
||||
|
||||
#### Windows
|
||||
|
||||
_Running:_ `gradlew.bat desktop:run`
|
||||
_Building:_ `gradlew.bat desktop:dist`
|
||||
_Sprite Packing:_ `gradlew.bat tools:pack`
|
||||
_Running:_ `gradlew desktop:run`
|
||||
_Building:_ `gradlew desktop:dist`
|
||||
_Sprite Packing:_ `gradlew tools:pack`
|
||||
|
||||
#### Linux/Mac OS
|
||||
|
||||
|
BIN
core/assets-raw/sprites/blocks/units/command-center-team.png
Normal file
BIN
core/assets-raw/sprites/blocks/units/command-center-team.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 511 B |
Binary file not shown.
Before Width: | Height: | Size: 783 B After Width: | Height: | Size: 347 B |
@ -20,7 +20,7 @@ import mindustry.world.meta.*;
|
||||
|
||||
public class CommandCenter extends Block{
|
||||
public TextureRegionDrawable[] commandRegions = new TextureRegionDrawable[UnitCommand.all.length];
|
||||
public Color topColor = Pal.command, bottomColor = Color.valueOf("5e5e5e");
|
||||
public Color topColor = null, bottomColor = Color.valueOf("5e5e5e");
|
||||
public Effect effect = Fx.commandSend;
|
||||
|
||||
public CommandCenter(String name){
|
||||
@ -63,7 +63,7 @@ public class CommandCenter extends Block{
|
||||
|
||||
Draw.color(bottomColor);
|
||||
Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy() - 1, size, size);
|
||||
Draw.color(topColor);
|
||||
Draw.color(topColor == null ? team.color : topColor);
|
||||
Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy(), size, size);
|
||||
Draw.color();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user