Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Command center name added / Regression fix

Browse Source
This commit is contained in:
Anuken
2018-07-26 23:04:37 -04:00
parent 68fd09c222
commit ce2896cb38
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+1
View File
@@ -531,3 +531,4 @@ block.bridge-conduit.name=Bridge Conduit
block.rotary-pump.name=Rotary Pump block.rotary-pump.name=Rotary Pump
block.nuclear-reactor.name=Nuclear Reactor block.nuclear-reactor.name=Nuclear Reactor
block.interceptor-factory.name=Interceptor Factory block.interceptor-factory.name=Interceptor Factory
block.command-center.name=Command Center
core/src/io/anuke/mindustry/content/fx/BlockFx.java
+4 -2
View File
@@ -278,9 +278,11 @@ public class BlockFx extends FxList implements ContentList{
Draw.reset(); Draw.reset();
}); });
commandSend = new Effect(30, e -> { commandSend = new Effect(28, e -> {
Draw.color(Palette.command);
Lines.stroke(e.fout() * 2f); Lines.stroke(e.fout() * 2f);
Lines.poly(e.x, e.y, 40, 4f + e.fin() * 120f); Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f);
Draw.color();
}); });
} }
} }
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class OverlayRenderer{
Vector2 vec = Graphics.world(input.getMouseX(), input.getMouseY()); Vector2 vec = Graphics.world(input.getMouseX(), input.getMouseY());
Tile tile = world.tileWorld(vec.x, vec.y); Tile tile = world.tileWorld(vec.x, vec.y);
if(tile != null && tile.block() != Blocks.air && tile.getTeam() == players[0].getTeam()){ if(tile != null && tile.block() != Blocks.air && tile.target().getTeam() == players[0].getTeam()){
Tile target = tile.target(); Tile target = tile.target();
if(showBlockDebug && target.entity != null){ if(showBlockDebug && target.entity != null){
core/src/io/anuke/mindustry/graphics/Palette.java
+2
View File
@@ -3,6 +3,8 @@ package io.anuke.mindustry.graphics;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
public class Palette{ public class Palette{
public static final Color command = Color.valueOf("eab678");
public static final Color bulletYellow = Color.valueOf("ffeec9"); public static final Color bulletYellow = Color.valueOf("ffeec9");
public static final Color bulletYellowBack = Color.valueOf("f9c87a"); public static final Color bulletYellowBack = Color.valueOf("f9c87a");
core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java
+2 -1
View File
@@ -11,6 +11,7 @@ import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.entities.units.UnitCommand; import io.anuke.mindustry.entities.units.UnitCommand;
import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockFlag; import io.anuke.mindustry.world.meta.BlockFlag;
@@ -26,7 +27,7 @@ import static io.anuke.mindustry.Vars.*;
public class CommandCenter extends Block{ public class CommandCenter extends Block{
protected TextureRegion[] commandRegions = new TextureRegion[UnitCommand.values().length]; protected TextureRegion[] commandRegions = new TextureRegion[UnitCommand.values().length];
protected Color topColor = Color.valueOf("eab678"); protected Color topColor = Palette.command;
protected Color bottomColor = Color.valueOf("5e5e5e"); protected Color bottomColor = Color.valueOf("5e5e5e");
protected Effect effect = BlockFx.commandSend; protected Effect effect = BlockFx.commandSend;