From 32baf06c97b1b63c1afa0c70f290e069bf8e41fb Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 16 Sep 2021 18:10:38 -0400 Subject: [PATCH 1/5] Experimental alternate Serpulo generation / Spawn margin decrease --- core/src/mindustry/ai/WaveSpawner.java | 2 +- .../mindustry/maps/planet/SerpuloPlanetGenerator.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java index 82d695fc83..6800c6f618 100644 --- a/core/src/mindustry/ai/WaveSpawner.java +++ b/core/src/mindustry/ai/WaveSpawner.java @@ -19,7 +19,7 @@ import mindustry.world.*; import static mindustry.Vars.*; public class WaveSpawner{ - private static final float margin = 40f, coreMargin = tilesize * 2f, maxSteps = 30; + private static final float margin = 0f, coreMargin = tilesize * 2f, maxSteps = 30; private int tmpCount; private Seq spawns = new Seq<>(); diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 95f9c875e8..862835f2e9 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -18,6 +18,8 @@ import mindustry.world.*; import static mindustry.Vars.*; public class SerpuloPlanetGenerator extends PlanetGenerator{ + //alternate, less direct generation (wip) + public static boolean alt = false; static final int seed = 0; BaseGenerator basegen = new BaseGenerator(); @@ -175,8 +177,12 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ Vec2 midpoint = Tmp.v1.set(to.x, to.y).add(x, y).scl(0.5f); rand.nextFloat(); - //add randomized offset to avoid straight lines - midpoint.add(Tmp.v2.setToRandomDirection(rand).scl(Tmp.v1.dst(x, y))); + if(alt){ + midpoint.add(Tmp.v2.set(1, 0f).setAngle(Angles.angle(to.x, to.y, x, y) + 90f * (rand.chance(0.5) ? 1f : -1f)).scl(Tmp.v1.dst(x, y) * 2f)); + }else{ + //add randomized offset to avoid straight lines + midpoint.add(Tmp.v2.setToRandomDirection(rand).scl(Tmp.v1.dst(x, y))); + } midpoint.sub(width/2f, height/2f).limit(width / 2f / Mathf.sqrt3).add(width/2f, height/2f); From 84935e1bb052de69c8d47dce073890fccde79b52 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 16 Sep 2021 21:25:31 -0400 Subject: [PATCH 2/5] Fixed #6008 --- core/src/mindustry/content/Fx.java | 6 +++--- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 3d4cd37cda..dca9904588 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -455,7 +455,7 @@ public class Fx{ color(Pal.lightFlame, Pal.darkFlame, e.fin()); stroke(0.5f + e.fout()); - randLenVectors(e.id, 2, e.fin() * 15f, e.rotation, 50f, (x, y) -> { + randLenVectors(e.id, 2, 1f + e.fin() * 15f, e.rotation, 50f, (x, y) -> { float ang = Mathf.angle(x, y); lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); }); @@ -465,7 +465,7 @@ public class Fx{ color(Color.white, Pal.heal, e.fin()); stroke(0.5f + e.fout()); - randLenVectors(e.id, 2, e.fin() * 15f, e.rotation, 50f, (x, y) -> { + randLenVectors(e.id, 2, 1f + e.fin() * 15f, e.rotation, 50f, (x, y) -> { float ang = Mathf.angle(x, y); lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); }); @@ -474,7 +474,7 @@ public class Fx{ hitLiquid = new Effect(16, e -> { color(e.color); - randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 60f, (x, y) -> { + randLenVectors(e.id, 5, 1f + e.fin() * 15f, e.rotation, 60f, (x, y) -> { Fill.circle(e.x + x, e.y + y, e.fout() * 2f); }); }), diff --git a/gradle.properties b/gradle.properties index 2c3b46df95..340bf482cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=e2eead82168c1a143e345bc5f78e2d72078f4657 +archash=7a4fbbcaa8350c7d6e04a59f1eb50b04947c2280 From 8ccca23a2477707c5c578d051604dc7fcdb0e094 Mon Sep 17 00:00:00 2001 From: Kowkodivka <86189625+Kowkodivka@users.noreply.github.com> Date: Fri, 17 Sep 2021 21:16:03 +0700 Subject: [PATCH 3/5] Update bundle_ru.properties (#6012) Translated "status.overdrive.name" --- core/assets/bundles/bundle_ru.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index ff395a9a22..acd212be5b 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -648,6 +648,7 @@ status.electrified.name = Электризация status.spore-slowed.name = Замедление спорами status.tarred.name = В нефти status.overclock.name = Разгон +status.overdrive.name = Ускорение status.shocked.name = Шок status.blasted.name = Разрыв status.unmoving.name = Обездвиживание From effd226c3e17f92cbbb0a10acafc14ded24e1edf Mon Sep 17 00:00:00 2001 From: Kowkodivka <86189625+Kowkodivka@users.noreply.github.com> Date: Fri, 17 Sep 2021 22:33:46 +0700 Subject: [PATCH 4/5] [RU] Settings translate (#6013) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Перевел 2 строчки в настройках графики. --- core/assets/bundles/bundle_ru.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index acd212be5b..a44eb4901f 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -901,6 +901,8 @@ setting.lasersopacity.name = Непрозрачность лазеров эне setting.bridgeopacity.name = Непрозрачность мостов setting.playerchat.name = Отображать облака чата над игроками setting.showweather.name = Отображать погоду +setting.skipcoreanimation.name = Пропускать анимацию запуска/приземления ядра +setting.borderlesswindow.name.windows = Полноэкранный режим без полей public.confirm = Вы хотите, чтобы ваша игра стала публичной?\n[accent] Любой игрок сможет присоединиться к вашим играм.\n[lightgray]Позже, это можно будет изменить в Настройки->Игра->Общедоступность игры. public.confirm.really = Если вы хотите поиграть с друзьями, то используйте кнопку «[green]Пригласить друзей[]» вместо создания [scarlet]публичного сервера[]!\nВы уверены, что хотите сделать свою игру [scarlet]публичной[]? public.beta = Имейте в виду, что бета-версия игры не может делать игры публичными. From 58a21c3cc7602456fa08f32dab42dd8e66e52cf8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 17 Sep 2021 11:46:52 -0400 Subject: [PATCH 5/5] Arc compatibility --- core/assets/shaders/planet.vert | 2 +- core/src/mindustry/core/Renderer.java | 2 +- core/src/mindustry/graphics/g3d/PlanetRenderer.java | 2 +- gradle.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/shaders/planet.vert b/core/assets/shaders/planet.vert index 1f3f85239f..f6721c2ef3 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, 32.0)) * (1.0-a_color.a); //specular power = 32 + specular = vec3(1.0 * pow(specularFactor, 64.0)) * (1.0-a_color.a); //specular power = 32 } 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/core/Renderer.java b/core/src/mindustry/core/Renderer.java index d4368ddf15..5ba0320cde 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -277,7 +277,7 @@ public class Renderer implements ApplicationListener{ } if(bloom != null){ - bloom.resize(graphics.getWidth() / 4, graphics.getHeight() / 4); + bloom.resize(graphics.getWidth(), graphics.getHeight()); Draw.draw(Layer.bullet - 0.02f, bloom::capture); Draw.draw(Layer.effect + 0.02f, bloom::render); } diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 68d8057bfe..2aef57b29a 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -124,7 +124,7 @@ public class PlanetRenderer implements Disposable{ } public void beginBloom(){ - bloom.resize(Core.graphics.getWidth() / 4, Core.graphics.getHeight() / 4); + bloom.resize(Core.graphics.getWidth(), Core.graphics.getHeight()); bloom.capture(); } diff --git a/gradle.properties b/gradle.properties index 340bf482cf..f3fc4af013 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=7a4fbbcaa8350c7d6e04a59f1eb50b04947c2280 +archash=e982971b17f48c13f3a18c344b8080b7498cccf6