From 83d9bd7d811cc707a7074300dd726ae92e16a040 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Sep 2020 10:42:16 -0400 Subject: [PATCH] Difficulty indicator for sectors / Power sense FPS scale --- core/assets/baseparts/752980871690059906.msch | Bin 0 -> 217 bytes core/assets/baseparts/752982341865046126.msch | Bin 0 -> 217 bytes core/assets/baseparts/752995421667721307.msch | Bin 0 -> 288 bytes core/assets/baseparts/753005578997071974.msch | Bin 0 -> 327 bytes core/assets/baseparts/753035709576642631.msch | Bin 0 -> 297 bytes core/assets/baseparts/753035713162903572.msch | 2 ++ core/assets/baseparts/753043453876895784.msch | Bin 0 -> 853 bytes core/assets/baseparts/753059583450415175.msch | 5 +++++ core/assets/baseparts/753087301323718736.msch | 2 ++ core/assets/baseparts/753087303836106812.msch | 2 ++ core/assets/baseparts/753087308881985706.msch | 1 + core/assets/baseparts/753232120369119314.msch | Bin 0 -> 449 bytes core/assets/baseparts/753389428575043614.msch | Bin 0 -> 413 bytes core/assets/baseparts/753644716297289769.msch | 2 ++ core/assets/baseparts/753646105383927950.msch | 2 ++ core/assets/baseparts/753652015078310049.msch | Bin 0 -> 584 bytes core/assets/baseparts/753653426667257906.msch | Bin 0 -> 648 bytes core/assets/baseparts/753659989050261756.msch | Bin 0 -> 384 bytes core/assets/baseparts/753663419592212490.msch | 1 + core/assets/baseparts/753938078997151744.msch | Bin 0 -> 180 bytes .../mindustry/entities/comp/BuildingComp.java | 6 +++--- core/src/mindustry/io/legacy/LegacyIO.java | 4 ++-- .../mindustry/ui/dialogs/PlanetDialog.java | 3 +++ .../world/blocks/power/PowerGraph.java | 18 ++++++++++++++++++ .../world/blocks/power/PowerNode.java | 4 ++-- gradle.properties | 2 +- 26 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 core/assets/baseparts/752980871690059906.msch create mode 100644 core/assets/baseparts/752982341865046126.msch create mode 100644 core/assets/baseparts/752995421667721307.msch create mode 100644 core/assets/baseparts/753005578997071974.msch create mode 100644 core/assets/baseparts/753035709576642631.msch create mode 100644 core/assets/baseparts/753035713162903572.msch create mode 100644 core/assets/baseparts/753043453876895784.msch create mode 100644 core/assets/baseparts/753059583450415175.msch create mode 100644 core/assets/baseparts/753087301323718736.msch create mode 100644 core/assets/baseparts/753087303836106812.msch create mode 100644 core/assets/baseparts/753087308881985706.msch create mode 100644 core/assets/baseparts/753232120369119314.msch create mode 100644 core/assets/baseparts/753389428575043614.msch create mode 100644 core/assets/baseparts/753644716297289769.msch create mode 100644 core/assets/baseparts/753646105383927950.msch create mode 100644 core/assets/baseparts/753652015078310049.msch create mode 100644 core/assets/baseparts/753653426667257906.msch create mode 100644 core/assets/baseparts/753659989050261756.msch create mode 100644 core/assets/baseparts/753663419592212490.msch create mode 100644 core/assets/baseparts/753938078997151744.msch diff --git a/core/assets/baseparts/752980871690059906.msch b/core/assets/baseparts/752980871690059906.msch new file mode 100644 index 0000000000000000000000000000000000000000..360d04733bf4922760821d1055717293fd378342 GIT binary patch literal 217 zcmV;~04D!!b7N=$c$_Vb0Zzj(5Ck{2NlKB35Fg+J<`2B1Lc&ds$Wm%s7pE;><8Rd1 zajje3dZgP$i^m4anG@kP_zSTPvvKh){)G3#$L9|H#l%eM8rcldGxozeM|(EKzr>Y~ z){&mb5pU>e37$y@re(ptMmj$ddh5=_kw(4vycqr9&8!DmX7}w>uQ+FWriY-WFU# literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752982341865046126.msch b/core/assets/baseparts/752982341865046126.msch new file mode 100644 index 0000000000000000000000000000000000000000..360d04733bf4922760821d1055717293fd378342 GIT binary patch literal 217 zcmV;~04D!!b7N=$c$_Vb0Zzj(5Ck{2NlKB35Fg+J<`2B1Lc&ds$Wm%s7pE;><8Rd1 zajje3dZgP$i^m4anG@kP_zSTPvvKh){)G3#$L9|H#l%eM8rcldGxozeM|(EKzr>Y~ z){&mb5pU>e37$y@re(ptMmj$ddh5=_kw(4vycqr9&8!DmX7}w>uQ+FWriY-WFU# literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752995421667721307.msch b/core/assets/baseparts/752995421667721307.msch new file mode 100644 index 0000000000000000000000000000000000000000..bd3313b2c30de8a52f22b09309db51f8b38e0c53 GIT binary patch literal 288 zcmV+*0pI>@b7N=$c$`g-OKyWO6h*HMm|v?XQWwxkhb+n=R%HonWK7d6KBD)*q(bJr z&wW3%cvmQcogKP0J3D`VyRi1SJZyGpaKAa(F~@{{jgw8oVuPD-&0D(p;0B6avXZZF zHnZZ1k1@`-ZOuN0f9cB-+&0_n$Kjs*BrSZl!Ef_0#_;2wGGekTXP$YJ;>LdHeRlJ( z#x0FpafuHqLcBWwUwkl7ifB%>C%O|olm^d(DhNtwQBqVyheAU>B|jq)EfN7G1_dhU zn#J@WJ)jzboeV)kyh@ZM%ZrwHtH6knDA=ZwDsx11N7PNVzxEy2U(A-!2bGrb)HkA& mgJgDL4&w;c&|)`dkn7Y8^)jJ8E`V&Q#N!#_HNYRq{7LX&go=Ow literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/753005578997071974.msch b/core/assets/baseparts/753005578997071974.msch new file mode 100644 index 0000000000000000000000000000000000000000..747c61f453c6d48939a1b390f80706b507984be7 GIT binary patch literal 327 zcmV-N0l5Bcb7N=$c$`g8ZE}Mk6kJ5{D`}=T=mF}X979uPR2+n+J$stkeX&0(4h#Es zmj`&lK_Q>}$>Mkk{qp`2+_H>zJ;3ZMv@Y7ITYUIg2*Pku zqLh(Ig>i;cgU4D!mxNrR3zR!lVlaD(AxR%AVkm{I2t`$IcgUx=A6j_Sc9RYzfBQzh zZQE_TD{=B7HGwT=gjRAY$*Bo!qeRUe|62MHFyMW~@*pcYrKOj(hRg$u^w#W>MkE3Z Z(^OK@;IP+P2514kOiQw+^cPL2Q4i3#n~VSe literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/753035709576642631.msch b/core/assets/baseparts/753035709576642631.msch new file mode 100644 index 0000000000000000000000000000000000000000..c1955436b533f9089aa5f815fffe4620ba64bfbf GIT binary patch literal 297 zcmV+^0oML)b7N=$c$_VdL2tt#422(|O-RzJ+GXcncFbwNh$g5*OQ55$u0MU6rp&G< z#rd$GpABfSQ`iK%I6S`|XB$SBuE(3tZ^tpl*@yEEhnvkV4el!^JLZ_MKiN!``!L&d zb}(ZMpYBe=;SyX~Z1&?YB|p#TeRj)mjU|l^{p>%ApN4G1JGx7}(a;bl5+;Am$)5@j zf667Dd~n0r1(z(B8d@+FpHa&NvHzcxVxfBgc%eWGC{!H$)1Z&uCa6It1+xXVs-iBE z8HRE?cX*T@9xWct9xhT#&1NGuy{=V5dBy66RYN1lQ4uzRt)Lb(0s~zWTBFw=>R0PG v#jk3q*71;i7G#G+#BQ&IcTdm z%nVk3iTS7j0qoA~U}34`V<6G7J~&CoW~fhfGyNquQ#;kic0TNy{&;q;{UAj?uj4$mC6zsO{mbqdd{Q;T zYyZ^E?fzOsGj~&a_Iawuq1`|KVlDRV2(^zh7t5~w2T{9sj`rBJN2dbpxkeVL4(_=B zt$vZOcx5gAZzCb$M&X0Pt-@Bq0B~QiG(ySn6RxoY>TdrA3Dup4i!HP|xVYx_v+yM>1 z7gyHAXhe@I#&I$ z>W@`_tomb3osjzh5G6RW8t*qR)5j+&Em3KSN=sB)LdO~Jr6rX12mKa=rm!JLF9hD~ zg?4*OF5Z%Wy}+)(H~JDhDQhCY9zx3cQXHH42*@cgl_JshCj~wskh7(qW#<{rRuX&y zuvq{b6>|$QZ;*1~du>ozz5^qkKHi8@eIIPG-y4%DS%$TcU|D7cp?)pZuUywwJo`*a zUIAa4FLn8kUErS!p6}#W_T>^**kAE3_|ckegqFzE=}eu@)ai`3nq2o{?u0ild;s_Z zd%Jp)vvCP4-ltqj%lrBnTGzY@x&D91wX{NG*ig9L1yAiyKW#Sn@zjL|6r`q!Ru2}f fRsonj4z-yK!M8P!%tNM-D-;SV1>EhQ)3_LSHL0G! literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/753059583450415175.msch b/core/assets/baseparts/753059583450415175.msch new file mode 100644 index 0000000000..a3ed4cf154 --- /dev/null +++ b/core/assets/baseparts/753059583450415175.msch @@ -0,0 +1,5 @@ +mschx%Ar0E?<5Yy9Yplrت)l\B) O/Cݿ%>C~^bXχ>3>t,xݗ E^' +RDWQU$A>L* )AMHQ+N'E|Qm=;),<<T~9*p^W&Fqe*6*~ zM&uzV(t*NAQOjJ_rO>^eD#~nLMTpDV^p&Xef--1HZIt+*LRc5MPP^1k`bO79SM*X@ zX|sg(Ad^OmIisa2OKlKJUCgT`suId6)64aO=%e@(!;enF3 z(;|~;F1jYma{$Na1`8P)@G%6>_h4%}0t6grGTWvu=ve>`o=~~CxN+{@nS@QY`0TUm zCK?+*zMV~bH;x3m_m7TloV?X;Uz|AqYWdUVG~Rr;{CWGr>8-bN?e+WhyI)41tX+}c zW*_7`)sM}Y;OW)%Z2VC*vGV-y*x8rwF5TH#`FLvb_wsHWw_ZGa{PocHt*L9PjpQe8 zHcw13T7dRp_Tcb`U@z97jd|$p{o4EEbE>Ho5+Uu+DH^&rnvTd3J6etdj>OTnG%;*H r+QJ+GJWlLKMjQui#Ns)a!*>J@?%1E%aWgw^X2(V>^ymKpDPwhYhX(1F literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/753389428575043614.msch b/core/assets/baseparts/753389428575043614.msch new file mode 100644 index 0000000000000000000000000000000000000000..f33e2db05220c9577918a2116b541ef4714cad46 GIT binary patch literal 413 zcmV;O0b>4bb7N=$c$`&`O>&$t5QTgA6$lu6oik{WD`evfM5CwIuRlZ&qz+X0@nT7TPvO~l`(*vsjvk|nqj%|IPK$rBzn4JAtGDSg zMt3q(aPv(4HO)6GhAFv7`j*1knz-C;Anl^PnA?)V$x=VNpUF)oEGhEYW5gtLw%&#@ za`x~X+;slTI^IWi8v84T@g#euIu`j6mLuEED>HwawE}{w_FMZoDz)O^Rd3KAFNeq*rw|(HkY#f zW(^F*Qgh87qtFj`==z|go2y~ohN(0dFG z42{$d7#%P=#wh+{VEl&A!Q2C(2SN{o9tZ<&V&E4yzVYsr*8qfJk1zmXKf ~ l (A{i [G8?{ݻ+n)p8ehߞVgy+N\.<oF^8QpF.d2hJT:Q ]˓RZR& d +eyny45QPt*Fo1Gdb+fhaz(cV**^pA%LflQ>D}VA(`J1ZT zBmaKMo${TRZxp@t?+_-H-i%{Lo#- zp?kV&QIFl&p1bR*+4tvH|Cy#u|LTXs(7pQRW#~WpIVh!jY`e1`P`&hT6g>9_-yGZF z*~4AW$G$z#S3C{f;n_>@Oe)oEiy%&JbR0_75-Tmng?&F>H?@kE?Nk1!w}WL#U`Yo0J8HY5gTs10|9jbUrp>7q;PbYbZh zR$zfr1@2kk7s$%WWUc3B(0XHo3T#}+CmuiDLP=~jGo@}LBVre@6$`4CQVoffI#XJQ zORKlCwpTV=6}vd2Fq8()mIjP@=ZtbL#QpS5eGX!-GnY)iI5-nW={wWAO~2U%-PeL6 zm9f^^Zm6~as%?Pke*+Yy*aUM79!3^Xhd5(tk#a%xpo{egTGmu#<8Nk9wa+J1V}J350^ zwIX3yzt$ex@ z>%K$LIZ4j2b?x)SLpio%b8DyT@zmY!_9sM}zI(OqcMdImp>6$ZaipE_#XV3qx&0Bo95u%}U zOPFDDFZMVx8%a>+6`BdPh{!JyPkj9GOU2`NA;t$(B1QuI@d_jqj}R%W6k>(7!bUtg zB?qmY$(x3Z=qMmWzz|J}wIN1mTMJ(Qidv3_uh@ zs!*tI$0#eLzd$YC8n9=5u{_Zvrh5oT;sBXN^DN=~HowpF{8-d`S&D+y21UV~kSJtg z5;pugU{=fkboC6RHl4oRI^=6GjpA=oI(%6r9}mWKB6H&jMJLA z7HC+EHlbA*rw1~8;QK*S*m2A}G?3;fI|pPa<1@Mn^F>@}=sj~R=~e*#GFa;1lsY)2 z4o<1YJI#NmB=7Jb)rzxhSQ6*H0uivRbfhctL1E6?DxK_#egV9eU8;4LYTcz;cd6E0 isyRa36>JY1Gylf+h#YiL54xxaUDN~O`hNh_L6wWX`Zy*4 literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/753659989050261756.msch b/core/assets/baseparts/753659989050261756.msch new file mode 100644 index 0000000000000000000000000000000000000000..9c14628e26b2a5298d6624a2fe31598ca18bb8e3 GIT binary patch literal 384 zcmc~TPR?MgnBzLhF|XM`!1cJ^Z*NOH2mWbweJmQgkaWFyL{fJohK1Q8xW8AsH(#1T9>e)ZD#} z)#8C81FwfdGn3l_vE||`m* \ No newline at end of file diff --git a/core/assets/baseparts/753938078997151744.msch b/core/assets/baseparts/753938078997151744.msch new file mode 100644 index 0000000000000000000000000000000000000000..6a666a246c8b74b23bfff80cb6cb1ab3e3f7ef47 GIT binary patch literal 180 zcmV;l089UEb7N=$c$_7S{R+Y`48$*6_n{(tlEVH`@NsI5GMMYgIyWC)w3&qP<1Tl> z4kf`1?#Vb_*7IGMPi;FcQls)=xXoQev$)7&d5z+H41&f7*IUm+l8*L!gds% zChYy($L{4cd6;H-u#I716`^-xM>lYf>grZ!I2@omV&j literal 0 HcmV?d00001 diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 58182e8463..333d843f7f 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/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; } diff --git a/core/src/mindustry/io/legacy/LegacyIO.java b/core/src/mindustry/io/legacy/LegacyIO.java index 1d0a790159..545487d8ca 100644 --- a/core/src/mindustry/io/legacy/LegacyIO.java +++ b/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", diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 4cd4f61877..a4184f994a 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/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 diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 6e015b272f..2d5a4d2918 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/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); diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 689e554399..d16dcf7c2f 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/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 diff --git a/gradle.properties b/gradle.properties index 1984811780..4df6b56cbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=74ab27e46d8236aadb3fb3d029c9dc11c5ef2e80 +archash=7c8c2224da6bc85658fc011808f21a7decaa6951