yawaflua/Informatis
1
0
Fork 0
mirror of https://github.com/yawaflua/Informatis.git synced 2025-12-10 12:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

i feel faaannnnnnnnntassssssssssssssttttticccccccccccccaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhhhhhhhhhhhhhhhhhhhhhhhh

Browse Source
This commit is contained in:
Sharlotte
2021-07-18 18:02:21 +09:00
parent 9c0821b2a1
commit 557d9a64a7
2 changed files with 272 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.bat
View File

@@ -1,9 +1,9 @@
@rem put this project path into PATH_FROM @rem put this project path into PATH_FROM
setlocal setlocal
set PATH_FROM=C:\Users\user\Documents\GitHub\UnitInfo set PATH_FROM=C:\Users\Administrator\Documents\GitHub\UnitInfo
@rem put your mindustry local path into PATH_TO @rem put your mindustry local path into PATH_TO
setlocal setlocal
set PATH_TO=C:\Users\user\AppData\Roaming\Mindustry set PATH_TO=C:\Users\Administrator\AppData\Roaming\Mindustry
if exist %PATH_TO%\mods\UnitInfo.jar del %PATH_TO%\mods\UnitInfo.jar if exist %PATH_TO%\mods\UnitInfo.jar del %PATH_TO%\mods\UnitInfo.jar
xcopy %PATH_FROM%\build\libs\UnitInfo.jar %PATH_TO%\mods\ /k xcopy %PATH_FROM%\build\libs\UnitInfo.jar %PATH_TO%\mods\ /k

341
src/UnitInfo/core/HudUi.java
View File

