Switch to civ name in worldbuilder

VDuchauffour · Jun 2, 2024 · 880c04e · 880c04e
1 parent c2c4013
commit 880c04e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Assets/Python/screens/PlatyBuilder/CvPlatyBuilderScreen.py b/Assets/Python/screens/PlatyBuilder/CvPlatyBuilderScreen.py
@@ -1,7 +1,7 @@
 from CvPythonExtensions import *
 from CityMapData import CITIES_MAP
 from CoreFunctions import get_data_from_upside_down_map, location, plot
-from CoreStructures import is_major_civ, player
+from CoreStructures import is_major_civ, name, player
 from CoreFunctions import city as _city
 import CvUtil
 import CvScreenEnums
@@ -627,7 +627,7 @@ def placeObject(self):
         if self.iPlayerAddMode == "EraseAll":
             self.m_pCurrentPlot.erase()
             CyEngine().removeLandmark(self.m_pCurrentPlot)
-            for iPlayerX in xrange(gc.getMAX_PLAYERS()):  # type: ignore
+            for iPlayerX in xrange(gc.getMAX_PLAYERS()):
                 CyEngine().removeSign(self.m_pCurrentPlot, iPlayerX)
         elif self.iPlayerAddMode == "AddLandMark":
             iIndex = -1
@@ -922,7 +922,7 @@ def removeObject(self):
         if self.iPlayerAddMode == "EraseAll":
             self.m_pCurrentPlot.erase()
             CyEngine().removeLandmark(self.m_pCurrentPlot)
-            for iPlayerX in xrange(gc.getMAX_PLAYERS()):  # type: ignore
+            for iPlayerX in xrange(gc.getMAX_PLAYERS()):
                 CyEngine().removeSign(self.m_pCurrentPlot, iPlayerX)
         elif self.iPlayerAddMode == "Ownership":
             self.m_pCurrentPlot.setOwner(-1)
@@ -1862,7 +1862,7 @@ def refreshSideMenu(self):
                 )
                 for iPlayer in xrange(gc.getMAX_PLAYERS()):
                     if gc.getPlayer(iPlayer).isEverAlive():
-                        sName = gc.getPlayer(iPlayer).getName()
+                        sName = name(iPlayer)
                         if not gc.getPlayer(iPlayer).isAlive():
                             sName = "*" + sName
                         if gc.getPlayer(iPlayer).isTurnActive():
@@ -2086,7 +2086,7 @@ def refreshSideMenu(self):
                     if iPlayer == gc.getBARBARIAN_PLAYER():
                         continue
                     if gc.getPlayer(iPlayer).isEverAlive():
-                        sName = gc.getPlayer(iPlayer).getName()
+                        sName = name(iPlayer)
                         if not gc.getPlayer(iPlayer).isAlive():
                             sName = "*" + sName
                         if gc.getPlayer(iPlayer).isTurnActive():
@@ -2306,7 +2306,7 @@ def refreshSideMenu(self):
                 )
                 for iPlayer in xrange(gc.getMAX_PLAYERS()):
                     if gc.getPlayer(iPlayer).isEverAlive():
-                        sName = gc.getPlayer(iPlayer).getName()
+                        sName = name(iPlayer)
                         if not gc.getPlayer(iPlayer).isAlive():
                             sName = "*" + sName
                         if gc.getPlayer(iPlayer).isTurnActive():