Minor corrections to avoid DB constraint errors

Infixo · Apr 28, 2023 · 0029043 · 0029043
1 parent 175e81b
commit 0029043
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 29 deletions.
diff --git a/base/RealStrategy_Main.sql b/base/RealStrategy_Main.sql
@@ -691,24 +691,20 @@ INSERT OR IGNORE INTO Strategy_Priorities (StrategyType, ListType) VALUES
 DELETE FROM AiFavoredItems WHERE ListType IN (
 'AncientPseudoYields',
 'AncientYields',
---'ClassicalSensitivity',
 'ClassicalPseudoYields',
 'ClassicalYields',
---'MedievalSensitivity',
 'MedievalPseudoYields',
 'MedievalYields',
 'RenaissancePseudoYields',
 'RenaissanceYields',
 'IndustrialPseudoYields',
 'IndustrialYields',
---'ModernSensitivity',
 'ModernPseudoYields',
 'ModernYields');
 
 INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 -- ANCIENT
 ('AncientYields', 'YIELD_FAITH',   1, 15), -- just to get a religion
-('AncientPseudoYields', 'PSEUDOYIELD_DIPLOMATIC_FAVOR', 1, -25), -- #27
 ('AncientPseudoYields', 'PSEUDOYIELD_GPP_PROPHET', 1, 15),
 ('AncientPseudoYields', 'PSEUDOYIELD_UNIT_COMBAT', 1, 15),
 -- CLASSICAL
@@ -723,15 +719,13 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 --('MedievalYields', 'YIELD_SCIENCE',    1,-15), -- def. 15
 ('MedievalPseudoYields', 'PSEUDOYIELD_GPP_PROPHET', 1, -25),
 ('MedievalPseudoYields', 'PSEUDOYIELD_UNIT_SETTLER', 1, 15),
-('MedievalPseudoYields', 'PSEUDOYIELD_DIPLOMATIC_FAVOR', 1, 25), -- #27
 ('MedievalPseudoYields', 'PSEUDOYIELD_STANDING_ARMY_NUMBER', 1, 10),
 ('MedievalPseudoYields', 'PSEUDOYIELD_STANDING_ARMY_VALUE', 1, 15),
 -- RENAISSANCE
 ('RenaissanceYields', 'YIELD_CULTURE',    1, 15),
 ('RenaissanceYields', 'YIELD_FOOD',       1,-15), -- def. 10
 ('RenaissanceYields', 'YIELD_GOLD',       1, 10), -- def. 15
 ('RenaissanceYields', 'YIELD_PRODUCTION', 1,-10),
---('RenaissanceYields', 'YIELD_SCIENCE',    1, 10),
 ('RenaissancePseudoYields', 'PSEUDOYIELD_GPP_SCIENTIST', 1, 15),
 ('RenaissancePseudoYields', 'PSEUDOYIELD_UNIT_NAVAL_COMBAT', 1, 15), -- exploration time
 -- INDUSTRIAL
@@ -742,7 +736,6 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 ('IndustrialPseudoYields', 'PSEUDOYIELD_STANDING_ARMY_NUMBER', 1, -10),
 ('IndustrialPseudoYields', 'PSEUDOYIELD_STANDING_ARMY_VALUE', 1, -15),
 -- MODERN
-('ModernSensitivity', 'YIELD_SCIENCE', 1, -15),
 ('ModernPseudoYields', 'PSEUDOYIELD_UNIT_NAVAL_COMBAT', 1, -15),
 -- ATOMIC
 ('AtomicYields', 'YIELD_CULTURE', 1, 15),

diff --git a/base/RealStrategy_Naval.sql b/base/RealStrategy_Naval.sql
@@ -133,10 +133,15 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 ('RSTNavalCivics', 'CIVIC_FOREIGN_TRADE', 1, 0),
 ('RSTNavalCivics', 'CIVIC_NAVAL_TRADITION', 1, 0),
 ('RSTNavalWonders', 'BUILDING_GREAT_LIGHTHOUSE', 1, 0),
-('RSTNavalWonders', 'BUILDING_HALICARNASSUS_MAUSOLEUM', 1, 0),
 ('NavalUnitPreferences', 'PSEUDOYIELD_GPP_ADMIRAL', 1, 15),
 ('NavalUnitPreferences', 'PSEUDOYIELD_GPP_GENERAL', 1, -15);
 
+-- DLC Wonder
+INSERT INTO AiFavoredItems (ListType, Item) 
+SELECT 'RSTNavalWonders', 'BUILDING_HALICARNASSUS_MAUSOLEUM'
+FROM Buildings
+WHERE BuildingType = 'BUILDING_HALICARNASSUS_MAUSOLEUM';
+
 
 --------------------------------------------------------------
 -- RST_STRATEGY_ISLAND