@@ -59,17 +59,12 @@ public class HudUi {
int maxwave; int maxwave;
int coreamount; int coreamount;
public Object getUnit(){ @SuppressWarnings("unchecked")
Log.info("h"); public <T extends Teamc> T getUnit(){
Seq<Unit> units = Groups.unit.intersect(Core.input.mouseWorldX(), Core.input.mouseWorldY(), 4, 4); Seq<Unit> units = Groups.unit.intersect(Core.input.mouseWorldX(), Core.input.mouseWorldY(), 4, 4);
if(units.size > 0) { if(units.size > 0) return (T) units.peek();
if(units.peek() == null){ if(getTile() != null && getTile().build != null) return (T) getTile().build;
if(getTile() != null && getTile().build != null) return getTile().build; else return (T) player.unit();
return player.unit();
}
else return units.peek();
}
else return player.unit();
} }
public @Nullable Tile getTile(){ public @Nullable Tile getTile(){
@@ -78,13 +73,13 @@ public class HudUi {
public void setEvent(){ public void setEvent(){
Events.run(EventType.Trigger.draw, () -> { Events.run(EventType.Trigger.draw, () -> {
if(!(getUnit() instanceof Posc) || !Core.settings.getBool("select")) return; if(getUnit() == null || !Core.settings.getBool("select")) return;
Posc entity = (Posc)getUnit(); Posc entity = getUnit();
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
float rot = i * 90f + 45f + (-Time.time) % 360f; float rot = i * 90f + 45f + (-Time.time) % 360f;
float length = (entity instanceof Unit ? ((Unit)entity).hitSize : ((Building)entity).block.size) * 1.5f + 2.5f; float length = (entity instanceof Unit ? ((Unit)entity).hitSize : entity instanceof Building ? ((Building)entity).block.size * tilesize : 0) * 1.5f + 2.5f;
Draw.color(Tmp.c1.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)).a(settings.getInt("uiopacity") / 100f)); Draw.color(Tmp.c1.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)).a(settings.getInt("selectopacity") / 100f));
Draw.rect("select-arrow", entity.x() + Angles.trnsx(rot, length), entity.y() + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f); Draw.rect("select-arrow", entity.x() + Angles.trnsx(rot, length), entity.y() + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f);
Draw.reset(); Draw.reset();
} }
@@ -224,9 +219,7 @@ public class HudUi {
} }
public void addBars(){ public void addBars(){
Log.info("hh");
bars.clear(); bars.clear();
bars.add( bars.add(
new SBar( new SBar(
() -> { () -> {
@@ -243,63 +236,81 @@ public class HudUi {
} }
) )
); );
bars.add(new SBar(
SBar secondBar = new SBar(
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) { if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) {
float value = Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime) * 100f; float value = Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime) * 100f;
return Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))); return Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2)));
} }
return Core.bundle.format("shar-stat.shield", Mathf.round(getUnit() instanceof Shieldc ? ((Shieldc)getUnit()).shield() : 0,1)); if(getUnit() instanceof Turret.TurretBuild){
float value = Mathf.clamp(((Turret.TurretBuild)getUnit()).reload / ((Turret)((Turret.TurretBuild)getUnit()).block).reloadTime) * 100f;
return Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2)));
}
if(getUnit() instanceof Shieldc)
return Core.bundle.format("shar-stat.shield", Strings.fixed(((Shieldc)getUnit()).shield(),1));
return "[lightgray]<Empty>[]";
}, },
() ->{ () ->{
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) { if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)
return Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime)); return Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime));
} if(getUnit() instanceof Turret.TurretBuild)
return Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)getUnit()).reload / ((Turret)((Turret.TurretBuild)getUnit()).block).reloadTime));
if(getUnit() instanceof Shieldc)
return Pal.surge; return Pal.surge;
return Color.clear;
}, },
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) { if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)
return Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime); return Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime);
} if(getUnit() instanceof Turret.TurretBuild)
return Mathf.clamp(((Turret.TurretBuild)getUnit()).reload / ((Turret)((Turret.TurretBuild)getUnit()).block).reloadTime);
if(getUnit() instanceof Shieldc) {
float max1 = ((ShieldRegenFieldAbility)content.units().copy().filter(ut -> ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility) != null).sort(ut -> ((ShieldRegenFieldAbility)ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max).peek().abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max; float max1 = ((ShieldRegenFieldAbility)content.units().copy().filter(ut -> ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility) != null).sort(ut -> ((ShieldRegenFieldAbility)ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max).peek().abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max;
float max2 = 0f; float max2 = 0f;
if(!(getUnit() instanceof Unitc)) return 0f; if(!(getUnit() instanceof Unit)) return 0f;
if(((Unitc)getUnit()).type().abilities.find(abil -> abil instanceof ForceFieldAbility) != null) max2 = ((ForceFieldAbility) ((Unitc)getUnit()).type().abilities.find(abil -> abil instanceof ForceFieldAbility)).max; if(((Unit)getUnit()).type().abilities.find(abil -> abil instanceof ForceFieldAbility) != null) max2 = ((ForceFieldAbility) ((Unit)getUnit()).type().abilities.find(abil -> abil instanceof ForceFieldAbility)).max;
return Mathf.clamp(((Unitc)getUnit()).shield() / Math.max(max1, max2)); return Mathf.clamp(((Unit)getUnit()).shield() / Math.max(max1, max2));
} }
); return 0f;
bars.add(secondBar); }
));
bars.add(new Stack(){{ bars.add(new Stack(){{
add(new Table(t -> { add(new Table(t -> {
t.defaults().width(Scl.scl(23 * 8f)); t.top().defaults().width(Scl.scl(23 * 8f)).height(Scl.scl(4f * 8f));
t.defaults().height(Scl.scl(4f * 8f));
t.top();
t.add(new SBar( t.add(new SBar(
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit){ if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild){
if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) { if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild)
return bundle.format("shar-stat.itemAmmo", ((ItemTurret.ItemTurretBuild) ((BlockUnitUnit)getUnit()).tile()).totalAmmo, ((ItemTurret)((BlockUnitUnit)getUnit()).tile().block).maxAmmo); return bundle.format("shar-stat.itemAmmo", ((ItemTurret.ItemTurretBuild) ((BlockUnitUnit)getUnit()).tile()).totalAmmo, ((ItemTurret)((BlockUnitUnit)getUnit()).tile().block).maxAmmo);
}
else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){ else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){
LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile()); LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile());
Func<Building, Liquid> current; return bundle.format("shar-stat.liquidAmmo", entity == null || entity.liquids == null ? 0 : Mathf.round(entity.liquids.get(entity.liquids.current()) * 10) / 10.0 + " / " + Mathf.round(entity.block.liquidCapacity));
current = entity1 -> entity1.liquids == null ? Liquids.water : entity1.liquids.current();
return bundle.format("shar-stat.liquidAmmo", entity == null || entity.liquids == null ? 0 : Mathf.round(entity.liquids.get(current.get(entity)) * 10) / 10.0 + " / " + Mathf.round(entity.block.liquidCapacity));
} }
else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){ else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){
PowerTurret.PowerTurretBuild entity = ((PowerTurret.PowerTurretBuild)((BlockUnitUnit)getUnit()).tile()); PowerTurret.PowerTurretBuild entity = ((PowerTurret.PowerTurretBuild)((BlockUnitUnit)getUnit()).tile());
float max = entity.block.consumes.getPower().usage; float max = entity.block.consumes.getPower().usage;
float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); float v = entity.power.status * entity.power.graph.getLastScaledPowerIn();
return bundle.format("shar-stat.power", (int)(Math.min(v,max) * 60), (int)(max * 60)); return bundle.format("shar-stat.power", (int)(Math.min(v,max) * 60), (int)(max * 60));
} }
} }
if(getUnit() instanceof Turret.TurretBuild){
if(getUnit() instanceof Unitc) return bundle.format("shar-stat.itemCapacity", ((Unitc)getUnit()).stack().amount, ((Unitc)getUnit()).type().itemCapacity); if(getUnit() instanceof ItemTurret.ItemTurretBuild)
return ""; return bundle.format("shar-stat.itemAmmo", ((ItemTurret.ItemTurretBuild) getUnit()).totalAmmo, ((ItemTurret)((ItemTurret.ItemTurretBuild) getUnit()).block).maxAmmo);
else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){
LiquidTurret.LiquidTurretBuild entity = getUnit();
return bundle.format("shar-stat.liquidAmmo", entity == null || entity.liquids == null ? 0 : Mathf.round(entity.liquids.get(entity.liquids.current()) * 10) / 10.0 + " / " + Mathf.round(entity.block.liquidCapacity));
}
else if(getUnit() instanceof PowerTurret.PowerTurretBuild){
PowerTurret.PowerTurretBuild entity = getUnit();
float max = entity.block.consumes.getPower().usage;
float v = entity.power.status * entity.power.graph.getLastScaledPowerIn();
return bundle.format("shar-stat.power", (int)(Math.min(v,max) * 60), (int)(max * 60));
}
}
if(getUnit() instanceof Unit)
return bundle.format("shar-stat.itemCapacity", ((Unit)getUnit()).stack().amount, ((Unit)getUnit()).type().itemCapacity);
return "[lightgray]<Empty>[]";
}, },
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit){ if(getUnit() instanceof BlockUnitUnit){
@@ -309,18 +320,27 @@ public class HudUi {
} }
else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){ else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){
LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile()); LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile());
Func<Building, Liquid> current; lastItemColor = entity.liquids.current().color;
current = entity1 -> entity1.liquids == null ? Liquids.water : entity1.liquids.current();
lastItemColor = current.get(entity).color;
} }
else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){ else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){
lastItemColor = Pal.powerBar; lastItemColor = Pal.powerBar;
} }
} }
else if(getUnit() instanceof Unitc && ((Unitc)getUnit()).stack().item != null && ((Unitc)getUnit()).stack().amount > 0) else if(getUnit() instanceof Turret.TurretBuild){
lastItemColor = ((Unitc)getUnit()).stack().item.color.cpy().lerp(Color.white, 0.15f); if(getUnit() instanceof ItemTurret.ItemTurretBuild) {
if(((ItemTurret.ItemTurretBuild)getUnit()).hasAmmo()) lastItemColor = ((ItemTurret) ((ItemTurret.ItemTurretBuild)getUnit()).block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild)getUnit()).peekAmmo(), true).color;
else lastItemColor = Pal.ammo;
}
else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){
lastItemColor = ((LiquidTurret.LiquidTurretBuild)getUnit()).liquids.current().color;
}
else if(getUnit() instanceof PowerTurret.PowerTurretBuild){
lastItemColor = Pal.powerBar;
}
}
else if(getUnit() instanceof Unit && ((Unit)getUnit()).stack().item != null && ((Unit)getUnit()).stack().amount > 0)
lastItemColor = ((Unit)getUnit()).stack().item.color.cpy().lerp(Color.white, 0.15f);
else lastItemColor = Color.clear;
return lastItemColor; return lastItemColor;
}, },
() -> { () -> {
@@ -330,10 +350,7 @@ public class HudUi {
} }
else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){ else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){
LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile()); LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile());
Func<Building, Liquid> current; return entity.liquids.get(entity.liquids.current()) / entity.block.liquidCapacity;
current = entity1 -> entity1.liquids == null ? Liquids.water : entity1.liquids.current();
return entity == null || entity.liquids == null ? 0f : entity.liquids.get(current.get(entity)) / entity.block.liquidCapacity;
} }
else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){ else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){
Building entity = ((BlockUnitUnit)getUnit()).tile(); Building entity = ((BlockUnitUnit)getUnit()).tile();
@@ -342,20 +359,38 @@ public class HudUi {
return v/max; return v/max;
} }
} }
if(getUnit() instanceof Unitc) return Mathf.clamp(((Unitc)getUnit()).stack().amount / (((Unitc)getUnit()).type().itemCapacity * 1f)); if(getUnit() instanceof Turret.TurretBuild) {
if(getUnit() instanceof ItemTurret.ItemTurretBuild) {
return (((ItemTurret.ItemTurretBuild) getUnit()).totalAmmo / (((ItemTurret) ((ItemTurret.ItemTurretBuild)getUnit()).block).maxAmmo * 1f));
}
else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){
LiquidTurret.LiquidTurretBuild entity = getUnit();
return entity.liquids.get(entity.liquids.current()) / entity.block.liquidCapacity;
}
else if(getUnit() instanceof PowerTurret.PowerTurretBuild){
Building entity = getUnit();
float max = entity.block.consumes.getPower().usage;
float v = entity.power.status * entity.power.graph.getLastScaledPowerIn();
return v/max;
}
}
if(getUnit() instanceof Unit)
return Mathf.clamp(((Unit)getUnit()).stack().amount / (((Unit)getUnit()).type().itemCapacity * 1f));
return 0f; return 0f;
} }
)).growX().left(); )).growX().left();
})); }));
add(new Table() add(new Table(){{
{{
left(); left();
update(() -> { update(() -> {
if(!(getUnit() instanceof BlockUnitUnit) || ( if((!(getUnit() instanceof BlockUnitUnit) || (
!(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) !(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild)
&& !(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild) && !(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild)
&& !(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild) && !(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild)))
)){ || (!(getUnit() instanceof Turret.TurretBuild) || (
!(getUnit() instanceof ItemTurret.ItemTurretBuild)
&& !(getUnit() instanceof LiquidTurret.LiquidTurretBuild)
&& !(getUnit() instanceof PowerTurret.PowerTurretBuild)))){
clearChildren(); clearChildren();
image = null; image = null;
return; return;
@@ -411,6 +446,61 @@ public class HudUi {
}; };
} }
if(image != null){
if(imaget.getClass() != image.getClass() || imaget.getClass() == Image.class){
clearChildren();
add(imaget).size(iconSmall).padBottom(2 * 8f).padRight(3 * 8f);
image = imaget;
}
}
else {
add(imaget).size(iconSmall).padBottom(2 * 8f).padRight(3 * 8f);
image = imaget;
}
}
if(getUnit() instanceof Turret.TurretBuild){
Element imaget = new Element();
if(getUnit() instanceof ItemTurret.ItemTurretBuild){
MultiReqImage itemReq = new MultiReqImage();
for(Item item : ((ItemTurret) ((ItemTurret.ItemTurretBuild) getUnit()).block).ammoTypes.keys())
itemReq.add(new ReqImage(item.uiIcon, () -> ((ItemTurret.ItemTurretBuild)getUnit()).hasAmmo()));
imaget = itemReq;
if(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo())
imaget = new Image(((ItemTurret) ((ItemTurret.ItemTurretBuild) getUnit()).block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild) getUnit()).peekAmmo(), true).uiIcon).setScaling(Scaling.fit);
}
else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){
LiquidTurret.LiquidTurretBuild entity = getUnit();
MultiReqImage liquidReq = new MultiReqImage();
for(Liquid liquid : ((LiquidTurret) ((LiquidTurret.LiquidTurretBuild) getUnit()).block).ammoTypes.keys())
liquidReq.add(new ReqImage(liquid.uiIcon, () -> ((LiquidTurret.LiquidTurretBuild) getUnit()).hasAmmo()));
imaget = liquidReq;
if(((LiquidTurret.LiquidTurretBuild) getUnit()).hasAmmo())
imaget = new Image(entity.liquids.current().uiIcon).setScaling(Scaling.fit);
}
else if(getUnit() instanceof PowerTurret.PowerTurretBuild){
imaget = new ReqImage(Icon.power.getRegion(), () -> ((PowerTurret.PowerTurretBuild)getUnit()).power.status * ((PowerTurret.PowerTurretBuild)getUnit()).power.graph.getLastScaledPowerIn() > 0f){{
add(new Image(Icon.power.getRegion()));
add(new Element(){
@Override
public void draw(){
Building entity = getUnit();
float max = entity.block.consumes.getPower().usage;
float v = entity.power.status * entity.power.graph.getLastScaledPowerIn();
Lines.stroke(Scl.scl(2f), Pal.removeBack);
Draw.alpha(1 - v/max);
Lines.line(x, y - 2f + height, x + width, y - 2f);
Draw.color(Pal.remove);
Draw.alpha(1 - v/max);
Lines.line(x, y + height, x + width, y);
Draw.reset();
}
});
}};
}
if(image != null){ if(image != null){
if(imaget.getClass() != image.getClass() || imaget.getClass() == Image.class){ if(imaget.getClass() != image.getClass() || imaget.getClass() == Image.class){
clearChildren(); clearChildren();
@@ -428,20 +518,19 @@ public class HudUi {
}}); }});
add(new Table(t -> { add(new Table(t -> {
t.left(); t.left();
t.add(new Image(){
t.add(new Image(){{ {
update(() -> { update(() -> {
if(getUnit() instanceof Unitc) if(getUnit() instanceof Unit && ((((Unit)getUnit()).stack().item == null || ((Unit)getUnit()).stack().amount <= 0)))
setDrawable((((Unitc)getUnit()).stack().item == null || ((Unitc)getUnit()).stack().amount <= 0) ? Core.atlas.find("clear") : ((Unitc)getUnit()).stack().item.uiIcon); setDrawable(((Unit)getUnit()).stack().item.uiIcon);
}); });
} }
@Override @Override
public void draw() { public void draw() {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) return; if(getUnit() instanceof Building || (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)) return;
super.draw(); super.draw();
} }
}.setScaling(Scaling.fit)).size(Scl.scl(30f)).scaling(Scaling.fit).padBottom(Scl.scl(4 * 8f)).padRight(Scl.scl(6 * 8f)); }.setScaling(Scaling.fit)).size(Scl.scl(30f)).padBottom(Scl.scl(4 * 8f)).padRight(Scl.scl(6 * 8f));
t.pack(); t.pack();
})); }));
}}); }});
@@ -452,45 +541,56 @@ public class HudUi {
float value = Mathf.clamp(heat2 / ((Turret)entity.block).chargeTime) * 100f; float value = Mathf.clamp(heat2 / ((Turret)entity.block).chargeTime) * 100f;
return Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))); return Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2)));
} }
if(getUnit() instanceof Unitc) if(getUnit() instanceof Turret.TurretBuild){
return Core.bundle.format("shar-stat.commandUnits", Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()), ((Unitc)getUnit()).type().commandLimit); Turret.TurretBuild entity = getUnit();
else return ""; float value = Mathf.clamp(heat2 / ((Turret)entity.block).chargeTime) * 100f;
return Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2)));
}
if(getUnit() instanceof Unit)
return Core.bundle.format("shar-stat.commandUnits", Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()), ((Unit)getUnit()).type().commandLimit);
return "[lightgray]<Empty>[]";
}, },
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){ if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){
Turret.TurretBuild entity = ((Turret.TurretBuild)((BlockUnitUnit) getUnit()).tile()); Turret.TurretBuild entity = ((Turret.TurretBuild)((BlockUnitUnit) getUnit()).tile());
return Pal.surge.cpy().lerp(Pal.accent, heat2 / ((Turret)entity.block).chargeTime); return Pal.surge.cpy().lerp(Pal.accent, heat2 / ((Turret)entity.block).chargeTime);
} }
if(getUnit() instanceof Unitc) if(getUnit() instanceof Turret.TurretBuild){
return Pal.powerBar.cpy().lerp(Pal.surge.cpy().mul(Pal.lighterOrange), Mathf.absin(Time.time, 7f / (1f + Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) / (((Unitc)getUnit()).type().commandLimit * 1f))), 1f)); return Pal.surge.cpy().lerp(Pal.accent, heat2 / ((Turret)((Turret.TurretBuild)getUnit()).block).chargeTime);
else return Color.clear; }
if(getUnit() instanceof Unit)
return Pal.powerBar.cpy().lerp(Pal.surge.cpy().mul(Pal.lighterOrange), Mathf.absin(Time.time, 7f / (1f + Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) / (((Unit)getUnit()).type().commandLimit * 1f))), 1f));
return Color.clear;
}, },
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){ if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){
Turret.TurretBuild entity = ((Turret.TurretBuild)((BlockUnitUnit) getUnit()).tile()); return heat2 / ((Turret)(((BlockUnitUnit) getUnit()).tile()).block).chargeTime;
return heat2 / ((Turret)entity.block).chargeTime; }
if(getUnit() instanceof Turret.TurretBuild){
return heat2 / ((Turret)((Turret.TurretBuild)getUnit()).block).chargeTime;
} }
if(getUnit() instanceof Unit) if(getUnit() instanceof Unit)
return Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) / (((Unitc)getUnit()).type().commandLimit * 1f)); return Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) / (((Unit)getUnit()).type().commandLimit * 1f));
else return 0f; return 0f;
} }
)); ));
if(getUnit() instanceof Unitc) bars.add(new SBar( if(getUnit() instanceof Unit)
() -> Core.bundle.format("shar-stat.payloadCapacity", Mathf.round(Mathf.sqrt(((Payloadc)getUnit()).payloadUsed())), Mathf.round(Mathf.sqrt(((Unitc)getUnit()).type().payloadCapacity))), bars.add(new SBar(
() -> Core.bundle.format("shar-stat.payloadCapacity", Mathf.round(Mathf.sqrt(((Payloadc)getUnit()).payloadUsed())), Mathf.round(Mathf.sqrt(((Unit)getUnit()).type().payloadCapacity))),
() -> Pal.items, () -> Pal.items,
() -> Mathf.clamp(((Payloadc)getUnit()).payloadUsed() / ((Unitc)getUnit()).type().payloadCapacity), () -> Mathf.clamp(((Payloadc)getUnit()).payloadUsed() / ((Unit)getUnit()).type().payloadCapacity),
() -> getUnit() instanceof Payloadc () -> getUnit() instanceof Payloadc));
));
bars.add(new Stack(){{ bars.add(new Stack(){{
add(new Table(t -> { add(new Table(t -> {
t.defaults().width(Scl.scl(23 * 8f)); t.defaults().width(Scl.scl(23 * 8f));
t.defaults().height(Scl.scl(4f * 8f)); t.defaults().height(Scl.scl(4f * 8f));
t.top(); t.top();
if(getUnit() instanceof Unitc) t.add(new SBar( if(getUnit() instanceof Unit) t.add(new SBar(
() -> Core.bundle.format("shar-stat.ammos", ((Unitc)getUnit()).ammo(), ((Unitc)getUnit()).type().ammoCapacity), () -> Core.bundle.format("shar-stat.ammos", ((Unit)getUnit()).ammo(), ((Unit)getUnit()).type().ammoCapacity),
() -> ((Unitc)getUnit()).dead() || getUnit() instanceof BlockUnitc ? Pal.ammo : ((Unitc)getUnit()).type().ammoType.color, () -> ((Unit)getUnit()).dead() || getUnit() instanceof BlockUnitc ? Pal.ammo : ((Unit)getUnit()).type().ammoType.color,
() -> ((Unitc)getUnit()).ammof(), () -> ((Unit)getUnit()).ammof(),
() -> Vars.state.rules.unitAmmo () -> Vars.state.rules.unitAmmo
)).growX().left(); )).growX().left();
})); }));
@@ -503,9 +603,9 @@ public class HudUi {
return; return;
} }
TextureRegion region = Items.copper.uiIcon; TextureRegion region = Items.copper.uiIcon;
if(getUnit() instanceof Unitc && ((Unitc)getUnit()).type() != null){ if(getUnit() instanceof Unit && ((Unit)getUnit()).type() != null){
if(((Unitc)getUnit()).type().ammoType == AmmoTypes.thorium) region = Items.thorium.uiIcon; if(((Unit)getUnit()).type().ammoType == AmmoTypes.thorium) region = Items.thorium.uiIcon;
if(((Unitc)getUnit()).type().ammoType == AmmoTypes.power || ((Unitc)getUnit()).type().ammoType == AmmoTypes.powerLow || ((Unitc)getUnit()).type().ammoType == AmmoTypes.powerHigh) region = Icon.powerSmall.getRegion(); if(((Unit)getUnit()).type().ammoType == AmmoTypes.power || ((Unit)getUnit()).type().ammoType == AmmoTypes.powerLow || ((Unit)getUnit()).type().ammoType == AmmoTypes.powerHigh) region = Icon.powerSmall.getRegion();
} }
setDrawable(region); setDrawable(region);
}); });
@@ -606,79 +706,76 @@ public class HudUi {
add(new Table(ttt -> ttt.add(new Image(){{ add(new Table(ttt -> ttt.add(new Image(){{
update(() -> { update(() -> {
TextureRegion region = Core.atlas.find("clear"); TextureRegion region = Core.atlas.find("clear");
if(getUnit() instanceof Unitc){ if(getUnit() instanceof Unit){
if(getUnit() instanceof BlockUnitUnit && ((Unitc)getUnit()).type() != null) if(getUnit() instanceof BlockUnitUnit && ((Unit)getUnit()).type() != null)
region = ((BlockUnitUnit)getUnit()).tile().block.uiIcon; region = ((BlockUnitUnit)getUnit()).tile().block.uiIcon;
else if(getUnit() != null && ((Unitc)getUnit()).type() != null) else if(getUnit() != null && ((Unit)getUnit()).type() != null)
region = ((Unitc)getUnit()).type().uiIcon; region = ((Unit)getUnit()).type().uiIcon;
}
else if(getUnit() instanceof Buildingc){
if(((Buildingc) getUnit()).block() != null) {
region = ((Buildingc) getUnit()).block().uiIcon;
}
} }
setDrawable(region); setDrawable(region);
}); });
}}.setScaling(Scaling.fit)).size(Scl.scl(4f * 8f)))); }}.setScaling(Scaling.fit)).size(Scl.scl(4f * 8f))));
add(new Table(ttt -> { add(new Table(ttt -> {
ttt.top().left();
ttt.add(new Stack(){{ ttt.add(new Stack(){{
add(new Table(temp -> { add(new Table(temp -> {
temp.left(); Image image = new Image(Icon.defenseSmall);
temp.add(new Image(Icon.defense).setScaling(Scaling.fit)).center(); temp.add(image).center();
}){ }){
@Override @Override
public void draw() { public void draw() {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) return; if(getUnit() instanceof Building || (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)) return;
super.draw(); super.draw();
} }
}); });
add(new Table(temp -> { add(new Table(temp -> {
temp.left(); Label label = new Label(() -> (getUnit() instanceof Unit && ((Unit)getUnit()).type() != null ? (int)((Unit)getUnit()).type().armor+"" : ""));
Label label = new Label(() -> ((int) (getUnit() instanceof Unitc && ((Unitc)getUnit()).type() != null ? ((Unitc)getUnit()).type().armor : 0)) + "");
label.setColor(Pal.surge); label.setColor(Pal.surge);
label.setSize(0.6f); label.setFontScale(0.5f);
label.setFontScale(Scl.scl()); temp.add(label).center();
temp.add(label).center().padLeft(getUnit() instanceof Unitc ? ((((Unitc)getUnit()).type() == null || ((Unitc)getUnit()).type().armor < Scl.scl(10)) ? Scl.scl(-4f) : Scl.scl(0f)) : Scl.scl(0f));
temp.pack(); temp.pack();
}){ }){
@Override @Override
public void draw() { public void draw() {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) return; if(getUnit() instanceof Building || (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)) return;
super.draw(); super.draw();
} }
}); });
}}).growX().left().padLeft(Scl.scl(5 * 8f)); }}).padLeft(Scl.scl(2 * 8f)).padBottom(Scl.scl(2 * 8f));
})); }));
}}; }};
Label label = new Label(() -> { Label label = new Label(() -> {
String name = ""; String name = "";
if(getUnit() instanceof Unitc) {
if (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild) if (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild)
name = "[accent]" + ((BlockUnitUnit) getUnit()).tile().block.localizedName + "[]"; name = "[accent]" + ((BlockUnitUnit) getUnit()).tile().block.localizedName + "[]";
else if (getUnit() != null && ((Unitc) getUnit()).type() != null) else if (getUnit() instanceof Unit && ((Unit) getUnit()).type() != null)
name = "[accent]" + ((Unitc) getUnit()).type().localizedName + "[]"; name = "[accent]" + ((Unit) getUnit()).type().localizedName + "[]";
else if (getUnit() instanceof Buildingc && ((Buildingc) getUnit()).block() != null) {
name = "[accent]" + ((Buildingc) getUnit()).block().localizedName + "[]";
} }
return name; return name;
}); });
label.setFontScale(Scl.scl()); label.setFontScale(Scl.scl());
TextButton button = Elem.newButton("?", Styles.clearPartialt, () -> { TextButton button = Elem.newButton("?", Styles.clearPartialt, () -> {
if(getUnit() instanceof Unitc) { if (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild)
if (((Unitc) getUnit()).type() != null && getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild)
ui.content.show(((BlockUnitUnit) getUnit()).tile().block); ui.content.show(((BlockUnitUnit) getUnit()).tile().block);
else if (((Unitc) getUnit()).type() != null) ui.content.show(((Unitc) getUnit()).type()); else if (getUnit() instanceof Unit && ((Unit) getUnit()).type() != null)
ui.content.show(((Unit) getUnit()).type());
else if (getUnit() instanceof Buildingc && ((Buildingc) getUnit()).block() != null) {
ui.content.show(((Buildingc) getUnit()).block());
} }
}); });
tt.top(); tt.top();
tt.table(ttt -> { //unit icon/armor tt.add(stack);
ttt.add(stack); tt.add(label);
}).left(); tt.add(button).size(Scl.scl(5 * 8f));
tt.table(ttt -> { //unit name
ttt.defaults().width(Scl.scl(12 * 8f));
ttt.add(label).padLeft(Scl.scl(24f));
}).center();
tt.table(ttt -> { //unit info
ttt.defaults().size(Scl.scl(5 * 8f));
ttt.add(button).padLeft(Scl.scl(-24f));
}).right();
}); });
t.row(); t.row();
t.table(tt -> { t.table(tt -> {
@@ -710,7 +807,7 @@ public class HudUi {
heat += Time.delta; heat += Time.delta;
if (heat >= 6) { if (heat >= 6) {
heat = 0f; heat = 0f;
if(getUnit() instanceof Unitc) type = ((Unitc)getUnit()).type(); if(getUnit() instanceof Unit) type = ((Unit)getUnit()).type();
table.removeChild(weapon); table.removeChild(weapon);
addWeapon(); addWeapon();
table.row(); table.row();