From c957d6034598db0352459da6fdd45c691b3b7a36 Mon Sep 17 00:00:00 2001
From: RecursiveVision <66801010+RecursiveVision@users.noreply.github.com>
Date: Tue, 3 Oct 2023 14:18:51 -0400
Subject: [PATCH] Fix Spanish Inquisition

Minor cleanup for TechCityTrade
---
 (2) Vox Populi/Database Changes/Civilizations/Spain.sql   | 1 +
 .../Text/en_US/Civilizations/NewCivilizationText.xml      | 6 ++++++
 (2) Vox Populi/Database Changes/Units/NewUnits.xml        | 4 ++--
 .../Database Changes/WorldMap/Improvements/NewBuilds.xml  | 8 ++++----
 .../WorldMap/Resources/ResourceChanges.sql                | 4 ++--
 .../WorldMap/Resources/ResourceSweeps.sql                 | 8 ++++++--
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/(2) Vox Populi/Database Changes/Civilizations/Spain.sql b/(2) Vox Populi/Database Changes/Civilizations/Spain.sql
index 595244f92d..59f01043aa 100644
--- a/(2) Vox Populi/Database Changes/Civilizations/Spain.sql	
+++ b/(2) Vox Populi/Database Changes/Civilizations/Spain.sql	
@@ -69,6 +69,7 @@ VALUES
 
 UPDATE Units
 SET
+	ShowInPedia = 0,
 	RequiresEnhancedReligion = 0,
 	NoMaintenance = 1
 WHERE Type = 'UNIT_SPAIN_INQUISITOR';
diff --git a/(2) Vox Populi/Database Changes/Text/en_US/Civilizations/NewCivilizationText.xml b/(2) Vox Populi/Database Changes/Text/en_US/Civilizations/NewCivilizationText.xml
index fa3a7c3347..9392eb8274 100644
--- a/(2) Vox Populi/Database Changes/Text/en_US/Civilizations/NewCivilizationText.xml	
+++ b/(2) Vox Populi/Database Changes/Text/en_US/Civilizations/NewCivilizationText.xml	
@@ -225,6 +225,12 @@
 			<Text>Unique Roman replacement for the Arena. Build the Colosseum to boost your City's Culture, Tourism, and Production output, also improves nearby [ICON_RES_PERFUME] Perfume and [ICON_RES_OLIVE] Olive resources. It also can maximize your Empire's gain from the victories of your conquering armies. Every Colosseum slightly increases the Gold value of City Connections, thus allowing Rome to benefit from large, sprawling empires.</Text>
 		</Row>
 		<!-- Spain -->
+		<Row Tag="TXT_KEY_UNIT_SPAIN_INQUISITOR">
+			<Text>Inquisition</Text>
+		</Row>
+		<Row Tag="TXT_KEY_UNIT_HELP_SPAIN_INQUISITOR">
+			<Text>{TXT_KEY_UNIT_HELP_INQUISITOR}[NEWLINE][NEWLINE][COLOR_NEGATIVE_TEXT]Nobody expects the Spanish Inquisition![ENDCOLOR]</Text>
+		</Row>
 		<Row Tag="TXT_KEY_BUILDING_MISSION">
 			<Text>Mission</Text>
 		</Row>
diff --git a/(2) Vox Populi/Database Changes/Units/NewUnits.xml b/(2) Vox Populi/Database Changes/Units/NewUnits.xml
index b9a261da0e..017987c995 100644
--- a/(2) Vox Populi/Database Changes/Units/NewUnits.xml	
+++ b/(2) Vox Populi/Database Changes/Units/NewUnits.xml	
@@ -765,10 +765,10 @@
 		</Row>
 		<Row>
 			<Type>UNIT_SPAIN_INQUISITOR</Type>
-			<Description>TXT_KEY_UNIT_INQUISITOR</Description>
+			<Description>TXT_KEY_UNIT_SPAIN_INQUISITOR</Description>
 			<Civilopedia>TXT_KEY_CIV5_INQUISITOR_TEXT</Civilopedia>
 			<Strategy>TXT_KEY_UNIT_INQUISITOR_STRATEGY</Strategy>
