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 zcmc~TPR?Mgn4{av=y%vafW>^9r`N;|0r>~a&-nK&b~@zScOob&T70=~{Nwy9HwxEA z->q75+qL^R+o_qt4^4k?Z{*ut_)+&?%lE^_pY#1adc^0Y)J>j?#@`NGxmTMV-G5|i z|FwzpP6+0|$mE>o$-XT0;667id!ee==Z;Kt+xugW#NP*J*RU5&eEZ!>a9)4T@y;&~ z?(Vq7vB167ciM`u(CbV_vzIY2?tHBf}M9;4H^^^RD!h dZ@If=K27}^J=<&Zs^9r`N;|0r>~a&-nK&b~@zScOob&T70=~{Nwy9HwxEA z->q75+qL^R+o_qt4^4k?Z{*ut_)+&?%lE^_pY#1adc^0Y)J>j?#@`NGxmTMV-G5|i z|FwzpP6+0|$mE>o$-XT0;667id!ee==Z;Kt+xugW#NP*J*RU5&eEZ!>a9)4T@y;&~ z?(Vq7vB167ciM`u(CbV_vzIY2?tHBf}M9;4H^^^RD!h dZ@If=K27}^J=<&Zsj5@?0Yz=d3M3s=v_Y_uyw_5nzTOO zZ1bbee#3LybI;nf)xSI~bjR%Wo8u4X{ZY}a*>*7hv%#?skLMXBZPHGkS2_97vAP$v zWuG@3)9sBZ?Bv&S+GEWSUtT5rV!mi{b4pnv-(!wz7n01=C%nGG^VMjfonAxE$|H{@ADJGIKl#V=0{~!zihuwB 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 zcmc~TPR?MgnByCeThy!|665kwJ9C-&3&vLqWt@Z4LS$N&*;dcGRlCt%i;w$v*>v`b zLyn5`f1i9*!TI;oKcPFDddh4MywTpGcWY&IEmyOv<&U3pVvfALDz21G z=2NZz?Y1xXcJ6NN!cR)3jk;+qVMSUeS90bob~!8iKkApD!GqePpA@t$moA;Ywe1XZ l&zEa&Cb_9F@mvlGy7XYf^(eLs#(h5Co0feM_gxXl4*<}(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 zcmc~TPR?Mgn4{b8n15J-r&WHTug9fTw^ET}CNk&SV*^$D^Dk=4P8am5_VWFGW8XEuE$6WHF7G`TF9@g$snwr7 zIiHKa{*>z6nu5bOS*Pnvmx?kFoga9bb>si}Q<4@|GgK^e;MNF{`Ez+e|2?%8j_RzN zS+}iPq&G>jt;njpVv3xcuH0EUy&&(iY074M*M&M)9(~mo>a2VsP|&Pt?E*0qCgxb- zsKwXiUxmLmKe|3^<+YC!X1SMb>JH@Q3Gsgsk^5vOuk@|s_g0Ckr*CObWLdkQ`5*I1 H4qqPt^Aw8x literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/753035713162903572.msch b/core/assets/baseparts/753035713162903572.msch new file mode 100644 index 0000000000..4d262d3fa3 --- /dev/null +++ b/core/assets/baseparts/753035713162903572.msch @@ -0,0 +1,2 @@ +mschx%Q + DguBIz^C-fiMD|̃7#!Y3 KLC,=՘ޱkjP*eƗx=Ed{L<5p \ No newline at end of file diff --git a/core/assets/baseparts/753043453876895784.msch b/core/assets/baseparts/753043453876895784.msch new file mode 100644 index 0000000000000000000000000000000000000000..013e2b4e23fe38fcc23fa1f34dde245e5f05571b GIT binary patch literal 853 zcmc~TPR?MgnByD5U3S|{Af}0Bzmn?lO?Oq^3YKWhYWjP_y;IA+=#KOg0n3cl7H4?E z>NsC}<9O+bFpE;KS*=<#t!iDQo}6EoOe>GJoEGZO_sw*{mmJ*JXcZzB`wf z@&D+LZO1e0x1?{k=KXvB-S?Uq@2n!tYwy05DxcH#Ewip{Q{75+^EY>2-hE19zAAeY>&6 zeL2&coo-?)`QGjLzqW4T`ifNDfBDLa58WO%A6k1T><~jizU!p}9LLo}nvWVB3fDQt z6vW9n(@8IpM?*s1%*t))^un9ItOnGE&(+-GE(T4?{>&Si@|S_-RkuPkd_I zEB5%mVB(PnvoD3Xs!Vh4nRq(5lW{7`jCD?WN3HzB92^fWY)IhMII4bY1-p6D3r4Nw z>~`@-YM45{YKsAGrq2ik!B3L&qY;^9_bU$2xjg7hGDSkQQc; z#~8gX(o3sVal^qb--U@gJsR#X@*a>V3lLCDJQ>D+K&$iWrZv-2x9Y4;y;(lVx+?dn z<00$$S~`pi_OKrj5(<*BRtPtnZx!};RP&i znVnwVAyH1pCEqVqo$`(SuUN~n4T|piEcf2DmQ{P}-J8^~_rSUX=D&n&G_#cs$T^+* z6(lqJC&vj*gQ-dvzp1m@DNfkDbbjh{$#Y>sHB1{K8KgyvxefCt6g{lY4T#*wtUS-| zUPn-^e9p%E(vvkK+qORFEb9#87h4;~IK!52>r9@5+fDn= UI4_%^EyAVEdgtx@%R3~>0X3C~^bXχ>3>t,xݗ E^' +RDWQU$A>L* )AMHQ+N'E|Qm=;),<<L%jx92sb zcA3xWJ0WNt)yLd-6ZWi 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 zcmc~TPR?Mgm=ij|w`h)mKx_36Q4WdfxyBh2wNoB*KVhl}SQc`$qtoq^iuL_V?Hh$J zon1YJdzH)L<=5BSyYMgJ3;FRe$+O=7;myk5DSxl`$t~_)T>di2ue*NZ{^<_KS8so5 z1m?x;bmdom_>ti}udAJ?YTNAp70(Px`9qXnwkxd_<*q z+r2i!qHiB$?v(sHV|CBHOzO9G+eekQy2_0YkMFs2cBcP|y{AMTPwzaKf7*tvSa$E+ z&KJ`9r#ks!xEA$zyY8Ga>r+h1)WDPOlC>v~OzVE{5bCLu{wLHsxUGjrQu0WQi{-;3 zle~MM`RW`ADm-G=IXUZB&5=DTk1kvH`qy-keD9Y!f^nWj$`_|>kKtmSBh+)}^TvJa z<=2E}+*tNn*KGQxziGTYM}ucLyfqXtxFYAw=&ZPv(T%ys&ET5-q;2jGYn$7|ByIout8u&=5qR{;RtG0E@% literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/753644716297289769.msch b/core/assets/baseparts/753644716297289769.msch new file mode 100644 index 0000000000..eba46613ca --- /dev/null +++ b/core/assets/baseparts/753644716297289769.msch @@ -0,0 +1,2 @@ +mschx5N[n! gU~\!wAVH, `IӭU0x<02 AOE:睉AKC +vtuFn /'fK:/UWYJ}uJٖ+cCs毯%d=|&KU㕉vR%X%fVlTg꭫RxRC)W|Yì uZ@2{*[It٥cƉ,zr X9Ptldž*^[Z4[v,Q.g-wwo' C?Eg \ No newline at end of file diff --git a/core/assets/baseparts/753646105383927950.msch b/core/assets/baseparts/753646105383927950.msch new file mode 100644 index 0000000000..500ab29da2 --- /dev/null +++ b/core/assets/baseparts/753646105383927950.msch @@ -0,0 +1,2 @@ +mschx%L0 1@P >f ~ l (A{i [G8?{ݻ+n)p8ehߞVgy+N\.<oF^8QpF.d2hJT:Q ]˓RZR& d +eu0eOE+(Qf53U8)y)Y(H=XYI-qWuC6!3HQsyiyr zFRbjER_F8m%glH4*!nAYHdt&|?|+*5|KR*<9(ww9_Iz?rqpg1}{5b#E!n^%{8~$8~ zJ+`oVS5{#E-5c|Ezg~Is`}6SsGne`Pf7O2Y!roucQeW8rveZ~wowIwhe8Ao>`64#o z+3(BTet7e6?D^ySY%he{@ZNoR)B8=qTem0v$G;hwg;>i?{LAlBx6^2oWUAx6-hWqO ze!brCoxw`MVU>MCs|UZTz^C1Zno5AqM3i=Hc4v2-mAB7+7@mWExOxcvB4C!bJN&*Dxdch=^gp|#kZC( zX`S(OpZyjV!tO7vFYor8R?q1+azJ1p#l6S9d?>Vn0xAyIiIJv*mfHAE0tH%xoem-lk4l;O^na)WB1fmV_I|6;Muf!3sbn39`c*k-SfjvkLxST z!>;ca^IcVka`={@p zr;fk6*YthlUCGhyv$a9DZ(rhR6$SnbHpM^(Zs9#%VS8Ge&%d5Bp+Vd@WLZsW$mUpY zmTI$N$YPU$yq380fonjdgJ!T6-C6==r)jas^7<{AfjE%{JXByV*DH@NB zcX54ojmdanTdeakjNzYA#H$BWtSpxD`K>%=eYSqN%KHxrSGzXnL(94!^YV|6|`eWJ&`0cdcNLy~6zH LS3ScO$En=_zWO*O 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 zcmc~TPR?Mgn4{YBm+O!L&k_CT?+cZxCms41_@OYX*J#G;6ISN(aa(4#e0Z!^evnV~ zAkVv#7ID`;$IkH2wblz-{3&tA*;tp&J5D53_CBiNX*$M!J^H-!ly`Ra6788hhss3e zslEAo=lHv)CY3YNDmU~dCWDMo|3rk$vVkRmtXIbpF%uIF0+3?(L nCwaP-bOdC%PgG*nN-?dqUm3FKT62>_Xw%Qd41XDX^L6C_lATvL 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