Merge branch 'pr/11081'

(1) Community Patch/Core Files/Core Values/CoreDefines.sql

@@ -1507,4 +1507,7 @@ UPDATE Defines SET Value = -500 WHERE Name = 'PLOT_INFLUENCE_NW_COST';
 -- Misc. Modmod Defines
 INSERT INTO Defines (Name, Value) SELECT 'FRIENDSHIP_THRESHOLD_MOD_MEDIEVAL', 6;
 INSERT INTO Defines (Name, Value) SELECT 'FRIENDSHIP_THRESHOLD_MOD_INDUSTRIAL', 10;
-INSERT INTO Defines (Name, Value) SELECT 'CITY_STATE_SCALE_PER_CITY_MOD', 0;
+INSERT INTO Defines (Name, Value) SELECT 'CITY_STATE_SCALE_PER_CITY_MOD', 0;
+
+-- Fix default max builder interaction with policies
+UPDATE Defines SET Value = -9999 WHERE Name = 'DEFAULT_MAX_NUM_BUILDERS';

(1) Community Patch/LUA/CityView.lua

@@ -322,14 +322,7 @@ function AddBuildingButton( pCity, building )
 		end
 
 		-- Name
-		local strBuildingName;
-
-		-- Religious Buildings have special names
-		if (building.IsReligious) then
-			strBuildingName = Locale.ConvertTextKey("TXT_KEY_RELIGIOUS_BUILDING", building.Description, pPlayer:GetStateReligionKey());
-		else
-			strBuildingName = Locale.ConvertTextKey(building.Description);
-		end
+		local strBuildingName = Locale.ConvertTextKey(building.Description);
 
 		-- Building is free, add an asterisk to the name
 		if (bIsBuildingFree) then

(2) Vox Populi/Core Files/Overrides/CivilopediaScreen.lua

@@ -4353,8 +4353,6 @@ function SelectBuildingOrWonderArticle( buildingID )
 		if thisBuilding.NearbyTerrainRequired ~= nil then sText = sText.."[NEWLINE][ICON_BULLET]Requires [COLOR_CYAN]"..Locale.Lookup(GameInfo.Terrains[thisBuilding.NearbyTerrainRequired].Description).."[ENDCOLOR]"; end
 		--AnalyzeBuilding("ProhibitedCityTerrain");
 		if thisBuilding.ProhibitedCityTerrain ~= nil then sText = sText.."[NEWLINE][ICON_BULLET]Prohibited [COLOR_NEGATIVE_TEXT]"..Locale.Lookup(GameInfo.Terrains[thisBuilding.ProhibitedCityTerrain].Description).."[ENDCOLOR]"; end
-		AnalyzeBuilding("FoundsReligion");
-		AnalyzeBuilding("IsReligious");
 		AnalyzeBuilding("BorderObstacle", "");
 		AnalyzeBuilding("PlayerBorderObstacle", "");
 		AnalyzeBuilding("Capital");

(2) Vox Populi/Database Changes/Policies/Artistry.sql

@@ -67,7 +67,9 @@ DELETE FROM Policy_FreeUnitClasses
 WHERE PolicyType = 'POLICY_ARTISTIC_GENIUS';
 
 UPDATE Policies
-SET NumFreeGreatPeople = 1
+SET
+	NumFreeGreatPeople = 1,
+	IncludesOneShotFreeUnits = 1
 WHERE Type = 'POLICY_ARTISTIC_GENIUS';
 
 INSERT INTO Policy_ArtifactYieldChanges

(2) Vox Populi/Database Changes/Policies/Fealty.sql

@@ -128,7 +128,9 @@ VALUES
 	('POLICY_PIETY_FINISHER', 'UNITCLASS_ARTIST');
 
 UPDATE Policies
-SET SharedReligionTourismModifier = 50
+SET
+	SharedReligionTourismModifier = 50,
+	IncludesOneShotFreeUnits = 0
 WHERE Type = 'POLICY_PIETY_FINISHER';
 
 INSERT INTO Policy_ReligionYieldMod

(2) Vox Populi/Database Changes/Policies/Freedom.sql

@@ -75,14 +75,15 @@ SET
 	SharedIdeologyTradeGoldChange = 6
 WHERE Type = 'POLICY_ECONOMIC_UNION';
 
- -- Universal Suffrage 
+-- Universal Suffrage 
 UPDATE Policies
 SET
 	Level = 1,
 	HalfSpecialistUnhappiness = 0,
 	GoldenAgeTurns = 10,
 	-- GoldenAgeDurationMod = 50,
