diff --git a/core/assets-raw/sprites/blocks/environment/arkycite-floor.png b/core/assets-raw/sprites/blocks/environment/arkycite-floor.png index 8d2645922b..fc0cbb677d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/arkycite-floor.png and b/core/assets-raw/sprites/blocks/environment/arkycite-floor.png differ diff --git a/core/assets-raw/sprites/items/liquid-arkycite.png b/core/assets-raw/sprites/items/liquid-arkycite.png index 57599983c2..3a52288354 100644 Binary files a/core/assets-raw/sprites/items/liquid-arkycite.png and b/core/assets-raw/sprites/items/liquid-arkycite.png differ diff --git a/core/assets/shaders/arkycite.frag b/core/assets/shaders/arkycite.frag index bd677d5e44..acbd4ab7c5 100644 --- a/core/assets/shaders/arkycite.frag +++ b/core/assets/shaders/arkycite.frag @@ -1,9 +1,8 @@ #define HIGHP -//shades of slag -#define S2 vec3(89.0, 150.0, 62.0) / 255.0 -#define S1 vec3(112.0, 181.0, 81.0) / 255.0 -#define MINSHADE vec4(68.0, 118.0, 66.0, 255.0) / 255.0 +#define S1 vec4(96.0, 131.0, 66.0, 78.0) / 255.0 +#define S2 vec3(132.0, 169.0, 79.0) / 255.0 +#define S3 vec3(210.0, 221.0, 118.0) / 255.0 #define NSCALE 170.0 / 2.0 #define DSCALE 160.0 / 2.0 @@ -19,7 +18,7 @@ varying vec2 v_texCoords; void main(){ vec2 c = v_texCoords.xy; - vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y); + vec2 coords = (c * u_resolution) + u_campos; vec4 orig = texture2D(u_texture, c); @@ -39,7 +38,7 @@ void main(){ if(noise > 0.85){ if(color.g >= (S2).g - 0.1){ - color.rgb = S1; + color.rgb = S3; }else{ color.rgb = S2; } @@ -48,7 +47,7 @@ void main(){ } if(orig.r > 0.01){ - color = max(MINSHADE, color); + color = max(S1, color); } gl_FragColor = color; diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index f2767585fe..a7f1dfb1c8 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -57,7 +57,7 @@ public class Liquids{ }}; //TODO - arkycite = new Liquid("arkycite", Color.valueOf("59963e")){{ + arkycite = new Liquid("arkycite", Color.valueOf("84a94b")){{ flammability = 0.4f; viscosity = 0.7f; }}; diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index f0a2ef5b0b..42e9ec6205 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -134,12 +134,23 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ erase(spawnX, spawnY, 15); brush(pathfind(spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 300f : 0f) + maxd - tile.dst(width/2f, height/2f)/10f, Astar.manhattan), 7); + //arkycite + pass((x, y) -> { + + if(noise(x + 300, y - x*1.6f + 100, 4, 0.81f, 86f, 1f) > 0.71f/* && floor == Blocks.yellowStone*/){ + floor = Blocks.arkyciteFloor; + } + }); + distort(10f, 12f); distort(5f, 7f); //smooth out slag to prevent random 1-tile patches median(3, 0.6, Blocks.slag); + //does arkycite need smoothing? + //median(3, 0.6, Blocks.arkyciteFloor); + pass((x, y) -> { float max = 0; for(Point2 p : Geometry.d8){ diff --git a/settings.gradle b/settings.gradle index 7a19432101..fed0fcf076 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,6 +24,8 @@ if(System.getenv("JITPACK") == "true") hasSdk = false if(hasSdk){ //hack: pretend the Android module doesn't exist when imported through IntelliJ //why? because IntelliJ chokes on the new version of the Android plugin + + //UPDATE: it no longer chokes on AGP with the latest version, but instead gives a completely different error. brilliant. if(!System.getProperty("jna.tmpdir")?.contains("JetBrains")){ include 'android' }