cleanup (#10516)

(2) Vox Populi/Database Changes/City/Buildings/BuildingChanges.sql

@@ -2234,6 +2234,8 @@ UPDATE Buildings
 SET
 	PrereqTech = 'TECH_COMPUTERS',
 	GlobalEspionageModifier = 0,
+	SpyRankChange = 0,
+	InstantSpyRankChange = 0,
 	SpySecurityModifier = 10
 WHERE BuildingClass = 'BUILDINGCLASS_INTELLIGENCE_AGENCY';
 

(2) Vox Populi/Database Changes/City/Buildings/PreBuildingChanges.sql

@@ -188,7 +188,8 @@ SET
 	UnlockedByBelief = 0,
 	SpecialistType = NULL,
 	SpecialistCount = 0,
-	Espionage = 1
+	Espionage = 1,
+	EspionageModifier = -25
 WHERE Type = 'BUILDING_WAT';
 
 DELETE FROM Building_FeatureYieldChanges WHERE BuildingType = 'BUILDING_WAT';

(2) Vox Populi/Database Changes/Civilizations/England.sql

@@ -62,7 +62,7 @@ INSERT INTO Building_YieldFromSpyDefenseOrID
 VALUES
 	('BUILDING_WHITE_TOWER', 'YIELD_GOLD', 40),
 	('BUILDING_WHITE_TOWER', 'YIELD_SCIENCE', 40);
-	
+
 INSERT INTO Building_YieldFromSpyAttack
 	(BuildingType, YieldType, Yield)
 VALUES

(2) Vox Populi/Database Changes/Civilizations/Siam.sql

@@ -39,7 +39,7 @@ UPDATE Buildings
 SET
 	SpecialistType = 'SPECIALIST_SCIENTIST',
 	SpecialistCount = 1,
-	SpySecurityModifier = 20,
+	SpySecurityModifier = 20, -- 15
 	DiplomatInfluenceBoost = 10,
 	PrereqTech = 'TECH_THEOLOGY'
 WHERE Type = 'BUILDING_WAT';

(2) Vox Populi/Database Changes/Civilizations/Venice.sql

@@ -72,7 +72,8 @@ SET
 	GreatPeopleRateModifier = 33,
 	CitySupplyFlat = 5,
 	PurchaseCooldownReduction = 1,
-	PurchaseCooldownReductionCivilian = 3
+	PurchaseCooldownReductionCivilian = 3,
+	SpySecurityModifier = 10
 WHERE Type = 'BUILDING_PIAZZA_SAN_MARCO';
 
 INSERT INTO Building_YieldChanges

(2) Vox Populi/Database Changes/Events/CityEventChanges.sql

@@ -298,7 +298,7 @@ VALUES
 	('ESPIONAGE_EVENT_CHOICE_ECONOMIC_TILES', 'ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS'),
 	('ESPIONAGE_EVENT_CHOICE_URBAN_UNREST', 'ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS'),
 	('ESPIONAGE_EVENT_CHOICE_CITY_DEFENSES', 'ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS'),
-
+	-- Counterspy
 	('ESPIONAGE_EVENT_CHOICE_COUNTERSPY_NETWORK', 'ESPIONAGE_EVENT_CHOICE_COUNTERSPY_FOCUS'),
 	('ESPIONAGE_EVENT_CHOICE_COUNTERSPY_DEFENSE', 'ESPIONAGE_EVENT_CHOICE_COUNTERSPY_FOCUS'),
 	('ESPIONAGE_EVENT_CHOICE_COUNTERSPY_CHASE', 'ESPIONAGE_EVENT_CHOICE_COUNTERSPY_FOCUS');
@@ -307,8 +307,8 @@ INSERT INTO CityEventChoice_YieldSiphon
 	(CityEventChoiceType, YieldType, Yield)
 VALUES
 	('ESPIONAGE_EVENT_CHOICE_STEAL_FAITH', 'YIELD_FAITH', 50);
-	
+
 INSERT INTO CityEventChoice_YieldOnSpyCaught
 	(CityEventChoiceType, YieldType, Yield)
 VALUES
-	('ESPIONAGE_EVENT_CHOICE_COUNTERSPY_CHASE', 'YIELD_SCIENCE', 50);
+	('ESPIONAGE_EVENT_CHOICE_COUNTERSPY_CHASE', 'YIELD_SCIENCE', 50);

(2) Vox Populi/Database Changes/Events/NewCityEvents.xml

@@ -449,8 +449,6 @@
 		<!-- Espionage -->
 		<Row>
 			<Type>ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS</Type>
-			<Description>TXT_KEY_ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS</Description>
-			<Help>TXT_KEY_ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS_HELP</Help>
 			<CityEventArt>Focus.dds</CityEventArt>
 			<EspionageSetup>true</EspionageSetup>
 		</Row>

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

@@ -129,7 +129,7 @@ INSERT INTO Policy_BuildingClassProductionModifiers
 	(PolicyType, BuildingClassType, ProductionModifier)
 VALUES
 	('POLICY_POLICE_STATE', 'BUILDINGCLASS_POLICE_STATION', 100);
-	
+
 INSERT INTO Policy_BuildingClassSecurityChanges
 	(PolicyType, BuildingClassType, SecurityChange)
 VALUES

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

@@ -62,9 +62,9 @@ WHERE Type = 'POLICY_VOLUNTEER_ARMY';
 -- Covert Action
 UPDATE Policies
 SET
+	RiggingElectionModifier = 0,
 	FreeSpy = 1,
 	RigElectionInfluenceModifier = 50,
-	RiggingElectionModifier = 0,
 	EspionageNetworkPoints = 10
 WHERE Type = 'POLICY_COVERT_ACTION';
 

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

@@ -53,6 +53,7 @@ VALUES
 -- Double Agents
 UPDATE Policies
 SET
+	CatchSpiesModifier = 0,
 	FreeSpy = 2
 WHERE Type = 'POLICY_DOUBLE_AGENTS';
 

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

@@ -501,7 +501,7 @@ WHERE Tag = 'TXT_KEY_BUILDING_OXFORD_UNIVERSITY_STRATEGY';
 
 -- National Intelligence Agency
 UPDATE Language_en_US
-SET Text = 'Improves City [ICON_SPY] City Security by 10 and provides 100 [ICON_VP_SPY_POINTS] Spy Points. -1 [ICON_HAPPINESS_3] Unhappiness from [ICON_FOOD] and [ICON_PRODUCTION] Distress in all Cities.[NEWLINE][NEWLINE]+100 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you capture or identify a foreign [ICON_SPY] Spy, or when you complete a [ICON_SPY] Spy Mission in a foreign City, scaling with Era. +25 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you successfully rig an election in a [ICON_CITY_STATE] City-State, scaling with Era.[NEWLINE][NEWLINE]The [ICON_PRODUCTION] Production Cost and [ICON_CITIZEN] Population Requirements increase based on the number of Cities you own.'
+SET Text = 'Improves City [ICON_SPY] City Security by 10 and provides 100 [ICON_VP_SPY_POINTS] Spy Points. -1 [ICON_HAPPINESS_3] Unhappiness from [ICON_FOOD] and [ICON_PRODUCTION] Distress in all Cities.[NEWLINE][NEWLINE]+100 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you identify, capture, or kill a foreign [ICON_SPY] Spy, or when you complete a [ICON_SPY] Spy Mission in a foreign City, scaling with Era. +25 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you successfully rig an election in a [ICON_CITY_STATE] City-State, scaling with Era.[NEWLINE][NEWLINE]The [ICON_PRODUCTION] Production Cost and [ICON_CITIZEN] Population Requirements increase based on the number of Cities you own.'
 WHERE Tag = 'TXT_KEY_BUILDING_INTELLIGENCE_AGENCY_HELP';
 
 UPDATE Language_en_US

(2) Vox Populi/Database Changes/Text/en_US/Civilizations/NewCivilizationText.xml

@@ -121,7 +121,7 @@
 			<Text>The White Tower is the old keep at the Tower of London. It was built by William the Conqueror during the early 1080s, and was later extended. The White Tower was the castle's strongest defensive point, and originally housed the king and his representatives. Throughout its long history, the Tower has been many things to England: A symbol of tyranny, a treasury, a menagerie, a mint, a palace and a prison. Today, the Tower of London is a vast museum which boasts, amongst its many treasures, the Crown Jewels of the English Monarchy.</Text>
 		</Row>
 		<Row Tag="TXT_KEY_BUILDING_WHITE_TOWER_HELP">
-			<Text>Provides 2 [COLOR_POSITIVE_TEXT]Free[ENDCOLOR] [ICON_RES_IRON] Iron and contains a pre-built [ICON_GREAT_WORK] Great Work of Art or Artifact.[NEWLINE][NEWLINE]+40 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you identify or capture a foreign [ICON_SPY] Spy or when you perform a Spy Mission, and +25 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you successfully rig an election in a [ICON_CITY_STATE] City-State or build a building in the city, scaling with Era.[NEWLINE][NEWLINE]All Constabularies, Castles, and Armories gain +1 [ICON_CULTURE] Culture.[NEWLINE][NEWLINE]The [ICON_PRODUCTION] Production Cost increases based on the number of Cities you own.</Text>
+			<Text>Provides 2 [COLOR_POSITIVE_TEXT]Free[ENDCOLOR] [ICON_RES_IRON] Iron and contains a pre-built [ICON_GREAT_WORK] Great Work of Art or Artifact.[NEWLINE][NEWLINE]+40 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you identify, capture, or kill a foreign [ICON_SPY] Spy or when you perform a Spy Mission, and +25 [ICON_RESEARCH] Science and [ICON_GOLD] Gold when you successfully rig an election in a [ICON_CITY_STATE] City-State or build a building in the city, scaling with Era.[NEWLINE][NEWLINE]All Constabularies, Castles, and Armories gain +1 [ICON_CULTURE] Culture.[NEWLINE][NEWLINE]The [ICON_PRODUCTION] Production Cost increases based on the number of Cities you own.</Text>
 		</Row>
 		<Row Tag="TXT_KEY_BUILDING_WHITE_TOWER_STRATEGY">
 			<Text>Unique English replacement for the Ironworks. In addition to the bonuses from the Ironworks, the White Tower improves Constabularies, Castles and Armories, and contains a Great Work of Art. The White Tower provides yields for both offensive and defensive Spy actions, like an early Intelligence Agency.</Text>

(2) Vox Populi/Database Changes/Text/en_US/Espionage/NewEspionageText.xml

@@ -7,58 +7,61 @@
 		<Row Tag="TXT_KEY_SPY_PASSIVE_1_HELP">
 			<Text>[ICON_BULLET]Can view the City Screen[NEWLINE][ICON_BULLET]Gain visibility on the center tile of the city[NEWLINE][ICON_BULLET]Each Turn, 3% of the City's [ICON_RESEARCH] Science Output is added to your Science per Turn</Text>
 		</Row>
+
 		<Row Tag="TXT_KEY_SPY_PASSIVE_2">
 			<Text>Surveillance II</Text>
 		</Row>
 		<Row Tag="TXT_KEY_SPY_PASSIVE_2_HELP">
 			<Text>[ICON_BULLET]Can view the City Screen[NEWLINE][ICON_BULLET]Gain visibility on city tiles next to the center tile[NEWLINE][ICON_BULLET]Each Turn, 5% of the City's [ICON_RESEARCH] Science Output is added to your Science per Turn</Text>
 		</Row>
+
 		<Row Tag="TXT_KEY_SPY_PASSIVE_3">
 			<Text>Surveillance III</Text>
 		</Row>
 		<Row Tag="TXT_KEY_SPY_PASSIVE_3_HELP">
 			<Text>[ICON_BULLET]Can view the City Screen[NEWLINE][ICON_BULLET]Gain visibility on city tiles up to 2 tiles away from the center[NEWLINE][ICON_BULLET]Each Turn, 7% of the City's [ICON_RESEARCH] Science Output is added to your Science per Turn</Text>
 		</Row>
+
 		<Row Tag="TXT_KEY_SPY_PASSIVE_4">
 			<Text>Surveillance IV</Text>
 		</Row>
 		<Row Tag="TXT_KEY_SPY_PASSIVE_4_HELP">
 			<Text>[ICON_BULLET]Can view the City Screen[NEWLINE][ICON_BULLET]Gain visibility on city tiles up to 3 tiles away from the center[NEWLINE][ICON_BULLET]Each Turn, 10% of the City's [ICON_RESEARCH] Science Output is added to your Science per Turn</Text>
 		</Row>
+
 		<Row Tag="TXT_KEY_SPY_PASSIVE_5">
 			<Text>Surveillance V</Text>
 		</Row>
 		<Row Tag="TXT_KEY_SPY_PASSIVE_5_HELP">
 			<Text>[ICON_BULLET]Can view the City Screen[NEWLINE][ICON_BULLET]Gain visibility on all city tiles[NEWLINE][ICON_BULLET]Each Turn, 10% of the City's [ICON_RESEARCH] Science Output is added to your Science per Turn</Text>
 		</Row>
-		
+
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_1">
 			<Text>Schmoozing I</Text>
 		</Row>
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_1_HELP">
 			<Text>[ICON_BULLET]+20% [ICON_TOURISM] Tourism and improved diplomatic relations with the other player[NEWLINE][ICON_BULLET]Can trade World Congress Votes</Text>
 		</Row>
-		
+
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_2">
 			<Text>Schmoozing II</Text>
 		</Row>
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_2_HELP">
 			<Text>[ICON_BULLET]+20% [ICON_TOURISM] Tourism with them and improved diplomatic relations[NEWLINE][ICON_BULLET]Can trade World Congress Votes[NEWLINE][ICON_BULLET]Receive Intrigues[NEWLINE][ICON_BULLET]Can view their Tech Tree and Policy Screen</Text>
 		</Row>
-		
+
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_3">
 			<Text>Schmoozing III</Text>
 		</Row>
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_3_HELP">
 			<Text>[ICON_BULLET]+20% [ICON_TOURISM] Tourism and improved diplomatic relations with the other player[NEWLINE][ICON_BULLET]Can trade World Congress Votes[NEWLINE][ICON_BULLET]Receive Intrigues[NEWLINE][ICON_BULLET]Can view their Tech Tree and Policy Screen[NEWLINE][ICON_BULLET]Can view types and count of their military units[NEWLINE][ICON_BULLET]Trade Routes to them generate +20% [ICON_GOLD] Gold</Text>
 		</Row>
-		
+
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_4">
 			<Text>Schmoozing III</Text>
 		</Row>
 		<Row Tag="TXT_KEY_DIPLOMAT_PASSIVE_4_HELP">
 			<Text>[ICON_BULLET]+20% [ICON_TOURISM] Tourism and improved diplomatic relations with the other player[NEWLINE][ICON_BULLET]Can trade World Congress Votes[NEWLINE][ICON_BULLET]Receive Intrigues[NEWLINE][ICON_BULLET]Can view their Tech Tree and Policy Screen[NEWLINE][ICON_BULLET]Can view types and count of their military units[NEWLINE][ICON_BULLET]Trade Routes to them generate +20% [ICON_GOLD] Gold[NEWLINE][ICON_BULLET]Can view all active trade deals[NEWLINE][ICON_BULLET]Can view their true diplomatic approaches toward all other players</Text>
 		</Row>
-
 	</Language_en_US>
 </GameData>

(2) Vox Populi/Database Changes/Text/en_US/Events/NewEventText.xml

@@ -1301,14 +1301,7 @@
 			<Text>Your farmers discovered a rare plant never before seen in a Plantation near the City. Your researchers are excited about studying it! Gain +{2_InstantYield}.</Text>
 		</Row>
 
-		<!-- Espionage events -->	
-		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS">
-			<Text></Text>
-		</Row>
-		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_SELECT_FOCUS_HELP">
-			<Text></Text>
-		</Row>
-
+		<!-- Espionage events -->
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_STEAL_GW">
 			<Text>[ICON_GREAT_WORK] Steal a Great Work</Text>
 		</Row>
@@ -1336,7 +1329,6 @@
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_STEAL_FAITH_EFFECT">
 			<Text>Each turn, 50% of the City's [ICON_PEACE] Faith Output are stolen. The city emits -50% Religious Pressure. {5_DurationText}</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_SCIENTIFIC_GREATPEOPLE">
 			<Text>[ICON_GREAT_PEOPLE] Kidnap Specialists in the City</Text>
 		</Row>
@@ -1358,7 +1350,6 @@
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_REPATRIATED_SPECIALISTS_PARENT_HELP">
 			<Text>Specialists in your Capital produce +1 [ICON_GREAT_PEOPLE] GPP per turn.</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_STEAL_FROM_TREASURY">
 			<Text>[ICON_GOLD] Steal from National Treasury</Text>
 		</Row>
@@ -1371,7 +1362,6 @@
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_STEAL_TREASURY_AMOUNT">
 			<Text>[NEWLINE][NEWLINE][COLOR_POSITIVE_TEXT]Amount to steal:[ENDCOLOR] {1_Num} [ICON_GOLD] Gold</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_STEAL_TECH">
 			<Text>[ICON_RESEARCH] Steal a Technology</Text>
 		</Row>
@@ -1416,7 +1406,6 @@
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_COUNTERSPY_FOCUS_HELP">
 			<Text>Your Spy has established their new counterintelligence operation. What would you like them to focus on?</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_ESPIONAGE_EVENT_CHOICE_COUNTERSPY_NETWORK">
 			<Text>[ICON_SPY] Establish a counter-espionage network.</Text>
 		</Row>

(2) Vox Populi/Database Changes/Text/en_US/Notifications/NewNotificationText.xml

@@ -639,7 +639,6 @@
 		<Row Tag="TXT_KEY_NOTIFICATION_EVENT_SUCCEEDED_ESPIONAGE_UNKNOWN">
 			<Text>Unknown foreign spies conducted a [COLOR_NEGATIVE_TEXT]Spy Mission[ENDCOLOR] in {1_City}: {2_MissionResult}</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_NOTIFICATION_SPY_WAS_IDENTIFIED_AND_CAUGHT_S">
 			<Text>{1_SpyRank} {2_SpyName} caught and identified!</Text>
 		</Row>
@@ -670,28 +669,24 @@
 		<Row Tag="TXT_KEY_NOTIFICATION_SPY_RELEASED_PRISON">
 			<Text>{1_SpyRank} {2_SpyName} has been released from prison. You may now send the spy on a mission again.</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_NOTIFICATION_NO_TOURISM_EVENT_ENDED_S">
 			<Text>{1_City} generates Tourism again</Text>
 		</Row>
 		<Row Tag="TXT_KEY_NOTIFICATION_NO_TOURISM_EVENT_ENDED">
 			<Text>The rebellion in {1_City} caused by foreign Spies has ended. The city now generates Tourism again.</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_NOTIFICATION_COUNTERSPY_DETECTED_S">
 			<Text>Counterspy in {1_City}!</Text>
 		</Row>
 		<Row Tag="TXT_KEY_NOTIFICATION_COUNTERSPY_DETECTED">
 			<Text>Upon arriving in {1_City}, {2_SpyRank} {3_SpyName} has detected the presence of an enemy [ICON_SPY] Counterspy! The followings effects are active:[NEWLINE][NEWLINE]{4_MissionEffect}</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_NOTIFICATION_COUNTERSPY_STARTED_S">
 			<Text>Counterspy in {1_City}!</Text>
 		</Row>
 		<Row Tag="TXT_KEY_NOTIFICATION_COUNTERSPY_STARTED">
 			<Text>A [ICON_SPY] Counterspy has started an operation in {1_City}. The followings effects are now active:[NEWLINE][NEWLINE]{2_MissionEffect}</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_NOTIFICATION_COUNTERSPY_ENDED_S">
 			<Text>Counterspy mission in {1_City} ended!</Text>
 		</Row>
@@ -710,7 +705,6 @@
 		<Row Tag="TXT_KEY_NOTIFICATION_NEW_PASSIVE_BONUS">
 			<Text>{1_SpyRank} {2_SpyName} has collected enough Network Points in {3_City} to unlock the following passive bonuses:[NEWLINE][NEWLINE] {4_Missions}</Text>
 		</Row>
-
 		<Row Tag="TXT_KEY_NOTIFICATION_SUMMARY_CHOOSE_EVENT">
 			<Text>MAKE EVENT CHOICE</Text>
 		</Row>