From ef617b7fd22d5f98b9d6fc82ee08da09da0b488f Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 8 Sep 2020 15:46:24 -0400 Subject: [PATCH] New base parts --- core/assets/baseparts/1599594352859.msch | Bin 0 -> 389 bytes core/assets/baseparts/752911659508695080.msch | 2 + core/assets/baseparts/752912199781056583.msch | Bin 0 -> 242 bytes core/assets/baseparts/752912460620496957.msch | Bin 0 -> 194 bytes core/assets/baseparts/752915237476368385.msch | Bin 0 -> 321 bytes core/assets/baseparts/752915746673131550.msch | Bin 0 -> 229 bytes core/assets/baseparts/752918895291007041.msch | Bin 0 -> 177 bytes core/assets/baseparts/752918896331456582.msch | Bin 0 -> 207 bytes core/assets/baseparts/752919619894902997.msch | Bin 0 -> 102 bytes core/assets/baseparts/752921320802746461.msch | Bin 0 -> 401 bytes core/assets/baseparts/752923816967012442.msch | 1 + core/assets/baseparts/752926963076694047.msch | Bin 0 -> 523 bytes core/assets/baseparts/752927009641857205.msch | Bin 0 -> 327 bytes core/assets/baseparts/752930133874049034.msch | Bin 0 -> 150 bytes core/assets/baseparts/752930845685448825.msch | 4 ++ core/assets/baseparts/752932257538506823.msch | Bin 0 -> 227 bytes core/assets/baseparts/752937073991745554.msch | 1 + core/assets/baseparts/752937145978716332.msch | Bin 0 -> 165 bytes core/assets/baseparts/752937230456193185.msch | 1 + core/assets/baseparts/752939992300388483.msch | 1 + core/assets/baseparts/752941306489077823.msch | 1 + core/assets/baseparts/752942460573057196.msch | Bin 0 -> 511 bytes core/assets/baseparts/752944648628076745.msch | 2 + core/assets/baseparts/752955880965799966.msch | Bin 0 -> 1033 bytes core/assets/baseparts/752961534690328648.msch | Bin 0 -> 376 bytes core/assets/baseparts/752961607314702336.msch | Bin 0 -> 472 bytes core/assets/baseparts/752965444419453010.msch | Bin 0 -> 406 bytes core/assets/baseparts/752967201597947924.msch | Bin 0 -> 229 bytes .../maps/generators/BaseGenerator.java | 38 ++++++++++++++---- core/src/mindustry/world/Tile.java | 2 +- 30 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 core/assets/baseparts/1599594352859.msch create mode 100644 core/assets/baseparts/752911659508695080.msch create mode 100644 core/assets/baseparts/752912199781056583.msch create mode 100644 core/assets/baseparts/752912460620496957.msch create mode 100644 core/assets/baseparts/752915237476368385.msch create mode 100644 core/assets/baseparts/752915746673131550.msch create mode 100644 core/assets/baseparts/752918895291007041.msch create mode 100644 core/assets/baseparts/752918896331456582.msch create mode 100644 core/assets/baseparts/752919619894902997.msch create mode 100644 core/assets/baseparts/752921320802746461.msch create mode 100644 core/assets/baseparts/752923816967012442.msch create mode 100644 core/assets/baseparts/752926963076694047.msch create mode 100644 core/assets/baseparts/752927009641857205.msch create mode 100644 core/assets/baseparts/752930133874049034.msch create mode 100644 core/assets/baseparts/752930845685448825.msch create mode 100644 core/assets/baseparts/752932257538506823.msch create mode 100644 core/assets/baseparts/752937073991745554.msch create mode 100644 core/assets/baseparts/752937145978716332.msch create mode 100644 core/assets/baseparts/752937230456193185.msch create mode 100644 core/assets/baseparts/752939992300388483.msch create mode 100644 core/assets/baseparts/752941306489077823.msch create mode 100644 core/assets/baseparts/752942460573057196.msch create mode 100644 core/assets/baseparts/752944648628076745.msch create mode 100644 core/assets/baseparts/752955880965799966.msch create mode 100644 core/assets/baseparts/752961534690328648.msch create mode 100644 core/assets/baseparts/752961607314702336.msch create mode 100644 core/assets/baseparts/752965444419453010.msch create mode 100644 core/assets/baseparts/752967201597947924.msch diff --git a/core/assets/baseparts/1599594352859.msch b/core/assets/baseparts/1599594352859.msch new file mode 100644 index 0000000000000000000000000000000000000000..3b73103fa919529c3ad9b5d9d95ea8791b3f67ca GIT binary patch literal 389 zcmV;00eb#zb7N=$c$_7WVQzyk4255SK!8%Z?Hv5s4R(|WqK=6Y6awweUTK|;h2XQT z=VxQQva(IhlwDY*#y57&b`}F}$h}Z7wW*2Ovw7uKtLgyYa z*q#f`vQ4XF{jiOZocu-tn4fL#C_vJVt%ZzGQbz5s;+sX_{ag#M6`KqCPd z84ENQQ$i`IS(!@%H48EU6*EE!#i#_e;3Q}SXSO!n&i@0=7O%LqB4x!!729&$fTD_A zNK%V?jT5=+q^780@rf)_MkdgLTtL6TOB(7)6D}OiCvI)%F;IrU3oCV|=uD(f&Cab{ jrDaP^$R#TzJI>$ARa&`9%U5Y}p^X$n3ks-zrQKIOxwpV> literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752911659508695080.msch b/core/assets/baseparts/752911659508695080.msch new file mode 100644 index 0000000000..9f1e10578e --- /dev/null +++ b/core/assets/baseparts/752911659508695080.msch @@ -0,0 +1,2 @@ +mschxE}r@ ŵ|.0%޺Llpא4iz47C[eaZ==iedxN>|Z5N20}N^cm!֬`Q0;cC}eL^w=qN*r^?~mbe9M%1N+Sm z;E1DwO>rgoDHmGfHyvQl`$l*x^%5?WsKlBJx-DMs8K=6`n3jDFQ%-k!F!6i3<~UP9 zU-DjAN68A?XDl8l8XmkE zE@fC+)1U+7=AbmUAj}Gr%`tRs-lJK0ykjwfJ6OT0hb%@tmv$`Ho98do^G|YMjOCtZ s@4zt*qr&S?t_5fBg$BpJ;UG|y@mznY> zl`*Gjc-3*50NnVXg)@v3tfU^!!bq|_IEGFY#|e^H0X$1=dQlws8v!u96J+2K*)#&H w5S?*66!oE~U5$3NEEs`RIE7aPMN~A3R?#Vr+D`jA*%L&m?Rnk(0W?$~Yb5Mi(EtDd literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752915237476368385.msch b/core/assets/baseparts/752915237476368385.msch new file mode 100644 index 0000000000000000000000000000000000000000..cfff6b7269851653801f80f03bbf174d243a18b8 GIT binary patch literal 321 zcmV-H0lxlib7N=$c$_tnQEr1U5JcBDIL2;pI7n`h|Efobh^rzcAQ6bv+jqy)e4wYX zcgM4f3^EvL=If)#uuWzCoXe$rm-$&P`_hWL?Th$z*|)Mv7?=4~ewS5Fk23yT=V`p& z&$o5D-z803d7PiizK%sizVs6>1_(q1jI?5mLhr2NAPy>sgX(zqUzq^QN~t=p;7FIAmHk^qY&K(3qwuKA{Jj~=fvUeZ T*KCS}h7(+XK&Zob7N=$c$__rQBK4#3`8es(uTqZAAIfy7sx3%07#r5+qITTZGzGiw3nwO zjD)3VGM;A}59k$446EQ&X34Kn-qN?^m$aVut;{LDmn>l&@VLtK5#l_B#b5HgEO1kb zUvf(sPt!l{uM#DPQoF-Blp^_t@w2V;Fe^4S zpq+(`dy+k~f#lGfhT~D!T!*`Mtcj*{lzPfw f1e`t&sN<)iwt7`(Y+XA-I})}LwHomYJuEu;N0V=g literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752918895291007041.msch b/core/assets/baseparts/752918895291007041.msch new file mode 100644 index 0000000000000000000000000000000000000000..54f4b360c80879c73b08293afa105bec5175899a GIT binary patch literal 177 zcmV;i08amHb7N=$c$_6n?Fzy$47`499Sjk~*XUCS`d7pkC^L*fT_x+7k8d&)$R&4| zLqKQX=kz9=>qLAlE8ojT{CM6jg{eh9ReHxo_<_(bB`1!bG*iZb>ljCxiBm0%KBt8^ zzIe)6j4O{6t486tr78-2E2lxNzzJFn5S)?4!dd|bV|QA>XzK`&p|o{k@anW^RdY&O f{nE?-FRz-{=nke4+_M|u#nVbVg#h;h27@Qg;4M=P literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752918896331456582.msch b/core/assets/baseparts/752918896331456582.msch new file mode 100644 index 0000000000000000000000000000000000000000..755ff98c0b972a18808d972eb197e6f05078a870 GIT binary patch literal 207 zcmV;=05Jb;b7N=$c$`g+Yl;IQ5QNLeJVJgX3rlX{q0FQS1C9pAAvt|^t23~yLVsFa z)rtc~1E1p}INT*mjjhxX$F-zb!y{%%I6ul$YRKg#f$Cjwdd5aYUaiK70s1%Up{WsH zZL8NgOZXdzV~Q&Sw>qbU@2M=;ZEbVO|1EQqC9GwulK{Bjvz!(KX9zo5*q=98KeDGp zbZRoY*Qi(FwXmy^J>;C8MmSIU9le_U9`zdaP}z3SZF=4YILkA%*K2PehEAU)b&w_a JhhK}LI9VW3VaEUf literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752919619894902997.msch b/core/assets/baseparts/752919619894902997.msch new file mode 100644 index 0000000000000000000000000000000000000000..c8c143ca231f331f8f7ef3eecb3ad5d297c7a16e GIT binary patch literal 102 zcmV-s0Ga=7b7N=$c$^)KI|_g>5Cxx!+Spio2XA4o;0eO|#6UiKcueENQmo6$|JnS+0Ir|1Kk5IfVk z$ptHBz4*ZfGuz1xIR0lCzB-3|aUB&Rvc-q!0!wl3=+sZKS*2yX(EXmhMbuCMvorDNn^psmP*Q z5}>bX@zD^uG?J6t@M@rIrqd}Jwai&a-GNP$qS$`zTmL<>M7I6jzP8WpOBPc5aFi-# vpj#P$eRKLN#xKyabtMl$ExS~>Msnm^eh^5C-w`R4Alt!MN>K6-RN!rJwlBgW literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752923816967012442.msch b/core/assets/baseparts/752923816967012442.msch new file mode 100644 index 0000000000..44c566dfcf --- /dev/null +++ b/core/assets/baseparts/752923816967012442.msch @@ -0,0 +1 @@ +mschx5[ ki5;B4EKT{]k>GӔqJq៩\KYZך .{~[:d9Sje+Wx DѻhwU-Y-:Gt:)h.28XoDtE6ϚT:A\8`#` \ No newline at end of file diff --git a/core/assets/baseparts/752926963076694047.msch b/core/assets/baseparts/752926963076694047.msch new file mode 100644 index 0000000000000000000000000000000000000000..6e2629672939712dd0206c89a855859549630003 GIT binary patch literal 523 zcmV+m0`&cDb7N=$c$`g9TW;Gh5M1hEQ4h;@ng&JDk6u7$=so&J%WU9677bc<+LISZ z0;n^j62ySKyTjR;NJC<77|W#a(@GWp{Cd@!i>s zcIc2jTKVK|)*t-wX1lX@zimG`FZBnWY@W)$9=hI*H~SZezK(-42kWH-HW~1}-1qLZzh0)J8$ULO!Mo8N>@s0}xgvBE zaS{26PgE|Fr%IHhk|Y3fQLMBi08kN^l_b~;(-eOJOy9u3%p#Z(Bq3Bes{m29AjnEf z=)#YA62k&ktSb0}UeS+G#u=qVhJ-+oN5P8yjgaeRex6_FXUXP& zBFJ9mR~W1L1!LijQ1QK2^Bf)rCn?(tNhqeHdi8Es3%0VOYk?3hwu>*7Fe{cN?D(W4 z2L4?n-o?$U0$D1mM95-*D?u$OS>XXvwpDDqmplN>Rv|0oGZ(|K;>Ztip%1Jw`GT{w Nk*~PBsQ-%~Z;>ed0+Ij# literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752927009641857205.msch b/core/assets/baseparts/752927009641857205.msch new file mode 100644 index 0000000000000000000000000000000000000000..7943fb1481c7cafd2a8641d09c62af8e14de0de6 GIT binary patch literal 327 zcmV-N0l5Bcb7N=$c$`g8ZEnLL41EdBceA$B4zL}7Kf4i4P=%C0MM=9}y_?2tI<1qz z&-mHKHlEODSXnh|JS!WFJb1U*Q7S*Yp5J>2GSD8~MSE%8s8P<^j@qL$LC^B!7C&h0 z!s7SFYI)FBdlj5VwO1i%e?>Q`6D5z{OcVNGg0g0rC}K=@M#x^lLHWZ- zN^8`kkNUBoXcR?y{uDq&9kJl=@^=2v2tB6ZL+=}efSIvDfw4l~%Zf{MlmS^eilXdsWI-ZQ# Zw2(C~B;I1=l_brS;Fa|p{{wFeX9=_kq51#- literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752930133874049034.msch b/core/assets/baseparts/752930133874049034.msch new file mode 100644 index 0000000000000000000000000000000000000000..93941bdff3778695397229bfd77743e06f028e60 GIT binary patch literal 150 zcmV;H0BQeib7N=$c$_7S4GO~`427SqwS~dT4&tH2g*BsUv0B*e7c2RDdHDzy7zG_& zAn48UKKB8WQ!SM7DqLLT8mv$8qF>5bk4QDR!rs0!?>m-njlOV-cz&`wHZEk3Oy`M* z$Y9S@vnK$n6x5vVbg2gKkb E2=j|ZqyPW_ literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752930845685448825.msch b/core/assets/baseparts/752930845685448825.msch new file mode 100644 index 0000000000..594f46b9ee --- /dev/null +++ b/core/assets/baseparts/752930845685448825.msch @@ -0,0 +1,4 @@ +mschx-Mn `bt5I\$# j?~q32Mt31}p垗TVqؖ;W +8k~t|nIzR$4_iAbjGIu~ M6 C~d΂SF0AX422p +FD<"F8e^H^ AG +ؠSkAS8+Adˌ})*o \ No newline at end of file diff --git a/core/assets/baseparts/752932257538506823.msch b/core/assets/baseparts/752932257538506823.msch new file mode 100644 index 0000000000000000000000000000000000000000..097246d11c62d6ccf9f4171603167dce55eb067e GIT binary patch literal 227 zcmV<90382qb7N=$c$_7WQEJ0L3pbJ|EcHa^Y}QP^}HO{?M$-#1=riQ*Q?C8xUBo}Romfle%JLL8xeVL zkBpK631pzafP)FlfuVU4NK6?hFmBE?f$oiXBi`7&A)vsxIk$=B97uR!^(g~oX~0=d zU?x}b{NI0V8u;%8dv7I&l3&TM^j2~x`IY>I90jl76}&=@f>-bgp5Ymuk>BWTc!p=> dH+nms)7$Z!-j3(=c07;X@$K51ya13*AtyStbxr^P literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752937073991745554.msch b/core/assets/baseparts/752937073991745554.msch new file mode 100644 index 0000000000..fe8d7ccc9c --- /dev/null +++ b/core/assets/baseparts/752937073991745554.msch @@ -0,0 +1 @@ +mschx-k )[SPHI$mBw5L70_"=Zc¶g+-1\RhA9Q)R˴oG #Eģ$8AжIhN8 p5\r;K % \ No newline at end of file diff --git a/core/assets/baseparts/752937145978716332.msch b/core/assets/baseparts/752937145978716332.msch new file mode 100644 index 0000000000000000000000000000000000000000..c3b5dbb923f4f6eb83dfbcb9a6287cb3623ab933 GIT binary patch literal 165 zcmV;W09yZTb7N=$c$_Vb(F(&L3`MUtT1)q^=lz2(`y+9}3T*}34)*s;%mh8jy*Cj7 zvjOdCE4Upwoo8t=rTBCRx$d9xtqu3Bn&=^d%(wDa=0!>ExUt3CTh TU=^g`Byn!y?Z*57l$aY~5bsi= literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752937230456193185.msch b/core/assets/baseparts/752937230456193185.msch new file mode 100644 index 0000000000..558a0a3c63 --- /dev/null +++ b/core/assets/baseparts/752937230456193185.msch @@ -0,0 +1 @@ +mschxMI0 "qh,8ϯӃǣYlL˜OX5G<,*1!xi%Wإ9+pMY8}b)avA-S%/7ރo­r m;s &.^' \ No newline at end of file diff --git a/core/assets/baseparts/752939992300388483.msch b/core/assets/baseparts/752939992300388483.msch new file mode 100644 index 0000000000..6d4d56c904 --- /dev/null +++ b/core/assets/baseparts/752939992300388483.msch @@ -0,0 +1 @@ +mschx= n0E} !]UMJn×@_~瑁)K(5jouz?ڭ2f?}+oulQq&O:=>n6WeL]3 Gonq_jv5,+}$>!I*%!#a«xیx͜v"K4%t =Lg\H(1v=CϡKL/W+4+`z zf v\b{==}9H|XF'Fψ+GAxt/t#?1"V9 \ No newline at end of file diff --git a/core/assets/baseparts/752941306489077823.msch b/core/assets/baseparts/752941306489077823.msch new file mode 100644 index 0000000000..d98f3b2a11 --- /dev/null +++ b/core/assets/baseparts/752941306489077823.msch @@ -0,0 +1 @@ +mschx-K0 D'Ю]ElB@D_!cW|$N㺜,c]w63ϋ‘LĂvHao6JBA׆5ЊN[Ua- xۇo]& \ No newline at end of file diff --git a/core/assets/baseparts/752942460573057196.msch b/core/assets/baseparts/752942460573057196.msch new file mode 100644 index 0000000000000000000000000000000000000000..57b5e83b0a99989af5f54cfd28ec80499f24e908 GIT binary patch literal 511 zcmV-s~7QdIKbL~ zM;57%q(sS!yaegic3q_2woBXJ=51e8hD%%LWtY_USzhlS_qKjKuBUlhzm}hE7j@^; zXIqzx4A*5noAdam-S5l(BjauMk<`!ad)ZIxb~Zl9r`vnm&ob=W1NQt_FI&S}k-y?k z4ERuzBuFPQn)H|#87QL&Y?+>gp4CmF5|ddYB~hFbNC~6_P+-e+DU>Q9ILQ9s6Vgp6EqUOO+$nV8gWf)!1cY&PB02#LTc)SynGEf#RJ_PZ z(qN0tA7c58CSA_hz~k3mJij6~dfNMcCZZaT)-hU#Xjq(cfjgE1Y~OSo5{{?OM28*H zdA!1~iadM7&juU#XIU2;2l1`4a`2aMTDAm{BSzUrFcmshE>n<4)-|H8-jj1NGA0Xc zDn4a3d&0@S!4iyK!qfLA`1pu8rCwYH%7_iiRx=iJV}o~%a5u4;oQY@@Kf%HiEIh%& z6D&NzLVh8?fDc=yr=MU!zd}@;IiZOw`>wL@D*LWtyC9CPL|39K(6D9XQjrv-QoQdf z`VQB^(MqP0sbngdN~V&jWGb1;>!nP0;w7DUNhjWjiIjL{y_̇Ȗ$ʎj7Cn6ѳ!Ot-G+ĉ o.?d ̏kr/8N4@Ϩd41SqÂc% +ɏM \ No newline at end of file diff --git a/core/assets/baseparts/752955880965799966.msch b/core/assets/baseparts/752955880965799966.msch new file mode 100644 index 0000000000000000000000000000000000000000..4cda9322eaa6db33faa362c3e744c82a0be43bf7 GIT binary patch literal 1033 zcmV+k1or!Fb7N=$c${riYjc}c5M8(eAt8h$B+HH-cKV$kg(aLJL7?)mn}5}xm!`Jq zId?tjOs9k3Tz1dC7s+S2b!1d!mt4m6(^Fox`EL@xWL@5*`5#@Aow~Y_uJ2L@X=>4+Cu^GQ19NV3^@A8G$t(-f_R- z#u?-hG_c3n;2udJ9-f}e#38@|VGgbMxEwMk6#7c>mEw~^-GbTql2A8RT|n>viMS&e zMC}xbuhYsZt779yo0zl%41nvZJ(F6k21~#i;HvAa=Mj<~?;=3(zI=rJS z2U3R-5Zu7AVY#^HkVP`5KZh|_0&jDW+?mz6P~yTbW{?<%mADJx0olYf;0!ioE>MX> zm@0${GZDgEtPhxnfGvef)h#u`N+T>uq4N!yOJ%Oeq_GXVVpx=`x0=tA6H8)&^8(ed7w}3>v5CG;aE<=MY z4LpEPyDj&Tgh<>mD6zOxye$!OWYsGsw$+eZI$D5bL*8O^LckIdW@4s*$m3^3L89t4 z+kZ>bJ6zWEj$1_-D+CJG-yPT%tiLE<-4Ivh*TZnl8*r^^hm7}I|)X^MuG)MmJECEZA z&w!PJo$OH~-|H81&vhZV3PxeXFY%t{Az;h52fh(7Rzjk%R@iXJ4_IA8*oyfFui7tT D|6=aT literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752961534690328648.msch b/core/assets/baseparts/752961534690328648.msch new file mode 100644 index 0000000000000000000000000000000000000000..15dbc9618c0cdd72e3f5a1a09ea4bdd22a538f6e GIT binary patch literal 376 zcmV-;0f+u=b7N=$c$`gNTw)>iZDb?G>QaAL{31L0MMm?;pHo{B|1eKl|V|sB?EFv6b+)l zE3+p~icBL~3li-;Ze;H+`dQm-nYlEmN=W{RGO z)e8zrJ+yXgw^UD6^^6VNm=FUO7Y}r))<&l{aXDzourtHX3SV&5R@5^esUM>Pu5+VGX!XV^rk!O284^gL8h4WsJvpud>*V*9WGU7X!&+b z*QOs)vhjK?d|<`Sn~QEn?|$l-+#XeczZ=!>1-jV;lD)Qp?X|NF<`NaFqg7LAR^Rn_ zLmd1hNo)Z5_Mt|p#81Ho_~URS(;QKx zC7>;MBCUXOLMc9$-U1}pi6{|)T>(JZ0ZP^u(JzXU{J#|vSa8{lH6**^I@wz1HFBPC z2@V+GY6mF!@Ga`q#BP&40R4U-mPj@L$(-LvG#55QW!57c5zpb7^0q!$VPtWXNFQ0p!$u>i%yU<*Z0M z9R@x)dv;l%mQFh=XMHyGC5}N~)Y;A^MD=~KZo=k~y10aAqmq9$fjXPaSw+8u(a`X! zlL^ZFNI{Ru2RdE!&3Qek(a%?NgL3?<1ivKC*EXo9&3z;J&o)HsEKVw(jbmSX;p^1w zCqtdn5&J1v=MY%j)dc$!Ci$|=W3qmxVf5Om(ab5>r{&quS3ONO*{e~(pl(cI**dJF z4_v?Z*8SIbXXlaMt@$umbOqO>KF#}RE;`5R&;E$MVNxx3>#y}q?67YuA}I>&dLn@V zu>>$HpkdEW)Kt)(L<6+&0|&XsO6xlk3alkqf;HD?b^VR=8)wlG60pZ@z=5cP9f1ST zvRJa%!-QKqs@PovO@<_K1duQw(sQwj1_qDfgasWHK%2!a)^JP$jTGyOe%AF5cO^Ik zKLf_o_8P$@@cKKT#E*zgsIpL3`3tz%CP)Z51wGvZc-8}O$YP&y%os>~0Ms*yI}0w# AN&o-= literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/752967201597947924.msch b/core/assets/baseparts/752967201597947924.msch new file mode 100644 index 0000000000000000000000000000000000000000..76607f758f2e94b4518943ac82345cf88172a25f GIT binary patch literal 229 zcmVob7N=$c$_tkjc$W55QCjR0?9V@MbMrJ(MUrBQl(|p-hOAU10|o#oo(=e zY~c54D;S<-`W~-Gy?3~5W&WD>WuDgY+Lm=iULIu|@AYVNK|k01r~K9iC;RAHJszbY z&-HdIZG28*06yg)0!H30;Cu`Q!lL74(G!k?54QE25%T$nXCFiU}W=e1&iZ literal 0 HcmV?d00001 diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java index a671ac4d72..f1a508d4c2 100644 --- a/core/src/mindustry/maps/generators/BaseGenerator.java +++ b/core/src/mindustry/maps/generators/BaseGenerator.java @@ -26,6 +26,7 @@ public class BaseGenerator{ private Tiles tiles; private Team team; private ObjectMap ores = new ObjectMap<>(); + private ObjectMap oreFloors = new ObjectMap<>(); private Seq cores; public void generate(Tiles tiles, Seq cores, Tile spawn, Team team, Sector sector){ @@ -41,6 +42,8 @@ public class BaseGenerator{ for(Block block : content.blocks()){ if(block instanceof OreBlock && block.asFloor().itemDrop != null){ ores.put(block.asFloor().itemDrop, (OreBlock)block); + }else if(block.isFloor() && block.asFloor().itemDrop != null && !oreFloors.containsKey(block.asFloor().itemDrop)){ + oreFloors.put(block.asFloor().itemDrop, block.asFloor()); } } @@ -73,7 +76,8 @@ public class BaseGenerator{ pass(tile -> { if(!tile.block().alwaysReplace) return; - if((tile.drop() != null || (tile.floor().liquidDrop != null && Mathf.chance(nonResourceChance * 2))) && Mathf.chance(resourceChance)){ + if(((tile.overlay().asFloor().itemDrop != null || (tile.drop() != null && Mathf.chance(nonResourceChance))) + || (tile.floor().liquidDrop != null && Mathf.chance(nonResourceChance * 2))) && Mathf.chance(resourceChance)){ Seq parts = bases.forResource(tile.drop() != null ? tile.drop() : tile.floor().liquidDrop); if(!parts.isEmpty()){ tryPlace(parts.random(), tile.x, tile.y); @@ -94,10 +98,6 @@ public class BaseGenerator{ //small walls pass(tile -> { - //no walls around cores - if(cores.contains(t -> t.within(tile, (3 + 4) * tilesize))){ - return; - } if(tile.block().alwaysReplace){ boolean any = false; @@ -175,19 +175,20 @@ public class BaseGenerator{ } if(part.required instanceof Item){ + Item item = (Item)part.required; for(Stile tile : result.tiles){ if(tile.block instanceof Drill){ tile.block.iterateTaken(tile.x + cx, tile.y + cy, (ex, ey) -> { if(!tiles.getn(ex, ey).floor().isLiquid){ - tiles.getn(ex, ey).setOverlay(ores.get((Item)part.required)); + set(tiles.getn(ex, ey), item); } Tile rand = tiles.getc(ex + Mathf.range(1), ey + Mathf.range(1)); if(!rand.floor().isLiquid){ //random ores nearby to make it look more natural - rand.setOverlay(ores.get((Item)part.required)); + set(rand, item); } }); } @@ -196,9 +197,32 @@ public class BaseGenerator{ Schematics.place(result, cx + result.width/2, cy + result.height/2, team); + //fill drills with items after placing + if(part.required instanceof Item){ + Item item = (Item)part.required; + for(Stile tile : result.tiles){ + if(tile.block instanceof Drill){ + + Building build = world.tile(tile.x + cx, tile.y + cy).build; + + if(build != null){ + build.items.add(item, build.block.itemCapacity); + } + } + } + } + return true; } + void set(Tile tile, Item item){ + if(ores.containsKey(item)){ + tile.setOverlay(ores.get(item)); + }else if(oreFloors.containsKey(item)){ + tile.setFloor(oreFloors.get(item)); + } + } + boolean isTaken(Block block, int x, int y){ int offsetx = -(block.size - 1) / 2; int offsety = -(block.size - 1) / 2; diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 482724699a..268888a45e 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -326,7 +326,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{ setOverlay(content.block(ore)); } - public void setOverlay(Block block){ + public void setOverlay(@NonNull Block block){ this.overlay = (Floor)block; recache();