From 7b83406ee455ae16ee98b681a484a6ca4f880f28 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 26 Jul 2019 20:46:06 -0400 Subject: [PATCH] Blend filter parameters / New map --- core/assets/bundles/bundle.properties | 1 + core/assets/cursors/cursor.png | Bin 1648 -> 2054 bytes core/assets/maps/shattered.msav | Bin 0 -> 16239 bytes core/assets/maps/wasteland.msav | Bin 0 -> 22115 bytes core/src/io/anuke/mindustry/maps/Maps.java | 2 +- .../mindustry/maps/filters/BlendFilter.java | 11 ++++++----- 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 core/assets/maps/shattered.msav create mode 100644 core/assets/maps/wasteland.msav diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0b7a116d49..fe92fb9a3b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -271,6 +271,7 @@ filter.ore = Ore filter.rivernoise = River Noise filter.mirror = Mirror filter.clear = Clear +filter.option.ignore = Ignore filter.scatter = Scatter filter.terrain = Terrain filter.option.scale = Scale diff --git a/core/assets/cursors/cursor.png b/core/assets/cursors/cursor.png index d8487b7fa12a5f1fbba15810f2ae47e4facbe964..86f4632037bcc620506e3f88346a8ce88845c529 100644 GIT binary patch delta 1755 zcmV<11|<3L42BSpBmoMMB_DrTlH@21{pS>O1dtFC$6<|_8_eDr=Z=R|mj-<;j%94GHeOb+2nhf`m!>?<%Dc2}AJ{T<10jFnGsMtC2{Vj6x6oi>q(O?As1a|Pu~MeCL5XXGN$P+`X9G43 z$T7%twk2%6dFg{PgXSKxm>&ZR(U zi3PF>_zMV?D%XElrKYOYYObXreOheNQqyKFx6-L|M+tB}b?w%3FCz@3(uhMw8aiy` zQ6_S2@{ChvnmTRfSkKC_O3kPbnfm(ceK@DWpFA-st6Iqx6F^U0*>p}nt zO$#$`Ax2urEzEo-cFaPsQWiKpEX06d9D!tpGj7Hc0xc6Rr8XjQ#cOK7xMM^IAuY7I_v$vlB8Z3_i)=h=IED94OO_Un*#Z zEGbI9uIGQ}DuSbhZ!0xs$xl#kp(qJ`v|0y?sxddlkHEaerpf-epuB z8Py*q&JpuS=s0Hzg3r;?9@mF$qFd6=+bV{^EpzJ;UNowtD_<}?_ZKF*UzlP)Nl^El zqVdX|Yj4~q?p)9A6L+q?aIdP)cig%5#(m<>3)Fvp;MNmRZc6P>-MRM0z2^=Z9B!#j zpQ{Wse8aG4$Lgn~k6d{z$ws}F(o3_^uqP@N4cr(}f?-cI=E%|l+Nr98WqL`u4ww~O z37w|ElQDu3RTKQBiaro+WrJhb<|$#Hl|n#tvhqL9IqtI}NQh7oSth zgpz+zM(zUcpeoJxQVIvdmaz5&_l?W;4;%cO+1(SqG4CRUoinP?%%r)P&hFqx+!YDE zv?!t?bKj3PHaZk1%dSw>mj+bPude@}%yg^4{oVu~-?7&H$SoerqNk4>1H5Um1I*6a zybdb0^wq^1jggE5sa64EMM|dRoAdyRVkdtABt4quxT1!&7UU3uuyF)RXy3hbY{#Rh z?`gD(O+qP63_7qY=qVwo*pO5e8x0cGJRCr<%4MqI6M^iCD<3)p?t~bj?1U(++Zcgp zPPJ@fG)>tH&yQE%{x`~!d!t`?qGne2uyuID8hTYBKNhr#k^2{Vh4kIpPImGD00Do5 zX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ>7wR2Md1SkfAzR5G~@URVYG*P%E_R zU~>J0CJjl7i=*ILaPVWX>fqw6tAnc`2!4RLxH>7iNQwVT3N2zhIPS;0dyl(!fKV?p z)$Eu6RLwGy@tBy-tcrnG1TchNL@|FLGgF_Fqy#+2*FAiEy^HWH?{j~So@~x!fKMcz zWx8PzZxBy!S~}-_;t(s!S>kizaf2>M{K$31~Sb~(#=i?dp;vgSSc3xhdrWtrn+a32;bRa{vGf6951U69E94oEQKA00(qQO+^Re2O1X!2LRVEx3g;n1p$yHM#2C9 delta 1320 zcmV+@1=sq95bz9;Bmo4GB_DrVk}D?+{bvT1DJIL~Lz&*CdkIA)tQC4cx8Xi@nhX0&dj&Z zQQ?d(ATl``9N6Q&CK5vfE^O#|-!m;r#8^0;?vH)v&chq$okusm^LEhryDOYe2Sd8? z(LoRL*mv7Q*BXV(%HLkJd=7#;-_6on8u6xORw~r^1OZx@q=2V8&cLbx zH3pf^x`e%M+3U5Cv2qXKqyS+7GwzyuM0}^61$C90e;ND$DlcJqzVLr2=(A5uwhOB2fG1lV~&Q+yRytCBeejCwM7)rU;_cH7zOd8 zF(ZadSfUe=Bq~{oSmG3uq?9zR9A(NHRWzw;)}od<$1FKz%{iBBg$g5uNl8Ur$)yxC zENT#Km~G%Nt5kov#ws;ct+|$J4dK&bla`vc+)A@fojbOFPhDNly>uI4Ae2TNGSbkI zM;SH|Ym;Z3GSk$VXPI_J?LhTAYT*XCpHT}3Y74Qr`SgMs$f{o=!b&HyFau%~0}$7R z00Np8WR!lA##N zNs;n(z3+b>DXOgz61m?qg4s?Z$a^1)b0>M9i*wiNeIm}?Tl=0k_sn@;;(pJjy@{wg z3bH>`oFkTzP;t%_r117pTpzZHYDxPhREEN>aO)9PG^(U4UeG-EA5?VD_SLHa>i#Kd z{AA9xHSQC0u6y^1IoDP=`oNrPYuqR1JV5OQvz~u|a!$4Hm~(B7d)*uqINVa5zEl|~ z_(tx2m_t1!eU!>;OE&7&tXs>Y;Y?%|1>6`>LdKbB%u%ETlv7m)%k+{;9Z(C^WJe7t zuw;yoiE0-7rHVQbWo3h5IOZwgoRvaDu@w#bm zM(KY7?w~5ocQfOVaU`rg!Tij&?ZXNAu6NH~Jn46m!pRv~Xcp39S#iLX6!#YCsHH{W z6+y*_=h4PShvH<}8LE0~Ko#}s`rpY+_ba%cRp9Zf+PYshi^tOF$t!Md=GXydXKh{w zS+%~7Uzx^8nFO&`0b)f+rsSLS0E*%y0VIDtisrbz2B)|~2;9aID4~4!(s3M*qQ0lm zDh>%|O)}QNsi3EXpyG_6syJwnsFnc?va4)UGd>ZBt{o5^0(U@+U^^g;bt@wf&8gZ} zM$?qN@%(u9?SCUJt=_#+FFbtfeup*>GvvpDRx)yb1M7P96y4<=>i_@%24YJ`L;wi@ e00000`9r&Zli3Cz2?GcdI5_|9i2t(z2L%Bd0&|Z5 diff --git a/core/assets/maps/shattered.msav b/core/assets/maps/shattered.msav new file mode 100644 index 0000000000000000000000000000000000000000..3164e822235fa551760241b548948bfe7c8781cc GIT binary patch literal 16239 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 Z5wq+QYZXiA=Tz`-26Q!}{~JN0=zN-BqL=^x literal 0 HcmV?d00001 diff --git a/core/assets/maps/wasteland.msav b/core/assets/maps/wasteland.msav new file mode 100644 index 0000000000000000000000000000000000000000..f7bb73595e07eab155fdc2ad0eedb832a18bb7d2 GIT binary patch literal 22115 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 ewz*X_8Ny(%)0XjFYRGp_m*0Tk!bdZjF7AV literal 0 HcmV?d00001 diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index cc04a792d6..8059329566 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -20,7 +20,7 @@ import static io.anuke.mindustry.Vars.*; public class Maps implements Disposable{ /** List of all built-in maps. Filenames only. */ - private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera", "glacier", "veins", "canyon"}; + private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera", "glacier", "veins", "canyon", "shattered", "wasteland"}; /** All maps stored in an ordered array. */ private Array maps = new Array<>(); /** Serializer for meta. */ diff --git a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java b/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java index cda996e31b..cbb62f46eb 100644 --- a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java @@ -11,20 +11,21 @@ import static io.anuke.mindustry.maps.filters.FilterOption.*; public class BlendFilter extends GenerateFilter{ float radius = 2f; - Block block = Blocks.stone, floor = Blocks.ice; + Block block = Blocks.stone, floor = Blocks.ice, ignore = Blocks.air; { buffered = true; options( - new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f), - new BlockOption("block", () -> block, b -> block = b, anyOptional), - new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly) + new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f), + new BlockOption("block", () -> block, b -> block = b, anyOptional), + new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly), + new BlockOption("ignore", () -> ignore, b -> ignore = b, floorsOptional) ); } @Override public void apply(){ - if(in.floor == block || block == Blocks.air) return; + if(in.floor == block || block == Blocks.air || in.floor == ignore) return; int rad = (int)radius; boolean found = false;