From 4bee7e598b36209e474fea02047d648572913145 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 19 Jan 2022 18:54:15 -0500 Subject: [PATCH] Red ice boulders --- .../sprites/blocks/props/crystal-blocks1.png | Bin 0 -> 261 bytes .../sprites/blocks/props/red-ice-boulder1.png | Bin 0 -> 691 bytes .../sprites/blocks/props/red-ice-boulder2.png | Bin 0 -> 656 bytes .../sprites/blocks/props/red-ice-boulder3.png | Bin 0 -> 623 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 8 +++++++- .../maps/planet/ErekirPlanetGenerator.java | 10 +++------- 7 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/props/crystal-blocks1.png create mode 100644 core/assets-raw/sprites/blocks/props/red-ice-boulder1.png create mode 100644 core/assets-raw/sprites/blocks/props/red-ice-boulder2.png create mode 100644 core/assets-raw/sprites/blocks/props/red-ice-boulder3.png diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks1.png b/core/assets-raw/sprites/blocks/props/crystal-blocks1.png new file mode 100644 index 0000000000000000000000000000000000000000..838aaaba7f40f16c9282ff2ddfc6515794b35ccd GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^7eJVU4M>(Pd0zsg7>k44ofy`glX(f`?DuqW45^s& s_MjmnkauXoSN~jI{slnhPyh|)%uC)eFz#6Axew%APgg&ebxsLQ03IzHDF6Tf literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png new file mode 100644 index 0000000000000000000000000000000000000000..6a3719383e65045cccaf17a165c5e9893b58331d GIT binary patch literal 691 zcmV;k0!;mhP)Px%ZAnByRA_dpaOvc(~7Gv!mvU7GuTyPLlSIO(MStt3`QV!aTo4_{nH`L
    Y%72s zeE@(_I#s`m8VgdUQetO7hj3{-pTz?;WWflKjXoxuIsIKM5G)JlSVM|=n@nc)=f0Cb zuh#Px%N=ZaPRA_52 zcy}Fj^eJgXjzDbjz<;q21;d2XVXK+pWb<%(e0l%?Sl`(XqmIbK^GmK#SM{6*diSsS z$S;ElVBUx|g=FzElkq5sFe+CU=f?D9RiS=&m>(~T38Mki=yOa=#-qxOY7Lmg>o5tF z&xbOhi$cKwN4!847&E=*3{b_(X(SM$b>ge6TDgHVZIpgk4Do6j)x^Q&Q9Wp0p7qa-Zuww>GwNk~M$}2H5~AVF83-8#UtG~scPa{k zDJxP+Q=_0pKozcwkZQmyg+fIlL?`y116&jR?lAw!*iuG4ukKC&niNXY25V{UN+*|5 zYC1l>eI`}b)r2fi7DJ7YxX)xn2sfd<$c;iMbS7j2x}CX&_5l@jj@)$K zoI8is8+>*sLhor*-nMq+1+2Z%Sk!ON!hT|kX@VmjAkG2T5@V6DgjF30?&t%a qUnxTy@ewX4l^SJ@lo7sSS@;7lR2G0<-JDMV0000Px%DM>^@RA_ozGTl2p6z2CR?fQE*KKaE$`jicovB8%AG zHP%sz0giYXt{GzkMMP4d8rk67wA1zxEf-PQ;yI99cG^Aw;Q8^cQsI;;kSkENcmSko zYYlYTKF)VeqSbtc)qG}89fN4Oh>%A(I&)mH6>!8h>^Xr`zkRlrGj71y1j14W~>W`NSbK)Q)t5_hx7 z^sxzdDv3!%j!@aV&WV!sG3t`WfK5y$QmqV_@P7>SCt>c(P2S^!OO!7(wn!SMjAHJ~ z(prRUS3zEHql)rLMQk7l1_*)yTU60?MX~-kt-DS!#u=x^Q%EI*B9LlAHX=?XlB5ji z`amUQJesm%LtQV7WQhk9Q>Z@)y_?e(>Cw7q*2V8t6YAyTD|bUv6`(Y78BjJNd7vez z)jzQutNZ@DHqN;VsBdUx@cHxY0l>lGUgpjVSZAYE(R#Qf4-##JI5%?vsRuZtwQ5+x zs)!S};zm2GGm<5OV%{XKg`$xqN+&{Pr0%_zBJ2($mt(p%`~v?X7aT3?CCdN+002ov JPDHLkV1g}y71aO$ literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index adb53e1a86..18c7e7109b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -506,3 +506,4 @@ 63198=crystalline-boulder|block-crystalline-boulder-ui 63197=crystal-floor|block-crystal-floor-ui 63196=vibrant-crystal-cluster|block-vibrant-crystal-cluster-ui +63195=red-ice-boulder|block-red-ice-boulder-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index afd76fd7d7..0d49e62e1d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -49,7 +49,8 @@ public class Blocks{ ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt, //boulders - shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystallineBoulder, + shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, + arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystallineBoulder, redIceBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, pebbles, tendrils, @@ -672,6 +673,11 @@ public class Blocks{ crystallineStone.asFloor().decoration = this; }}; + redIceBoulder = new Prop("red-ice-boulder"){{ + variants = 3; + redIce.asFloor().decoration = this; + }}; + metalFloor = new Floor("metal-floor", 0); metalFloorDamaged = new Floor("metal-floor-damaged", 3); diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 75da1ed535..6d46b778e9 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -140,6 +140,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ //arkycite //TODO arkycite biome + //TODO ice biome pass((x, y) -> { if(nearWall(x, y)) return; @@ -184,10 +185,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ //make sure enemies have room erase(endX, endY, 6); - tiles.getn(endX, endY).setOverlay(Blocks.spawn); + //TODO enemies get stuck on 1x1 passages. - //TODO tech is lazy and boring - //tech(Blocks.darkPanel3, Blocks.darkPanel5, Blocks.darkMetal); + tiles.getn(endX, endY).setOverlay(Blocks.spawn); //ores pass((x, y) -> { @@ -199,10 +199,6 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 38f, 1f) > 0.665f){ ore = Blocks.wallOreBeryl; } - //TODO generate tungsten, or not? - //else if(block == Blocks.yellowStoneWall && noise(x, y + 942, 4, 0.7f, 38f, 1f) > 0.71f){ - // ore = Blocks.wallOreTungsten; - //} } }else if(!nearWall(x, y)){