From dbd31b9031ba2c989283808d131e2268dbca2174 Mon Sep 17 00:00:00 2001 From: TranquillyUnpleasant <62061444+TranquillyUnpleasant@users.noreply.github.com> Date: Mon, 27 Sep 2021 23:46:28 +0500 Subject: [PATCH] Cryo tiles (#6054) * Cryo tile * tile name * Shader * Icon and property --- .../blocks/environment/pooled-cryofluid.png | Bin 0 -> 1335 bytes core/assets/bundles/bundle.properties | 1 + core/assets/icons/icons.properties | 1 + core/assets/shaders/cryofluid.frag | 35 ++++++++++++++++++ core/src/mindustry/content/Blocks.java | 18 ++++++++- core/src/mindustry/graphics/CacheLayer.java | 3 +- core/src/mindustry/graphics/Shaders.java | 3 +- 7 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/pooled-cryofluid.png create mode 100644 core/assets/shaders/cryofluid.frag diff --git a/core/assets-raw/sprites/blocks/environment/pooled-cryofluid.png b/core/assets-raw/sprites/blocks/environment/pooled-cryofluid.png new file mode 100644 index 0000000000000000000000000000000000000000..9d50189fd901faa4516b6d23738f91ce5e1797d0 GIT binary patch literal 1335 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANM!KdM3^N`ey06$*;-(=u~X z6-p`#QWa7wGSe6sDsH`<9zE@e8c*B(NY`l%DlJEf45k-vYSyv0H(R&v)jQ9$Nj6Uw zo-s^N^xkCWSla&a_;{^J=4W zZuCc<)cZ--#qYUYE3Obzah|rz$$Liogd>~3YcoZfdmfFrusP+$M3pnH8VMdjWhx#g zPCvh!+;g6@%JY*g_x#QOXViMxUDuuNzw?Z>`;4014!>$YofomUoaXNGXIDbi>|e8< zSnfV=xo-VxP36Uv;UPTbW!J0&Y$g<0#-Gk;i#FW8S=6N8)a<~^jYpZ+1}d^mmDC7a z?lt+CrCAn-;m3r-C+;w0os8+>Hs5Kn@L~${UOm3LUU!CFDt|g!{q{foa{a`^ox&kA z6M8E*Ir@I>qeK5>M1ATHP+zaN*9KFFqgcn*I9`Vy_V@aK-p+ zAOD(X@VYk&$W1 zDOtxNp*PbK-t4J)EW0>(`cz|m!*gm40Vk6Zn*Xv!XllMXK522=sxGzAvstekyRYe3 zrk=Hoj%$xG-I$Vf^UR&DP;vit^X}f+TcI1nlD=SC%$f?#rD1%ceOfu8FTy?e?4EeE z%l+JNxWDL1+o#NxnWxXr+I}hPxt{ECm-BabeZTa2fk8n~k4eds#KZ2ArHigDJ7ZG% zEc0^u%&(5Q!GAB+HA>}X)l7=2`nG^A(_pvn1uMT2LuNximPgw-7A&YV?Do_AsI+~? z(L*;xPH_Z@&%Tf;$b878qx4eqUG|;xABkP5?~?v6yK}>Zzv54rF4R8##=CW2-Sbf|(bwG4@$ul(+Bx6PJ>2)3 zp?>k9kj>dL0j8%t)PI(wk4s&$+h$wJ}agx%BynVA8@H z2aDJ@Pg*GCFL+!eba74nwba(nV(D9hlGob(fCwZ%dOZLccuW)L8^5fwD2j6qf9(vL;Tf~duuKu>ahDeMoy@?% zVBqQE7!q;#?KwwA1_u@f1HBE)X1yp#`jNvq?ds>p7rK*~PyzR473Q?dpOSb%mU+7R KxvX 0.55 && noise < 0.56) { + color.rgb = S2; + } else if (noise > 0.50 && noise < 0.60){ + color.rgb = S1; + } + + gl_FragColor = color; +} diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index d944f433f0..acd40284f6 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -35,7 +35,7 @@ public class Blocks implements ContentList{ public static Block //environment - air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, + air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, dacite, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, grass, salt, @@ -196,6 +196,22 @@ public class Blocks implements ContentList{ cacheLayer = CacheLayer.tar; }}; + cryofluid = new Floor("pooled-cryofluid"){{ + drownTime = 150f; + status = StatusEffects.freezing; + statusDuration = 240f; + speedMultiplier = 0.5f; + variants = 0; + liquidDrop = Liquids.cryofluid; + liquidMultiplier = 0.5f; + isLiquid = true; + cacheLayer = CacheLayer.cryofluid; + + emitLight = true; + lightRadius = 20f; + lightColor = Color.cyan.cpy().a(0.19f); + }}; + slag = new Floor("molten-slag"){{ drownTime = 150f; status = StatusEffects.melting; diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index a68b7f6e06..3921612853 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -10,7 +10,7 @@ import static mindustry.Vars.*; public class CacheLayer{ public static CacheLayer - water, mud, tar, slag, space, normal, walls; + water, mud, cryofluid, tar, slag, space, normal, walls; public static CacheLayer[] all = {}; @@ -37,6 +37,7 @@ public class CacheLayer{ mud = new ShaderLayer(Shaders.mud), tar = new ShaderLayer(Shaders.tar), slag = new ShaderLayer(Shaders.slag), + cryofluid = new ShaderLayer(Shaders.cryofluid), space = new ShaderLayer(Shaders.space), normal = new CacheLayer(), walls = new CacheLayer() diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index 7ea78a2549..33026d6fe1 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -21,7 +21,7 @@ public class Shaders{ public static UnitBuildShader build; public static DarknessShader darkness; public static LightShader light; - public static SurfaceShader water, mud, tar, slag, space, caustics; + public static SurfaceShader water, mud, tar, slag, cryofluid, space, caustics; public static PlanetShader planet; public static PlanetGridShader planetGrid; public static AtmosphereShader atmosphere; @@ -47,6 +47,7 @@ public class Shaders{ mud = new SurfaceShader("mud"); tar = new SurfaceShader("tar"); slag = new SurfaceShader("slag"); + cryofluid = new SurfaceShader("cryofluid"); space = new SpaceShader("space"); //caustics = new SurfaceShader("caustics"){ // @Override