From df2be377855f1dd78c9aa6998cc955b70d97b29a Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 6 Sep 2019 16:20:45 +0300
Subject: [PATCH] Added show/hide button for tile panel in map editor Fixed
 unit unique translations in Civilopedia

---
 .../unciv/models/gamebasics/unit/BaseUnit.kt  |  2 +-
 core/src/com/unciv/ui/EmpireOverviewScreen.kt |  2 +-
 .../com/unciv/ui/mapeditor/MapEditorScreen.kt | 22 ++++++++++++++++---
 .../ui/mapeditor/TileEditorOptionsTable.kt    |  2 --
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
index 39e1b8556f..928ce3bff5 100644
--- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
+++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
@@ -75,7 +75,7 @@ class BaseUnit : INamed, IConstruction, ICivilopedia {
         }
 
         for(unique in uniques)
-            sb.appendln(unique.tr())
+            sb.appendln(Translations.translateBonusOrPenalty(unique))
 
         for(promotion in promotions)
             sb.appendln(promotion.tr())
diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
index c7672ea31b..759e05c262 100644
--- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt
+++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
@@ -414,7 +414,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
                 civGroup.add(ImageGetter.getImage("OtherIcons/DisbandUnit")).size(30f)
                 civGroup.background = civGroupBackground.tint(Color.LIGHT_GRAY)
                 label.setFontColor(Color.BLACK)
-            } else if (currentPlayer==civ || currentPlayer.knows(civ)) {
+            } else if (currentPlayer==civ || UnCivGame.Current.viewEntireMapForDebug || currentPlayer.knows(civ)) {
                 civGroup.add(ImageGetter.getNationIndicator(civ.nation, 30f))
                 civGroup.background = civGroupBackground.tint(civ.nation.getColor())
                 label.setFontColor(civ.nation.getSecondaryColor())
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
index 9a1e1e0ccd..6069a1f8af 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
@@ -1,11 +1,12 @@
 package com.unciv.ui.mapeditor
 
+import com.badlogic.gdx.scenes.scene2d.actions.Actions
 import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
-import com.unciv.models.metadata.GameParameters
 import com.unciv.logic.MapSaver
 import com.unciv.logic.map.TileMap
 import com.unciv.models.gamebasics.tr
+import com.unciv.models.metadata.GameParameters
 import com.unciv.ui.tilegroups.TileGroup
 import com.unciv.ui.tilegroups.TileSetStrings
 import com.unciv.ui.utils.CameraStageBaseScreen
@@ -18,7 +19,7 @@ class MapEditorScreen(): CameraStageBaseScreen(){
     var mapName = "My first map"
     lateinit var mapHolder: TileGroupMap<TileGroup>
     val tileEditorOptions = TileEditorOptionsTable(this)
-
+    val showHideEditorOptionsButton = TextButton(">",skin)
 
     constructor(mapNameToLoad:String?):this(){
         var mapToLoad = mapNameToLoad
@@ -44,8 +45,23 @@ class MapEditorScreen(): CameraStageBaseScreen(){
         val mapHolder = getMapHolder(tileMap)
 
         stage.addActor(mapHolder)
-
         stage.addActor(tileEditorOptions)
+        tileEditorOptions.setPosition(stage.width - tileEditorOptions.width, 0f)
+
+        showHideEditorOptionsButton.labelCell.pad(10f)
+        showHideEditorOptionsButton.pack()
+        showHideEditorOptionsButton.onClick {
+            if (showHideEditorOptionsButton.text.toString() == ">") {
+                tileEditorOptions.addAction(Actions.moveTo(stage.width, 0f, 0.5f))
+                showHideEditorOptionsButton.setText("<")
+            } else {
+                tileEditorOptions.addAction(Actions.moveTo(stage.width - tileEditorOptions.width, 0f, 0.5f))
+                showHideEditorOptionsButton.setText(">")
+            }
+        }
+        showHideEditorOptionsButton.setPosition(stage.width - showHideEditorOptionsButton.width - 10f,
+                stage.height - showHideEditorOptionsButton.height - 10f)
+        stage.addActor(showHideEditorOptionsButton)
 
 
         val optionsMenuButton = TextButton("Options".tr(), skin)
diff --git a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
index 29e709859a..a47029bcc5 100644
--- a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
+++ b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
@@ -56,8 +56,6 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
         add(ScrollPane(tabPickerTable).apply { this.width= mapEditorScreen.stage.width/3}).row()
 
         add(editorPickTable).row()
-
-        setPosition(mapEditorScreen.stage.width - width, 0f)
     }
 
     private fun setImprovements() {