@@ -198,13 +203,17 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 ('RSTIslandCivics', 'CIVIC_FOREIGN_TRADE', 1, 0),
 ('RSTIslandCivics', 'CIVIC_NAVAL_TRADITION', 1, 0),
 ('RSTIslandWonders', 'BUILDING_GREAT_LIGHTHOUSE', 1, 0),
-('RSTIslandWonders', 'BUILDING_HALICARNASSUS_MAUSOLEUM', 1, 0),
 ('RSTIslandPseudoYields', 'PSEUDOYIELD_GPP_ADMIRAL', 1, 25),
 ('RSTIslandPseudoYields', 'PSEUDOYIELD_GPP_GENERAL', 1, -25),
 ('RSTIslandPseudoYields', 'PSEUDOYIELD_UNIT_AIR_COMBAT', 1, 25),
 ('RSTIslandPseudoYields', 'PSEUDOYIELD_UNIT_COMBAT', 1, -30),
 ('RSTIslandPseudoYields', 'PSEUDOYIELD_UNIT_NAVAL_COMBAT', 1, 50);
 
+-- DLC Wonder
+INSERT INTO AiFavoredItems (ListType, Item) 
+SELECT 'RSTIslandWonders', 'BUILDING_HALICARNASSUS_MAUSOLEUM'
+FROM Buildings
+WHERE BuildingType = 'BUILDING_HALICARNASSUS_MAUSOLEUM';
 
 
 

diff --git a/nfp/RealStrategy_ByzantiumGaul.sql b/nfp/RealStrategy_ByzantiumGaul.sql
@@ -97,12 +97,17 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 ('BasilCivics', 'CIVIC_DIVINE_RIGHT', 1, 0),
 ('BasilPseudoYields', 'PSEUDOYIELD_GPP_PROPHET', 1, 15),
 ('BasilPseudoYields', 'PSEUDOYIELD_UNIT_RELIGIOUS',  1, 15),
-('BasilPseudoYields', 'PSEUDOYIELD_RELIGIOUS_CONVERT_EMPIRE',  1, 15),
 ('BasilUnitBuilds', 'PROMOTION_CLASS_HEAVY_CAVALRY', 1, 10),
 ('BasilUnitBuilds', 'PROMOTION_CLASS_LIGHT_CAVALRY', 1, 10),
 ('BasilDiplomacy', 'DIPLOACTION_DECLARE_HOLY_WAR', 1, 0),
 ('BasilDiplomacy', 'DIPLOACTION_KEEP_PROMISE_DONT_CONVERT', 0, 0);
 
+-- PseudoYield from XP2
+INSERT INTO AiFavoredItems (ListType, Item, Favored, Value)
+SELECT 'BasilPseudoYields', 'PSEUDOYIELD_RELIGIOUS_CONVERT_EMPIRE', 1, 15 -- favor
+FROM PseudoYields
+WHERE PseudoYieldType = 'PSEUDOYIELD_RELIGIOUS_CONVERT_EMPIRE';
+
 -- why firaxis wants him to build walls???
 DELETE FROM AiFavoredItems WHERE ListType = 'BasilFavoredBuildings';
 DELETE FROM AiLists WHERE ListType = 'BasilFavoredBuildings';

diff --git a/nfp/RealStrategy_TeddyRoosevelt.sql b/nfp/RealStrategy_TeddyRoosevelt.sql
@@ -54,8 +54,13 @@ INSERT INTO AiLists (ListType, LeaderType, System) VALUES
 ('RooseveltAltDiploActions', 'TRAIT_LEADER_ROOSEVELT_COROLLARY', 'DiplomaticActions');
 
 INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
-('RooseveltAltPseudoYields', 'PSEUDOYIELD_DIPLOMATIC_FAVOR', 1, 15), -- favor
 ('RooseveltAltPseudoYields', 'PSEUDOYIELD_INFLUENCE', 1, 15), -- envoys
 ('RooseveltAltPseudoYields', 'PSEUDOYIELD_DIPLOMATIC_BONUS', 1, 15), -- good relations
 ('RooseveltAltPseudoYields', 'PSEUDOYIELD_UNIT_TRADE',  1, 25), -- traders
 ('RooseveltAltDiploActions', 'DIPLOACTION_GRANT_INFLUENCE_TOKEN', 1, 0); -- suze all city states!
