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!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$DedLn2z= zUOUL!puof6V5)b3%jdxH`IjvWg*PxMzwmAjTHw)bcdNyv^U`L+*23uNwLc8fP95zD zyS}wl?(4ZD6J>U#vo4vGD3BuR;mUcCPeXARLlK7%!?*tROcHDJnwc2aGBYh;-zgxd zFuj9oB5QyPr(m6jDZ}lDyS6{t&hgETLGjSe4D&7L7N5S;WU+V`lddm2?*hLdUJF5g u4)!$_N{`mLZND49z$DPX!15vb0ONaKOGn}7@Ad;7&*16m=d#Wzp$P!XNLUd7 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!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Gd*1#Ln2y} zeKr~XJ#Wy^kg1?6UwU8#vzx5JtA;>!10dKCkk!yQNrCJCp}pT#UM|;QxuAPo)lHcF z!R8JT_X|3_0#)ibt9rPG)Oc!_2VAUukn& Tz>|4EM>2T2`njxgN@xNAEN@RD literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc10ed086489610d9664031b4721db8b46a6a6d GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>+}rLn2y} zeKr~XJ#Wy^kg1?6UwU8#vzx5JtA;>!10dL-P|P!h<>4Fd@AobrW&9xEuuVpK{xZG= z(^D;E8@MkVPGp|P;V$cNfpLo;d$TZ^v`ua;M@>5 zmEVt@N5r9!!Em9&+X;s_7-Pg@c6^_wcCp2j>w@m0)L#h)RUN;JU36e%@bggGY}@^B Q3($!Sp00i_>zopr0HXOzLjV8( 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!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2!5 zPCY2tpuod&bt7Z+1}6J|YmRlTZ4lFN+~4Ek@gOhZjImALa}T}8m2bXZ*syHcqgaMB zLB-M2SCm`&Gj_;KI1*f|;o#T8m^hEo#O0!ZlH#m<$9RTYq0Z};++-|~b75F>Adq>9 zf<(dmc!93ibC>4`<~On&T&2>m?cTu@#`WhIHAQtjBUvX1U2+m(Uht05w99lt?Oi6f zr!g9A4yi6vnK?TCpJ$L&_|Chtyo1^Fx%4;Ie8aa5PU{winyh)|{DZ+R#qNZR-~V+$ P4>5SU`njxgN@xNAswrc0 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 zcmV-j0;2tiP)Px%7fD1xRA_{|v5LbaU}SXBVME-#~Ql>L#v^;-Zh>D1y^{0PzhR z1SyDPp)O*#qJu+0x?WO^MA%LpgVz<{#P$FW3Y~bg6H2v(4u=erL0Kg}J{k=^9z;G~*GNI^9 z>L$hnJB5^Z#q0am?0z^HbGw_PGpQSHYOxHM;%%gw0C@EwQp9=`fT;;}<%V1Xl+m~0 zGm%m=3Q`14x(6ato{7&KHI0G>a*0>?Oi)&Kks44_X)GxwyauF4ziPK;mq~2FJByei zo-^{M=&IcknWdsrC^c<>c~ia_$(Ke^24cj!M%$HARKylCb1_>K$p&=cAtO0fW|0V( zNSpBO;G72To?b|QZC&-Ss7ORbfST`%sEwtq#MCH+4gjJJm?P^mkuwTj1JpWDgiP4> z4XGrhkZoi`>BKQXIX@Cz2PE52H~8XPO3n# zZ+A}5eSH~hPfnq~-J`5W@v*RKAcqN+cIN0)VK>T=O5F8EC#s>Oi4^fb!V3-w6RF~X r#5XjtCM1L_k~{L5kQ7=d6zu#1eog&xCuyA+00000NkvXXu0mjfx+o7D 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 zcmV-50?Pe~P)Px$?@2^KRA_g00!yN!XHd%O! z0Qf>k78)eIyfYhF(>$IoSD&-Vf^s?%R9n>w7$iNGKQ%>Ax|&K6n^^$Dif{_x?tW9a zM0j-}DQ1Rz3tz=T9Ln~h+N~-Jl>#{SDO#x{Fz&Hsyfa`6-bIyVq$0#MKnYyy=H^0_ z0nV;VJx?V_7t#*eBzPCnrZocUYNcxUY1BgIBL=ryQK`(p@aaW$+$=vYnfP=nk%e5r zxQ?;?MhV_EJBw?8B0__@!QZQhLy2(V6hNs1s#PfeNl+hXGy|l(H&VL~jHgR-@RT`P zZK&67rv)w%oL4KP3^XOe2KT)X>)Px$Ycr z5QJbENZuf%6)d#cu(#Qdnc3Mp!TmwtNRHY0&wutS0GUiClljjSlEK~{#y{qFqe&$? zh6y_O_0=-~034U6*5A*+s=efWn8I!!U-#a*zqts;Iiw8gf|@))-L282D)eM+Vq8Qy zaPs-IOQP&|(S!P+wj8-XFNbHfY7csy-LsSk0K5>A05f?-n<5Ud!Cc7$04&zq-ScX> zfz@(@4I2&00blY8-31$5XF@KZ9SEVjU?Y_)K?g9^SA<-!fpNy?f|vtbVx93iK&ifh z;{rg~36~4v4us}{G)@ON)z_gofnA|&E+m@+7$?epH+th^2^jP`s0#Z;NbT5U0ea$G z5t7G^=oaFxI#iObLfDo{0c#%!C9AiM>s?A4`F3K~jcl>rdPOwp2D^n~H!SQCBI#)~ zwTS2o&2%;o259=|U?Q>#wJAdMLZdzuTy6AzG)CPPg90#ZWD+X^n>;|nhdGQ(l;i;j zf2+hEuWgw7#mD!smd{Id7mR^+fYVALBql$pg{HH4AuU9SFsqM+os48l#T11-iBq%` s2azOV+=wlNcoivP{)&s4Or}MC0Rl6(wa77w1^@s607*qoM6N<$g5h=YF#rGn 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++){