From 77d4b0972d747b9540110a97990ef1c065c7e365 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 2 Aug 2019 12:39:21 -0400 Subject: [PATCH] Balancing --- .../sprites/blocks/environment/lead1.png | Bin 2197 -> 2246 bytes .../sprites/blocks/environment/lead2.png | Bin 2113 -> 2173 bytes .../sprites/blocks/environment/lead3.png | Bin 2250 -> 2272 bytes .../sprites/blocks/environment/thorium1.png | Bin 2240 -> 2244 bytes .../sprites/blocks/environment/thorium2.png | Bin 2221 -> 2309 bytes .../sprites/blocks/environment/titanium1.png | Bin 2802 -> 2868 bytes .../sprites/blocks/environment/titanium2.png | Bin 2834 -> 2831 bytes .../io/anuke/mindustry/content/Blocks.java | 24 +++++++++--------- .../src/io/anuke/mindustry/game/Gamemode.java | 1 + core/src/io/anuke/mindustry/game/Team.java | 4 +-- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/core/assets-raw/sprites/blocks/environment/lead1.png b/core/assets-raw/sprites/blocks/environment/lead1.png index ea20a9261d43dc5e1bcccae97258791167a3ba77..75b71b0f8d60bbfeb3622376b3b72fdf8953c85f 100644 GIT binary patch delta 2188 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 delta 2158 zcmX>mI8|_hO1)lHNJL3cV!1*=QGQxxPO3slWkIS!YDH!m14G5FtKpGlPt17!Jl8B@ zVN%#3)Bd`8r(@szN0(k5&8@bXIp5>F66?f>RSX+)f7#dbe-_tM`*tj|!>%&FaOV@D zbe~0cugjg>^)*I(zJEpiq}i{TomC`K_y4N9mVV;vKE)l%`seG5gkN10?pNC6zbrLs z-siG8HeD^-=bYQ^neP0J|KS|_b?$F<*Gw-LXK)LCA#8T1^~k&D+f+U{O-kwE^A|cF ztTdzB#U}FJgLJ(Y_ZTY9#(mgqe*OvH@vsu^)B7KkJXxY&wDZh|$?iv{r`CP(xWe|k z!uEl=TX*so+1RoZi=X`Ad{r-YYF1(*-kvG94r#GRXTBBvbae64i!>})o6<~pez2`dx)6rP-VZ{ zWMV5lC?lA#Ep@eq*Y`Vk?kcPBq>8e+z z8CRCv>@JVn`~Bc~yQ$4A;wC=?oOm>!Xk4s!?X_!@Nba&M6xw2FdUE-MBrnZ$iL-jn z;m3aQI6hQ5DyqA$MaWxgr&8^z)ls#)rq@D>AFJ`|9x%D@)UCVq&PwH}yI$X_<+uHI z<+H;&Udg-{AC!A6E}an1Zois-EpF!TS*BKNJ}PCc<1W9Z!1r)jQ=0X~ladn2?g=(N zY!fcn)LU+zIOp-nJ5SE2i77AQ(J!5JIm3vJEmr-Sqj-7wGrOl}8Sc*ibnN{My5w(hyLR;MXVlqtBxLvk|b@|Mj;OXe{YeQpS!n7Ov>oG0t=l~cB| z?YKPa#_tuE7b|>bO|)!V-grFBQ`0S0yU^{_X+QaM>eao^>O()+2wl1s{5kd`&#jpL zgQe5`GfqlAy~U|L_pu3zE%?~yIT zX5|?UObPdA_dER9vGle~P0*aZ&B=4PlHSd;OGx~ZJ;9Fk{P(4sk0xKSnPlNOJM!GY zXvet2wJAjr=K`YF`L-n2zg_rf$*mRVpuF~W$cKhv}TF(4a{-^OfkDWT+=4SCH@yf#P9d|Qprl=qOe(}w-7|DyhC9DlC1*+;L6?bU>W}Gp5E_dFl=7_x?FT->LX_Yxg50+bBnN%x1XXnBl4b^O~1yAR@ ze_qY~KfWuaCsFEv@qZ@uZx*nf0YbNA+T zeCwJNelR|I^lHfqCDniWnp-+PKG-4u{+;c+dyN0mrmjpYkO?q7ePYQZC%yezEpdV_ zEP*|W3WmY+g^!xp9KUW`Q?u9mgU*A(1) zv?lEJnp*#VhYB2{BcEBFRa~;6L$yOdVR0YVstpqsgeo6(Y5O)=?w{jv{Yl+OKDGCZ)2$C2n5-u`Ntrd{SGVhfzdidj`CalG_nB_r{>{!$zCovS z>OMw3zQ&0{sq3rv?B2e6d;R$>zkf5@=od|lcm6+RGAFxyJ&S;#ny6RRoM;9H#w<@4 z$B>A_Pp9q8I&2_t+}~+R3CGiA4edO0nHHX(u>IBKDSI4G6tnCqod=b5cN;``>W_HkKp=uTdz$Jx)isk z_MLC&^n3l~U++1bSIn(1`mLanB*19-P|5!&KZC;EyTzIrYa>tYWzi6PFK=zQOZf!v z)9T2ps%N^7Dp>Cq2>6~ZD0Gn5WzWY>6($CT_F!d;&Xv`x0#q3s#994{$^>^Q@hx{N znEZP}@cR(%?jLXUUhL(qZMzc5y!dNl4A;I_=fyVE#LS%Fd;Cm$3ghLI^=Hm>yDnc4 za(&9mlgTHxyiDPq;g@zyZF!k|vCA4|2bUjq_hv4%Vi3$^+NU_lXwEK;9k2iI(^b diff --git a/core/assets-raw/sprites/blocks/environment/lead2.png b/core/assets-raw/sprites/blocks/environment/lead2.png index 7741575e000e2df27a4cef46827ce58acf1e89c0..b61a3a5cfb988b1e9d8a2a41a8f0d7f173838df3 100644 GIT binary patch delta 2108 zcmX>o@K<1hG83!7L{<6v=&~nTJb%(fH?vF-=zsdb=J~q^di7oHci;6H+j<`J`0fsotkcO8VMouWU6ouD&@J+A3A0#Cq*E$6oLMvvTq-X{Ph{xa)W2Slhpd z=<7?}DL!x8-4nL;lb32MIX^#B;>xmU?>@Qke^tDDw{P8*GM6bfPybcKsW*uV8e47R zi!E&bvDVt3?=XI`ggaz)L{^y9V>KzJ+4XlLf_;tdZn-HI%y2PCxqsRU0srU(|B0tW zj`m$H`NZ`rWQB9gf;$1NemZIAq>tCk&`EffWiW|nj^pF!!F#3lRohv zQM~sDQ_sRXJCa0L3~P(ECdV%hTO8l7sN?K7(}Z2e;N_l}6vO@-k5(FI2TEjpJthA5 zbs0l_m%(<1oTeKhyG-H#W+ z4-%SL#A`Sd+e9>tPR&^HVo|^1u^B>YzGer*5B*?qURHnRX4*-;-!esKRw~qV=?2Ao zRGktLwDgpyszYdaEwAadD?ZK|rni^ud={OtacN(~>pQvA-|c$8@c2BxtJ_wcU$s~3 zd-~NgVZF-&lIPT~VB7q?o!j_SC(qdh5|PYD{{}EH`Z^oS_G~qoB0cM+$C??f4MA-d zS9y*uSdiPcWOnfG_WGjvua+Hn7hby9`stMk@8UIyZ?jujpU zuOIx87qM!e58HFSkQ({BtgHri)_vl4zVhxzZ)f9#vWz8rm@D`gHd(bv$Ypb^h%ELg z_Es=;XS^NrPx!|1Bh4Qp_Aiifk}TbpxzYM{tV`;?Ws$qQH{aAM`RBQ7rDfq^w+YP? z>nA!e-_)?5J+H{kDD}O-NyZh?7nz^yg#J3Q)&0!;KZbTP@t+>%t}aV2Vw%Uj-#=L8 zrq@52Ly^)~mPXy1&agyrpMFX4?a($kfBjzHMV(oeYW<-gKg-1=pK$i~gHlBK!-gb8eUwM%?aMeeQ%I-hx~J)?D)wgnl7#2Y+f z-Scb5*1A`G^Kw{CIXc$5&I!7)SGIPs!+hOUN5mZWYA&w7yK4RZA2FKzJg?Xl-uze^ za&X5l-nkd=MEtCek3P=8z}TAU>>S|f?5q$F8dR zMX_Z+dy6k7+Mn-{n)$`1a7u(m*@im@*QBgCGWm$1>s5{W^GhQi?l~H{_DaO-d4F0T z?%B5KOlg#}N0OkofTDvNZ)$x=f}-DUx2{f;x#~85n)~8aru(cjlCTsDXyrQjvHAbO z_cv#?b{3jz&SBUUpYuCeg5w?2*KJlJo-cyJk=Lz_-_1bnaqWH?k{V07H7|W{Dtwvg*8Fu2M#J4Xa+5L zQ`%qNZuR_IzJGR|eNaKstUk|RHwFd4e`BMa`-Yv|70vwZ-#% zq?UeClKk77TY0i%TI>DqZi{b5UNhnKI(GZCC_};CJsp%z)py+W#cpgosmA&brT9>z_ei@|vwyqW}J0-lUu`S9wEX(xZi2r*Pi4 z?qg^77i^oeY*Rvg_TM*G9CT8rhNSiHzOj9=dw^%E*vC8b_We92^Rl9tHzdgQsCRvu zqY4`b`=g(qyd+O<`sFq;+vBD5ZiW?iFR(i@ZOB$siSta=Fg?7yl7YdkaPH$dCX;+W z3&^MyvGv&s)aW{hdOCjFwY&L;(edKBK?kl?FR$c~n|))_yQk^a*IpMlp1gixo}|;~ j!-xOP_~YGRzb0tyN5; delta 2035 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 delta 1808 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 delta 2187 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 delta 2767 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 C2q!iG diff --git a/core/assets-raw/sprites/blocks/environment/titanium2.png b/core/assets-raw/sprites/blocks/environment/titanium2.png index c6add6ad54c9f5d9f8c66b9f8a0763ea25be75b4..e1edbe30463155b9a63ef4ab1e87a6cfbd9fc7ac 100644 GIT binary patch delta 2750 zcmbOv)-N_eg;8~)s(gLsv@aTbf6i+@<4_Q2dc0wux%rF7{u~>$ufO{DtTfefBcrmW zQ}nEl*Xx)6!B&fUwluN zNv}U>^M8-R!!y^PS1P}qGx?lj`a`P=t5c?4>!0*o!N2<6-1N!)UaEF8ir3ZO)Oam& zeeaiFGAs!t$13OX@V?&@dw+{+WyZtJ`VyCasa=xnu6{3h|B3yB^t=~#3>EkHK1jbk z^Sgb)n`XVukGTEP?|n@FBj(jFWw}fB@?tmTdwn1J?!U=Aw{fkuqSOJ={=n&)ulb}I zGe5lE+R^_Y>CWk2DK(RHw>56%3tqiZl)wI_;DtGQJKlB8&Rer_Cz~iUuTYOm@1I%T zaT>wVOIZHy@Ju@3&u;xhddBA&%c8}%KS`U)p2#_A_hG*x3mzH!`ZKSO{Qq5PmEl)f z{5)sZ#-_L>|5#0@SpGexC-CUm!71YV&b>Lf@1N#IIi62VmIn_cy|!Dl>Gwz7{T1J) z@or<={kZ<9r#(A^(up*U$2JlhE>@OZj8qhQ-jK{>&pK-|f5^dx@g>4(v%=S)!=U)$vH)5CIz3{DZ-(<@WGm<`oFBgQ&+8DSkxPuwQA=y zw(pq>3%h-zvUX1OyIa15;d1iyc~$RHcQA%aC4T5|c9W`{!WloiuI;3;-^|Qsk$Knn zR-a$9*XX--_PY&k-5Ph*?bjqmJ+V5JX_fetrzfx=A!Z7rg^6am*-inEnZf6B)bb~+ z=7`!f>GE77HnzhBM=sajz4O=L`&4u0lK)f8e;t_<`05|;v!0;u2kuzs%SXIUT^hZg z4BE(u8J+!60DTm z#A`P9&^}&`=Nq&R{d79Z$bN*;c-zLEA*-*iUh0<{Gfhgafy*gvcChhQks}WRZ*9N# zNX)`nXqSp3lZ=v(y-e=9&4ChTKDoQ@t*eie<8Qd>o)+(3e7C`hV@tv-iQK~rd5-65 z&Q@pLa5#1Lr6*CACJSXmm;0?*rcm>V-#RpDYXsvJ&L2OeniD+1Y|TH%5cd2sUY*o^LJO0u;w~mgQS(ZCxrKIFTV3hF>fum znNn1E&j$nLMQa^aSuwth?ccuZ{|)vDAADYGZdJG%sS+X)uH}7k{SiVK^L}Wy8%jb#GisCPqZsRU2cKTNzdt};&XGu#pzMYl0!0_GG zjjNin+8)2zu9*C?=x1&Qf8Fm$F=fU_M^$VqjI-x^rd{sS{Z{x$YL44)kv5P2vjSC0 zYl9VC`Oar-`h4t)hKcgB@MUqw-$xwZ&|td$MBGjz)3tuSjQtq9Zj_D;oP#n$>OrduwieCu&C3Yx=cBBMXC=T4s8=F-h!zk=kZd0suVX@>l% zn$s2crm{-UsVq6Zgmc+L)!3hpOzu~h$j?o6)$nn%a|&xR4{@J+Igabg$)wLmpUn7m z^4$W7*!e>0f4KRcr5S$R`rYnfYrX&e^uW)v-0l`xi&z}EuyxX^<%^FTG_PMW)%xVB z@|3G3r;n{)oa*=Pe&=t={hGVoK8L>Ee_ZBn&Q3#f-D#3Gv!p`K+;j6xe73o?HL8=Y!tc3-*rN?!QH1IJgTY>8#tyzvEJ z#^(i5^5^0eKZiKWdH+!EdG^5K*DE=J3H3j2D%#)Wsmo&Eys==Kp64x-kP=?+$-B2Z zcJ%zp`~NcOSH+v8BZm#&y%G3S%xV0gXTDssQj~AZ^60?$NAB^L=B>%N{4K1oY31^q zb@!*=-*jv0j7x1g(*>g)rUtk)D|uzOwaa)&pDI~gf8n6)j^023OrrwCHQki!tIqYrc<$HM_W4I%>F<*O@sA4cv zn?Ysq`8`Yu*{8GTDZehg@*_@Gv`*|uyms%;r7XIC3#OE+@6e{-$@VL3x{Vjo$ z&tBpBV9%9%-&l}if&c>pW9#HXc8U4`kyiicrLIx3ZxkL)SZEa~AS$T7)=5ySC2C