-			<Help>TXT_KEY_UNIT_HELP_INQUISITOR</Help>
+			<Help>TXT_KEY_UNIT_HELP_SPAIN_INQUISITOR</Help>
 			<Domain>DOMAIN_LAND</Domain>
 			<CombatClass>UNITCOMBAT_INQUISITOR</CombatClass>
 			<Class>UNITCLASS_INQUISITOR</Class>
diff --git a/(2) Vox Populi/Database Changes/WorldMap/Improvements/NewBuilds.xml b/(2) Vox Populi/Database Changes/WorldMap/Improvements/NewBuilds.xml
index b1e64e7bba..6dfa0fb79b 100644
--- a/(2) Vox Populi/Database Changes/WorldMap/Improvements/NewBuilds.xml	
+++ b/(2) Vox Populi/Database Changes/WorldMap/Improvements/NewBuilds.xml	
@@ -112,8 +112,8 @@
 			<OrderPriority>99</OrderPriority>
 			<IconIndex>36</IconIndex>
 			<IconAtlas>UNIT_ACTION_ATLAS</IconAtlas>
-			<ShowInPedia>false</ShowInPedia>
-			<ShowInTechTree>false</ShowInTechTree>
+			<ShowInPedia>0</ShowInPedia>
+			<ShowInTechTree>0</ShowInTechTree>
 		</Row>
 		<!-- Polynesia UA -->
 		<Row>
@@ -130,8 +130,8 @@
 			<OrderPriority>98</OrderPriority>
 			<IconIndex>35</IconIndex>
 			<IconAtlas>UNIT_ACTION_ATLAS</IconAtlas>
-			<ShowInPedia>false</ShowInPedia>
-			<ShowInTechTree>false</ShowInTechTree>
+			<ShowInPedia>0</ShowInPedia>
+			<ShowInTechTree>0</ShowInTechTree>
 		</Row>
 	</Builds>
 </GameData>
\ No newline at end of file
diff --git a/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceChanges.sql b/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceChanges.sql
index 3e24ef0696..7bd66b7601 100644
--- a/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceChanges.sql	
+++ b/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceChanges.sql	
@@ -81,11 +81,11 @@ WHERE Type = 'RESOURCE_HIDDEN_ARTIFACTS';
 
 -- Strategics
 UPDATE Resources
-SET TechReveal = 'TECH_STEAM_POWER', TechCityTrade = 'TECH_STEAM_POWER'
+SET TechReveal = 'TECH_STEAM_POWER'
 WHERE Type = 'RESOURCE_COAL';
 
 UPDATE Resources
-SET TechReveal = 'TECH_COMBUSTION', TechCityTrade = 'TECH_COMBUSTION'
+SET TechReveal = 'TECH_COMBUSTION'
 WHERE Type = 'RESOURCE_OIL';
 
 -- Bonus and luxuries
diff --git a/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceSweeps.sql b/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceSweeps.sql
index a247698899..1c18c5638c 100644
--- a/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceSweeps.sql	
+++ b/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceSweeps.sql	
@@ -265,7 +265,6 @@ ORDER BY a.BuildingClass, a.Type;
 DROP TABLE BuildingClass_ResourceYieldChanges;
 
 -- Tech where the resource can be set as "owned"
--- Strategic resources always require the reveal tech
 UPDATE Resources
 SET TechImproveable = (
 	SELECT PrereqTech FROM Builds WHERE ImprovementType = (
@@ -274,7 +273,12 @@ SET TechImproveable = (
 )
 WHERE ResourceUsage <> 1;
 
--- Non-strategic resources shouldn't have a tech requirement to be sold
+-- Strategics can be sold when they are revealed
+-- Luxuries can be sold at game start
+UPDATE Resources
+SET TechCityTrade = TechReveal
+WHERE ResourceUsage = 1;
+
 UPDATE Resources
 SET TechCityTrade = NULL
 WHERE ResourceUsage <> 1;