diff --git a/core/assets/shaders/menu.fragment b/core/assets/shaders/menu.fragment index 2638f466f9..3c519b91e8 100644 --- a/core/assets/shaders/menu.fragment +++ b/core/assets/shaders/menu.fragment @@ -1,11 +1,11 @@ #ifdef GL_ES -precision highp float; -precision highp int; +precision mediump float; +precision mediump int; #endif uniform sampler2D u_texture; uniform vec2 u_resolution; -uniform float u_time; +uniform int u_time; uniform vec2 u_uv; uniform vec2 u_uv2; uniform float u_scl; @@ -25,7 +25,7 @@ void main() { float d = (abs(float(coords.x)) - abs(float(coords.y))); - float m = abs(sin(-u_time/50.0 + d/120.0)); + float m = abs(sin(-float(u_time)/50.0 + d/120.0)); m = float(int(m / roundm)) * roundm + roundm; gl_FragColor.rgb = mix(v_color.rgb, vec3(0.0), m); diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index d07add4353..839ec274d6 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -25,6 +25,7 @@ import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.util.OS; import io.anuke.ucore.util.Translator; +import java.util.Arrays; import java.util.Locale; public class Vars{ @@ -146,6 +147,8 @@ public class Vars{ } } + Arrays.sort(locales, (l1, l2) -> Platform.instance.getLocaleName(l1).compareTo(Platform.instance.getLocaleName(l2))); + Version.init(); playerGroup = Entities.addGroup(Player.class).enableMapping(); diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index b16eb6be87..cd5291623e 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -44,10 +44,10 @@ public class TurretBlocks extends BlockList implements ContentList{ hail = new ArtilleryTurret("hail"){{ ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary}; - reload = 100f; + reload = 80f; recoil = 2f; - range = 200f; - inaccuracy = 5f; + range = 230f; + inaccuracy = 1f; health = 120; }}; @@ -195,7 +195,7 @@ public class TurretBlocks extends BlockList implements ContentList{ restitution = 0.02f; recoil = 6f; shootShake = 2f; - range = 300f; + range = 320f; health = 550; }}; diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 7d4a93cf74..485390bf47 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -36,7 +36,7 @@ public class TurretBullets extends BulletList implements ContentList{ @Override public void load(){ - healBullet = new BulletType(5.2f, 16){ + healBullet = new BulletType(5.2f, 13){ float healAmount = 21f; { diff --git a/core/src/io/anuke/mindustry/graphics/Shaders.java b/core/src/io/anuke/mindustry/graphics/Shaders.java index 46d830b08f..022119aab3 100644 --- a/core/src/io/anuke/mindustry/graphics/Shaders.java +++ b/core/src/io/anuke/mindustry/graphics/Shaders.java @@ -53,8 +53,10 @@ public class Shaders{ @Override public void apply(){ + time = time % 158; + shader.setUniformf("u_resolution", Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); - shader.setUniformf("u_time", time += Gdx.graphics.getDeltaTime() * 60f); + shader.setUniformi("u_time", (int)(time += Gdx.graphics.getDeltaTime() * 60f)); shader.setUniformf("u_uv", Draw.getBlankRegion().getU(), Draw.getBlankRegion().getV()); shader.setUniformf("u_scl", Unit.dp.scl(1f)); shader.setUniformf("u_uv2", Draw.getBlankRegion().getU2(), Draw.getBlankRegion().getV2()); diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index 97f17c6c25..b454c3d2f2 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -2,6 +2,8 @@ package io.anuke.mindustry.world.meta; import io.anuke.ucore.util.Bundles; +import java.util.Locale; + /** * Describes one type of stat for a block. */ @@ -53,6 +55,6 @@ public enum BlockStat{ } public String localized(){ - return Bundles.get("text.blocks." + name().toLowerCase()); + return Bundles.get("text.blocks." + name().toLowerCase(Locale.ROOT)); } } diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStats.java b/core/src/io/anuke/mindustry/world/meta/BlockStats.java index e9d89e7b5b..2e6b3507aa 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStats.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStats.java @@ -10,6 +10,8 @@ import io.anuke.mindustry.world.meta.values.*; import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Log; +import java.util.Locale; + /** * Hold and organizes a list of block stats. */ @@ -71,7 +73,7 @@ public class BlockStats{ * Adds a stat value. */ public void add(BlockStat stat, StatValue value){ - if(!Bundles.has("text.blocks." + stat.name().toLowerCase())){ + if(!Bundles.has("text.blocks." + stat.name().toLowerCase(Locale.ROOT))){ if(!errorWhenMissing){ Log.err("Warning: No bundle entry for stat type \"" + stat + "\"!"); }else{ @@ -79,9 +81,9 @@ public class BlockStats{ } } - if(!Bundles.has("text.category." + stat.category.name().toLowerCase())){ + if(!Bundles.has("text.category." + stat.category.name().toLowerCase(Locale.ROOT))){ if(!errorWhenMissing){ - Log.err("Warning: No bundle entry for stat cateogry \"" + stat.category + "\"!"); + Log.err("Warning: No bundle entry for stat category \"" + stat.category + "\"!"); }else{ throw new RuntimeException("No bundle entry for stat category \"" + stat.category + "\"!"); } diff --git a/core/src/io/anuke/mindustry/world/meta/StatUnit.java b/core/src/io/anuke/mindustry/world/meta/StatUnit.java index 781f18806f..1ebbee1452 100644 --- a/core/src/io/anuke/mindustry/world/meta/StatUnit.java +++ b/core/src/io/anuke/mindustry/world/meta/StatUnit.java @@ -2,6 +2,8 @@ package io.anuke.mindustry.world.meta; import io.anuke.ucore.util.Bundles; +import java.util.Locale; + /** * Defines a unit of measurement for block stats. */ @@ -19,6 +21,6 @@ public enum StatUnit{ items; public String localized(){ - return Bundles.get("text.unit." + name().toLowerCase()); + return Bundles.get("text.unit." + name().toLowerCase(Locale.ROOT)); } }