Icons of missions
This commit is contained in:
+1
-1
@@ -25,7 +25,7 @@ allprojects {
|
|||||||
appName = 'Mindustry'
|
appName = 'Mindustry'
|
||||||
gdxVersion = '1.9.8'
|
gdxVersion = '1.9.8'
|
||||||
roboVMVersion = '2.3.0'
|
roboVMVersion = '2.3.0'
|
||||||
uCoreVersion = '6f251d1f32bb7a8ff5dfaa28525af57536ad549f'
|
uCoreVersion = 'f5ae8c0d58b6b7b42e95e57114220b11beb43fb3'
|
||||||
|
|
||||||
getVersionString = {
|
getVersionString = {
|
||||||
String buildVersion = getBuildVersion()
|
String buildVersion = getBuildVersion()
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 167 B |
Binary file not shown.
|
After Width: | Height: | Size: 157 B |
Binary file not shown.
|
Before Width: | Height: | Size: 112 B After Width: | Height: | Size: 187 B |
+465
-451
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 103 KiB After Width: | Height: | Size: 101 KiB |
@@ -87,22 +87,7 @@ public class UI extends SceneModule{
|
|||||||
Dialog.closePadR = -1;
|
Dialog.closePadR = -1;
|
||||||
Dialog.closePadT = 5;
|
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("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
|
@Override
|
||||||
|
|||||||
@@ -41,24 +41,8 @@ public class Palette{
|
|||||||
portal = Color.valueOf("6344d7"),
|
portal = Color.valueOf("6344d7"),
|
||||||
portalDark = Color.valueOf("3f3dac"),
|
portalDark = Color.valueOf("3f3dac"),
|
||||||
|
|
||||||
powerLaserFrom = Color.valueOf("e3e3e3"),
|
|
||||||
powerLaserTo = Color.valueOf("ffe7a8"),
|
|
||||||
|
|
||||||
heal = Color.valueOf("98ffa9"),
|
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,
|
bar = Color.SLATE,
|
||||||
interact = Color.ORANGE,
|
|
||||||
accent = Color.valueOf("f4ba6e"),
|
accent = Color.valueOf("f4ba6e"),
|
||||||
accentBack = Color.valueOf("d58c4b"),
|
accentBack = Color.valueOf("d58c4b"),
|
||||||
place = Color.valueOf("6335f8"),
|
place = Color.valueOf("6335f8"),
|
||||||
@@ -81,6 +65,5 @@ public class Palette{
|
|||||||
redDust = Color.valueOf("ffa480"),
|
redDust = Color.valueOf("ffa480"),
|
||||||
redderDust = Color.valueOf("ff7b69"),
|
redderDust = Color.valueOf("ff7b69"),
|
||||||
|
|
||||||
plasticSmoke = Color.valueOf("f1e479"),
|
plasticSmoke = Color.valueOf("f1e479");
|
||||||
plasticBurn = Color.valueOf("e9ead3");
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ package io.anuke.mindustry.ui.dialogs;
|
|||||||
import com.badlogic.gdx.graphics.Color;
|
import com.badlogic.gdx.graphics.Color;
|
||||||
import com.badlogic.gdx.math.Vector2;
|
import com.badlogic.gdx.math.Vector2;
|
||||||
import io.anuke.mindustry.graphics.Palette;
|
import io.anuke.mindustry.graphics.Palette;
|
||||||
|
import io.anuke.mindustry.graphics.Shaders;
|
||||||
import io.anuke.mindustry.maps.Sector;
|
import io.anuke.mindustry.maps.Sector;
|
||||||
import io.anuke.ucore.core.Graphics;
|
import io.anuke.ucore.core.Graphics;
|
||||||
import io.anuke.ucore.graphics.Draw;
|
import io.anuke.ucore.graphics.Draw;
|
||||||
import io.anuke.ucore.graphics.Fill;
|
|
||||||
import io.anuke.ucore.scene.Element;
|
import io.anuke.ucore.scene.Element;
|
||||||
import io.anuke.ucore.scene.event.InputEvent;
|
import io.anuke.ucore.scene.event.InputEvent;
|
||||||
import io.anuke.ucore.scene.event.InputListener;
|
import io.anuke.ucore.scene.event.InputListener;
|
||||||
@@ -142,23 +142,30 @@ public class SectorsDialog extends FloatingDialog{
|
|||||||
Draw.colorl(!sector.complete ? 0.3f : 1f);
|
Draw.colorl(!sector.complete ? 0.3f : 1f);
|
||||||
Draw.rect(sector.texture, drawX, drawY, sectorSize + 1f, sectorSize + 1f);
|
Draw.rect(sector.texture, drawX, drawY, sectorSize + 1f, sectorSize + 1f);
|
||||||
|
|
||||||
Draw.color(Palette.place);
|
String region = "icon-mission-defense";
|
||||||
|
|
||||||
if(sector == selected){
|
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,
|
}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){
|
if(clicked){
|
||||||
selectSector(sector);
|
selectSector(sector);
|
||||||
}
|
}
|
||||||
Draw.color(Palette.remove);
|
Draw.color(Palette.remove);
|
||||||
}else if(sector.complete){
|
}else if(sector.complete){
|
||||||
|
region = "icon-mission-done";
|
||||||
Draw.color(Palette.accent);
|
Draw.color(Palette.accent);
|
||||||
}else{
|
}else{
|
||||||
Draw.color(Color.LIGHT_GRAY);
|
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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user