cleanup (#10405)

LoneGazebo · Oct 29, 2023 · a7dae5c · a7dae5c
1 parent 8abc362
commit a7dae5c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/(1) Community Patch/Core Files/Core Tables/CoreTableEntries.sql b/(1) Community Patch/Core Files/Core Tables/CoreTableEntries.sql
@@ -430,9 +430,6 @@ ALTER TABLE Improvements ADD COLUMN 'MovesChange' INTEGER DEFAULT 0;
 -- Improvement requires fresh water, coast, or river adjacency to make valid.
 ALTER TABLE Improvements ADD COLUMN 'WaterAdjacencyMakesValid' BOOLEAN DEFAULT 0;
 
--- Table for Lua elements that we don't want shown in Civ selection screen or in Civilopedia
-ALTER TABLE Improvements ADD 'ShowInPedia' BOOLEAN DEFAULT 1;
-
 -- Table for Civilopedia Game Concepts to add more in boxes...
 ALTER TABLE Concepts ADD COLUMN 'Extended' TEXT DEFAULT NULL;
 ALTER TABLE Concepts ADD COLUMN 'DesignNotes' TEXT DEFAULT NULL;

diff --git a/(2) Vox Populi/Database Changes/AI/LeaderFlavorSweeps.sql b/(2) Vox Populi/Database Changes/AI/LeaderFlavorSweeps.sql
@@ -528,4 +528,4 @@ UPDATE Leader_Flavors SET Flavor = 8 WHERE FlavorType = 'FLAVOR_SCIENCE' AND Lea
 UPDATE Leader_Flavors SET Flavor = 8 WHERE FlavorType = 'FLAVOR_SPACESHIP' AND LeaderType = 'LEADER_WU_ZETIAN'; -- 5, primary: science
 UPDATE Leader_Flavors SET Flavor = 7 WHERE FlavorType = 'FLAVOR_CULTURE' AND LeaderType = 'LEADER_WU_ZETIAN'; -- 10
 UPDATE Leader_Flavors SET Flavor = 7 WHERE FlavorType = 'FLAVOR_ARCHAEOLOGY' AND LeaderType = 'LEADER_WU_ZETIAN'; -- 8
-UPDATE Leader_Flavors SET Flavor = 9 WHERE FlavorType = 'FLAVOR_GREAT_PEOPLE' AND LeaderType = 'LEADER_WU_ZETIAN'; -- 8, UA
+UPDATE Leader_Flavors SET Flavor = 9 WHERE FlavorType = 'FLAVOR_GREAT_PEOPLE' AND LeaderType = 'LEADER_WU_ZETIAN'; -- 8, UA
diff --git a/(2) Vox Populi/Database Changes/AI/LeaderPersonalitySweeps.sql b/(2) Vox Populi/Database Changes/AI/LeaderPersonalitySweeps.sql
@@ -1695,4 +1695,4 @@ VALUES
 	('LEADER_WU_ZETIAN', 'MINOR_CIV_APPROACH_IGNORE', 3),
 	('LEADER_WU_ZETIAN', 'MINOR_CIV_APPROACH_PROTECTIVE', 9),
 	('LEADER_WU_ZETIAN', 'MINOR_CIV_APPROACH_BULLY', 5),
-	('LEADER_WU_ZETIAN', 'MINOR_CIV_APPROACH_CONQUEST', 5);
+	('LEADER_WU_ZETIAN', 'MINOR_CIV_APPROACH_CONQUEST', 5);
diff --git a/(2) Vox Populi/Database Changes/Remapper.sql b/(2) Vox Populi/Database Changes/Remapper.sql
@@ -1,11 +1,11 @@
 -- This code is necessary to avoid a UI glitch, do not remove it
 CREATE TABLE IDRemapper (id INTEGER PRIMARY KEY AUTOINCREMENT, Type TEXT);
 INSERT INTO IDRemapper (Type) SELECT Type FROM HandicapInfos ORDER BY ID;
-UPDATE HandicapInfos SET ID = (SELECT IDRemapper.id-1 FROM IDRemapper WHERE HandicapInfos.Type = IDRemapper.Type);
+UPDATE HandicapInfos SET ID = (SELECT IDRemapper.id - 1 FROM IDRemapper WHERE HandicapInfos.Type = IDRemapper.Type);
 DROP TABLE IDRemapper;
 
 UPDATE sqlite_sequence
-SET seq = (SELECT COUNT(ID) FROM HandicapInfos)-1
+SET seq = (SELECT COUNT(ID) FROM HandicapInfos) - 1
 WHERE name = 'HandicapInfos';
 -- End UI glitch fix
 
@@ -115,4 +115,4 @@ DROP TABLE IDRemapper;
 
 UPDATE sqlite_sequence
 SET seq = (SELECT COUNT(ID) FROM PlayerColors) - 1
-WHERE name = 'PlayerColors';
+WHERE name = 'PlayerColors';
diff --git a/(2) Vox Populi/Database Changes/Triggers.sql b/(2) Vox Populi/Database Changes/Triggers.sql
@@ -9,12 +9,12 @@ CREATE TRIGGER Unit_BuildingClassPurchaseRequireds
 AFTER INSERT ON Units
 WHEN (EXISTS (SELECT Type FROM Units WHERE Type = NEW.Type))
 BEGIN
-INSERT INTO Unit_BuildingClassPurchaseRequireds
-	(UnitType, BuildingClassType)
-SELECT
-	NEW.Type, BuildingClassType
-FROM Unit_BuildingClassPurchaseRequireds
-WHERE UnitType IN (SELECT DefaultUnit FROM UnitClasses WHERE Type = NEW.Class);
+	INSERT INTO Unit_BuildingClassPurchaseRequireds
+		(UnitType, BuildingClassType)
+	SELECT
+		NEW.Type, BuildingClassType
+	FROM Unit_BuildingClassPurchaseRequireds
+	WHERE UnitType IN (SELECT DefaultUnit FROM UnitClasses WHERE Type = NEW.Class);
 END;
 
 ---------------------------------------------------------------------------------

diff --git a/(2) Vox Populi/Database Changes/WorldMap/Improvements/NewImprovements.xml b/(2) Vox Populi/Database Changes/WorldMap/Improvements/NewImprovements.xml
@@ -20,7 +20,7 @@
 			<Type>IMPROVEMENT_JFD_MACHU_PICCHU</Type>
 			<Description>TXT_KEY_IMPROVEMENT_JFD_MACHU_PICCHU</Description>
 			<ArtDefineTag>ART_DEF_IMPROVEMENT_JFD_MACHU</ArtDefineTag>
-			<GraphicalOnly>1</GraphicalOnly>
+			<GraphicalOnly>true</GraphicalOnly>
 		</Row>
 		<!--
 			Unique Improvements
@@ -67,7 +67,7 @@
 			<ArtDefineTag>ART_DEF_IMPROVEMENT_POLDER</ArtDefineTag>
 			<PortraitIndex>0</PortraitIndex>
 			<IconAtlas>EXPANSION_TERRAIN_ATLAS</IconAtlas>
-			<GraphicalOnly>1</GraphicalOnly>
+			<GraphicalOnly>true</GraphicalOnly>
 		</Row>
 		<Row>
 			<Type>IMPROVEMENT_MONGOLIA_ORDO</Type>