diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index b38afe1f9e..2904df4e98 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1437,7 +1437,7 @@ rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit rules.unitcap = Base Unit Cap rules.limitarea = Limit Map Area -rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles) +rules.enemycorebuildradius = Core No-Build Radius:[lightgray] (tiles) rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles) rules.wavespacing = Wave Spacing:[lightgray] (sec) rules.initialwavespacing = Initial Wave Spacing:[lightgray] (sec) diff --git a/core/assets/maps/extractionOutpost.msav b/core/assets/maps/extractionOutpost.msav index a065005256..5bf8b21cdd 100644 Binary files a/core/assets/maps/extractionOutpost.msav and b/core/assets/maps/extractionOutpost.msav differ diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 6ad5544c42..449fc74406 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -168,7 +168,7 @@ public class MinimapRenderer{ if(fullView && net.active()){ for(Player player : Groups.player){ if(!player.dead()){ - drawLabel(player.x, player.y, player.name, player.color); + drawLabel(player.x, player.y, player.name, player.color, scaleFactor); } } } @@ -373,22 +373,22 @@ public class MinimapRenderer{ return color.rgba(); } - public void drawLabel(float x, float y, String text, Color color){ + public void drawLabel(float x, float y, String text, Color color, float scaleFactor){ Font font = Fonts.outline; GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new); boolean ints = font.usesIntegerPositions(); - font.getData().setScale(1 / 1.5f / Scl.scl(1f)); + font.getData().setScale(1 / 1.25f / Scl.scl(1f) * scaleFactor * 1f); font.setUseIntegerPositions(false); - l.setText(font, text, color, 90f, Align.left, true); + l.setText(font, text, color, 90f * scaleFactor, Align.left, false); float yOffset = 20f; - float margin = 3f; + float margin = 3f * scaleFactor; Draw.color(0f, 0f, 0f, 0.2f); Fill.rect(x, y + yOffset - l.height/2f, l.width + margin, l.height + margin); Draw.color(); font.setColor(color); - font.draw(text, x - l.width/2f, y + yOffset, 90f, Align.left, true); + font.draw(text, x - l.width/2f, y + yOffset, 90f * scaleFactor, Align.left, false); font.setUseIntegerPositions(ints); font.getData().setScale(1f); diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 882ae6a9e5..a4a8879abc 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -432,7 +432,7 @@ public class CustomRulesDialog extends BaseDialog{ public void ruleInfo(Cell cell, String text){ if(Core.bundle.has(text.substring(1) + ".info")){ - if(mobile){ + if(mobile && !graphics.isPortrait()){ //disabled in portrait - broken and goes offscreen Table table = new Table(); table.add(cell.get()).left().expandX().fillX(); cell.clearElement(); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index e41a3e0176..492a996309 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -165,7 +165,7 @@ public class ModsDialog extends BaseDialog{ void setup(){ float h = 110f; - float w = Math.min(Core.graphics.getWidth() / Scl.scl(1.05f), 520f); + float w = Math.min(Core.graphics.getWidth() / Scl.scl(1.05f) - Scl.scl(28f), 520f); cont.clear(); cont.defaults().width(Math.min(Core.graphics.getWidth() / Scl.scl(1.05f), 556f)).pad(4);