From 3c65a26d72e40862aa473e7bda614a12dd44e572 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 19 Jun 2021 21:19:46 -0400
Subject: [PATCH] New ferric blocks, improved asteroid generation

---
 .../blocks/environment/ferric-craters1.png    | Bin 0 -> 389 bytes
 .../blocks/environment/ferric-craters2.png    | Bin 0 -> 322 bytes
 .../blocks/environment/ferric-craters3.png    | Bin 0 -> 357 bytes
 .../environment/ferric-stone-wall-large.png   | Bin 0 -> 755 bytes
 .../blocks/environment/ferric-stone-wall1.png | Bin 0 -> 354 bytes
 .../blocks/environment/ferric-stone-wall2.png | Bin 0 -> 330 bytes
 .../blocks/environment/ferric-stone1.png      | Bin 0 -> 233 bytes
 .../blocks/environment/ferric-stone2.png      | Bin 0 -> 225 bytes
 .../blocks/environment/ferric-stone3.png      | Bin 0 -> 219 bytes
 .../blocks/environment/ferric-stone4.png      | Bin 0 -> 256 bytes
 .../sprites/blocks/environment/ferrous.png    | Bin 0 -> 371 bytes
 core/assets/icons/icons.properties            |   3 +
 core/src/mindustry/content/Blocks.java        |  63 +++++++-----------
 .../maps/planet/AsteroidGenerator.java        |  21 +++---
 .../world/blocks/distribution/MassDriver.java |   1 +
 .../world/blocks/environment/StaticTree.java  |   1 +
 16 files changed, 43 insertions(+), 46 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-craters1.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-craters2.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-craters3.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-stone-wall-large.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-stone-wall1.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-stone-wall2.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-stone1.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-stone2.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-stone3.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferric-stone4.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ferrous.png

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-craters1.png b/core/assets-raw/sprites/blocks/environment/ferric-craters1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fdccda562fe4a7745f339f1092e70fd2df4328e
GIT binary patch
literal 389
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V6^vi
zaSVxQJv!Z*?~nmc+ubg11;_1rvXY5yy^jx{n6Wh4;Sq;{Xk_2pTa_H%v5SuU7r)(k
z`CXM|{e%8(k+ThYn@=asNS0+-ZxEZ#`ZBxg`411J1-g6g%D?&XvLZlnOGe2K4%I@>
z8(fPV{{#hS?K?B|nfJe&QWK7B{~h}&@>-_ABTbHC5mpTmh6BHUdMRv~qI0b{<=*BV
zM-3L!RZEvG5N+X_u(?{FrO)XqM~1*8Q^p5AT~5Xf*&;p+mn~AhvU432eWJx6w(jDR
zI}BH{oKvnk_;!RgT&h0Ed*JOlF_!DnXEYB8m@d9lEz@SX>queylHKutOsa*GF5lYp
zOG}S;t4hz`Z+8^hP8hy@w!~`P><un6gxM7|If_$cGtOsoFPL^}37ZPX>KUOGhGwiw
vk3P3t_iFWx&5vU;zP{g4D$l_1gGt@GZ_aJ|)iW3v7#KWV{an^LB{Ts5<He-x

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-craters2.png b/core/assets-raw/sprites/blocks/environment/ferric-craters2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad54fb651fc91cc173b0a29277426a167227412c
GIT binary patch
literal 322
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VEE(d
z;usRqdUx7JzC#8)F5XA@6&R(tm6gwI`1(09<;|tF3LiNQB&QxxxnArPnD5j4K5_Z<
zbFVIcjO<;pbK8!)YZl6z=ccn2>@&>L`@NZQ!_hSYuQ*(upAL<+e^buLV$G+{8t^&)
z{0%>gT*EZG6n<8NB?WvP4|sIKPA6P`T-M%YnC>Xc$TZbkz`>IvJhWob)P{=rjWQcg
zamY2Q*-w~Z@5ub)*%}RovvXt<zvv0n9?5Bw-mpG}eL~N6nS>S0sy(hJ`7+deZ>Lu0
zF64_i`^WIx>zPFjhTpGuF)s-bQTWDoa`VeFhQDre^4R~$Ic!Q0X_(I<DD`mJ>5j$^
ZUzv^zgv`9Dp$G~a22WQ%mvv4FO#r@YfENG&

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-craters3.png b/core/assets-raw/sprites/blocks/environment/ferric-craters3.png
new file mode 100644
index 0000000000000000000000000000000000000000..609d670889ff0eba57ce6eb783a5655837a690c5
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3hZC
zaSVxQeLHPGUz35rvF?wo9u2*%7X#Dp*3`(#M&7t^#Qnm`wk`L+{=3k2bhbz4&$@Ek
zck6b=os-|b@a;B{|I8N8@5F7cd||!A&aXI<!ONm1pV5=4;E<)m37HFB(dSncJt(U`
z@b&UX21S*LD*_a`Y!|esD#*0FG+%T3*wtL&waNkStdtt2d|z0=$6>}4C(@~?q3g2E
zE2H&9RF|&6&FV(6MIOeJ97I?rIQ-BM$vu8${^l)@J|7Tba!vf)xWwYX@1MVH7snlB
zT9bL&d$Cj~OT(^kJ&q;H^Vpp@&R%KW^PO$I!>5l6-@8nFn8sqnzC<oaKqTSE-6x_y
z&R$wM!}!S*4faFL)0Qkz%38(z*ktu2gRSMEijNdj7OdKMhw0!=asTxtdw!TIY++zv
OVDNPHb6Mw<&;$UUkeYY^

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone-wall-large.png b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall-large.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1a16a11e3b4e2e0f32b3f53e54909c4daf5e8a4
GIT binary patch
literal 755
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z_ixW
z#WAE}&f6%*qC*BeB9iwG^fsQfzZD&SAzA)He0su;kDOH*cdhzzyf?|5UQ(^>Ae0-X
z9r^Ly=f{5;?JfG%Z%DEIKb*R2+phjJiDkEI%M!9xco-O>)gGF&ItguS+WS9o*WE-L
zIfe((tXq8ymu(PJ+r!WQL&f6(yExkvZ{6><Q#-EwT=D$I-o5*5Ht5T6&RM?bt?bI|
z;B~G$ziTiu7z8`LOWE2pdG(?@|DAP$4zOPp&I;?jC7OBS?}MAGor4(p{5ThS7Jj~v
zR6jA4q3v{u=*$U6x3bM_kPB{f+Tp=y+px+^j4?)Z%c)AgRTF(Su+;sW@}sTnF8{=w
z7N;p&PKbE??hz_Beav`C!AqOlk~Pb|R&R^fDoNHO4JYF_&sPvkc>6N@P!H1vby;Kk
zv!A@;_@Z0fv|L0JY%3UKRTr>)5!mCb$$8cKpy`BJ&d(aO795{CpE+DGkpIL)gS+oy
zg`ZB)Y2L{2_pzAggB1=-`CrUr+3I#eiBqIw*&*AhCuNRsad>WU<Ju~->DVL1HLPzB
zykwnMrRCE&^J;?jAK?qX*t`nm{9Pxf7%|Rjdw%OhP`u_{dxi@RjENV5gtpwXUS}n|
zCe~AB<ph-k8@Wvfvrk5H#|Rx!Hq?0`!zngf^P-22s75=>+PfK39vkX#XmHNs^2!Qa
zurYYeZ@UBPjz$Wx0uzi)PEC%!EwD1W%%CH^$ueRE&(&=w3O;Q&<+Pk&?$svI&t6op
zRI_!i_v#w4+$l$vIZbL<@$%4Ix8RzE8A>by`FUHG_Rl?UuNKOZt#pLbtH^oEcY!<q
zyP^}{wHkPMPS{s5aYf%&?=#1xWEYFv*n8A#(GFpqNd7Bq&wnMcerX8coWZp#o_mSF
zFV3_Mf8PdYEmbo|h6D1P3%Sgk84k>0aX+$*gQ1~SJ*SVM!ICqck)u!S*i9jB1_lNO
MPgg&ebxsLQ0Km&Q^Z)<=

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone-wall1.png b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd7286066127b0684b0feddccc2b1fa76905c944
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3hH6
zaSVxQJv-f+?~nmc+uarE3C;`dF`M}vIKjB1G-QhIbdBH%oPIgSbDNioS^hZve!7*7
z{C8G{2R3sTwD0_4@H<?dLH^P6rR*)t3@<nhm$Az$`5b5FT)39MW}fxy58Po&|D9JF
z?UXOi+Yzhp{VzFaQQDQWSqHtmCNKnXtPK?C`*8cJM}ux2zr*qu|3z-R`j*tN_bvMZ
z6YetR8$wQ3+bmo7FS3M5xm=a<U@Uwf)^W=&q5HxtzN<!ArruR&7-Fh+<gQ>l(45tq
z7s%+bY)KfaA%o~1mL-h_*BeU9*IZ(?Y+>`_IUpLtwJJ2_N$itp?8_H?KDflIaoO7?
z`?6R+d~Y_3_;gsyM08=Q<xheAQJZ$M=>!XCZ_E<h=CFs+)wREPN>K(Y0|Nttr>mdK
II;Vst06~9@K>z>%

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone-wall2.png b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fb0c13179bd35cf03c8b4869b2dc241a8bb71a3
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U}W)h
zaSVxQJv-fzuSJ2!b${Bq2j_Y|%I*66&s;&OEbdUGkH;1fmL(73l|1La-M;p$k^k`<
z<r2sAvsSP&EG=J?wVFLZc+pb!rHXnCUhl;_LUSD*p2cz1Y(8_@k^lI<Wc}d9yO@qi
z+|pwFaK7ban|8vwpxPS#srT0AJo&~kn~_U#Wi&(PUikxGT}7BZ0(%1YGWg%K6LGr2
zyd}RNAV-}gCA<FJlpMAtz2(zb1B@)V6?Cmu+`HdV)FplSC_{|3lOV(WrX)s>{&=l2
z#f1X?_Gd$L&wEW!)?Rm0;0>dE%T2{#hs8c8SQn(*3FvX(TWTVr^zGhTgGnNPS=U_Z
jIxlch^#ms)gZ;9~)(?l*Yo1_WU|{fc^>bP0l+XkKw{L$}

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone1.png b/core/assets-raw/sprites/blocks/environment/ferric-stone1.png
new file mode 100644
index 0000000000000000000000000000000000000000..898da4de92cb2319950080ec5c65edb55a79560a
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|8(w
z;usRq`u3_JUxNY<Yk=vz#@^QI7tj9YA2@VOwM1D><VVu#i(5K7`L^gU?R~sW@ArqK
zGjmSPF@1Tron!7ym9F6XiyDFqSq@%n4B8^_s6niWwSgyw^WZhcl2=C=IGSEDaTZ)#
z;x09jvFiIzu0>o6nxqTQeLo>}%}Jyo#+7XW-`8~#lluQi{}Q-tdsj2gIfOB$b>ffj
m0$L7?TmcPCA|E&pFbeY<trz~Czm0)`fx*+&&t;ucLK6Vo+*+Ri

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone2.png b/core/assets-raw/sprites/blocks/environment/ferric-stone2.png
new file mode 100644
index 0000000000000000000000000000000000000000..60a5384168a89ad916ff5f34dfe26a93380b9883
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3_Uc
z;usRq`u3V3UxNV$Yk<kTgJ+Lczj*dH|H9H}{e`n%GEC$0@JYBN@$_l;k%u?73(I7G
z$&qVdU{PRT<X~Vpu;k-}(wXlcPw~FK_YuphXE%0gHe_9EHki$*cc_HJlH>FG1+4;%
zJB0tY{K(-C;P~#U!uCZ^uGGOlalIp}f~TWy<MxjK{E4w^MK-*C#knNrf}4on)B1*{
ef>X6@dXY1gndjZ~^JZXRVDNPHb6Mw<&;$TnG*+|#

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone3.png b/core/assets-raw/sprites/blocks/environment/ferric-stone3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6622c35e3877b100cf6a5ea4b2db8eabba8e308f
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3_LZ
z;usRqnq0DV^WXCZ4GozJy7Hw5RxrEC8oX)<War^x-*7;}Yg1Ce!Rr3_i)R^qUQA1V
zeEAOJ4Tilkjpn=;4hu5R<8YUCxWKr@kKLt}L08tXL`36c*To}>K0G{2rq*03W3gd*
z5&0*n^ne4S2)lqV*A+g^9)Sa?2lpOdpCRNMv6$hmQq(eju^6E*UQ?R21^HMQ7*70G
WT6Z~oUNQp%1B0ilpUXO@geCyymrCgX

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone4.png b/core/assets-raw/sprites/blocks/environment/ferric-stone4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0b84af75226990561291f87a8a49c1bb8221160
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VA$p9
z;usRqdUvX!n41Gn%f~s6%M1CfzVB~zdoC2hrG0aHit+AiCH6;a)IO`f-E}5CI3U*Z
zvp>U^JKdQwa{IUcZD5$d+4Ag;F^9t$4#tJ=8q8Z(w#*aIX9&4@gkfhY(+8hUmJZ2^
z{tn*;Bd0ITcUv?L2b4~`5PVTEV9~UIQ!7F^3#1KFjk_2(#X7HE)1bs~<$5>cl1&X_
z|E0SaCP)X)X<#|T6m^^<Px0IqE5`T6Yxl9PY+Ly1)d77*y^H@$INrWW1o@G{)78&q
Iol`;+04UpJX8-^I

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ferrous.png b/core/assets-raw/sprites/blocks/environment/ferrous.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2dfe8ad6b5b34d85a11ad56b0a87c31353c76fa
GIT binary patch
literal 371
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VAS<=
zaSVxQJ$h}gXp;jE`-g(9%mK}<d#Cw5U^3G?!Q}UlK}_zvAKQko)sH_;^e#Ht`0~rb
z|M!(oIu=^K+kaq6zO}{tZBI<kem(e?mx19*sO7IWDi0?y@O89qZV-?=)pX#H=K+&D
zO&zV18CC@egjjGssGE_j=5Zj3V;gJOk;LsA8K=2*v`=ul63V&#cXX@AEhZkrKYq;)
zjQid$dVat_fO)A>T0^2i>w>6BO#=4ZLEc>gXAex`IR19!R*M$yNdb4xJ$L(}yFkD)
z!0<>0n}N$Y>n6oC=N)C%7jz%68OwxNZd2aXW_ZNpN|(a<MolHLG)IfK!8+oHSWoU3
zsO2tFyu!fQRDJyNnzuO|TRGm&Y|Lx?>NkT?swI<qn#+&p-A6X+tBAGaTQ~R%9%W?s
a!=U<flj1Dxmh%h@3=E#GelF{r5}E*#FPC5d

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index ac2d241dfd..7e7c3f434e 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -383,3 +383,6 @@
 63350=red-ice|block-red-ice-ui
 63349=red-ice-wall|block-red-ice-wall-ui
 63348=ferrous|block-ferrous-ui
