From 8fc7aff7ef911d42fb5c4985883756634c2fcf2d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 20 Jan 2022 15:49:47 -0500 Subject: [PATCH] More decoration blocks --- .../blocks/environment/rough-rhyolite1.png | Bin 0 -> 247 bytes .../blocks/environment/rough-rhyolite2.png | Bin 0 -> 223 bytes .../blocks/environment/rough-rhyolite3.png | Bin 0 -> 221 bytes .../blocks/environment/rough-rhyolite4.png | Bin 0 -> 267 bytes .../sprites/blocks/props/rhyolite-boulder1.png | Bin 0 -> 605 bytes .../sprites/blocks/props/rhyolite-boulder2.png | Bin 0 -> 565 bytes .../sprites/blocks/props/rhyolite-boulder3.png | Bin 0 -> 554 bytes core/assets/icons/icons.properties | 2 ++ core/src/mindustry/content/Blocks.java | 16 +++++++++++++--- core/src/mindustry/content/UnitTypes.java | 2 +- .../maps/planet/ErekirPlanetGenerator.java | 7 ++++++- 11 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png create mode 100644 core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png create mode 100644 core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png create mode 100644 core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png create mode 100644 core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png create mode 100644 core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png create mode 100644 core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png new file mode 100644 index 0000000000000000000000000000000000000000..3f8f555456f7874d42efbe25caca6ce4e400a468 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VA$yC z;usRq`u5sE-UbC81_x8U16)1_j?cerVJN(TN%@6$bI<~hZo6A8E}fS)8@3ikPp|!9 zkap^5PuTUXrE*`-9hoSzE1h-8q(p%fQ4d$ngM1o_yBLZ%gc!c{uV<22o7c?5xR#k| z0sBq?L51lZToYLXTsQ^mJWLsGKiswb(RPk+b_|M#c4nAwIk))qohFOLyO?x+*?AZE z1@T%4`g5?asZe^f&TaeM00t(31_qW7(FYjc`&v2*KYzEMfq{X+)78&qol`;+0Lw^N A5dZ)H literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png new file mode 100644 index 0000000000000000000000000000000000000000..a011218c3ee4ad6dc805bde1415b908a8bd0a9b8 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3_IY z;usRqn(VX5@b7tphK5W9UHQ@jE12D64PG?_vKtr}7;Fg0YG|CK!1e#o-tQ_emus+G z&^@l|Cd~d|bBBog1sz_2*BrCdoRVZ5KgT$n5KOUdm~y4>ydZNN--WY`JDeJo*e682 z2)N65g+au+;Znc?FOGmm9Sh}I4IDH?3Qh)_vgqBZ?!T&3)3V3_Xd z;usRqn(VX5@b7tphK5W9UHQ@jE12D64PG?_vKtr}7;I1|=9$9s@D2C(dzX(geh_fj zCL=w68Q+5GsTQ&g+!qcfGSB01mvy+nxW$jX*`9^1l{rI_*QLFoagu_s%%LL(9HMsm z=ei$oZit)8@5jy~;!wz7xX|J4ghL#RF=8=0zRy#;*ka0cL3dH=uY`lDj^D*DIxsT$ Yc_?kR?f$ogfq{X+)78&qol`;+0HXOzLjV8( literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png new file mode 100644 index 0000000000000000000000000000000000000000..4a73e0ce761e469b68a473bd178e9ce4fdef3695 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U^wdO z;usRqdUxtU!3G5$ma7{XqcJ+6H7{lbQ2 z(;me#oCzw9p1z{o(x0(IX2Ox+S`7!k7RJPRj3zD@1(XzLciJS|= zngfB%OB5su=Enlw*9LFkf`2=jt>jHX?t z6Kd}=xjl{1U~@=ynaa%3@&7!7tipHRo#h?Orq89nvF01TZE#w*Fw|ttGv^-+b}4oz VWc>cGV_;xl@O1TaS?83{1OTcjV{-ri literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png new file mode 100644 index 0000000000000000000000000000000000000000..888aeed2eb91a70b70d7c2144e2a6b63a0b6bf5a GIT binary patch literal 605 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FU=sIq zaSX|5d^>Z$m$RYBG5h~K>!M1EKRTt0FLb`|Q1bqj+Pc0+i~1jEG+nM`_{b~6qS=wW zP%mlwqGo5uCstFYm^?XedD3(D6ZYwG8Iyn4T0U3t)eF!N;X0k7n*O~1`d+uY@^M!p z=S^K29J|AhPk52+u9n#zQi|mzWmVh^H&&IcxnHhk>bd7p&N;T= z=<#hEH_p3M@%!yE#su>5TB#L*>UTnNlIxlM@&x}X8OJ*@td{qoOQYF%`lC$(_ zTMYA*i`yR>PYg2V3S#lw#jX@Quk*Z&X>Su-QD^uMpMbEkiBbWY2Xolo&5QG>&yD@MVTFf_Ys0Mf-79*Ru03)^qlJ%Q5$_D; z*Txf#x#F0wSOv8B-1x@3Qf29c+!W`RM+_Y;?S*35Rc;5E|9BMbb&hAL!Qum!b2+3I zTx+~C<)m$t;(v?l=X}=B{Fh(ucfPh(GRNO<;r_de*SLS&xFJiSopWm0vlqdM=BFll z-TCUKzG~r;PLYoehq(DTg;zdmJYsILQB9>qdy@61nG-~!G(_I~VXpK2Td1BnSAv0o Ofx*+&&t;ucLK6VGC=VL| literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png new file mode 100644 index 0000000000000000000000000000000000000000..7b6f910a8ae69cc013080b91430857749c1e9fcc GIT binary patch literal 565 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FV0`cC z;uwl-|KaC z-R%_(MGw@XltNf{Fl}3?*i_Th{kfXqK;HKQzy6;rKgG50LFMjv$-`%#M!x;!d(!o^ zN3;I5Uu*79(qn1(yM4C|gAv2s#kTW<*P0!iDkz=87(ZYB#TmDsfBwGTZrSkouq=av zS!6{w!w)A9F)5Y3dyJ(cFWb!13!lIFWK)rqP)PJuE(sOeY4)bB0lQ{-3C@mWIMh|Z z_26Ay@D7)XQbo46HF;3vV=Q=fYiP8~M z2hNz+&z?C=VLZ3a+ty#zL;MooEtLxKOUq1|US%!K`jL6X>6tRy_UOQsXAXRL=~{Y6 z$6kNtj}onktuY68^lkj>#(B@wx;wi;$*FnQ!TYN_oI491ia4xfUKOhG-!niy!-RRs z9`m5x{5{LPi#|-TjLKbcJ#RUyp5UBt?Ik=Ws)yLV?-h9cKrJohGvD7|lmB!-SKPZU z_WrDNMNJ(>--wkfT0gxD7Sz48ZPNK;6>nEeo3NFW;g9Q&TR}%J3kfPl7pn+m8tzXy XbUDt^Y~4Nv1_lOCS3j3^P6V0_}~ z;uw09R8BiD>>Wn^Y*GOm8jdS9Vcpd~@l zw|wCA9(cL{CU3qn>NEtAGOIp&x=etcu($_{j>7Lo~l-D zoK`=+UNvT5keR;x+WqtUSM7aLJL6EEeEj!&JNNJ8IA*zo=T*}z8;84VFD}vgl9HPg z<6>Fx>E{;jMQ_S4Hvd|%O=hRPetY`XEdHvwcQ;SrVAvxtiNUzib+!`UhJ!IDnHhAh z-M;%dYiHxtqGn!c-cyY6pSbR_O2?!-=`E1uShzbud8)P}yTR4)mY5BVg~y&Z&0vm6 zn)}hpVdcK2$4m}4IHz+z;%j-P05(ZD;Tn5%!5HNq0JQTPj2~lm2ye&-7X5TF1y_ynX8l!!A%7VDNPH Kb6Mw<&;$VCb@DL) literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 0f81f57397..9af5d1a3c7 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -509,3 +509,5 @@ 63195=red-ice-boulder|block-red-ice-boulder-ui 63194=crystal-blocks|block-crystal-blocks-ui 63193=yellow-stone-plates|block-yellow-stone-plates-ui +63192=rough-rhyolite|block-rough-rhyolite-ui +63191=rhyolite-boulder|block-rhyolite-boulder-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 24a433c3b5..c56e21c7cc 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -40,7 +40,7 @@ public class Blocks{ //environment air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty, - dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redIce, + dacite, rhyolite, rhyoliteCrater, roughRhyolite, regolith, yellowStone, redIce, arkyciteFloor, arkyicStone, redmat, bluemat, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, @@ -50,7 +50,7 @@ public class Blocks{ 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, crystalBlocks, crystallineBoulder, redIceBoulder, + arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystallineBoulder, redIceBoulder, rhyoliteBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, pebbles, tendrils, @@ -367,6 +367,11 @@ public class Blocks{ blendGroup = rhyolite; }}; + roughRhyolite = new Floor("rough-rhyolite"){{ + attributes.set(Attribute.water, -1f); + variants = 3; + }}; + steamVent = new SteamVent("steam-vent"){{ parent = blendGroup = rhyolite; attributes.set(Attribute.vent, 1f); @@ -519,7 +524,7 @@ public class Blocks{ }}; rhyoliteWall = new StaticWall("rhyolite-wall"){{ - rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = this; + rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = roughRhyolite.asFloor().wall = this; attributes.set(Attribute.silicate, 1f); }}; @@ -688,6 +693,11 @@ public class Blocks{ redIce.asFloor().decoration = this; }}; + rhyoliteBoulder = new Prop("rhyolite-boulder"){{ + variants = 3; + rhyolite.asFloor().decoration = roughRhyolite.asFloor().decoration = this; + }}; + metalFloor = new Floor("metal-floor", 0); metalFloorDamaged = new Floor("metal-floor-damaged", 3); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 3d70796424..282559e285 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2538,7 +2538,7 @@ public class UnitTypes{ drownTimeMultiplier = 2f; hovering = true; - visualElevation = 0.65f; + visualElevation = 0.4f; groundLayer = Layer.legUnit; weapons.add(new Weapon("bulwark-weapon"){{ diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index ca42c750ca..6157f87579 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -169,6 +169,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ median(3, 0.6, Blocks.slag); pass((x, y) -> { + //rough rhyolite + if(noise(x, y + 600 + x, 5, 0.86f, 60f, 1f) < 0.41f && floor == Blocks.rhyolite){ + floor = Blocks.roughRhyolite; + } + if((floor == Blocks.arkyciteFloor || floor == Blocks.arkyicStone) && block.isStatic()){ block = Blocks.arkyicWall; } @@ -244,7 +249,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ //vents outer: for(Tile tile : tiles){ - if(floor == Blocks.rhyolite && rand.chance(0.0011)){ + if(floor == Blocks.rhyolite && rand.chance(0.0015)){ int radius = 2; for(int x = -radius; x <= radius; x++){ for(int y = -radius; y <= radius; y++){