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

Icons of missions

Browse Source
This commit is contained in:
Anuken
2018-11-02 10:35:29 -04:00
parent 9f77c0c9b7
commit 0391ed3e63
9 changed files with 479 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/io/anuke/mindustry/core/UI.java
View File

@@ -87,22 +87,7 @@ public class UI extends SceneModule{
Dialog.closePadR = -1;
Dialog.closePadT = 5;
Colors.put("description", Palette.description);
Colors.put("turretinfo", Palette.turretinfo);
Colors.put("iteminfo", Palette.iteminfo);
Colors.put("powerinfo", Palette.powerinfo);
Colors.put("liquidinfo", Palette.liquidinfo);
Colors.put("craftinfo", Palette.craftinfo);
Colors.put("missingitems", Palette.missingitems);
Colors.put("health", Palette.health);
Colors.put("healthstats", Palette.healthstats);
Colors.put("interact", Palette.interact);
Colors.put("accent", Palette.accent);
Colors.put("place", Palette.place);
Colors.put("remove", Palette.remove);
Colors.put("placeRotate", Palette.placeRotate);
Colors.put("range", Palette.range);
Colors.put("power", Palette.power);
}
@Override

19
core/src/io/anuke/mindustry/graphics/Palette.java
View File

@@ -41,24 +41,8 @@ public class Palette{
portal = Color.valueOf("6344d7"),
portalDark = Color.valueOf("3f3dac"),
powerLaserFrom = Color.valueOf("e3e3e3"),
powerLaserTo = Color.valueOf("ffe7a8"),
heal = Color.valueOf("98ffa9"),
description = Color.WHITE,
turretinfo = Color.ORANGE,
iteminfo = Color.LIGHT_GRAY,
powerinfo = Color.YELLOW,
liquidinfo = Color.ROYAL,
craftinfo = Color.LIGHT_GRAY,
missingitems = Color.SCARLET,
health = Color.YELLOW,
ammo = Color.valueOf("32cf6d"),
healthstats = Color.SCARLET,
bar = Color.SLATE,
interact = Color.ORANGE,
accent = Color.valueOf("f4ba6e"),
accentBack = Color.valueOf("d58c4b"),
place = Color.valueOf("6335f8"),
@@ -81,6 +65,5 @@ public class Palette{
redDust = Color.valueOf("ffa480"),
redderDust = Color.valueOf("ff7b69"),
plasticSmoke = Color.valueOf("f1e479"),
plasticBurn = Color.valueOf("e9ead3");
plasticSmoke = Color.valueOf("f1e479");
}

17
core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
View File

@@ -3,10 +3,10 @@ package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector2;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.graphics.Shaders;
import io.anuke.mindustry.maps.Sector;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Fill;
import io.anuke.ucore.scene.Element;
import io.anuke.ucore.scene.event.InputEvent;
import io.anuke.ucore.scene.event.InputListener;
@@ -142,23 +142,30 @@ public class SectorsDialog extends FloatingDialog{
Draw.colorl(!sector.complete ? 0.3f : 1f);
Draw.rect(sector.texture, drawX, drawY, sectorSize + 1f, sectorSize + 1f);
Draw.color(Palette.place);
String region = "icon-mission-defense";
if(sector == selected){
Draw.color(Palette.place);
Draw.color(Color.WHITE);
}else if(Mathf.inRect(mouse.x, mouse.y, drawX - padSectorSize / 2f, drawY - padSectorSize / 2f,
drawX + padSectorSize / 2f, drawY + padSectorSize / 2f)){
drawX + padSectorSize / 2f, drawY + padSectorSize / 2f)){
if(clicked){
selectSector(sector);
}
Draw.color(Palette.remove);
}else if(sector.complete){
region = "icon-mission-done";
Draw.color(Palette.accent);
}else{
Draw.color(Color.LIGHT_GRAY);
}
Fill.square(drawX, drawY, Unit.dp.scl(10f), 45f);
float size = Unit.dp.scl(1f) * 10f * 5f;
Shaders.outline.color = Color.BLACK;
Shaders.outline.region = Draw.region(region);
Graphics.shader(Shaders.outline);
Draw.rect(region, drawX, drawY, size, size);
Graphics.shader();
}
}