+63347=ferric-stone|block-ferric-stone-ui
+63346=ferric-stone-wall|block-ferric-stone-wall-ui
+63345=ferric-craters|block-ferric-craters-ui
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 10fa055e4d..6ea3167a33 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -40,8 +40,8 @@ public class Blocks implements ContentList{
     redmat, bluemat,
     stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
     redweed, purbush, coralChunk, glowBlob, yellowCoral,
-    regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall,
-    graphiticStone,
+    regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall,
+    ferricStone, ferricCraters, graphiticStone,
     iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, grass, salt,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
     darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
@@ -312,6 +312,16 @@ public class Blocks implements ContentList{
             variants = 4;
         }};
 
+        ferricStone = new Floor("ferric-stone"){{
+            attributes.set(Attribute.water, -1f);
+        }};
+
+        ferricCraters = new Floor("ferric-craters"){{
+            variants = 3;
+            attributes.set(Attribute.water, -1f);
+            blendGroup = ferricStone;
+        }};
+
         redIce = new Floor("red-ice"){{
             dragMultiplier = 0.4f;
             speedMultiplier = 0.9f;
@@ -349,67 +359,52 @@ public class Blocks implements ContentList{
 
         shale = new Floor("shale"){{
             variants = 3;
-            attributes.set(Attribute.oil, 1f);
+            attributes.set(Attribute.oil, 1.2f);
         }};
 
-        stoneWall = new StaticWall("stone-wall"){{
-            variants = 2;
-        }};
+        stoneWall = new StaticWall("stone-wall");
 
-        sporeWall = new StaticWall("spore-wall"){{
-            variants = 2;
-        }};
+        sporeWall = new StaticWall("spore-wall");
 
-        dirtWall = new StaticWall("dirt-wall"){{
-            variants = 2;
-        }};
+        dirtWall = new StaticWall("dirt-wall");
 
-        daciteWall = new StaticWall("dacite-wall"){{
-            variants = 2;
-        }};
+        daciteWall = new StaticWall("dacite-wall");
 
         iceWall = new StaticWall("ice-wall"){{
-            variants = 2;
             iceSnow.asFloor().wall = this;
         }};
 
-        snowWall = new StaticWall("snow-wall"){{
-            variants = 2;
-        }};
+        snowWall = new StaticWall("snow-wall");
 
         duneWall = new StaticWall("dune-wall"){{
-            variants = 2;
             basalt.asFloor().wall = darksandWater.asFloor().wall = darksandTaintedWater.asFloor().wall = this;
         }};
 
         regolithWall = new StaticWall("regolith-wall"){{
-            variants = 2;
             regolith.asFloor().wall = this;
         }};
 
         yellowStoneWall = new StaticWall("yellow-stone-wall"){{
-            variants = 2;
             yellowStone.asFloor().wall = slag.asFloor().wall = this;
         }};
 
         rhyoliteWall = new StaticWall("rhyolite-wall"){{
-            variants = 2;
             rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = this;
         }};
 
         carbonWall = new StaticWall("carbon-wall"){{
-            variants = 2;
             graphiticStone.asFloor().wall = this;
         }};
 
+        ferricStoneWall = new StaticWall("ferric-stone-wall"){{
+            ferricStone.asFloor().wall = this;
+        }};
 
         redIceWall = new StaticWall("red-ice-wall"){{
-            variants = 2;
             redIce.asFloor().wall = this;
         }};
 
         sandWall = new StaticWall("sand-wall"){{
-            variants = 2;
             sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = this;
         }};
 
@@ -417,21 +412,13 @@ public class Blocks implements ContentList{
 
         shrubs = new StaticWall("shrubs");
 
-        shaleWall = new StaticWall("shale-wall"){{
-            variants = 2;
-        }};
+        shaleWall = new StaticWall("shale-wall");
 
-        sporePine = new StaticTree("spore-pine"){{
-            variants = 0;
-        }};
+        sporePine = new StaticTree("spore-pine");
 
-        snowPine = new StaticTree("snow-pine"){{
-            variants = 0;
-        }};
+        snowPine = new StaticTree("snow-pine");
 
-        pine = new StaticTree("pine"){{
-            variants = 0;
-        }};
+        pine = new StaticTree("pine");
 
         whiteTreeDead = new TreeBlock("white-tree-dead");
 
diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java
index d2ec593f4d..6b713a8095 100644
--- a/core/src/mindustry/maps/planet/AsteroidGenerator.java
+++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java
@@ -11,9 +11,9 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class AsteroidGenerator extends BlankPlanetGenerator{
-    public static int min = 15, max = 25, octaves = 2, foct = 3;
+    public static int min = 20, max = 28, octaves = 2, foct = 3;
 
-    public static float radMin = 5f, radMax = 50f, persistence = 0.4f, scale = 30f, mag = 0.46f, thresh = 1f;
+    public static float radMin = 12f, radMax = 60f, persistence = 0.4f, scale = 30f, mag = 0.46f, thresh = 1f;
 
     public static float fmag = 0.6f, fscl = 50f, fper = 0.6f;
 
@@ -25,7 +25,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
         for(int x = ax - radius; x <= ax + radius; x++){
             for(int y = ay - radius; y <= ay + radius; y++){
                 if(tiles.in(x, y) &&  Mathf.dst(x, y, ax, ay) / (radius) + Simplex.noise2d(seed, octaves, persistence, 1f / scale, x, y) * mag < thresh){
-                    tiles.getn(x, y).setFloor(Blocks.stone.asFloor());
+                    tiles.getn(x, y).setFloor(Blocks.ferricStone.asFloor());
                 }
             }
         }
@@ -51,7 +51,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
         }
 
         //tiny asteroids.
-        int smalls = rand.random(min, max * 2);
+        int smalls = rand.random(min, max) * 3;
         for(int i = 0; i < smalls; i++){
             float radius = rand.random(1, 8), ax = rand.random(radius, width - radius), ay = rand.random(radius, height - radius);
 
@@ -61,15 +61,15 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
         pass((x, y) -> {
             if(floor != Blocks.space){
                 if(Ridged.noise2d(seed, x, y, foct, fper, 1f / fscl) > fmag){
-                    floor = Blocks.graphiticStone;
+                    floor = Blocks.stone;
                 }
             }
         });
 
         pass((x, y) -> {
-            if(floor == Blocks.space || Ridged.noise2d(seed + 1, x, y, 3, 0.5f, 1f / 70f) > 0.5f) return;
+            if(floor == Blocks.space || Ridged.noise2d(seed + 1, x, y, 3, 0.5f, 1f / 60f) > 0.38f || Mathf.within(x, y, sx, sy, 20 + Ridged.noise2d(seed, x, y, 3, 0.5f, 1f / 30f) * 6f)) return;
 
-            int radius = 5;
+            int radius = 6;
             for(int dx = x - radius; dx <= x + radius; dx++){
                 for(int dy = y - radius; dy <= y + radius; dy++){
                     if(Mathf.within(dx, dy, x, y, radius + 0.0001f) && tiles.in(dx, dy) && tiles.getn(dx, dy).floor() == Blocks.space){
@@ -82,6 +82,11 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
 
         });
 
+        pass((x, y) -> {
+            if(floor == Blocks.ferricStone && rand.chance(0.02)) floor = Blocks.ferricCraters;
+            if(floor == Blocks.stone && rand.chance(0.02)) floor = Blocks.craters;
+        });
+
         Schematics.placeLaunchLoadout(sx, sy);
 
         state.rules.environment = Env.space;
@@ -89,6 +94,6 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
 
     @Override
     public int getSectorSize(Sector sector){
-        return 450;
+        return 500;
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java
index 045d61736f..bba6787793 100644
--- a/core/src/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java
@@ -48,6 +48,7 @@ public class MassDriver extends Block{
         hasPower = true;
         outlineIcon = true;
         sync = true;
+        envEnabled |= Env.space;
 
         //point2 is relative
         config(Point2.class, (MassDriverBuild tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY()));
diff --git a/core/src/mindustry/world/blocks/environment/StaticTree.java b/core/src/mindustry/world/blocks/environment/StaticTree.java
index 9b1a7063f4..0cea162c2c 100644
--- a/core/src/mindustry/world/blocks/environment/StaticTree.java
+++ b/core/src/mindustry/world/blocks/environment/StaticTree.java
@@ -10,6 +10,7 @@ public class StaticTree extends StaticWall{
 
     public StaticTree(String name){
         super(name);
+        variants = 0;
     }
 
     @Override