Difficulty indicator for sectors / Power sense FPS scale

core/assets/baseparts/753035713162903572.msch

@@ -0,0 +1,2 @@
+msch
xœ%ŠQ
+à Dgu…BIz…^ÀC-fiMDÍý«É|̃7†#ð!Y±„3	ý»KL�Á“ø”C¯,=¿Õ˜Þ±köí¼jP¬¿*eÆ—ª­
xá=E“dØ
ÎÚ{ÞLØç<5ý
�pþ

core/assets/baseparts/753059583450415175.msch

@@ -0,0 +1,5 @@
+msch
xœ%‘Ar£0E?
<5»Yy9Ypˆlr�œ€ØªØ)l\B)çò	éO/ÐCÝ¿¿º%üÅ>C~¯
ÿ^ïá˜bXχÿé<ÇËçõpŠ—izªÐ\R¸Ëü�
ûûy\Âð§i˜ÆøЦKoR°Q\Ãí"ÊE-Ñ?Æâ¾R�iŽè¨îqþÛ¾¾ÏÜæS@ó6�K¶£
¼È‡Ö
¥Í`QB�C~�À*r…SŠJQ+ÅNË[XK9åÆÉâa¬aj`Œä2î
+˜RP{*À
+Y­èñÚ„QRïžÎ^MJÍyæ,3ôò°žîC¾®pë7Ø„ªz+ªÔ°b‘Ãxé°ÔœH2Ù�CÕ²³Û€T6ƒØQ¹£щ·4¼y¶+—PÅ~Zì<ï—-¶:S«òNï S«Nƒ½Ó³¯B`éÑÃy³þH
+ë·œÐój¥$Þ�fŽ•{Ú1ØòaþˆAFä
+§�Ê¥J*␍ÖŠF!£ýÆzEò

core/assets/baseparts/753087301323718736.msch

@@ -0,0 +1,2 @@
+msch
xœ5�ANÃ0E¿k;	i¡ªX±f畸
7àVh¤$®ìR‰Û3“‘’?ïÍ—¢Á:·Æ…ðü¶L+…Ó%S)áõôç[
+ïôEëH|Fÿ�ãå<])l=T%å+e4cZoô›2†…Æs\§1Îá3OóŒ=×—PÒO	À¿ØÁJx™ù1;␍¯…Z[ŽÑrËÉšQ'-Ë&‹JÂql²VÙ¨lTÞ©lU¶*÷ò‡N©ò¸‡eôÆò´­{]÷BÀ rø§FèQé Ç/'PoU�®[9ᨇEþ
̃'†

core/assets/baseparts/753087303836106812.msch

@@ -0,0 +1,2 @@
+msch
xœ5�Ûnƒ0DÇØ–[óÖ¯à!U‘­„LDH¤ü}÷Ò"¡£vgŒqÆ9 åie|~¯Kæñòõ˜§ãà}¼ò癪?õ¼å¿·írð:>¶ç>3>ët,óxÝ—Û␍ÀE^”°‡€€'
+RDWQU�„$£AŒ¤>L‘*‹	Û)ÿÍAM�ŠèHŽQ+N°¦Ú'Eëè½|’¶¤™•ŒQÆm¯Ö=;½®“‘‘‘),š<š<š<šüœ�fB`?Öø�´j*Lu®:W½«Þû¿„AÕ/¥J®

core/assets/baseparts/753087308881985706.msch

@@ -0,0 +1 @@
+msch
xśMŤÍNĂ0„ÇMú#*$npŕŽ,•/¤fSYJěʱ)Ľ=»�űłgfgq‡�‚MĂLx|§iôKÇ"ĄęŻůFĺůőítz鱏•fżäVáx*O_µˇć‚űÚĘ9&ňJT‘BžĎm©1§ęńš¨ÍCŤÁ”8Mܸؔ}Čé“ľ9˛?OĂR˙lŕ‰:8Ł a`4ĂAFXF-Ž‚a›EÍ/ě »¬lö¦ăkŤp'ÔZ%skVŕd�“qᵝüŻá2ËpâőŇb[°ľhÎYéÜń¤RŚ^p�Îb7»

core/assets/baseparts/753644716297289769.msch

@@ -0,0 +1,2 @@
+msch
xś5N[n!ŘgU”ź~ö\!wA„VH, `“öęIÓ­ťU0x<ö02öŘ	´AOďE‡ł:睉Ať˛KÉŰň†C
+vžtuFťłóÇęŞnž	/ö'fKô:«¤�őŠŞ/‹ĂUW›•ý®Y›Jš­™}uÍő®¤�­JŮ–‚�‰Ú+cCÍîs毯%Ęd=™�|&KU㕉«vR%ÎŮXô%fVlĎT�gę­«ř ‡Rôxž
R‚C�µ)W‰|±�Yìˇ	uZ@2{*[žItŮĄcƉ,z‚r čX9P†tlčdž*Ůń^[ŞZ4‚ [�śv,‡ĺ
±üQü.Źgľ-wĘwŞo‚Ąä¸'‡␍CżÂÍ?EŚgš

core/assets/baseparts/753646105383927950.msch

@@ -0,0 +1,2 @@
+msch
xœ%LÑ‚0¼1@P>øf	~…àl	ÛÌ(AÿÞ{i¯éÝ␍…Ü[G8?™¬{�¿Ý»®+Ñn–)úp´‡ˆÓÄäÌÖ8½e‘¿hßžVgyÌ+NóŒë\¿.<oFòí^Ö8’á°Qp‘F
­�¡.dÍ2h�JTý©†ÒÈ:Q	�ö]Ë“–òRZ”ÝR&d¡
+ñe´<O	ÈMÌ?W'„

core/assets/baseparts/753663419592212490.msch

@@ -0,0 +1 @@
+msch
xśMŚA E˙ĐŇ’vˇŻÁˇ�N’␍ĄĎîBA6.&ďçĺe0a ôÁxĆŐF?ŹěbĐűfB0gZYçřä„Ůeöú�g˛ŚŰ_ĽrŕdrL�öZꆲ1<řUěe|z“ťŐKrŰŕRB$@T¶,CB”#�®NEźwiŞęŠě1Ô ˘křɱɱɱJ	UŢR…hčA_ö*>

core/src/mindustry/entities/comp/BuildingComp.java

@@ -1219,10 +1219,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         if(sensor == LAccess.itemCapacity) return block.itemCapacity;
         if(sensor == LAccess.liquidCapacity) return block.liquidCapacity;
         if(sensor == LAccess.powerCapacity) return block.consumes.hasPower() ? block.consumes.getPower().capacity : 0f;
-        if(sensor == LAccess.powerNetIn && power != null) return power.graph.getPowerProduced();
-        if(sensor == LAccess.powerNetOut && power != null) return power.graph.getPowerNeeded();
+        if(sensor == LAccess.powerNetIn && power != null) return power.graph.getLastScaledPowerIn() * 60;
+        if(sensor == LAccess.powerNetOut && power != null) return power.graph.getLastScaledPowerOut() * 60;
         if(sensor == LAccess.powerNetStored && power != null) return power.graph.getLastPowerStored();
-        if(sensor == LAccess.powerNetCapacity && power != null) return power.graph.getBatteryCapacity();
+        if(sensor == LAccess.powerNetCapacity && power != null) return power.graph.getLastCapacity();
         return 0;
     }
 

core/src/mindustry/io/legacy/LegacyIO.java

@@ -10,8 +10,8 @@ public class LegacyIO{
     /** Maps old unit names to new ones. */
     public static final StringMap unitMap = StringMap.of(
     "titan", "mace",
-    "chaos-array", "vestige",
-    "eradicator", "cataclyst",
+    "chaos-array", "scepter",
+    "eradicator", "reign",
     "eruptor", "atrax",
     "wraith", "flare",
     "ghoul", "horizon",

core/src/mindustry/ui/dialogs/PlanetDialog.java

@@ -306,6 +306,9 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         stable.add("[accent]" + (sector.preset == null ? sector.id : sector.preset.localizedName)).row();
         stable.image().color(Pal.accent).fillX().height(3f).pad(3f).row();
         stable.add(sector.save != null ? sector.save.getPlayTime() : "@sectors.unexplored").row();
+        if(sector.hasWaves() || sector.hasEnemyBase()){
+            stable.add("[accent]Difficulty: " + (int)(sector.baseCoverage * 10)).row();
+        }
 
         if(sector.hasBase() && sector.hasWaves()){
             //TODO localize when finalized

core/src/mindustry/world/blocks/power/PowerGraph.java

@@ -20,6 +20,7 @@ public class PowerGraph{
 
     private final WindowedMean powerBalance = new WindowedMean(60);
     private float lastPowerProduced, lastPowerNeeded, lastUsageFraction, lastPowerStored;
+    private float lastScaledPowerIn, lastScaledPowerOut, lastCapacity;
 
     private long lastFrameUpdated = -1;
     private final int graphID;
@@ -33,6 +34,18 @@ public class PowerGraph{
         return graphID;
     }
 
+    public float getLastScaledPowerIn(){
+        return lastScaledPowerIn;
+    }
+
+    public float getLastScaledPowerOut(){
+        return lastScaledPowerOut;
+    }
+
+    public float getLastCapacity(){
+        return lastCapacity;
+    }
+
     public float getPowerBalance(){
         return powerBalance.mean();
     }
@@ -200,6 +213,11 @@ public class PowerGraph{
 
         lastPowerNeeded = powerNeeded;
         lastPowerProduced = powerProduced;
+
+        lastScaledPowerIn = powerProduced / Time.delta;
+        lastScaledPowerOut = powerNeeded / Time.delta;
+        lastCapacity = getTotalBatteryCapacity();
+
         lastPowerStored = getBatteryStored();
 
         powerBalance.add((lastPowerProduced - lastPowerNeeded) / Time.delta);

core/src/mindustry/world/blocks/power/PowerNode.java

@@ -111,9 +111,9 @@ public class PowerNode extends PowerBlock{
 
         bars.add("batteries", entity -> new Bar(() ->
         Core.bundle.format("bar.powerstored",
-            (UI.formatAmount((int)entity.power.graph.getLastPowerStored())), UI.formatAmount((int)entity.power.graph.getTotalBatteryCapacity())),
+            (UI.formatAmount((int)entity.power.graph.getLastPowerStored())), UI.formatAmount((int)entity.power.graph.getLastCapacity())),
             () -> Pal.powerBar,
-            () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getTotalBatteryCapacity())));
+            () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getLastCapacity())));
     }
 
     @Override

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=74ab27e46d8236aadb3fb3d029c9dc11c5ef2e80
+archash=7c8c2224da6bc85658fc011808f21a7decaa6951