+
+-- PseudoYield from XP2
+INSERT INTO AiFavoredItems (ListType, Item, Favored, Value)
+SELECT 'RooseveltAltPseudoYields', 'PSEUDOYIELD_DIPLOMATIC_FAVOR', 1, 15 -- favor
+FROM PseudoYields
+WHERE PseudoYieldType = 'PSEUDOYIELD_DIPLOMATIC_FAVOR';
diff --git a/xp1/RealStrategy_RiseAndFall.sql b/xp1/RealStrategy_RiseAndFall.sql
@@ -28,23 +28,6 @@ UPDATE AiFavoredItems SET Item = 'TECH_SAILING' WHERE Item = 'TECH_SALING'; -- G
 DELETE FROM AiFavoredItems WHERE ListType = 'WilhelminaEmergencyAllianceList' AND Item = 'DIPLOACTION_ALLIANCE_MILITARY_EMERGENCY(NOT_IN_YET)'; -- WilhelminaEmergencyAllianceList, REMOVE IF IMPLEMENTED PROPERLY!
 DELETE FROM AiFavoredItems WHERE ListType = 'IronConfederacyDiplomacy' AND Item = 'DIPLOACTION_ALLIANCE_TEAMUP'; -- IronConfederacyDiplomacy, does not exists in Diplo Actions, REMOVE IF IMPLEMENTED PROPERLY!
 
-/*
-This System is not tested, so no changes here yet. Also, it seems ok.
-
-DELETE FROM AiFavoredItems WHERE ListType IN (
-'ClassicalSensitivity',
-'MedievalSensitivity',
-'ModernSensitivity');
-
-INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
--- CLASSICAL
-('ClassicalSensitivity', 'YIELD_SCIENCE', 1, 10),
--- MEDIEVAL
-('MedievalSensitivity',	'YIELD_CULTURE', 1, 10),
--- MODERN
-('ModernSensitivity', 'YIELD_CULTURE', 1, 10),
-('ModernSensitivity', 'YIELD_SCIENCE', 1, 10),
-*/
 
 
 -- ===========================================================================
@@ -64,6 +47,17 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 ('ScienceVictoryWonders', 'BUILDING_GOV_SCIENCE', 1, 0);
 
 
+------------------------------------------------------------------------------
+-- 230428 Time Strategies, YieldSensitivities
+-- This System is not tested, so no changes here yet. Also, it seems ok.
+
+INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
+-- CLASSICAL
+-- MEDIEVAL
+-- MODERN
+('ModernSensitivity', 'YIELD_SCIENCE', 1, -15);
+
+
 ------------------------------------------------------------------------------
 -- Anti-Strategies
 

diff --git a/xp2/RealStrategy_GatheringStorm.sql b/xp2/RealStrategy_GatheringStorm.sql
@@ -276,6 +276,17 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 ('ScienceVictoryTechs', 'TECH_SMART_MATERIALS', 1, 0); -- !BUGGED!
 
 
+------------------------------------------------------------------------------
+-- 230428 Time Strategies
+
+INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
+-- ANCIENT
+('AncientPseudoYields', 'PSEUDOYIELD_DIPLOMATIC_FAVOR', 1, -25), -- #27
+-- CLASSICAL
+-- MEDIEVAL
+('MedievalPseudoYields', 'PSEUDOYIELD_DIPLOMATIC_FAVOR', 1, 25); -- #27
+
+
 ------------------------------------------------------------------------------
 -- RST_STRATEGY_ANTI_SCIENCE
 

diff --git a/xp2/RealStrategy_Leaders_XP2.sql b/xp2/RealStrategy_Leaders_XP2.sql
@@ -119,9 +119,14 @@ INSERT INTO AiFavoredItems (ListType, Item, Favored, Value) VALUES
 -- the list is defined but no wonders defined
 ('DidoWonders', 'BUILDING_COLOSSUS', 1, 0),
 ('DidoWonders', 'BUILDING_GREAT_LIGHTHOUSE', 1, 0),
-('DidoWonders', 'BUILDING_HALICARNASSUS_MAUSOLEUM', 1, 0),
 ('DidoWonders', 'BUILDING_PANAMA_CANAL', 1, 0);
 
+-- DLC Wonder
+INSERT INTO AiFavoredItems (ListType, Item) 
+SELECT 'DidoWonders', 'BUILDING_HALICARNASSUS_MAUSOLEUM'
+FROM Buildings
+WHERE BuildingType = 'BUILDING_HALICARNASSUS_MAUSOLEUM';
+
 
 -- LEADER_ELEANOR_ENGLAND
 -- LEADER_ELEANOR_FRANCE