Localization fixes

Don't consider how a World Congress proposal affects players with no cities
LoneGazebo · Nov 7, 2023 · e5d0adc · e5d0adc
1 parent 282fdf4
commit e5d0adc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/(1) Community Patch/Core Files/Text/CoreText_en_US.sql b/(1) Community Patch/Core Files/Text/CoreText_en_US.sql
@@ -28,7 +28,7 @@ VALUES	('TXT_KEY_GAME_OPTION_BARB_GG_GA_POINTS',		'Barbarian GG/GA Points'),
 		('TXT_KEY_GAME_OPTION_BARB_GG_GA_POINTS_HELP',	'Allows all players to accumulate Great General and Great Admiral points from fighting Barbarians.');
 
 UPDATE Language_en_US
-SET Text = 'Each time the game is loaded, the random number seed is regenerated. This means that if you reload the game, some randomized results and AI decisions might be different from the first time you played.'
+SET Text = 'This option is unused and should not be enabled.'
 WHERE Tag = 'TXT_KEY_GAME_OPTION_NEW_RANDOM_SEED_HELP';
 
 -- Advisors
@@ -54,7 +54,7 @@ WHERE Tag = 'TXT_KEY_POPUP_CITY_CAPTURE_INFO_RAZE';
 
 -- Production Queue
 UPDATE Language_en_US
-SET Text = 'LEFT CLICK adds an additional item to the end of the production queue.[NEWLINE]CTRL + LEFT CLICK adds an additional item in front of the production queue.[NEWLINE]ALT + LEFT CLICK adds the chosen item to the end of the production queue on repeat.[NEWLINE]SHIFT + LEFT CLICK replaces everything in the production queue with the chosen item.[NEWLINE]H hides the chosen item from this cities production options.'
+SET Text = 'LEFT CLICK adds an additional item to the end of the production queue.[NEWLINE]CTRL + LEFT CLICK adds an additional item in front of the production queue.[NEWLINE]ALT + LEFT CLICK adds the chosen item to the end of the production queue on repeat.[NEWLINE]SHIFT + LEFT CLICK replaces everything in the production queue with the chosen item.[NEWLINE]H hides the chosen building from this city''s production options.'
 WHERE Tag = 'TXT_KEY_CITYVIEW_QUEUE_PROD_TT';
 
 -- Avoid Growth

diff --git a/(3a) EUI Compatibility Files/EUI/NeededText.xml b/(3a) EUI Compatibility Files/EUI/NeededText.xml
@@ -54,7 +54,10 @@
 			<Text>Corporations</Text>
 		</Row>
 		<Row Tag="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS">
-			<Text>Restore hidden buildings in this cities production options.</Text>
+			<Text>Unhide</Text>
+		</Row>
+		<Row Tag="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS_TT">
+			<Text>Make hidden buildings visible again in this city's production options.</Text>
 		</Row>
 		<!-- Condensed Help Texts -->
 		<Row>

diff --git a/(3a) EUI Compatibility Files/LUA/CityView.xml b/(3a) EUI Compatibility Files/LUA/CityView.xml
@@ -205,7 +205,7 @@
 			<Shuttle Vertical="1" Texture="Blank.dds" Size="144,38" />
 		</Slider>
 
-		<GridButton Offset="0,7" Anchor="R,T" ID="UnhideBuildingsButton" Size="70,25" Style="BaseButton" String="Unhide" Font="TwCenMT14" ToolTip="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS" Hidden="1" />
+		<GridButton Offset="0,7" Anchor="R,T" ID="UnhideBuildingsButton" Size="70,25" Style="BaseButton" String="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS" Font="TwCenMT14" ToolTip="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS_TT" Hidden="1" />
 	</Grid>
 
 	<!-- City Name Panel -->

diff --git a/(3a) EUI Compatibility Files/LUA/CityView_small.xml b/(3a) EUI Compatibility Files/LUA/CityView_small.xml
@@ -198,7 +198,7 @@
 			<Shuttle Vertical="1" Texture="Blank.dds" Size="144,38" />
 		</Slider>
 
-		<GridButton Offset="0,7" Anchor="R,T" ID="UnhideBuildingsButton" Size="70,25" Style="BaseButton" String="Unhide" Font="TwCenMT14" ToolTip="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS" Hidden="1" />
+		<GridButton Offset="0,7" Anchor="R,T" ID="UnhideBuildingsButton" Size="70,25" Style="BaseButton" String="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS" Font="TwCenMT14" ToolTip="TXT_KEY_CITYVIEW_UNHIDE_BUILDINGS_TT" Hidden="1" />
 	</Grid>
 
 	<!-- City Name Panel -->

diff --git a/CvGameCoreDLL_Expansion2/CvVotingClasses.cpp b/CvGameCoreDLL_Expansion2/CvVotingClasses.cpp
@@ -13533,7 +13533,7 @@ int CvLeagueAI::ScoreVoteChoiceYesNo(CvProposal* pProposal, int iChoice, bool bE
 			for (int iPlayerLoop = 0; iPlayerLoop < MAX_MAJOR_CIVS; iPlayerLoop++)
 			{
 				PlayerTypes eLoopPlayer = (PlayerTypes)iPlayerLoop;
-				if (pLeague->CanEverVote(eLoopPlayer) && GET_PLAYER(eLoopPlayer).GetID() != GetPlayer()->GetID()&& GET_PLAYER(eLoopPlayer).isAlive())
+				if (pLeague->CanEverVote(eLoopPlayer) && GET_PLAYER(eLoopPlayer).GetID() != GetPlayer()->GetID() && GET_PLAYER(eLoopPlayer).isAlive() && GET_PLAYER(eLoopPlayer).getNumCities() > 0)
 				{
 					iDiploScore = 0;
 					if (GetPlayer()->GetDiplomacyAI()->GetCivOpinion(eLoopPlayer) != NO_CIV_OPINION)
@@ -13564,7 +13564,6 @@ int CvLeagueAI::ScoreVoteChoiceYesNo(CvProposal* pProposal, int iChoice, bool bE
 					AlignmentLevels eAlignment = EvaluateAlignment(eLoopPlayer, false);
 					switch (eAlignment)
 					{
-					case ALIGNMENT_SELF:
 					case ALIGNMENT_TEAMMATE:
 					case ALIGNMENT_LIBERATOR:
 					case ALIGNMENT_LEADER: