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

fixed color of item bar bug

Browse Source
This commit is contained in:
sharlottes
2021-05-29 23:58:17 +09:00
parent 8936bed334
commit 39c2f17033
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,8 @@ public class HudUi {
@Nullable Unit unit; @Nullable Unit unit;
Element image; Element image;
Color lastItemColor = Pal.items;
int uiIndex = 0; int uiIndex = 0;
float heat; float heat;
@@ -267,23 +269,24 @@ public class HudUi {
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit){ if(getUnit() instanceof BlockUnitUnit){
if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) { if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) {
if(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo()) return ((ItemTurret) ((BlockUnitUnit) getUnit()).tile().block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).peekAmmo(), true).color; if(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo()) lastItemColor = ((ItemTurret) ((BlockUnitUnit) getUnit()).tile().block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).peekAmmo(), true).color;
else return Pal.ammo; else lastItemColor = Pal.ammo;
} }
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; Func<Building, Liquid> current;
current = entity1 -> entity1.liquids == null ? Liquids.water : entity1.liquids.current(); current = entity1 -> entity1.liquids == null ? Liquids.water : entity1.liquids.current();
return current.get(entity).color; lastItemColor = current.get(entity).color;
} }
else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){ else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){
return Pal.powerBar; lastItemColor = Pal.powerBar;
} }
} }
else if(getUnit().stack.item == null || getUnit().stack.amount <= 0) return Pal.items; else if(getUnit().stack.item != null && getUnit().stack.amount > 0)
lastItemColor = getUnit().stack.item.color.cpy().lerp(Color.white, 0.15f);
return getUnit().stack.item.color.cpy().lerp(Color.white, 0.15f); return lastItemColor;
}, },
() -> { () -> {
if(getUnit() instanceof BlockUnitUnit) { if(getUnit() instanceof BlockUnitUnit) {
@@ -358,7 +361,6 @@ public class HudUi {
double max = (Math.round(cons.usage * 10) / 10.0) * 60; double max = (Math.round(cons.usage * 10) / 10.0) * 60;
double v = (Math.round(((ConditionalConsumePower)entity.block.consumes.get(ConsumeType.power)).requestedPower(entity) * 10) / 10.0); double v = (Math.round(((ConditionalConsumePower)entity.block.consumes.get(ConsumeType.power)).requestedPower(entity) * 10) / 10.0);
float amount = (float) (((Math.round(entity.power.status * v * 10) / 10.0) * 60) / max); float amount = (float) (((Math.round(entity.power.status * v * 10) / 10.0) * 60) / max);
//float amount = Mathf.zero(cons.requestedPower(entity)) && entity.power.graph.getPowerProduced() + entity.power.graph.getBatteryStored() > 0f ? 1f : entity.power.status;
imaget = new PrograssedReqImage(Icon.power.getRegion(), () -> amount >= 0.99f, amount); imaget = new PrograssedReqImage(Icon.power.getRegion(), () -> amount >= 0.99f, amount);
if(amount >= 0.999f) imaget = new Image(Icon.power.getRegion()).setScaling(Scaling.fit); if(amount >= 0.999f) imaget = new Image(Icon.power.getRegion()).setScaling(Scaling.fit);

2
src/UnitInfo/ui/SBar.java
View File

@@ -149,7 +149,7 @@ public class SBar extends Element{
} }
Draw.color(color, blinkColor, blink); Draw.color(color, blinkColor, blink);
float topWidthReal = width * computed; float topWidthReal = width * (Math.min(value, computed));
if(topWidthReal > Core.atlas.find("unitinfo-bar-top").width){ if(topWidthReal > Core.atlas.find("unitinfo-bar-top").width){
top.draw(x, y, topWidthReal, height); top.draw(x, y, topWidthReal, height);