From 608e25c2ee7cd5706e7855fa9c678b3903b9af48 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 23 Jan 2022 15:45:40 -0500 Subject: [PATCH] Research tweaks --- core/assets/maps/onset.msav | Bin 32522 -> 32522 bytes .../src/mindustry/content/ErekirTechTree.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/maps/onset.msav b/core/assets/maps/onset.msav index 9ea9f672f97a3d4142ff4448383d648db3d591de..a3d93eda5e9bb2d02e1ad750e3c6c6ce0c930ac1 100644 GIT binary patch delta 5501 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 delta 5501 zcmV-@6@u!D{sD^q0kC`z0ba9x4;)$uWrdOQIK2G#4S25gGI1>+>Hu=yt<5#}u+m(OmU@N91dnbc-m#e0zn}IN#BFzJlR8G! zR;ss$@`1u{f8hF*^g;ir+}B*ck#Vo`uC7D1Wg$B@xu?SIF{JQiPxhLS-&gfWbKFz; zfn~of@h+{wb5@Psw)ou^VR`=ai@5C0n*F#_^hy+6Pcex$;Sb?Csq=*2N95=%Lve3E zkK;nS81vh6gg?h~+b3_@{eQr-d0W2xMZ&T3>%rsde>dx_aIMJg$0hf` z=N&Z`n?)ZAe73&x3EvQrpD3BOP9AD_-rzYte@JxZy}f*W8QuVqlQuxe>hqMzYw7-N zkv}{@#0gi+JYx-Kl1@APH8?I%pIJ?Jag#W{ipag(g3CL}GRczx+(ud9nR_l6#scV?3`<9kGkh ze_PHZ-D{!9O<&JX5IlXG_$T4*@@`Kh9U5>yZJ)9%=N(QV^eg3S{AHpg-3`wdcl%R% z%NoMRQ4x2C^in0dSC76X?|eJqlfT5y`=_Yu2Q7GRqpeM~`;GCQc)t|yLx?iIJw6xd zeUF)gUdO(th=GUP~t&N;>$6S&)__<3)#wkha0tdC@0PF zEu|c_iu)iuGn~gU*Yzn}ubd|je>}tQo8$dBVGQ$g()Fm&*f7y;kFaIG`~tyWt0ep6 zJ24#Mcf*N%V$Z8IyEn$oq%#=utc7Qh{Bl6JHwouzq7C_kRUfVKUjWPx^?4b;zgXl` z|+k^1TTe<#VGD4R#I z?Jno{hy43%0R6jew=5#;noA`wEo8pnd0$iKxgDOX-NlFecjXaZMd*V0oY$y(YM+f4 zy-a+^cv5OJ+(++z+^EyD+TMEH=wrA|B%4ltRImH5pTqJ*KI~0I%-`{NKHLoNc#G$G z8hquM*&X;E=c9b~?8`Z=e@>!7`0WILi#qZw;VTbTGC(wQZh}^{HuYHp@vCo}c-0r_ z9PD0hBl4yz-hDu|p8nmN7!{q<{_H_HnGuh&^XnwqH@pX2TUF$6oW(llznb`-_wG=< z&UuJ(s0Gt(&n~}xTw*_te}`wM82u*4%_4jths2d-`UB1-_b!`7f9Sfs!i(Lnbx`D> zulH}^eBR>MM-%ZW^^vmuk}UiR&)4w(T^c(qd*k`xE}tWxyOCgfEa!wi6YGr;y!9Ul z(_-8=iVPnye(ZBMesQPNXXwm*{LkRL&p*fU4UUhqlwKaR)GTnE-ftsl_)3xM zBksH7H{SCO@7q5@fBr(hCzgM5t(-&1<5`XqkCD7PCO!WQ(j^0q=wG_+Sx7d!9U=M& z-Nk<%rg((S@$aG9MYp?-#{1>8xdi12$rt1>u5n%(t6asK<9*3`p2O%Q80u$rzvwCs z%Va^@cVt z#oGbT#kqjEPq+EK>d`{a)m%g`zF)JH%@+_d^O!Ki7o{`b;N0aqw7oQ6`9rSv)8{|` z2F@>+`ETm4aX^@&lRG7zWWA=thd58Tm(!YFFMP{?e}zBINBToV?666?RZhC+TF1GF z2G#e+DyF|bf8pnmPkg}ht>F1`7t^^vQU!msvqMBjI}9|F%A;!&f4@%|vO?bNHVaDbQ}*M16^~2L z0r}N)>_mPp*SG6^a_u|QvA&!9vps}O)ugOwB5ICWNzQ3+#UCFd`j07ZT6v~gThy~g z{g{3?eR6T){yyQH6my!HuzgT;0L^d2yv6$5ET3(V=w7}2yrw98Ps-_4-(mTojc3X4 zD4r_We>K_L%JUIpuGNJ7q<-d#$vq+;iGE)8M|ynZTFK|G7}_D?uJ_a2DnuWF!vtqD z&8ahSo(A9EuuvbD++Spdyy|>f;{rl2nnlzdt1kE~!Y?#HuD6p;>c87OKTNc{hI&7( z0iG1zy^px_s(sIPK|A4>4eR;zsOd5CPpIC;XU4vh_@a6-s=tieK9A`K9Wh=XacJeq zwmA3u0X5!}zF zT9GMuPDl^#XKq6=wa_~Z$Mtd-&9<;VFT%b}laO*Bf8I&_#&F0^nM&tBfNK1*|H=1m zg|M|}*9qHv3SXnXq5kLU6``B~`Mvy4*s>jX4*yi5<34enL)6LIy)^l-4)rLF+GxM; zsPzg*!l(WoYw5nY-HQ?@^>}xj)jZrT+aSKEi}Sdpde$`&ez-xxEq-u@w5*tq_W5nte-W>AzmuPR?oHC?@2bUKfchu}&y|ciK~ znTPzc;m^>1dB2moEZ>0J=UZcb9Q$TGMg3mgFXjAbfqS?>|8g5)TS%8M-OlHfFV9qaHsgv0yry3L~X zDQ3|~xMma0-6XCq!f&l!T4xDcw6u?Uj;3(T79J>Fu#Pjwbh`=nb+}F^+$$6OPQLJp ze{^nk!z$OgPZ^`VlzuWy{2})lF&y)V94Gnub_MI+UkAop5dyzpLA)y076!^Y?WO=YTSBFZspP*VJK%$H(4FpN;pgqIa>*#^SxN zLA^MgC*9^9R~^I-Wzq~3|B_$A&(ZE>e=ot7UX$zw2YuiEgG4JrWyfO`WnApO^XE=Xu8@ko$04f3D6# z{VO6zPkKm|V0V#asOMrH5XL>u^_aNk5p_W7CD(-e?_@7Xe~{d67un*nU7NO8H8WB zOWbFPTe>%RKfT|Xa$tglQHE*HJZ2vHBjEZ{mEhaGvOb>1e_LLK#|mG8 za(4snF4XhN;dxJz6Ub)nBzSMbbH>b1yu$rh=h>}reLHF1y&|J?eN5=zZ;#g>v}XIT zoM>vL+?ViKZ=8a!#q)K4SNO}d&u?=djtE~ho6g7d7GJDonR^p^5O%~g|Gl651FB0A zt^?AH%Wb#Uw$pu;UDcqze>{)qy(yf#6Li!rysYj=nI|1dKezj#ep&L(E5^IWIe{`J z$EcM9xQi^SN9DX0Aif@Uz%kEd2dY!{x4C-Aa-m)aA-%%i+!~R7Blir%V|(}v>P0ge z>(3sOa5&1($$G2BBzlQnq~G5|`1iF>ww@0W{u$*MT;+Yfn{;aXf8#!WzXxAO^d+`& z-%36LkKvETecL+YaXLTkvwTpVcUu+_A_ zcXdkhQckUYr)+&^{9K6cr z{!Pg5tnrfhPU{9obv2^RA>o2CyCIxE@1*$|&i4}RMe?94T=!M-(SD&@gCl+ud%u9N zZM?6K>(LqZQi5$~Bb)sk@6_t}?#R!l_+`NQAnoBY&$-V%e^@7fnc{wFUM6E?x6F+1 zy2GC${3`J^^Yut4*y6pPO869mi++WX>*YO4yyj~v*-eWHhwfIz^}7CdQv8kD(^fh| zliQZZeTDbCiFjL0{c>dI%O+QjO^f^DeADlw_wKCQ3l+kqtkV4DJ6B$l;j-Md14OUg zZx>!ue@__ne;X*yYw=d|32efBhSI^DpTxS=hgbKkN4gcClb&NRKSIQS^!BXR)A<{Z zS%+*R^b^s>3V#j}wdx1_dy~_@TlAmksUY}=Q0;uZKFq$qfzXEz;ePB+;g1ftnc(W3 zn0|sAJ;{BX`pC)8(dQi!-CRs?^ScdEGZFr-jAu6Of2;NFJW96NEb4hUKSaE_DchzZ zJjE|<-j-Kz8_M~TM|{-cRIwVU*ZKPSBE*T8v$ z^SYkCSDe}O#XUSJxh%&BIjGp`t7+T}@z}U+@)gs;EdOAGcS-SF(-;0Mt+Rsrl$6(N z_{O+|K6j`^L9EibZgPVg-I z`*VptzX!KPyW}w%=RIBgo@^oBTM;i_Ds|D8oygh<8^+yMxal87beDA|N9Q_nf#F-zn~XKzlB52|0&1c z;JS_OZcWfn&{fDay~(XQ!w(5Z@>=ULI#T>m=exjt^tU;D9^dBgR?{PWTluIXp4XX# z?_;QMMDT;(;CG9JYv27g_sjgPmnVGre|k6UF2|XDvrInHd7f(sJFbU%?t|(?KI6T$@y{mc zsLSt+pLZwZs^0vqI1jD=X1YhRPanbUL4Ox4op(jb;5l;oy#=kUhe-Tdoug2Ron9s;koZK)|=&rY!v-2 z__@9^_qy|VywBI@-PZMBOqcZQHqJGW|0AuPL0x8nI>{U&Z$uiEI&`r9f;Wp6OMqks+^wjsKAIFep;Nk2tP@P!)}Y)zTAO%SVLmt97^P zHs=`MhWYvt&+T29c=I*dxx7X;t#Q>U-@jG%$lY%1aCLSqeg7};Cl24>?@Ha18Xu+E zK7adOX6UO)9l6KxQ_wR`fAtiyiu3(vgm_#mV%E=At;Xfb$n4Pe!>-~#CH(mbs|G?` zws^KO&lRfb)aDazrajJUfF}&S%WRHTLvlNtdbX7AQ-(iF+O5)j{}o|QsnvC)!J)X6 z0Dnqn5zeYxX|4@~h!C!6&fRdRZJwo>_IWRr8s&5vaQjeenrIbae`760*3^roG`2OS zQ(te3=c=~yav7^^^5;Miqn+Ze@jVj^wdUNK82by-sJGrxnxKyzajfCpO+3u*;U>rb zJN&uvCchs*?czt}sbTx>-{7j(Z(>wvY!fmqU2PG}TfECZ;+Svpr&_@_xQAMcN>p!g zjz1y}jWb+oN7NxMf34qK|2FqO;nRoIe|376>Xe@yvfpnK=AR;-DX`zw`sxC4 zfP32F`KfGLyhEWXh55e3h$-M erekirSector = Seq.with(new OnPlanet(Planets.erekir)); var costMultipliers = new ObjectFloatMap(); - costMultipliers.put(Items.silicon, 7); + costMultipliers.put(Items.silicon, 8); costMultipliers.put(Items.surgeAlloy, 4); costMultipliers.put(Items.phaseFabric, 4); - costMultipliers.put(Items.thorium, 8); - costMultipliers.put(Items.graphite, 6); + costMultipliers.put(Items.thorium, 9); + costMultipliers.put(Items.graphite, 8); Planets.erekir.techTree = nodeRoot("erekir", coreBastion, true, () -> { context().researchCostMultipliers = costMultipliers;