From 580e830300c2c1528cf895fc81efd033163a8ce1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 13 Jan 2022 23:33:12 -0500 Subject: [PATCH] Erekir gen fix --- core/assets/shaders/planet.vert | 2 +- core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/maps/planet/ErekirPlanetGenerator.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/shaders/planet.vert b/core/assets/shaders/planet.vert index f6721c2ef3..0e7a52e7dd 100755 --- a/core/assets/shaders/planet.vert +++ b/core/assets/shaders/planet.vert @@ -20,7 +20,7 @@ void main(){ vec3 lightReflect = normalize(reflect(a_normal, u_lightdir)); float specularFactor = dot(u_camdir, lightReflect); if(specularFactor > 0.0){ - specular = vec3(1.0 * pow(specularFactor, 64.0)) * (1.0-a_color.a); //specular power = 32 + specular = vec3(1.0 * pow(specularFactor, 64.0)) * (1.0-a_color.a); } vec3 norc = (u_ambientColor + specular) * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0))); diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index af62b122e3..3bc530df58 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -633,7 +633,7 @@ public class Blocks{ yellowStoneBoulder = new Prop("yellow-stone-boulder"){{ variants = 2; - yellowStone.asFloor().decoration = this; + yellowStone.asFloor().decoration = regolith.asFloor().decoration = this; }}; metalFloor = new Floor("metal-floor", 0); diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 95d4831ca2..6eb17ff16b 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -132,8 +132,8 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ float maxd = Mathf.dst(width/2f, height/2f); 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); - erase(endX, endY, 12); + brush(pathfind(spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 300f : 0f) + maxd - tile.dst(width/2f, height/2f)/10f, Astar.manhattan), 9); + erase(endX, endY, 15); //arkycite pass((x, y) -> {