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!ia0y~yV7LIn9Bd2>3}s8+moP9eFct^7J29*~C-ahlfnmR= yi(^Q|oVN!J85tND4lVfVpUca?fMIBW26N^m?-&?&tn=IlaV9ND$ zaSX|5d^>Y}5tE_7vF}!<7Fr9K8ksJ4?PJ{4#lGT&bHnO&i}M{=4~K-#eG!tpT42i} z4HhPW1zkSAlR1y8-SjPDH+~v?CU(~Ey4|z)vs%1d@_(&Ln0wM*fi?W`F>XJ%g{wPp zG@PB3dLv7T;TV5|WNzOMgPaDNv#%F5%_+3{JF`Y4X`Zssft-zvH< z;xn0H->>{dn||rp{7Tv@;B>?O^_tD!kBeV*UVS&gOr9Z#OcR)eb`uBz9L76PSeM2)cSDp-= zwcgLJSMtQH^E?XowLnie~rP`fHxzbjKhwqsrO7}rY zj@Vjf?+GjcE@Bp!@^wx~Zg4EvB=B2d3B$DO;paYo)R-&fsBvtASsT?yW2Tk-x4Og7X9LJ@~Xz%O$t7$9kSCz zj@-9YSgpaZOH;Zd+v*t8$1gTp{PbQZ?5o}JdEa{TvmsZu9=YZx_oOtkw@vPY^OY>~ zgwRa2^@sOWwK2MAFT4>II!kNEj6%(8PxAsFO)*%RI8orv$KzRZ%sb9Md1!n4NZZG` zKNtO-e?#0OPwD+_^SJxHYz-$_MYH}bNxq=J;f>7Ii2X;;GB7YOc)I$ztaD0e0sxco BHn{)* literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png new file mode 100644 index 0000000000000000000000000000000000000000..64913660e4f00130440bb6798b2ace38ed6db045 GIT binary patch literal 656 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FVDj>G zaSX|5d^>Z!AG4#tvHi-X9y}8m96vI&usclBnzUKO^+N8U!~+Qhsun)YN)j=lj$-#e zFocSVCQO*>I$>|#_iyLV+`G4J(f%bTpS~;lUTeMC__l4r(XJqsjd3P_|IUkQ&B>|E z>`XeK8uuXi&}oO=ci9+HBExpLiDow^A35#7F;Q=Y+O-}0eTws#PdluR^qJ}E%r#ly zUq!iW=@-pRmp+G_j|b{E3a}n-xtzFq=EIcF1ywaw3=9$XZ}KnhJ8}54_qxFFuXEU{ zzOVmzLcf_a;a-PnYsyEX$saX3479?CZ&&MpOt49t# z4YbWz-g{O1#_GU?YZrWu`=~q4%2W zG9Q+9{S!Fb;9c{y_&{r}XJBeNpA_T$&d6nNp0Qaq&-;45H}7Xclkuz6YPTz%YlId( zJS)i|$r>MXF}Pfdt4UKk$SZj90yhWIb=?!P4rsSJxhlD+f1Ae~BmDQB!T*ytg4}G^ zzw=|5CE|6NEj#nAm-_U;EGxUc^=b}<`5wE)Uh!0MUTx6{5OeOGu;YA+3y1l_y(fB| zG)mM`n0L+H+4_x9w6yO|$-Oz&?boDh$~2rle*8R@;lR6l+sdA>uGxDr;!6JcLv=}A znN7-a3g;NF3nfq7&=M-k`R)btym(D#>5qbX8dIfGd#4EQON#u#tREuQ5O;TuKLY~; NgQu&X%Q~loCIIroA?5%8 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb2cb653f566fc15c880f3943ac3b51feade929 GIT binary patch literal 623 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FVAAw- zaSX|5d^{!&eyXI@edC_# zwZJaMz6!~8lF7`jE

VZa%oPqx! zaRM(MO;O$D!7};r)YwLyPi5g-A8*r2Oi_?jp1DMFu1B!&$^UHHq6MAB%&v>Kq%~YR z;IOMRR;YaQ$uAo@%e6W^UHSrU?mpK!>8s(ZNyi#|ebj>1^33>9&+|n+@!e_PdykvF zr|6q(^N?EJll1QNrKpyiaL2g(#a*8~U2_yT*f^RPqeCv1x^Dbuv39qg;W5eO$AUdn zTa+ebIhiT>sZLtL^Wv9-YKqOQO-atN`aLO~>>|M{>^b+&zAX0g;;xKqN8g7Ezk2#u zyWBZgbb(2cWPq7c+!H03r&T&ViFAlv} zwL^tpD7VGJyqIw%yT#(ISrLa;bqH^N*U(mj=Rt&1kAdZ|05E_t_in$jCS g<>|@0%>FR_R}z=eeXV+$fq{X+)78&qol`;+04;$P)c^nh 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)){