From cbfc766e55c16075c1038bb72d45d461575fe894 Mon Sep 17 00:00:00 2001
From: Mengyang Li <mayli.he@gmail.com>
Date: Mon, 14 Oct 2019 20:42:03 -0700
Subject: [PATCH] hud: show player position (#717)

* hud: show player position

* hud: clean up old statement

* hug: address comments
---
 core/assets/bundles/bundle.properties              |  2 ++
 core/assets/bundles/bundle_zh_CN.properties        |  2 ++
 .../mindustry/ui/dialogs/SettingsMenuDialog.java   |  1 +
 .../anuke/mindustry/ui/fragments/HudFragment.java  | 14 +++++++++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 5c89a303c8..91a5ecfc89 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -49,6 +49,7 @@ customgame = Custom Game
 newgame = New Game
 none = <none>
 minimap = Minimap
+position = Position
 close = Close
 website = Website
 quit = Quit
@@ -593,6 +594,7 @@ setting.fps.name = Show FPS
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate[lightgray] (disables animations)
 setting.minimap.name = Show Minimap
+setting.position.name = Show Player Position
 setting.musicvol.name = Music Volume
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index f8d5173ecf..fc73f3db8f 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -45,6 +45,7 @@ customgame = 自定义游戏
 newgame = 新游戏
 none = <无>
 minimap = 小地图
+position = 位置
 close = 关闭
 website = 官网
 quit = 退出
@@ -547,6 +548,7 @@ setting.fps.name = 显示 FPS
 setting.vsync.name = 垂直同步
 setting.pixelate.name = 像素画面 [LIGHT_GRAY](禁用动画)
 setting.minimap.name = 显示小地图
+setting.position.name = 显示玩家坐标
 setting.musicvol.name = 音乐音量
 setting.ambientvol.name = 环境体积
 setting.mutemusic.name = 静音
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
index a84dddac73..06b1c605a3 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -294,6 +294,7 @@ public class SettingsMenuDialog extends SettingsDialog{
         graphics.checkPref("effects", true);
         graphics.checkPref("playerchat", true);
         graphics.checkPref("minimap", !mobile);
+        graphics.checkPref("position", false);
         graphics.checkPref("fps", false);
         graphics.checkPref("indicators", true);
         graphics.checkPref("animatedwater", false);
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 357cc0eb58..1011fe6324 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -16,6 +16,7 @@ import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.ImageButton.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.*;
@@ -249,9 +250,16 @@ public class HudFragment extends Fragment{
                 info.label(() -> ping.get(netClient.getPing())).visible(net::client).left().style(Styles.outlineLabel);
             }).top().left();
         });
-
-        //minimap
-        parent.fill(t -> t.top().right().add(new Minimap()).visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial));
+        
+        parent.fill(t -> {
+            //minimap
+            t.add(new Minimap().visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial));
+            t.row();
+            //position
+            t.label(() -> (int)player.x + "," + (int)player.y).visible(
+                () -> Core.settings.getBool("position") && !state.rules.tutorial);
+            t.top().right();
+        });
 
         //spawner warning
         parent.fill(t -> {