-	ExtraHappinessPerCity = 1
+	ExtraHappinessPerCity = 1,
+	OneShot = 1
 WHERE Type = 'POLICY_UNIVERSAL_SUFFRAGE';
 
 ------------------

(2) Vox Populi/Database Changes/Policies/Order.sql

@@ -13,6 +13,10 @@ WHERE PolicyType = 'POLICY_SOCIALIST_REALISM';
 DELETE FROM Policy_BuildingClassProductionModifiers
 WHERE PolicyType = 'POLICY_SOCIALIST_REALISM';
 
+UPDATE Policies
+SET OneShot = 1
+WHERE Type = 'POLICY_SOCIALIST_REALISM';
+
 INSERT INTO Policy_BuildingClassProductionModifiers
 	(PolicyType, BuildingClassType, ProductionModifier)
 VALUES
@@ -64,7 +68,9 @@ VALUES
 
 -- Worker's Faculties
 UPDATE Policies
-SET Level = 1
+SET
+	Level = 1,
+	OneShot = 1
 WHERE Type = 'POLICY_WORKERS_FACULTIES';
 
 UPDATE Policy_BuildingClassYieldModifiers
@@ -112,7 +118,9 @@ DELETE FROM Policy_BuildingClassHappiness
 WHERE PolicyType = 'POLICY_ACADEMY_SCIENCES';
 
 UPDATE Policies
-SET IlliteracyFlatReductionGlobal = 2
+SET
+	IlliteracyFlatReductionGlobal = 2,
+	OneShot = 1
 WHERE Type = 'POLICY_ACADEMY_SCIENCES';
 
 INSERT INTO Policy_BuildingClassProductionModifiers
@@ -143,7 +151,8 @@ UPDATE Policies
 SET
 	-- NewCityExtraPopulation = 3,
 	FreePopulation = 2,
-	NoPartisans = 1
+	NoPartisans = 1,
+	OneShot = 1
 WHERE Type = 'POLICY_RESETTLEMENT';
 
 -- Five Year Plan

(2) Vox Populi/Database Changes/Policies/Progress.sql

@@ -17,7 +17,9 @@ VALUES
 
 -- Opener (now Progress)
 UPDATE Policies
-SET CulturePerCity = 0
+SET
+	CulturePerCity = 0,
+	OneShot = 1
 WHERE Type = 'POLICY_LIBERTY';
 
 INSERT INTO Policy_YieldFromBirthCapital
@@ -47,6 +49,7 @@ WHERE PolicyType = 'POLICY_COLLECTIVE_RULE';
 UPDATE Policies
 SET
 	CapitalSettlerProductionModifier = 0,
+	IncludesOneShotFreeUnits = 0,
 	PortraitIndex = 29,
 	IconAtlas = 'POLICY_ATLAS',
 	IconAtlasAchieved = 'POLICY_A_ATLAS'

(2) Vox Populi/Database Changes/Policies/Rationalism.sql

@@ -40,7 +40,8 @@ VALUES
 UPDATE Policies
 SET
 	GreatScientistRateModifier = 0,
-	NumFreeTechs = 1
+	NumFreeTechs = 1,
+	OneShot = 1
 WHERE Type = 'POLICY_HUMANISM';
 
 INSERT INTO Policy_BuildingClassHappiness

(2) Vox Populi/Database Changes/Policies/Tradition.sql

@@ -39,7 +39,8 @@ WHERE PolicyType = 'POLICY_TRADITION';
 UPDATE Policies
 SET
 	PlotCultureExponentModifier = 0,
-	FreePopulationCapital = 2
+	FreePopulationCapital = 2,
+	OneShot = 1
 WHERE Type = 'POLICY_TRADITION';
 
 INSERT INTO Policy_CapitalYieldChanges

(2) Vox Populi/Database Changes/Text/en_US/City/BuildingTextChanges.sql

@@ -833,3 +833,16 @@ SET Text = '+1 [ICON_GOLDEN_AGE] Golden Age Points on all Civilized Jewelers'' M
 	|| (SELECT GROUP_CONCAT(r.IconString) FROM Corporation_ResourceYieldChanges c, Resources r WHERE c.CorporationType = 'CORPORATION_CIVILIZED_JEWELERS' AND c.ResourceType = r.Type)
 	|| ') near the City. {TXT_KEY_CORPORATION_TRADE_ROUTE_BONUS_CIVILIZED_JEWELERS}'
 WHERE Tag = 'TXT_KEY_BUILDING_CIVILIZED_JEWELERS_FRANCHISE_HELP';