8dRMX_Z+dy6k7+Mn-{n)$`1a7u(m z*@im@*QBgCGWm$1>s5{W^GhQi?l~H{_DaO-d4F0T?%B5KOlg#}N0OkofTDvNZ)!+_ zqTg<}u1=G=>NbCx`{Grm`>ZpPuoMeuKJlJo-cyJk=Lz z_-_1bnaqWH?k{V07H7|W{Dtwvg*8Fu2M#J41TA?}+F#yo_554De|DXHP(jhGKF?q` z1_lPUByV>YE{6XgxM1({$&>$b$k%f)@hOXBOgMLefr0Usr;B4q#Nn%9d-D!C@NCnU zl!#d2722jJTiL&liQ8NC*e8n>`3)0(vDFHSEm@<`(WRv*%6PI=@!*}g`se(kzfM+~ zSWy1&&1QRP_r-z%Dr*@FcGU0Lyl?Kb%d5Ztc-`$Gz}$F_%|UX9pXDiRaoyTeJ7>6myziC@v}9`L?XOGV|t> z+VGW2j_qtV`^@RpQOvPg?fk zp&^U?Ty@A>hJ3j^-N&KM@^9`>*vr)CBHZ?Q^Y?nu;sr|*&#daQYW;X-Zp$fP zQ<-&3_k)NO9Rj(RweR42@~t3S^pD|`CDj*SEl7O6Zh^*|t-BWG8d_bwEj`C-jn zoldo93{rx|^swKS%T*TGrb7xgpi&TlX3Ff|CnNroY$} r9Jtgdr8L&y+TZ@T0QcLcA4zAIpYxl|=WfNoz`)??>gTe~DWM4fyqrZT delta 2772 zcmeAdnPRBzt*RTKVcFR(IZu6X4L0_%N_rC)_$+*;=-~Bn~)6IZKXXn%x|19g< zd#0+Ik14(6Sml#m`6nmdz1Qtrz?!Nh!Msn_b-i&*wNl*Ycgz2uIb13)^J7Q#=lOe0 z7B9E{<~Tj_<5~aodmnGx*dF;I-aDt><6C*JTOG?G{{LrhUY?U29qwdO5N_iZyKIfM z&YA-CwYh@w2aoQU{`F*7tH|w!sP>gtZ`60Szp<&YjV-twUqD!+q2HE9d{Hx7TMs zyE5_J9AEx;NB#AR+@>Oye~)P~JbLy~Q~$r!X7=CzmLCujc=Gfa3v>6{-yNskNk(re zP&>_5@7;X&=c6U_nI9;fNYi-C!Exh7M{G&h9`WZ7je01Q<#8%;Sy@^R3GRad`*o3yI zaCnPMREhLjBqFqYhRV_@!6)s6GkSdcB8yI0PG?%ES}!subi=-cMZdgEL)LBd@-@AF zNx)9mByXdqx9;{!wafXq3~b9@u6!QXCe5)_kgeY$WywVMnH^g_jeX`7p7Jq1|HmpjLHtu_@fIN*BiK*K%m zYZFC_I=||gJ&Bqem#sf%C)<_794{zhnJ`zD_!X898Y~iynVC(``dYR9%F5o;L5G>wHBGqrEM(cVCK(&A;Mcl& zjm9b=499MI3*BMvnv`nU&@_GG-})Vgx29@roW6OgRM4}au*F{I-E5xAzq@pCkAFz- z^Ty4`Ev*-X*z(*AQYn=SO=g}LFMF#)${xgYZ$Fh6k3mZ?aQ$?)#( zX>y15_gbHGxUl!BMOnfl!HK-nFCG$G(i_13Np|NolYMgR>wo;Z8~f~Re(Se$ZD+ds z>kHTp1icEn{Zr$d_m{2uxgY904IY^6eYix%HJj0(t>5y%GwbL;KWOne97GUhS^_ThqBP_a^_wH6MOtWKFBJTmSi>d)^7VRc0ntFO7B`XU_CG zy!Z5$qcS<+2H^p>J9H1cUZ8#a;A@`T6${L}nj#G`T zn>i#5PHPC}^43?BUpDD}(p~)iWNVLmWVG|OX%aU*SLnRZaGzD<+BH+pB2X=by}_IjoZb)nb(tou5@w(q{VV{P8F%Uk!TtjsfYlzggs zeziz;>Cd%F23Fz+n>F8QeGwF~uf4ZmUD1SHv2Ty9`|@Mq>f?*$J8M;)Zcb&2zUV5I zC3>EPwK8>{ zdD0F!s~7D|e_5&adR4qAi)%)y1OH@4erKbqsfYQMt5?TLSupKn%m00F`#vV$)Jxp< z)e74(ICmWnirjeR#}WsXoZYiJWc=TLc~QOp)2)woa;@;!W85kH_GM$|RJe{2t0)qVA zJbhdl7%Jw}PPFwn>>zVA-hPRaF5g>)M-vuWMGA@*UeOX+=(IvKs?=cT7w%amDw=wI zP1y$z_8+ZZ)!e;#9pAbpg&&NM9=%%fLP_+qJm-YeBq-eHpj2q*3|6v{-E=|xW2C=$UyRea7X&gyoe*x zM=sBvcCK>1#j#V9oND}RvM#W8%J0=*VYQXBC%h=uqttP*~i@wQ9qJ1)<7EUE01) zmiy;;Tz`_cS~zQu4EGAh)+av>{(n%uJ*}|lkS~{d<2>=(|0LL)b~~(2ynX-pw!2o0 zOy>_wz4r0?tOIA%U-tHi*?Tel+TPgxx=-yr<8akFRl}Q0n^XJ-fH>-d=xx%kSTeHu^;qu_FE4qYeOmKeIdFB8Eeg6D2=W&G%o0e-n$DBKN@0;zL8@{>w z`=8Gfud*`S&|4<{eiq~U8o!POay?Rx64le|_x*LWoRanUYmqS5f=BxdxAE4#P4a8C zN-_%CIU_JSUTrG>9dVwick{yS4a>f8G(C`+{5GlUg436+ZO4N<<@5EEYA3h41hhDQ z+xXxf&kB>qqWG2rA1kz?n^&4RT3GZsEajZ`dr^_(ofOF%4>rCDou$CQ@T_#Xjw*4=D;VO}g?|F{G!O%DJ7 diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 81058d17da..b80a143631 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -543,7 +543,7 @@ public class Blocks implements ContentList{ }}; cryofluidMixer = new LiquidConverter("cryofluidmixer"){{ - requirements(Category.crafting, ItemStack.with(Items.lead, 130, Items.silicon, 80, Items.thorium, 90)); + requirements(Category.crafting, ItemStack.with(Items.lead, 130, Items.silicon, 80, Items.titanium, 120)); outputLiquid = new LiquidStack(Liquids.cryofluid, 0.1f); craftTime = 60f; size = 2; @@ -1294,7 +1294,7 @@ public class Blocks implements ContentList{ ); reload = 20f; restitution = 0.03f; - range = 95f; + range = 100; shootCone = 15f; ammoUseEffect = Fx.shellEjectSmall; health = 250; @@ -1604,7 +1604,7 @@ public class Blocks implements ContentList{ draugFactory = new UnitFactory("draug-factory"){{ requirements(Category.units, ItemStack.with(Items.copper, 60, Items.lead, 140)); type = UnitTypes.draug; - produceTime = 5000; + produceTime = 2500; size = 2; maxSpawn = 2; consumes.power(1.1f); @@ -1614,7 +1614,7 @@ public class Blocks implements ContentList{ spiritFactory = new UnitFactory("spirit-factory"){{ requirements(Category.units, ItemStack.with(Items.metaglass, 70, Items.lead, 110, Items.silicon, 90)); type = UnitTypes.spirit; - produceTime = 5700; + produceTime = 2850; size = 2; maxSpawn = 2; consumes.power(0.80f); @@ -1624,7 +1624,7 @@ public class Blocks implements ContentList{ phantomFactory = new UnitFactory("phantom-factory"){{ requirements(Category.units, ItemStack.with(Items.titanium, 90, Items.thorium, 80, Items.lead, 110, Items.silicon, 210)); type = UnitTypes.phantom; - produceTime = 7300; + produceTime = 3650; size = 2; maxSpawn = 2; consumes.power(2f); @@ -1634,7 +1634,7 @@ public class Blocks implements ContentList{ wraithFactory = new UnitFactory("wraith-factory"){{ requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 60, Items.lead, 80, Items.silicon, 90)); type = UnitTypes.wraith; - produceTime = 1500; + produceTime = 750; size = 2; consumes.power(0.6f); consumes.items(new ItemStack(Items.silicon, 20), new ItemStack(Items.titanium, 10)); @@ -1643,7 +1643,7 @@ public class Blocks implements ContentList{ ghoulFactory = new UnitFactory("ghoul-factory"){{ requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 150, Items.lead, 130, Items.silicon, 220)); type = UnitTypes.ghoul; - produceTime = 2300; + produceTime = 1150; size = 3; consumes.power(1.2f); consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 20)); @@ -1652,7 +1652,7 @@ public class Blocks implements ContentList{ revenantFactory = new UnitFactory("revenant-factory"){{ requirements(Category.units, padVisible, ItemStack.with(Items.plastanium, 100, Items.titanium, 300, Items.lead, 300, Items.silicon, 400)); type = UnitTypes.revenant; - produceTime = 4000; + produceTime = 2000; size = 4; consumes.power(3f); consumes.items(new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80)); @@ -1661,7 +1661,7 @@ public class Blocks implements ContentList{ daggerFactory = new UnitFactory("dagger-factory"){{ requirements(Category.units, padVisible, ItemStack.with(Items.lead, 110, Items.silicon, 70)); type = UnitTypes.dagger; - produceTime = 1700; + produceTime = 850; size = 2; consumes.power(0.5f); consumes.items(new ItemStack(Items.silicon, 15)); @@ -1670,7 +1670,7 @@ public class Blocks implements ContentList{ crawlerFactory = new UnitFactory("crawler-factory"){{ requirements(Category.units, padVisible, ItemStack.with(Items.lead, 50, Items.silicon, 80)); type = UnitTypes.crawler; - produceTime = 500; + produceTime = 250; size = 2; maxSpawn = 5; consumes.power(0.5f); @@ -1680,7 +1680,7 @@ public class Blocks implements ContentList{ titanFactory = new UnitFactory("titan-factory"){{ requirements(Category.units, padVisible, ItemStack.with(Items.graphite, 100, Items.lead, 100, Items.silicon, 90)); type = UnitTypes.titan; - produceTime = 2100; + produceTime = 1050; size = 3; consumes.power(0.60f); consumes.items(new ItemStack(Items.silicon, 30)); @@ -1689,7 +1689,7 @@ public class Blocks implements ContentList{ fortressFactory = new UnitFactory("fortress-factory"){{ requirements(Category.units, padVisible, ItemStack.with(Items.thorium, 80, Items.lead, 220, Items.silicon, 150)); type = UnitTypes.fortress; - produceTime = 4000; + produceTime = 2000; size = 3; maxSpawn = 3; consumes.power(1.4f); diff --git a/core/src/io/anuke/mindustry/game/Gamemode.java b/core/src/io/anuke/mindustry/game/Gamemode.java index ed492b6afb..b2e803dced 100644 --- a/core/src/io/anuke/mindustry/game/Gamemode.java +++ b/core/src/io/anuke/mindustry/game/Gamemode.java @@ -24,6 +24,7 @@ public enum Gamemode{ rules.unitDrops = true; rules.waves = false; rules.attackMode = true; + rules.waves = true; }, map -> map.teams.contains(waveTeam.ordinal())), pvp(rules -> { rules.pvp = true; diff --git a/core/src/io/anuke/mindustry/game/Team.java b/core/src/io/anuke/mindustry/game/Team.java index faa28ea081..7f9c3428b5 100644 --- a/core/src/io/anuke/mindustry/game/Team.java +++ b/core/src/io/anuke/mindustry/game/Team.java @@ -8,8 +8,8 @@ public enum Team{ derelict(Color.valueOf("4d4e58")), sharded(Pal.accent), crux(Color.valueOf("e82d2d")), - green(Color.valueOf("3ea56b")), - purple(Color.valueOf("8247b6")), + green(Color.valueOf("4dd98b")), + purple(Color.valueOf("9a4bdf")), blue(Color.valueOf("ff7f50")); public final static Team[] all = values();