more bugfixes yay (#10287)

* fix Waraq'Ak being Archer replacement * fix War Elephant not having Feared Elephant * fix Embarkation availability * fix prereqs for Authority, Fealty, Imperialism policies * fix #10288 * probably fix strategic resources being sold early
LoneGazebo · Oct 1, 2023 · edd71e7 · edd71e7
1 parent 1cd7a0d
commit edd71e7
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 13 deletions.
diff --git a/(2) Vox Populi/Database Changes/Policies/Authority.sql b/(2) Vox Populi/Database Changes/Policies/Authority.sql
@@ -12,10 +12,9 @@ SET GridX = 2, GridY = 2
 WHERE Type = 'POLICY_WARRIOR_CODE';
 
 DELETE FROM Policy_PrereqPolicies
-WHERE PrereqPolicy IN (
+WHERE PolicyType IN (
 	'POLICY_MILITARY_TRADITION',
-	'POLICY_WARRIOR_CODE',
-	'POLICY_DISCIPLINE'
+	'POLICY_MILITARY_CASTE'
 );
 
 INSERT INTO Policy_PrereqPolicies

diff --git a/(2) Vox Populi/Database Changes/Policies/Fealty.sql b/(2) Vox Populi/Database Changes/Policies/Fealty.sql
@@ -8,7 +8,7 @@ SET GridX = 3, GridY = 1
 WHERE Type = 'POLICY_MANDATE_OF_HEAVEN';
 
 DELETE FROM Policy_PrereqPolicies
-WHERE PrereqPolicy IN (
+WHERE PolicyType IN (
 	'POLICY_MANDATE_OF_HEAVEN',
 	'POLICY_ORGANIZED_RELIGION',
 	'POLICY_FREE_RELIGION',

diff --git a/(2) Vox Populi/Database Changes/Policies/Imperialism.sql b/(2) Vox Populi/Database Changes/Policies/Imperialism.sql
@@ -20,10 +20,10 @@ SET GridX = 5, GridY = 2
 WHERE Type = 'POLICY_MARITIME_INFRASTRUCTURE';
 
 DELETE FROM Policy_PrereqPolicies
-WHERE PrereqPolicy IN (
-	'POLICY_NAVAL_TRADITION',
+WHERE PolicyType IN (
+	'POLICY_NAVIGATION_SCHOOL',
 	'POLICY_MERCHANT_NAVY',
-	'POLICY_MARITIME_INFRASTRUCTURE'
+	'POLICY_TREASURE_FLEETS'
 );
 
 INSERT INTO Policy_PrereqPolicies

diff --git a/(2) Vox Populi/Database Changes/Text/en_US/UI/NewUIText.xml b/(2) Vox Populi/Database Changes/Text/en_US/UI/NewUIText.xml
@@ -131,6 +131,18 @@
 		<Row Tag="TXT_KEY_MINOR_CIV_FIRST_CONTACT_BONUS_UNIT">
 			<Text>{1: gender *:an?An; other?A;} [COLOR_POSITIVE_TEXT]{1_UnitName}[ENDCOLOR] joins your expedition.</Text>
 		</Row>
+		<Row Tag="TXT_KEY_MINOR_CIV_CONTACT_BONUS_CULTURE">
+			<Text>They share their knowledge of artistic merit, giving you [COLOR_POSITIVE_TEXT]{1_NumCulture} [ICON_CULTURE] Culture[ENDCOLOR].</Text>
+		</Row>
+		<Row Tag="TXT_KEY_MINOR_CIV_CONTACT_BONUS_FAITH">
+			<Text>They share their knowledge of religious rituals, giving you [COLOR_POSITIVE_TEXT]{1_NumFaith} [ICON_PEACE] Faith[ENDCOLOR].</Text>
+		</Row>
+		<Row Tag="TXT_KEY_MINOR_CIV_CONTACT_BONUS_GOLD">
+			<Text>They provide you with a gift of [COLOR_POSITIVE_TEXT]{1_NumGold} [ICON_GOLD] Gold[ENDCOLOR].</Text>
+		</Row>
+		<Row Tag="TXT_KEY_MINOR_CIV_CONTACT_BONUS_FOOD">
+			<Text>They provide you with a crate of [COLOR_POSITIVE_TEXT]{1_NumFood} [ICON_FOOD] Food[ENDCOLOR].</Text>
+		</Row>
 		<Row Tag="TXT_KEY_MINOR_CIV_CONTACT_BONUS_NOTHING">
 			<Text>Unfortunately, they have nothing to offer you.</Text>
 		</Row>

diff --git a/(2) Vox Populi/Database Changes/UnitPromotions/PromotionSweeps.sql b/(2) Vox Populi/Database Changes/UnitPromotions/PromotionSweeps.sql
@@ -344,6 +344,13 @@ VALUES
 	('PROMOTION_ICE_BREAKERS', 'UNITCOMBAT_WORKER'),
 	('PROMOTION_ICE_BREAKERS', 'UNITCOMBAT_WORKBOAT');
 
+INSERT INTO UnitPromotions_UnitCombats
+	(PromotionType, UnitCombatType)
+SELECT
+	'PROMOTION_EMBARKATION', Type
+FROM UnitCombatInfos
+WHERE IsMilitary = 1 AND IsNaval = 0 AND IsAerial = 0; -- Civilians handled in DLL
+
 INSERT INTO UnitPromotions_CivilianUnitType
 	(PromotionType, UnitType)
 SELECT

diff --git a/(2) Vox Populi/Database Changes/Units/PreUnitChanges.sql b/(2) Vox Populi/Database Changes/Units/PreUnitChanges.sql
@@ -290,10 +290,10 @@ WHERE Type = 'UNIT_AUSTRIAN_HUSSAR';
 -- Inca: Slinger
 UPDATE Units
 SET
-	PrereqTech = (SELECT PrereqTech FROM Units WHERE Type = 'UNIT_INCAN_SLINGER'),
-	ObsoleteTech = (SELECT ObsoleteTech FROM Units WHERE Type = 'UNIT_INCAN_SLINGER'),
-	CombatClass = (SELECT CombatClass FROM Units WHERE Type = 'UNIT_INCAN_SLINGER'),
-	DefaultUnitAI = (SELECT DefaultUnitAI FROM Units WHERE Type = 'UNIT_INCAN_SLINGER')
+	PrereqTech = (SELECT PrereqTech FROM Units WHERE Type = 'UNIT_VP_SLINGER'),
+	ObsoleteTech = (SELECT ObsoleteTech FROM Units WHERE Type = 'UNIT_VP_SLINGER'),
+	CombatClass = (SELECT CombatClass FROM Units WHERE Type = 'UNIT_VP_SLINGER'),
+	DefaultUnitAI = (SELECT DefaultUnitAI FROM Units WHERE Type = 'UNIT_VP_SLINGER')
 WHERE Type = 'UNIT_INCAN_SLINGER';
 
 -- India: Cuirassier

diff --git a/(2) Vox Populi/Database Changes/Units/UnitChanges2.sql b/(2) Vox Populi/Database Changes/Units/UnitChanges2.sql
@@ -257,7 +257,7 @@ VALUES
 	('UNITCLASS_BAZOOKA', 'PROMOTION_COVERING_FIRE_2'),
 	('UNITCLASS_BAZOOKA', 'PROMOTION_ANTI_TANK'),
 	-- Mounted Melee/Armor
-	('UNIT_CARTHAGINIAN_FOREST_ELEPHANT', 'PROMOTION_FEARED_ELEPHANT'),
+	('UNITCLASS_ELEPHANT_RIDER', 'PROMOTION_FEARED_ELEPHANT'),
 	('UNITCLASS_MECH', 'PROMOTION_MECH'),
 	('UNITCLASS_MECH', 'PROMOTION_AMPHIBIOUS'),
 	-- Skirmisher

diff --git a/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceSweeps.sql b/(2) Vox Populi/Database Changes/WorldMap/Resources/ResourceSweeps.sql
@@ -267,7 +267,7 @@ DROP TABLE BuildingClass_ResourceYieldChanges;
 -- Non-strategic resources shouldn't have a tech requirement to be sold
 UPDATE Resources
 SET TechCityTrade = NULL
-WHERE ResourceUsage = 1;
+WHERE ResourceUsage <> 1;
 
 -- No need for this anymore, using TechObsolete instead
 UPDATE Resources