From e30d090a2ede0c489a73332649af86f51f2e6344 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 30 Nov 2021 22:52:33 -0500 Subject: [PATCH] arkycite recolor --- .../blocks/environment/arkycite-floor.png | Bin 275 -> 273 bytes .../sprites/items/liquid-arkycite.png | Bin 496 -> 502 bytes core/assets/shaders/arkycite.frag | 13 ++++++------- core/src/mindustry/content/Liquids.java | 2 +- .../maps/planet/ErekirPlanetGenerator.java | 11 +++++++++++ settings.gradle | 2 ++ 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/core/assets-raw/sprites/blocks/environment/arkycite-floor.png b/core/assets-raw/sprites/blocks/environment/arkycite-floor.png index 8d2645922b08befdbc25085bed7ca67eadb1b061..fc0cbb677d5128141d15f36ea2b0ca1da870cff7 100644 GIT binary patch delta 232 zcmbQtG?8h7Vf|@O7srr@)~C}h@*Xnaap8ZV5jZVTcUq$A5iP+QR@YUtExtYUdRrS_ zb-r)%uTK^C>;s7he0 zi{Nuzt_|y_n@wF^$L=C{)1U(l{*^pxi&o9y{~0)Z?@`zHF2BY{cSVY^j4dZ q?ar<{dSVvEljq4fso6Yj(q~)Zx+uca*M@HD=+|5$sxe3|yMT$jmnWcd@&z-#|iRmL~QnlbI`tit!Zl{US# sW@Ni#b!VNJMe(G0b}c>?rA9j@vHTIasz`(%Z>FVdQ&MBb@0N@sC%>V!Z diff --git a/core/assets-raw/sprites/items/liquid-arkycite.png b/core/assets-raw/sprites/items/liquid-arkycite.png index 57599983c2ed9eeee00c220c9c29cd35d176d554..3a52288354e3fa60ea9a5b97fcc6a901cf3e6681 100644 GIT binary patch delta 463 zcmeys{Ec~nVf_YA7srr@*5m|HUhr*y{c6dycenq@AM-E&bo9dEBO+bb zg%T4JKgk-@`roO~$+{rhbYAd>%z>8RHij8H^FP-=neg*_zG>t$ff9#hr7VVmVFz{~W)Z zHgL50^Zl61CYev~?`JhFRk^0H_s1{ZIl7hELUUxdJo`}3&#h;1|GbN|^ZRAS;Sb-G zsK>jhEeqJAs(4MnVY^Mn*~A`&qiL2tGB*WVE-{@mQK-xoYMxOl-1YRtzT@l(eadRO z38f5Yo}0DyS?IcdQ&nY1ujfeME-PYK7@(jf{fMh7tA#0yeZr$^FIh(emJZK~+2>+h z3pq6V4$bEEWPQ?d?7{k;vN=D@Ht;PF5%|Oq$fsZ~(s8latmCLktq@|+2WUN)2}ZtK~>rIMtp^rV`N%_h^~%&yLd9{=l_*gPIE9eH(B zis^WqwBa7BDE7yXcsOGcVmow|ojY^`vkKh~ZoKZs6SnBN0GpA(I^_<|Pmb&i(;atm VKJ<&pV_;xl@O1TaS?83{1OQjA$d&*A delta 457 zcmeyy{DFCbVf`vk7srr@*0WRh`W-e9IIb_2FA%s=NIS{3wUaM$#x6q_kJwFy3+DRvj-KwN!5qCzPx6IJ;LVKPMuML>EO@2{Z?~*h6Wn{Uux8)=zqRSie>Pj*NST&; zbjBqPwu>t1_ZQyR|0(duyLrdDZ2p4(HItLGzd5D|7%?dQS-hd%(d1-hsz&dcZ-Gob zdGP^LD+E@b*u|hGV5XHJ?-(p_%``yVWi5kQ8p{GJHilwRslWqEjQcj6)Zg{dUU7Cy zy}kTe2aVn-+f}q)y8jC9xxIRW#P?&KbyfR(-~D>D=85%O{qDjS-({U@Uix-uZIIt% z?&mcr>EKNp{)MYp6M46U*DG$>b$ITBnr}wQ1y)-dm^Pfze{YjmV0T(eEren6-D4qI z8Cw^6{IUvhVD#Cvo@-%$^ 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' }