+
+-- Theming bonuses
+UPDATE Language_en_US
+SET Text = '{2_CivAdjective} Museum of the {1_EraAdjective} Era'
+WHERE Tag = 'TXT_KEY_THEMING_BONUS_MUSEUM_5';
+
+UPDATE Language_en_US
+SET Text = 'Museum of {2_CivAdjective} Art'
+WHERE Tag = 'TXT_KEY_THEMING_BONUS_MUSEUM_7';
+
+UPDATE Language_en_US
+SET Text = 'Museum of {2_CivAdjective} Warfare'
+WHERE Tag = 'TXT_KEY_THEMING_BONUS_MUSEUM_8';

(2) Vox Populi/LUA/CityView.lua

@@ -342,14 +342,7 @@ function AddBuildingButton( pCity, building )
 		end
 
 		-- Name
-		local strBuildingName;
-
-		-- Religious Buildings have special names
-		if (building.IsReligious) then
-			strBuildingName = Locale.ConvertTextKey("TXT_KEY_RELIGIOUS_BUILDING", building.Description, pPlayer:GetStateReligionKey());
-		else
-			strBuildingName = Locale.ConvertTextKey(building.Description);
-		end
+		local strBuildingName = Locale.ConvertTextKey(building.Description);
 
 		-- Building is free, add an asterisk to the name
 		if (bIsBuildingFree) then

(3a) EUI Compatibility Files/ImprovedTopPanel/TopPanel.lua

@@ -2536,7 +2536,7 @@ local function ResourcesToolTip( control )
 									tip = tip .. " [COLOR_CYAN]" .. L(tech.Description) .. "[ENDCOLOR]"
 								end
 								local policyBranch = building.PolicyBranchType and GameInfo.PolicyBranchTypes[ building.PolicyBranchType ]
-								if policyBranch and not g_activePlayer:GetPolicyBranchChosen( policyBranch.ID ) then
+								if policyBranch and not g_activePlayer:IsPolicyBranchUnlocked( policyBranch.ID ) then
 									tip = tip .. " [COLOR_MAGENTA]" .. L(policyBranch.Description) .. "[ENDCOLOR]"
 								end
 							end
@@ -2809,7 +2809,7 @@ local function ResourcesToolTip( control )
 								tip = S( "%s [COLOR_CYAN]%s[ENDCOLOR]", tip, L(tech.Description) )
 							end
 							local policyBranch = civ5bnw_mode and building.PolicyBranchType and GameInfo.PolicyBranchTypes[ building.PolicyBranchType ]
-							if policyBranch and not g_activePlayer:GetPolicyBranchChosen( policyBranch.ID ) then
+							if policyBranch and not g_activePlayer:IsPolicyBranchUnlocked( policyBranch.ID ) then
 								tip = S( "%s [COLOR_MAGENTA]%s[ENDCOLOR]", tip, L(policyBranch.Description) )
 							end
 							if civBE_mode then

(3a) EUI Compatibility Files/LUA/CityView.lua

@@ -1062,9 +1062,6 @@ local function SetupBuildingList( city, buildings, buildingIM )
 			tips:insertIf( tourism ~= 0 and tourism.."[ICON_TOURISM]" )
 		end
 
-		if civ5_mode and building.IsReligious then
-			buildingName = L( "TXT_KEY_RELIGIOUS_BUILDING", buildingName, Players[city:GetOwner()]:GetStateReligionKey() )
-		end
 		if city:GetNumFreeBuilding( buildingID ) > 0 then
 			buildingName = buildingName .. " ([COLOR_POSITIVE_TEXT]" .. L"TXT_KEY_FREE" .. "[ENDCOLOR])"
 		else

CvGameCoreDLL_Expansion2/CvAStarNode.h

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.  

CvGameCoreDLL_Expansion2/CvAdvisorRecommender.cpp

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.  

CvGameCoreDLL_Expansion2/CvAdvisorRecommender.h

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.  

CvGameCoreDLL_Expansion2/CvArea.cpp

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.  

CvGameCoreDLL_Expansion2/CvArea.h

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.  

CvGameCoreDLL_Expansion2/CvArmyAI.h

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.  

CvGameCoreDLL_Expansion2/CvBarbarians.cpp

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.  

CvGameCoreDLL_Expansion2/CvBitfield.h

@@ -1,5 +1,5 @@
 /*	-------------------------------------------------------------------------------------------------------
-	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
+	© 1991-2012 Take-Two Interactive Software and its subsidiaries.  Developed by Firaxis Games.  
 	Sid Meier's Civilization V, Civ, Civilization, 2K Games, Firaxis Games, Take-Two Interactive Software 
 	and their respective logos are all trademarks of Take-Two interactive Software, Inc.  
 	All other marks and trademarks are the property of their respective owners.