From c65ba7f3fa32905581b9d660acb1af115b1fc254 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 27 Jan 2022 15:52:37 -0500
Subject: [PATCH] Rhyolite walls darkened

---
 .../environment/rhyolite-wall-large.png       | Bin 1085 -> 1052 bytes
 .../blocks/environment/rhyolite-wall1.png     | Bin 435 -> 408 bytes
 .../blocks/environment/rhyolite-wall2.png     | Bin 404 -> 414 bytes
 core/src/mindustry/content/Blocks.java        |   3 +++
 core/src/mindustry/content/UnitTypes.java     |   4 ++--
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-wall-large.png b/core/assets-raw/sprites/blocks/environment/rhyolite-wall-large.png
index d8c6164d73556869b9c25faa103057f640e04cd5..28f43f1ff7dd11680094487e8e94dedd05fb455e 100644
GIT binary patch
delta 1017
zcmV<V0|xxP2%HFzF@M%cL_t(|oaI}+YFjZBK5@H*LK{;I8EhI{Xjd=YO1F-Ei9Si+
zDQ}P`@a(}5?4e+S;SO$>k}g$H<@0}}Ym@syp}D$}rBCNyx)<L+e|m&}Sj@*TG>q~;
zmh1hg=5aEN$_LB!eo#b=HrpNAFccC-000yTL%@>?U?dDd3V$xX-rPLq4`$Pe*eQ97
zlAu~%B#qmLS2`j9Kt}?F=%ibbO5w;00K{xUL~Tx?awq`+aT01RrZp)qxyD3-S0(bv
zw-V*3y&xqZ$7Z_=yGqSYQj4Ja=Fh#7q9P#Slq9r*iGUjLlF-T)m<T9s!D2ps`d1qg
z2^b+Bl2{|ip?{np6&&TrRY*hHVm>|^ueKzpBw#k3{I~nu<f%5V{jf@xl^~G-j|-G0
zz1i-X`ghCNECJDwI47bU>s&}^?ger~=_SEyWHn>E2=MM4wvg76AOXz=6F3zpjaqtF
zvs<@!EA+Rdz8<2aF<-pDy81yicHIHqync1`9JA<McYlDcJHYDx0e<}%!S(o({Lzo^
z-oons;i$jV?|OU*Kli`McB&5tmkLP6akJgQ?cIvqv2R~Kcz(Ki(8a1i0<~a^Z>JVq
zs)I%q0QBl0jit^8F<9KBcEY7mq-qP=NK%4I0&-XkBi0w26lN4PeK}IKs!}x$C`0BF
zl*`lD1AnY9wMdJdFiQY{P4p?LC>Na;=aHgFRj4@u0K5&MvPg~yt)bMQmx74Li*V{x
zGkWZ;B1A1lsvt)aG7ZcGL?%@3s&*{wy;|p)=8Di}yF*K3C2H?#-lyhauFDAKkX%@+
zOfPLj)EI^d0MPmI)+sL+Byl8FApk(1+?+D^$A5^Z<^^gcC+VFQC3kF&)d;ZoW@}Zs
z<!O;g1+bbP1+QJ;j9XNFurbvHL}~&Y8Tq2}v8>sj22E^$lmP<h(%ljzvDD(Vwt{L`
z6QIe`I8Y>TX9p5-*zugzhEzQsmq_4tks2dX5z@R@B^1t)+Ay;6ixylI*E#{p(JUL(
zRDX^mM$KbaFoXz@0u~Jk0Cwvx^|QncRnuV)3Esu0|3`16scitZkmY)>VtY27s8d+0
z@5e4(R6QQ=t29NSB!rs_b{Zwk&us$|^HCBs*Jd;%XaX_}qzYI|-;#UOK&w&!_EV{F
zBq&WFa$=OX*Sh_sh5LSh7MA*5<iN#p&2m2nD*@5sqqV>GN-h;;dJsAur%<bEYpFj_
zeM*#4po#;eTjQ<1IqKtECUZ7ePU_q~xRT~m8dTR+*>hWT1l7vo=Ln5Gc-90Ya76U}
ny}&8Jxz|Auz+q4XU{dfG{EAPPG2?#)00000NkvXXu0mjfR%qMh

delta 1051
zcmV+$1mydi2)zi9F@N_-L_t(|oaI})Zrd;vy>SB+@g{2tP@sbyc*x`q-8vW9vv=s1
z^c(sg+4C9N0vNVtFOJ4~s=Jf{P2DFSvJo91KxB$Ed3fKXuYUjdeuV#6ENd7WCjP^A
zy+7AH&W1_&!FIhL6%muB?a+p?kT3xNphy@4-c$f1VGL4m?SDTsZ3nA)b@Bp6g7X$(
zTP`o+#vQ^d^^BlK9VkPYLt^|fhLFG>0RU+>A!X9%P&t$UfOHaaEv7Un*Ic6`A+!rx
z_>(WC&#Cr;lmH)1+a<e7%}!E_p!(*p7b*fA&PhTkm<Y&$SQ1Lv0uuqDEm$n;x4+zw
zNXX@eStH0HoPQt{9Qp87NJH9US@*`vEeR?KSk0@G-RCAxwZ+;Gt8`fj5($WLfzqU#
zwkzu2En~9;#QJ{#=-GyFtV<!GxEJsZWh@D?MpiR+6ale2hb^SEBuI$%0#DDIlV`WP
z(r!II-1Yi811TBT5=4FY^7+#*s&UsH;I_KyeU4f5U4M6gU3Y+&%`1HTdxTj%CBO9k
zZU!%#*Is|A->jZOxBo-7Q++r@seoi0o3?|e=MB4Kj}Lb-U!6VZ5(%LEx5h&_B0`aO
z2uUby6fvl?K@1i*sny?*1gf^6jU**p{rvXzD8A)^TeKAIt>zUvDM~`5z8tAqDajfK
zgduYXN`J&P_5kZkEz+VQW(feWi9RJ2;iBE*Vx%agD#W@$3Ycr;-raSF-shpabnfl8
zx*_`j;O=r(Pepe}VUU6dB{AG?bLx~cdK|1GL@h?DAg3f`8kh-4nNYZ^+Oe?ra-C<I
za{=u5%v!^XA<^%X^Ds9`1zefDX*<>xm8$SMGJkT|fhac^LgU9vr@UN{#BD?t0s!>M
z%{g;_jEHPrK)Wz)3}2$;j?FO}0T$nEttyv1Ei$P9R@0*pYZsiCDRDZKqym`h;@p|5
z18|vMI3Y*qkafaj6_7GO0A0EpB9tzQ5Us7C+SLSTvNR493EbI%L>zWJXSE?&kH;kv
zxPM)w#z?6MY2M2c3j1(v7+L;B3(C;>V+?^}*`TI!oMPx=><We?0;GUNLjr)^y-EEn
zaYNR0IEIAS#k>DgZ=|Vh0Jf0rdaq)8HLuhutfle`fM2@EdOSW<X^KKf2san(G)kIZ
zv<=7=wP~)+Xh_fmWEe;lu$I0h_o#tZrGEhIr&7t0pfrJ$6C=O9)Fo^RY&Mu9AhFc%
zQVv`+ea+cmYVpz9Uwb8&iZWxMss~slAy?JbQh%WOgb1ZT6$ePS#!LO?Xo%l3nX|!g
zQkV9FD``HVL5;d3b!m%E!Qi*Whk#^E{rurw65yaA;$0Kqz!5PD0yvC{089%00Ti1~
Vf~d&f^QHg*002ovPDHLkV1n$t>KFh3

diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-wall1.png b/core/assets-raw/sprites/blocks/environment/rhyolite-wall1.png
index effb2bbad3c2e8333ea6f62b97de1723054c0e56..e49b98179f4fd535c0056387a43ae9f4d270f1c0 100644
GIT binary patch
delta 368
zcmV-$0gwK(1DFGlF@I7?L_t(oh3%KS5rRMvhF8Z149H-HAuzTAGtF$lqHM(utbo{n
z1Tq3j!04Ry*w-zLB>o{RyC1hN*xYZI5mwZ8&ES6k0D#T8EXV8VAR5)pFu8WD_R9eP
z02FyPaY_YV8sw9Lw(FCFr`V|g0058Y%jI+q#LnsrA2nrDH-CdU9r*cA4PX^{Mh3RP
zrrMKj80tZLBkDePg4}g>4zykG?t=I^$q$(VEUG;zc?$7Z?e$3*PC^TiIuC-qX%x3z
zZ%T<30^6x6pyV0dap0iI9I#01`IK~!DJb&nYZk<c$Mzge0B~RlV(t!L0VE(S>zvT!
zssRkar9&&!AZc|M;9zsa0hvF^q<XL@ta=jw_qJMhcpzLgP~=%sN+f7;8+x5ec5&y3
zHL&Es;UG-gkOHy7adrX1+y&UtQYTY4gKryp#MR8te$BX3`{}<S1@Q*SKCKbCwgk!m
O0000<MNUMnLSTaP7pXP?

delta 396
zcmV;70dxMC1G58=F@J4IL_t(oh3%I;Zo*Iu$4%)#y9I6#PzR<gY&`%w6KhY>q1WkH
ziDP7rn%p4DSc!#BiHu|W+3!WLV2OqJ`TvWbKa|<e*YN^(w5NNDKL7v#=8N;o=XSGH
zo$9KEuKm0EEmyCT0L(t#cNYMFBF|v`wi*eCjGpn@a0O-4xqrnyen9{LfbY|9RL~TN
zXKOH=YR;#wTJv?_^Fs|_EAosLw!nJ***5I!A@oMvb18$;|Kc1dn=ZNw=s7LUs0Jv6
zBtjuPqWD~J684!01@z8?-e1iChOh{6nb5=moV%cGx?xsWf^*O4b5jPWg?ip|9c%`Q
zJiD3&)ackwv40T&7S<qAcYp|>0b#SwiI7Fr0EUpR<FMbDVgz>q7E3V+$lQinJy=X?
zUv(LA5Gf!WL{tqFdFHwj4O-oXu|YLI+Bs?sOgV5Q2-7y?K&)_*Uk_pK0vu?n%+yuu
q--a>b+L@bunn@5h{Wjzv{sB;U!4cWk%vt~d002ovP6b4+LSTZ!7`i?H

diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-wall2.png b/core/assets-raw/sprites/blocks/environment/rhyolite-wall2.png
index ed7119e655ca5602dce272f6670b2d01936234eb..f0a9abf12b0efb0ab60621542a10fd9cc0255c00 100644
GIT binary patch
delta 374
zcmV-+0g3*U1D*qrF@IP|L_t(og}s+OlEN?yg&)jbAVs=lhDot?8ajrKl1uCrxdA6g
zO_3()QsfBG;9wNlmh7z6@nh*5`RQrA`#T+<ct_h5$Q}Fa6)C_lPRoa`pV9SmR)F2*
zaCibhU6o%yNUwtf)?DRs1$HM~i6zCQXIB6mL`-ol#7cxz6MrcoInPdkq!TF`2?E#<
zz65Pkh(LTfHt~TJ2q%C&mbd$3GYASI?!Z<MG*|#?N;X95WKhUp2k1l$;}mT`T!*4W
z=!4J{2Y{c@!MZA0UohX9#IZXe2;hrhoK|o~KT<)8oX{mo$=N6XE;JBP>sSh*0ofeD
z264sp{QLg^25*9bXo~}hQ(!;<|GnSt57bquGa`+eC8Begm-h;^BgKWi#JGIwU7#t<
zZP2K7%sHMfX=ruZ|5u67hM*ImT~1v;qiu@M!z4#={*mo%=rXTt04@z>eI0WUF9XZ3
U)xFPiZ~y=R07*qoM6N<$f_itR*#H0l

delta 364
zcmV-y0h9io1C#@hF@H`;L_t(og}s--4TCTYMct|kAU1%CGgDN(_uiqp2Y1HcjDQVL
zMrbdjN{th2Cyj3)Vn6I}TRFX+w>NB7Hznk@bM}ZBU|7ueVIEhQ$2BX!1pr`J47648
z1Hvr_1uQA$w*+n`e2zK6xo39(6oe+Y6k;brtce)ooF}`0lYfaAjT{2F5FrP3Q?fup
zK9bCV7zi(b+m>BFC4;~q><pxWz(xYNe~%$zI|D-=W&n4@uo(3KqB5isVF*GJ9AMi8
zA#1CGoD24yb*$Y9hX5fP7PEu1`r!(aH3@y9<eXIjP$q#;tz#~P1SC0t3*xiK{rZ0Z
z3xPqT!2u$>z-58}gzMh*6SP$!8$=Q{b42GGUcnMbTZ%GwiBbN<yFe0{+Mud+OijFy
z)1%exelHTC3xPX8x}5CYL)`_M(ooRZ?uNeMl?}j`v8=aa3gQEurMB(zr2kg{0000<
KMNUMnLSTYwah&}C

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index c97826959e..48783427d7 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2509,6 +2509,7 @@ public class Blocks{
             itemCapacity = 8000;
             size = 4;
             thrusterLength = 34/4f;
+            armor = 5f;
 
             unitCapModifier = 8;
             researchCostMultiplier = 0.07f;
@@ -2523,6 +2524,7 @@ public class Blocks{
             itemCapacity = 11000;
             size = 5;
             thrusterLength = 40/4f;
+            armor = 10f;
 
             unitCapModifier = 16;
             researchCostMultiplier = 0.11f;
@@ -2537,6 +2539,7 @@ public class Blocks{
             itemCapacity = 16000;
             size = 6;
             thrusterLength = 48/4f;
+            armor = 15f;
 
             unitCapModifier = 24;
             researchCostMultiplier = 0.11f;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index f424462a7e..2e2a450af5 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -2453,7 +2453,7 @@ public class UnitTypes{
                 heatColor = Color.valueOf("f9350f");
                 cooldownTime = 80f;
 
-                bullet = new BasicBulletType(8f, 100){{
+                bullet = new BasicBulletType(8f, 110){{
                     sprite = "missile-large";
                     width = 9.5f;
                     height = 15f;
@@ -2484,7 +2484,7 @@ public class UnitTypes{
                     rotate = true;
                     rotateSpeed = 2f;
 
-                    bullet = new BasicBulletType(4.5f, 14){{
+                    bullet = new BasicBulletType(4.5f, 20){{
                         width = 6.5f;
                         height = 11f;
                         shootEffect = Fx.sparkShoot;