diff --git a/(1) Community Patch/Core Files/Core Values/CoreDefines.sql b/(1) Community Patch/Core Files/Core Values/CoreDefines.sql index 798967a224..d0386fa95b 100644 --- a/(1) Community Patch/Core Files/Core Values/CoreDefines.sql +++ b/(1) Community Patch/Core Files/Core Values/CoreDefines.sql @@ -879,6 +879,7 @@ INSERT INTO Defines (Name, Value) SELECT 'MINOR_INFLUENCE_SCALING_DECAY_EXPONENT -- Each valid quest has X base copies - trait and personality can add or subtract copies -- Minimum of 1 copy for each valid quest -- The more copies of a quest, the greater the chance it is selected +-- "Hyperlink" values are specific trait + personality combinations which, if non-zero, override the normal number of copies. INSERT INTO Defines (Name, Value) VALUES -- Personal Quests @@ -903,6 +904,7 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HYPERLINK', 0), -- Mercantile + Friendly ('MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_BASE', 10), ('MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_CULTURED', 20), @@ -914,6 +916,7 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HYPERLINK', 0), -- Religious + Hostile ('MINOR_CIV_QUEST_GREAT_PERSON_COPIES_BASE', 10), ('MINOR_CIV_QUEST_GREAT_PERSON_COPIES_CULTURED', 20), @@ -925,6 +928,7 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_GREAT_PERSON_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_GREAT_PERSON_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HYPERLINK', 0), -- Cultured + Friendly ('MINOR_CIV_QUEST_FIND_PLAYER_COPIES_BASE', 10), ('MINOR_CIV_QUEST_FIND_PLAYER_COPIES_CULTURED', 0), @@ -991,6 +995,7 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HYPERLINK', 0), -- Mercantile + Hostile ('MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_BASE', 10), ('MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_CULTURED', 0), @@ -1002,6 +1007,7 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HYPERLINK', 0), -- Religious + Friendly ('MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_BASE', 10), ('MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_CULTURED', 0), @@ -1013,31 +1019,33 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HYPERLINK', 0), -- Mercantile + Neutral ('MINOR_CIV_QUEST_FIND_CITY_COPIES_BASE', 10), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_MARITIME', 20), -('MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE', 10), +('MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_RELIGIOUS', 0), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_FIND_CITY_COPIES_IRRATIONAL', 0), -('MINOR_CIV_QUEST_WAR_COPIES_BASE', 15), -('MINOR_CIV_QUEST_WAR_COPIES_CULTURED', 40), -('MINOR_CIV_QUEST_WAR_COPIES_MILITARISTIC', 70), +('MINOR_CIV_QUEST_WAR_COPIES_BASE', 10), +('MINOR_CIV_QUEST_WAR_COPIES_CULTURED', 0), +('MINOR_CIV_QUEST_WAR_COPIES_MILITARISTIC', 20), ('MINOR_CIV_QUEST_WAR_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_WAR_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_WAR_COPIES_RELIGIOUS', 0), ('MINOR_CIV_QUEST_WAR_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_WAR_COPIES_NEUTRAL', 0), -('MINOR_CIV_QUEST_WAR_COPIES_HOSTILE', 50), +('MINOR_CIV_QUEST_WAR_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_WAR_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_WAR_COPIES_HYPERLINK', 80), -- Militaristic + Friendly -('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE', 7), -('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED', 23), +('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE', 10), +('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED', 20), ('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MERCANTILE', 0), @@ -1046,94 +1054,99 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HYPERLINK', 80), -- Cultured + Hostile -('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE', 7), +('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE', 10), ('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_CULTURED', 0), -('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC', 13), +('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_RELIGIOUS', 0), ('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_NEUTRAL', 0), -('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE', 0), +('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE', 20), ('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HYPERLINK', 80), -- Militaristic + Hostile ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_BASE', 10), ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MILITARISTIC', 0), -('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MARITIME', 1), -('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MERCANTILE', 2), +('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MARITIME', 20), +('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_RELIGIOUS', 0), ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_IRRATIONAL', 0), -('MINOR_CIV_QUEST_LIBERATION_COPIES_BASE', 5), +('MINOR_CIV_QUEST_LIBERATION_COPIES_BASE', 10), ('MINOR_CIV_QUEST_LIBERATION_COPIES_CULTURED', 0), -('MINOR_CIV_QUEST_LIBERATION_COPIES_MILITARISTIC', 55), +('MINOR_CIV_QUEST_LIBERATION_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_LIBERATION_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_LIBERATION_COPIES_MERCANTILE', 0), -('MINOR_CIV_QUEST_LIBERATION_COPIES_RELIGIOUS', 45), -('MINOR_CIV_QUEST_LIBERATION_COPIES_FRIENDLY', 35), +('MINOR_CIV_QUEST_LIBERATION_COPIES_RELIGIOUS', 0), +('MINOR_CIV_QUEST_LIBERATION_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_LIBERATION_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_LIBERATION_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_LIBERATION_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_LIBERATION_COPIES_HYPERLINK', 80), -- Militaristic + Friendly / Mercantile + Hostile -('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE', 5), +('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE', 10), ('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MILITARISTIC', 0), -('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MARITIME', 22), -('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MERCANTILE', 15), +('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MARITIME', 20), +('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_RELIGIOUS', 0), ('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HYPERLINK', 80), -- Maritime + Friendly / Maritime + Neutral -('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE', 15), +('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE', 10), ('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MARITIME', 0), -('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MERCANTILE', 5), +('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_RELIGIOUS', 0), -('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_FRIENDLY', 5), +('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_IRRATIONAL', 0), -('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_BASE', 7), -('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_CULTURED', 8), +('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_BASE', 10), +('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MARITIME', 0), -('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MERCANTILE', 0), -('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_RELIGIOUS', -2), -('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_FRIENDLY', -5), -('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_NEUTRAL', 0), -('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_HOSTILE', 28), +('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MERCANTILE', 20), +('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_RELIGIOUS', 0), +('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_FRIENDLY', 0), +('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_NEUTRAL', 20), +('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_IRRATIONAL', 0), -('MINOR_CIV_QUEST_COUP_COPIES_BASE', 15), -('MINOR_CIV_QUEST_COUP_COPIES_CULTURED', -8), +('MINOR_CIV_QUEST_COUP_COPIES_BASE', 10), +('MINOR_CIV_QUEST_COUP_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_COUP_COPIES_MILITARISTIC', 0), -('MINOR_CIV_QUEST_COUP_COPIES_MARITIME', 8), +('MINOR_CIV_QUEST_COUP_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_COUP_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_COUP_COPIES_RELIGIOUS', 0), -('MINOR_CIV_QUEST_COUP_COPIES_FRIENDLY', -5), -('MINOR_CIV_QUEST_COUP_COPIES_NEUTRAL', 0), -('MINOR_CIV_QUEST_COUP_COPIES_HOSTILE', 30), +('MINOR_CIV_QUEST_COUP_COPIES_FRIENDLY', 0), +('MINOR_CIV_QUEST_COUP_COPIES_NEUTRAL', 20), +('MINOR_CIV_QUEST_COUP_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_COUP_COPIES_IRRATIONAL', 0), -('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_BASE', 2), +('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_BASE', 10), ('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_CULTURED', 0), -('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MILITARISTIC', 48), +('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MILITARISTIC', 20), ('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MARITIME', 0), -('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MERCANTILE', 18), +('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_RELIGIOUS', 0), -('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_FRIENDLY', -35), +('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_NEUTRAL', 0), -('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE', 25), +('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE', 20), ('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HYPERLINK', 80), -- Militaristic + Neutral -- Global Quests ('MINOR_CIV_QUEST_KILL_CAMP_COPIES_BASE', 30), @@ -1153,7 +1166,7 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_RELIGIOUS', 0), -('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_FRIENDLY', -5), -- In Community Patch Only, friendly CS will not give this quest at all +('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_FRIENDLY', 0), -- In Community Patch Only, friendly CS will not give this quest at all ('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_NEUTRAL', -6), ('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_HOSTILE', 10), ('MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_IRRATIONAL', 0), @@ -1168,17 +1181,19 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_IRRATIONAL', 0), - -('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE', 10), -('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED', -5), -('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC', -5), -('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MARITIME', -5), -('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MERCANTILE', -5), -('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_RELIGIOUS', 10), +('MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HYPERLINK', 0), -- Cultured + Neutral + +('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE', 5), +('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED', 0), +('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC', 0), +('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MARITIME', 0), +('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MERCANTILE', 0), +('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_RELIGIOUS', 15), ('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HYPERLINK', 0), -- Religious + Neutral ('MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_BASE', 10), ('MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_CULTURED', 0), @@ -1202,34 +1217,34 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_INVEST_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_INVEST_COPIES_IRRATIONAL', 0), -('MINOR_CIV_QUEST_INFLUENCE_COPIES_BASE', 7), +('MINOR_CIV_QUEST_INFLUENCE_COPIES_BASE', 10), ('MINOR_CIV_QUEST_INFLUENCE_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_INFLUENCE_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_INFLUENCE_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_INFLUENCE_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_INFLUENCE_COPIES_RELIGIOUS', 0), -('MINOR_CIV_QUEST_INFLUENCE_COPIES_FRIENDLY', 0), +('MINOR_CIV_QUEST_INFLUENCE_COPIES_FRIENDLY', 10), ('MINOR_CIV_QUEST_INFLUENCE_COPIES_NEUTRAL', 0), -('MINOR_CIV_QUEST_INFLUENCE_COPIES_HOSTILE', -2), +('MINOR_CIV_QUEST_INFLUENCE_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_INFLUENCE_COPIES_IRRATIONAL', 0), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_BASE', 10), -('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_CULTURED', 0), +('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_CULTURED', 10), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_RELIGIOUS', 0), -('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_FRIENDLY', 3), +('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_IRRATIONAL', 0), -('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_BASE', 7), -('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_CULTURED', 0), -('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MILITARISTIC', 18), +('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_BASE', 10), +('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_CULTURED', 10), +('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MILITARISTIC', 10), ('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MARITIME', 0), ('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MERCANTILE', 0), -('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_RELIGIOUS', 23), +('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_RELIGIOUS', 10), ('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_HOSTILE', 0), @@ -1238,13 +1253,14 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_BASE', 10), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MILITARISTIC', 0), -('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MARITIME', 15), +('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MARITIME', 10), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MERCANTILE', 0), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_RELIGIOUS', 0), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HYPERLINK', 45), -- Maritime + Friendly / Maritime + Neutral ('MINOR_CIV_QUEST_HORDE_COPIES_BASE', 30), ('MINOR_CIV_QUEST_HORDE_COPIES_CULTURED', 0), @@ -1256,8 +1272,9 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_HORDE_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_HORDE_COPIES_HOSTILE', 0), ('MINOR_CIV_QUEST_HORDE_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_HORDE_COPIES_HYPERLINK', 60), -- Maritime + Hostile -('MINOR_CIV_QUEST_REBELLION_COPIES_BASE', 70), +('MINOR_CIV_QUEST_REBELLION_COPIES_BASE', 50), ('MINOR_CIV_QUEST_REBELLION_COPIES_CULTURED', 0), ('MINOR_CIV_QUEST_REBELLION_COPIES_MILITARISTIC', 0), ('MINOR_CIV_QUEST_REBELLION_COPIES_MARITIME', 0), @@ -1266,7 +1283,8 @@ INSERT INTO Defines (Name, Value) VALUES ('MINOR_CIV_QUEST_REBELLION_COPIES_FRIENDLY', 0), ('MINOR_CIV_QUEST_REBELLION_COPIES_NEUTRAL', 0), ('MINOR_CIV_QUEST_REBELLION_COPIES_HOSTILE', 0), -('MINOR_CIV_QUEST_REBELLION_COPIES_IRRATIONAL', 0); +('MINOR_CIV_QUEST_REBELLION_COPIES_IRRATIONAL', 0), +('MINOR_CIV_QUEST_REBELLION_COPIES_HYPERLINK', 80); -- Maritime + Hostile -- Quest reward values INSERT INTO Defines (Name, Value) SELECT 'BALANCE_INFLUENCE_BOOST_PROTECTION_MINOR', 0; -- modifier to all quest rewards from PTP diff --git a/(2) Vox Populi/Balance Changes/Minors/QuestChanges.sql b/(2) Vox Populi/Balance Changes/Minors/QuestChanges.sql index 386dea4119..733fe446c0 100644 --- a/(2) Vox Populi/Balance Changes/Minors/QuestChanges.sql +++ b/(2) Vox Populi/Balance Changes/Minors/QuestChanges.sql @@ -135,10 +135,56 @@ UPDATE SmallAwards SET Influence = '40', CapitalGPPoints = '150', RandomMod = '1 UPDATE SmallAwards SET Influence = '80', GlobalExperience = '15', RandomMod = '5', QuestDuration = '50' WHERE Type = 'MINOR_CIV_QUEST_ACQUIRE_CITY'; -- Quest Weights -UPDATE Defines SET Value = -5 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_CULTURED'; -UPDATE Defines SET Value = 5 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MILITARISTIC'; -UPDATE Defines SET Value = -5 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MARITIME'; -UPDATE Defines SET Value = -5 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MERCANTILE'; -UPDATE Defines SET Value = -5 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_NEUTRAL'; -UPDATE Defines SET Value = 5 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_HOSTILE'; -UPDATE Defines SET Value = -2 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_IRRATIONAL'; \ No newline at end of file +-- Personal Quests +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_ROUTE_COPIES_MERCANTILE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_ROUTE_COPIES_RELIGIOUS'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_ROUTE_COPIES_FRIENDLY'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_ROUTE_COPIES_HOSTILE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_MARITIME'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_FRIENDLY'; +UPDATE Defines SET Value = 80 WHERE Name = 'MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HYPERLINK'; -- Mercantile + Friendly +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_CULTURED'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_RELIGIOUS'; +UPDATE Defines SET Value = 80 WHERE Name = 'MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HYPERLINK'; -- Religious + Hostile +UPDATE Defines SET Value = 80 WHERE Name = 'MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HYPERLINK'; -- Cultured + Friendly +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_FIND_PLAYER_COPIES_MERCANTILE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MILITARISTIC'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MARITIME'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_RELIGIOUS'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_HOSTILE'; +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_GIVE_GOLD_COPIES_BASE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_GIVE_GOLD_COPIES_MILITARISTIC'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_GIVE_GOLD_COPIES_MERCANTILE'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_GIVE_GOLD_COPIES_FRIENDLY'; +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_BASE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_CULTURED'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_MILITARISTIC'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_NEUTRAL'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_MILITARISTIC'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_FRIENDLY'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_NEUTRAL'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_HOSTILE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_IRRATIONAL'; +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_BASE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_MARITIME'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_RELIGIOUS'; +UPDATE Defines SET Value = 80 WHERE Name = 'MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HYPERLINK'; -- Mercantile + Hostile +UPDATE Defines SET Value = 80 WHERE Name = 'MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HYPERLINK'; -- Religious + Friendly +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MARITIME'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MERCANTILE'; +UPDATE Defines SET Value = 20 WHERE Name = 'MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_FRIENDLY'; +UPDATE Defines SET Value = 80 WHERE Name = 'MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HYPERLINK'; -- Mercantile + Neutral +-- Global Quests +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_KILL_CAMP_COPIES_BASE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_KILL_CAMP_COPIES_MILITARISTIC'; +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_KILL_CAMP_COPIES_HOSTILE'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MILITARISTIC'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_NEUTRAL'; +UPDATE Defines SET Value = 45 WHERE Name = 'MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HYPERLINK'; -- Cultured + Neutral +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE'; +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_RELIGIOUS'; +UPDATE Defines SET Value = 45 WHERE Name = 'MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HYPERLINK'; -- Religious + Neutral +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MILITARISTIC'; +UPDATE Defines SET Value = 0 WHERE Name = 'MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_RELIGIOUS'; +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_INVEST_COPIES_MERCANTILE'; +UPDATE Defines SET Value = 10 WHERE Name = 'MINOR_CIV_QUEST_INVEST_COPIES_FRIENDLY'; \ No newline at end of file diff --git a/CvGameCoreDLL_Expansion2/CvGlobals.cpp b/CvGameCoreDLL_Expansion2/CvGlobals.cpp index 90d0ac4d0e..109da034d6 100644 --- a/CvGameCoreDLL_Expansion2/CvGlobals.cpp +++ b/CvGameCoreDLL_Expansion2/CvGlobals.cpp @@ -407,6 +407,7 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HYPERLINK, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_CULTURED, 20), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MILITARISTIC, 0), @@ -417,6 +418,7 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HYPERLINK, 0), GD_INT_INIT(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_CULTURED, 20), GD_INT_INIT(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MILITARISTIC, 0), @@ -427,6 +429,7 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HYPERLINK, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_MILITARISTIC, 0), @@ -487,6 +490,7 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HYPERLINK, 0), GD_INT_INIT(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MILITARISTIC, 0), @@ -497,6 +501,7 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HYPERLINK, 0), GD_INT_INIT(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MILITARISTIC, 0), @@ -507,28 +512,30 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HYPERLINK, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_MARITIME, 20), - GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE, 10), + GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_RELIGIOUS, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_BASE, 15), - GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_CULTURED, 40), - GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_MILITARISTIC, 70), + GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_BASE, 10), + GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_CULTURED, 0), + GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_MILITARISTIC, 20), GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_RELIGIOUS, 0), GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_NEUTRAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_HOSTILE, 50), + GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE, 7), - GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED, 23), + GD_INT_INIT(MINOR_CIV_QUEST_WAR_COPIES_HYPERLINK, 80), + GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE, 10), + GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED, 20), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MERCANTILE, 0), @@ -537,86 +544,91 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE, 7), + GD_INT_INIT(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HYPERLINK, 80), + GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_CULTURED, 0), - GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC, 13), + GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_RELIGIOUS, 0), GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_NEUTRAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE, 0), + GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE, 20), GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HYPERLINK, 80), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MILITARISTIC, 0), - GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MARITIME, 1), - GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MERCANTILE, 2), + GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MARITIME, 20), + GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_RELIGIOUS, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_BASE, 5), + GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_CULTURED, 0), - GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_MILITARISTIC, 55), + GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_MERCANTILE, 0), - GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_RELIGIOUS, 45), - GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_FRIENDLY, 35), + GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_RELIGIOUS, 0), + GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE, 5), + GD_INT_INIT(MINOR_CIV_QUEST_LIBERATION_COPIES_HYPERLINK, 80), + GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MILITARISTIC, 0), - GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MARITIME, 22), - GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MERCANTILE, 15), + GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MARITIME, 20), + GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_RELIGIOUS, 0), GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE, 15), + GD_INT_INIT(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HYPERLINK, 80), + GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MARITIME, 0), - GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MERCANTILE, 5), + GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_RELIGIOUS, 0), - GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_FRIENDLY, 5), + GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_BASE, 7), - GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_CULTURED, 8), + GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_BASE, 10), + GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MARITIME, 0), - GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MERCANTILE, 0), - GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_RELIGIOUS, -2), - GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_FRIENDLY, -5), - GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_NEUTRAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_HOSTILE, 28), + GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MERCANTILE, 20), + GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_RELIGIOUS, 0), + GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_FRIENDLY, 0), + GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_NEUTRAL, 20), + GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_BASE, 15), - GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_CULTURED, -8), + GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_BASE, 10), + GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_MILITARISTIC, 0), - GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_MARITIME, 8), + GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_RELIGIOUS, 0), - GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_FRIENDLY, -5), - GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_NEUTRAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_HOSTILE, 30), + GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_FRIENDLY, 0), + GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_NEUTRAL, 20), + GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_COUP_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_BASE, 2), + GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_CULTURED, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MILITARISTIC, 48), + GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MILITARISTIC, 20), GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MARITIME, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MERCANTILE, 18), + GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_RELIGIOUS, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_FRIENDLY, -35), + GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_NEUTRAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE, 25), + GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE, 20), GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HYPERLINK, 80), GD_INT_INIT(MINOR_CIV_QUEST_KILL_CAMP_COPIES_BASE, 30), GD_INT_INIT(MINOR_CIV_QUEST_KILL_CAMP_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_KILL_CAMP_COPIES_MILITARISTIC, 60), @@ -647,16 +659,18 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE, 10), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED, -5), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC, -5), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MARITIME, -5), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MERCANTILE, -5), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_RELIGIOUS, 10), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HYPERLINK, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE, 5), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MARITIME, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MERCANTILE, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_RELIGIOUS, 15), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HYPERLINK, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MILITARISTIC, 0), @@ -677,32 +691,32 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_INVEST_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_INVEST_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_INVEST_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_BASE, 7), + GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_RELIGIOUS, 0), - GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_FRIENDLY, 0), + GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_FRIENDLY, 10), GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_NEUTRAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_HOSTILE, -2), + GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_INFLUENCE_COPIES_IRRATIONAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_BASE, 10), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_CULTURED, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_CULTURED, 10), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_RELIGIOUS, 0), - GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_FRIENDLY, 3), + GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_BASE, 7), - GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_CULTURED, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MILITARISTIC, 18), + GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_BASE, 10), + GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_CULTURED, 10), + GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MILITARISTIC, 10), GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MARITIME, 0), GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MERCANTILE, 0), - GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_RELIGIOUS, 23), + GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_RELIGIOUS, 10), GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_HOSTILE, 0), @@ -710,13 +724,14 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_BASE, 10), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MILITARISTIC, 0), - GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MARITIME, 15), + GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MARITIME, 10), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MERCANTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_RELIGIOUS, 0), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_FRIENDLY, 0), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HYPERLINK, 45), GD_INT_INIT(MINOR_CIV_QUEST_HORDE_COPIES_BASE, 30), GD_INT_INIT(MINOR_CIV_QUEST_HORDE_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_HORDE_COPIES_MILITARISTIC, 0), @@ -727,7 +742,8 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_HORDE_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_HORDE_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_HORDE_COPIES_IRRATIONAL, 0), - GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_BASE, 70), + GD_INT_INIT(MINOR_CIV_QUEST_HORDE_COPIES_HYPERLINK, 60), + GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_BASE, 50), GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_CULTURED, 0), GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_MILITARISTIC, 0), GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_MARITIME, 0), @@ -737,6 +753,7 @@ CvGlobals::CvGlobals() : GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_NEUTRAL, 0), GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_HOSTILE, 0), GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_IRRATIONAL, 0), + GD_INT_INIT(MINOR_CIV_QUEST_REBELLION_COPIES_HYPERLINK, 80), GD_INT_INIT(INFLUENCE_TARGET_DISTANCE_WEIGHT_VALUE, 3), GD_INT_INIT(AI_MILITARY_RECAPTURING_CITY_STATE, 200), GD_INT_INIT(NEED_DIPLOMAT_THRESHOLD_MODIFIER, 125), @@ -5128,6 +5145,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MILITARISTIC); @@ -5138,6 +5156,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MILITARISTIC); @@ -5148,6 +5167,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_MILITARISTIC); @@ -5208,6 +5228,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MILITARISTIC); @@ -5218,6 +5239,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MILITARISTIC); @@ -5228,6 +5250,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_CITY_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_CITY_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_CITY_COPIES_MILITARISTIC); @@ -5248,6 +5271,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_WAR_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_WAR_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_WAR_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_WAR_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MILITARISTIC); @@ -5258,6 +5282,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC); @@ -5268,6 +5293,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MILITARISTIC); @@ -5288,6 +5314,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_LIBERATION_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_LIBERATION_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_LIBERATION_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_LIBERATION_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MILITARISTIC); @@ -5298,6 +5325,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MILITARISTIC); @@ -5338,6 +5366,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_KILL_CAMP_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_KILL_CAMP_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_KILL_CAMP_COPIES_MILITARISTIC); @@ -5368,6 +5397,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC); @@ -5378,6 +5408,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MILITARISTIC); @@ -5438,6 +5469,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_HORDE_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_HORDE_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_HORDE_COPIES_MILITARISTIC); @@ -5448,6 +5480,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_HORDE_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_HORDE_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_HORDE_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_HORDE_COPIES_HYPERLINK); GD_INT_CACHE(MINOR_CIV_QUEST_REBELLION_COPIES_BASE); GD_INT_CACHE(MINOR_CIV_QUEST_REBELLION_COPIES_CULTURED); GD_INT_CACHE(MINOR_CIV_QUEST_REBELLION_COPIES_MILITARISTIC); @@ -5458,6 +5491,7 @@ void CvGlobals::cacheGlobals() GD_INT_CACHE(MINOR_CIV_QUEST_REBELLION_COPIES_NEUTRAL); GD_INT_CACHE(MINOR_CIV_QUEST_REBELLION_COPIES_HOSTILE); GD_INT_CACHE(MINOR_CIV_QUEST_REBELLION_COPIES_IRRATIONAL); + GD_INT_CACHE(MINOR_CIV_QUEST_REBELLION_COPIES_HYPERLINK); GD_INT_CACHE(INFLUENCE_TARGET_DISTANCE_WEIGHT_VALUE); GD_INT_CACHE(AI_MILITARY_RECAPTURING_CITY_STATE); GD_INT_CACHE(NEED_DIPLOMAT_THRESHOLD_MODIFIER); diff --git a/CvGameCoreDLL_Expansion2/CvGlobals.h b/CvGameCoreDLL_Expansion2/CvGlobals.h index 63dc297357..c0c6f07e88 100644 --- a/CvGameCoreDLL_Expansion2/CvGlobals.h +++ b/CvGameCoreDLL_Expansion2/CvGlobals.h @@ -980,6 +980,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MILITARISTIC); // VP @@ -990,6 +991,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MILITARISTIC); // VP @@ -1000,6 +1002,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_MILITARISTIC); // VP @@ -1010,16 +1013,6 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_IRRATIONAL); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_BASE); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_CULTURED); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_MILITARISTIC); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_MARITIME); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_RELIGIOUS); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_FRIENDLY); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_NEUTRAL); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_HOSTILE); // VP - GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_IRRATIONAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MILITARISTIC); // VP @@ -1070,6 +1063,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MILITARISTIC); // VP @@ -1080,6 +1074,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MILITARISTIC); // VP @@ -1090,6 +1085,17 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HYPERLINK); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_BASE); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_CULTURED); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_MILITARISTIC); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_MARITIME); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_RELIGIOUS); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_FRIENDLY); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_NEUTRAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_HOSTILE); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_COPIES_IRRATIONAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_WAR_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_WAR_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_WAR_COPIES_MILITARISTIC); // VP @@ -1100,6 +1106,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_WAR_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_WAR_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_WAR_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_WAR_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MILITARISTIC); // VP @@ -1110,6 +1117,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC); // VP @@ -1120,6 +1128,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MILITARISTIC); // VP @@ -1140,6 +1149,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_LIBERATION_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_LIBERATION_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_LIBERATION_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_LIBERATION_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MILITARISTIC); // VP @@ -1150,6 +1160,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MILITARISTIC); // VP @@ -1190,6 +1201,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_KILL_CAMP_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_KILL_CAMP_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_KILL_CAMP_COPIES_MILITARISTIC); // VP @@ -1220,6 +1232,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC); // VP @@ -1230,6 +1243,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MILITARISTIC); // VP @@ -1290,6 +1304,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_HORDE_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_HORDE_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_HORDE_COPIES_MILITARISTIC); // VP @@ -1300,6 +1315,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_HORDE_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_HORDE_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_HORDE_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_HORDE_COPIES_HYPERLINK); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_REBELLION_COPIES_BASE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_REBELLION_COPIES_CULTURED); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_REBELLION_COPIES_MILITARISTIC); // VP @@ -1310,6 +1326,7 @@ class CvGlobals GD_INT_MEMBER(MINOR_CIV_QUEST_REBELLION_COPIES_NEUTRAL); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_REBELLION_COPIES_HOSTILE); // VP GD_INT_MEMBER(MINOR_CIV_QUEST_REBELLION_COPIES_IRRATIONAL); // VP + GD_INT_MEMBER(MINOR_CIV_QUEST_REBELLION_COPIES_HYPERLINK); // VP GD_INT_MEMBER(INFLUENCE_TARGET_DISTANCE_WEIGHT_VALUE); // VP GD_INT_MEMBER(AI_MILITARY_RECAPTURING_CITY_STATE); // VP GD_INT_MEMBER(NEED_DIPLOMAT_THRESHOLD_MODIFIER); // VP diff --git a/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp b/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp index d6097e5e29..b20637ad63 100644 --- a/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp +++ b/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp @@ -344,11 +344,7 @@ void CvMinorCivQuest::CalculateRewards(PlayerTypes ePlayer, bool bRecalc) // Random contribution (VP only) int iRandomContribution = 0; if (MOD_BALANCE_CORE_MINORS) - { - iRandomContribution += GC.getGame().randRangeInclusive(0, pkSmallAwardInfo->GetRandom(), kPlayer.GetPseudoRandomSeed().mix(m_eType)) * 2; - if (ePersonality == MINOR_CIV_PERSONALITY_IRRATIONAL) - iRandomContribution -= GC.getGame().randRangeInclusive(0, pkSmallAwardInfo->GetRandom(), pMinor->GetPseudoRandomSeed().mix(m_eType)) * 2; - } + iRandomContribution = GC.getGame().randRangeInclusive(0, pkSmallAwardInfo->GetRandom(), kPlayer.GetPseudoRandomSeed().mix(m_eType)) * 2; // Now determine the rewards! int iBaseModifier = pMinor->GetMinorCivAI()->GetQuestRewardModifier(ePlayer); @@ -7218,10 +7214,10 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_MERCANTILE); + iNumCopies += /*5 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*2*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_RELIGIOUS); + iNumCopies += /*2 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_RELIGIOUS); break; default: UNREACHABLE(); @@ -7230,13 +7226,13 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_FRIENDLY); + iNumCopies += /*10 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*-8*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_HOSTILE); + iNumCopies += /*-8 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ROUTE_COPIES_IRRATIONAL); @@ -7250,45 +7246,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_CONNECT_RESOURCE: { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MERCANTILE && ePersonality == MINOR_CIV_PERSONALITY_FRIENDLY) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*0 in CP, 80 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONNECT_RESOURCE_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -7296,45 +7300,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_CONSTRUCT_WONDER: { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_RELIGIOUS && ePersonality == MINOR_CIV_PERSONALITY_HOSTILE) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*0 in CP, 80 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*20 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_WONDER_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -7342,45 +7354,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_GREAT_PERSON: { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_CULTURED && ePersonality == MINOR_CIV_PERSONALITY_FRIENDLY) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*0 in CP, 80 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GREAT_PERSON_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -7402,7 +7422,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_MERCANTILE); + iNumCopies += /*10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_PLAYER_COPIES_RELIGIOUS); @@ -7432,52 +7452,6 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const break; } - case MINOR_CIV_QUEST_FIND_CITY: - { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_BASE); - - switch (eTrait) - { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); - } - - switch (ePersonality) - { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); - } - - break; - } - case MINOR_CIV_QUEST_FIND_NATURAL_WONDER: { iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_BASE); @@ -7488,16 +7462,16 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MILITARISTIC); + iNumCopies += /*-5 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MARITIME); + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_RELIGIOUS); + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_RELIGIOUS); break; default: UNREACHABLE(); @@ -7512,7 +7486,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*-7*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_HOSTILE); + iNumCopies += /*-7 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_NATURAL_WONDER_COPIES_IRRATIONAL); @@ -7526,7 +7500,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_GIVE_GOLD: { - iNumCopies = /*30*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_BASE); + iNumCopies = /*30 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_BASE); switch (eTrait) { @@ -7534,13 +7508,13 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: // We're tough, we don't need your charity >:( - iNumCopies += /*-10*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_MILITARISTIC); + iNumCopies += /*-10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: // Money, that's what I need. - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_MERCANTILE); + iNumCopies += /*5 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_RELIGIOUS); @@ -7552,7 +7526,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_FRIENDLY); + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIVE_GOLD_COPIES_NEUTRAL); @@ -7572,21 +7546,21 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_PLEDGE_TO_PROTECT: { - iNumCopies = /*30*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_BASE); + iNumCopies = /*30 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_BASE); switch (eTrait) { case MINOR_CIV_TRAIT_CULTURED: // Military? We don't have one of those! - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_CULTURED); + iNumCopies += /*5 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: // We're tough, we can take care of ourselves. - iNumCopies += /*-10*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_MILITARISTIC); + iNumCopies += /*-10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_MERCANTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_RELIGIOUS); @@ -7601,7 +7575,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_NEUTRAL); + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_PLEDGE_TO_PROTECT_COPIES_HOSTILE); @@ -7626,7 +7600,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_MILITARISTIC); + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_MARITIME); @@ -7644,16 +7618,16 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*-7*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_FRIENDLY); + iNumCopies += /*-7 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_NEUTRAL); + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_HOSTILE); + iNumCopies += /*10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_IRRATIONAL); + iNumCopies += /*5 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_BULLY_CITY_STATE_COPIES_IRRATIONAL); break; default: UNREACHABLE(); @@ -7664,24 +7638,186 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_DENOUNCE_MAJOR: { - iNumCopies = /*15*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_BASE); + if (GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MERCANTILE && ePersonality == MINOR_CIV_PERSONALITY_HOSTILE) + { + iNumCopies = /*0 in CP, 80 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HYPERLINK); + } + else + { + iNumCopies = /*15 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*5 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } + } + + break; + } + + case MINOR_CIV_QUEST_SPREAD_RELIGION: + { + if (GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_RELIGIOUS && ePersonality == MINOR_CIV_PERSONALITY_FRIENDLY) + { + iNumCopies = /*0 in CP, 80 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HYPERLINK); + } + else + { + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } + } + + break; + } + + case MINOR_CIV_QUEST_TRADE_ROUTE: + { + if (GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MERCANTILE && ePersonality == MINOR_CIV_PERSONALITY_NEUTRAL) + { + iNumCopies = /*0 in CP, 80 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HYPERLINK); + } + else + { + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*10 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0 in CP, 20 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } + } + + break; + } + + case MINOR_CIV_QUEST_FIND_CITY: + { + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_BASE); switch (eTrait) { case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_CULTURED); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_MILITARISTIC); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_MARITIME); + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_MERCANTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_RELIGIOUS); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_RELIGIOUS); break; default: UNREACHABLE(); @@ -7690,16 +7826,16 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_FRIENDLY); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_NEUTRAL); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_HOSTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_DENOUNCE_MAJOR_COPIES_IRRATIONAL); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_COPIES_IRRATIONAL); break; default: UNREACHABLE(); @@ -7708,185 +7844,109 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const break; } - case MINOR_CIV_QUEST_SPREAD_RELIGION: + case MINOR_CIV_QUEST_WAR: { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MILITARISTIC && ePersonality == MINOR_CIV_PERSONALITY_FRIENDLY) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*80*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPREAD_RELIGION_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); - } + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_BASE); - break; - } - - case MINOR_CIV_QUEST_TRADE_ROUTE: - { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_BASE); - - switch (eTrait) - { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); - } + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: // No bullying in the halls! + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } - switch (ePersonality) - { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_TRADE_ROUTE_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; } - case MINOR_CIV_QUEST_WAR: + case MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER: { - iNumCopies = /*15*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_CULTURED && ePersonality == MINOR_CIV_PERSONALITY_HOSTILE) { - case MINOR_CIV_TRAIT_CULTURED: // Help!! - iNumCopies += /*40*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: // How dare they bully us? We'll make them pay! - iNumCopies += /*70*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*80*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: // Vengeance will be ours! - iNumCopies += /*50*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_WAR_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); - } - - break; - } - - case MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER: - { - iNumCopies = /*7*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_BASE); - switch (eTrait) - { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*23*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); - } + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } - switch (ePersonality) - { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONSTRUCT_NATIONAL_WONDER_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -7894,45 +7954,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT: { - iNumCopies = /*7*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MILITARISTIC && ePersonality == MINOR_CIV_PERSONALITY_HOSTILE) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*13*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*80*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_GIFT_SPECIFIC_UNIT_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -7951,10 +8019,10 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*1*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MARITIME); + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*2*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MERCANTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_FIND_CITY_STATE_COPIES_RELIGIOUS); @@ -7986,45 +8054,54 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_LIBERATION: { - iNumCopies = /*5*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_HYPERLINK) > 0 && + ((eTrait == MINOR_CIV_TRAIT_MILITARISTIC && ePersonality == MINOR_CIV_PERSONALITY_FRIENDLY) + || (eTrait == MINOR_CIV_TRAIT_MERCANTILE && ePersonality == MINOR_CIV_PERSONALITY_HOSTILE))) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: // War beckons - will you answer? - iNumCopies += /*55*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*45*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*80*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: // Our friends were in that city! - iNumCopies += /*35*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_LIBERATION_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -8032,45 +8109,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_EXPLORE_AREA: { - iNumCopies = /*5*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HYPERLINK) > 0 && eTrait == MINOR_CIV_TRAIT_MARITIME + && (ePersonality == MINOR_CIV_PERSONALITY_FRIENDLY || ePersonality == MINOR_CIV_PERSONALITY_NEUTRAL)) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*22*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*15*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*80*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_EXPLORE_AREA_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -8078,7 +8163,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_BUILD_X_BUILDINGS: { - iNumCopies = /*15*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_BASE); switch (eTrait) { @@ -8092,7 +8177,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MERCANTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_RELIGIOUS); @@ -8104,7 +8189,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_FRIENDLY); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_BUILD_X_BUILDINGS_COPIES_NEUTRAL); @@ -8124,12 +8209,12 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_SPY_ON_MAJOR: { - iNumCopies = /*7*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_BASE); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_BASE); switch (eTrait) { case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*8*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_CULTURED); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MILITARISTIC); @@ -8138,10 +8223,10 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MERCANTILE); + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*-2*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_RELIGIOUS); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_RELIGIOUS); break; default: UNREACHABLE(); @@ -8150,13 +8235,13 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_FRIENDLY); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_NEUTRAL); + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*28*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_HOSTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_SPY_ON_MAJOR_COPIES_IRRATIONAL); @@ -8170,18 +8255,18 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_COUP: { - iNumCopies = /*15*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_BASE); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_BASE); switch (eTrait) { case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*-8*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_CULTURED); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*8*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_MARITIME); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_MERCANTILE); @@ -8196,13 +8281,13 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_FRIENDLY); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_NEUTRAL); + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*30*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_HOSTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_COUP_COPIES_IRRATIONAL); @@ -8216,45 +8301,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_ACQUIRE_CITY: { - iNumCopies = /*2*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MILITARISTIC && ePersonality == MINOR_CIV_PERSONALITY_NEUTRAL) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*48*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*18*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*80*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*-35*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*25*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*20*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ACQUIRE_CITY_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -8266,7 +8359,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_KILL_CAMP: { - iNumCopies = /*30*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_BASE); + iNumCopies = /*30 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_BASE); switch (eTrait) { @@ -8274,7 +8367,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*30*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_MILITARISTIC); + iNumCopies += /*60 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_MARITIME); @@ -8298,7 +8391,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_HOSTILE); + iNumCopies += /*0 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CAMP_COPIES_IRRATIONAL); @@ -8318,16 +8411,16 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (eTrait) { case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0 in CP, -5 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_CULTURED); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*10 in CP, 5 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MILITARISTIC); + iNumCopies += /*10 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0 in CP, -5 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MARITIME); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0 in CP, -5 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MERCANTILE); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_RELIGIOUS); @@ -8339,16 +8432,16 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: // In Community Patch only, friendly CS will not give this quest at all - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_FRIENDLY); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*-6 in CP, -5 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_NEUTRAL); + iNumCopies += /*-6 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_NEUTRAL); break; case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*10 in CP, 5 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_HOSTILE); + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0 in CP, -2 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_IRRATIONAL); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_KILL_CITY_STATE_COPIES_IRRATIONAL); break; default: UNREACHABLE(); @@ -8359,91 +8452,107 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_CONTEST_CULTURE: { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_CULTURED && ePersonality == MINOR_CIV_PERSONALITY_NEUTRAL) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*0 in CP, 45 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); - } + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_BASE); - break; - } - - case MINOR_CIV_QUEST_CONTEST_FAITH: - { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE); + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } - switch (eTrait) - { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_CULTURE_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } - switch (ePersonality) + break; + } + + case MINOR_CIV_QUEST_CONTEST_FAITH: + { + if (GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_RELIGIOUS && ePersonality == MINOR_CIV_PERSONALITY_NEUTRAL) { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*0 in CP, 45 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HYPERLINK); + } + else + { + iNumCopies = /*5 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*15 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_FAITH_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -8459,7 +8568,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MILITARISTIC); + iNumCopies += /*0 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MARITIME); @@ -8468,7 +8577,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*-5*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_RELIGIOUS); + iNumCopies += /*-5 in CP, 0 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TECHS_COPIES_RELIGIOUS); break; default: UNREACHABLE(); @@ -8511,7 +8620,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INVEST_COPIES_MARITIME); break; case MINOR_CIV_TRAIT_MERCANTILE: // Money, that's what I need. - iNumCopies += /*5*/ GD_INT_GET(MINOR_CIV_QUEST_INVEST_COPIES_MERCANTILE); + iNumCopies += /*5 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_INVEST_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INVEST_COPIES_RELIGIOUS); @@ -8523,7 +8632,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INVEST_COPIES_FRIENDLY); + iNumCopies += /*0 in CP, 10 in VP*/ GD_INT_GET(MINOR_CIV_QUEST_INVEST_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INVEST_COPIES_NEUTRAL); @@ -8543,7 +8652,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_INFLUENCE: { - iNumCopies = /*7*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_BASE); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_BASE); switch (eTrait) { @@ -8569,13 +8678,13 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_FRIENDLY); + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_NEUTRAL); break; - case MINOR_CIV_PERSONALITY_HOSTILE: // Leave us alone! - iNumCopies += /*-2*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_HOSTILE); + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_HOSTILE); break; case MINOR_CIV_PERSONALITY_IRRATIONAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_INFLUENCE_COPIES_IRRATIONAL); @@ -8594,7 +8703,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (eTrait) { case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_CULTURED); + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_MILITARISTIC); @@ -8615,7 +8724,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const switch (ePersonality) { case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*3*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_FRIENDLY); + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_FRIENDLY); break; case MINOR_CIV_PERSONALITY_NEUTRAL: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CONTEST_TOURISM_COPIES_NEUTRAL); @@ -8635,15 +8744,15 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_ARCHAEOLOGY: { - iNumCopies = /*7*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_BASE); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_BASE); switch (eTrait) { case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_CULTURED); + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_CULTURED); break; case MINOR_CIV_TRAIT_MILITARISTIC: // Recover the spoils of ancient war! - iNumCopies += /*18*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MILITARISTIC); + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MILITARISTIC); break; case MINOR_CIV_TRAIT_MARITIME: iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MARITIME); @@ -8652,7 +8761,7 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_MERCANTILE); break; case MINOR_CIV_TRAIT_RELIGIOUS: // Religious relics, you say? - iNumCopies += /*23*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_RELIGIOUS); + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_ARCHAEOLOGY_COPIES_RELIGIOUS); break; default: UNREACHABLE(); @@ -8681,45 +8790,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_CIRCUMNAVIGATION: { - iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HYPERLINK) > 0 && eTrait == MINOR_CIV_TRAIT_MARITIME + && (ePersonality == MINOR_CIV_PERSONALITY_FRIENDLY || ePersonality == MINOR_CIV_PERSONALITY_NEUTRAL)) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: // We are the masters of the sea! - iNumCopies += /*15*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*45*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: // We are the masters of the sea! + iNumCopies += /*10*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_CIRCUMNAVIGATION_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -8727,45 +8844,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_HORDE: { - iNumCopies = /*30*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MARITIME && ePersonality == MINOR_CIV_PERSONALITY_HOSTILE) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*60*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*30*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_HORDE_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -8773,45 +8898,53 @@ int CvMinorCivAI::GetNumQuestCopies(MinorCivQuestTypes eQuest) const case MINOR_CIV_QUEST_REBELLION: { - iNumCopies = /*70*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_BASE); - - switch (eTrait) + if (GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_HYPERLINK) > 0 && + eTrait == MINOR_CIV_TRAIT_MARITIME && ePersonality == MINOR_CIV_PERSONALITY_HOSTILE) { - case MINOR_CIV_TRAIT_CULTURED: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_CULTURED); - break; - case MINOR_CIV_TRAIT_MILITARISTIC: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_MILITARISTIC); - break; - case MINOR_CIV_TRAIT_MARITIME: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_MARITIME); - break; - case MINOR_CIV_TRAIT_MERCANTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_MERCANTILE); - break; - case MINOR_CIV_TRAIT_RELIGIOUS: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_RELIGIOUS); - break; - default: - UNREACHABLE(); + iNumCopies = /*80*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_HYPERLINK); } - - switch (ePersonality) + else { - case MINOR_CIV_PERSONALITY_FRIENDLY: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_FRIENDLY); - break; - case MINOR_CIV_PERSONALITY_NEUTRAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_NEUTRAL); - break; - case MINOR_CIV_PERSONALITY_HOSTILE: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_HOSTILE); - break; - case MINOR_CIV_PERSONALITY_IRRATIONAL: - iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_IRRATIONAL); - break; - default: - UNREACHABLE(); + iNumCopies = /*50*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_BASE); + + switch (eTrait) + { + case MINOR_CIV_TRAIT_CULTURED: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_CULTURED); + break; + case MINOR_CIV_TRAIT_MILITARISTIC: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_MILITARISTIC); + break; + case MINOR_CIV_TRAIT_MARITIME: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_MARITIME); + break; + case MINOR_CIV_TRAIT_MERCANTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_MERCANTILE); + break; + case MINOR_CIV_TRAIT_RELIGIOUS: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_RELIGIOUS); + break; + default: + UNREACHABLE(); + } + + switch (ePersonality) + { + case MINOR_CIV_PERSONALITY_FRIENDLY: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_FRIENDLY); + break; + case MINOR_CIV_PERSONALITY_NEUTRAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_NEUTRAL); + break; + case MINOR_CIV_PERSONALITY_HOSTILE: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_HOSTILE); + break; + case MINOR_CIV_PERSONALITY_IRRATIONAL: + iNumCopies += /*0*/ GD_INT_GET(MINOR_CIV_QUEST_REBELLION_COPIES_IRRATIONAL); + break; + default: + UNREACHABLE(); + } } break; @@ -9424,26 +9557,20 @@ CvPlot* CvMinorCivAI::GetBestNearbyDig() /// NOTE: This should tell us if it is time to spawn a horde - it is based on the wealth and size of CSs - stronger = better target! PlayerTypes CvMinorCivAI::SpawnHorde() { - if(!IsValidRebellion()) - { + if (!IsValidRebellion()) return NO_PLAYER; - } - PlayerTypes pActiveMinor = GetPlayer()->GetID(); - EraTypes eAssumeEra = NO_ERA; - EraTypes eCurrentEra = eAssumeEra; - if(eCurrentEra == NO_ERA) - eCurrentEra = GET_TEAM(GET_PLAYER(pActiveMinor).getTeam()).GetCurrentEra(); - - EraTypes eRenaissance = (EraTypes) GC.getInfoTypeForString("ERA_RENAISSANCE", true); - EraTypes eClassical = (EraTypes) GC.getInfoTypeForString("ERA_CLASSICAL", true); + PlayerTypes pActiveMinor = GetPlayer()->GetID(); + EraTypes eCurrentEra = GET_TEAM(GET_PLAYER(pActiveMinor).getTeam()).GetCurrentEra(); + EraTypes eRenaissance = (EraTypes) GC.getInfoTypeForString("ERA_RENAISSANCE", true); + EraTypes eClassical = (EraTypes) GC.getInfoTypeForString("ERA_CLASSICAL", true); //This is just for Classical/Medieval/Renaissance Eras. - if(eCurrentEra < eClassical) + if (eCurrentEra < eClassical) { return NO_PLAYER; } - else if(eCurrentEra > eRenaissance) + else if (eCurrentEra > eRenaissance) { return NO_PLAYER; } @@ -9453,110 +9580,96 @@ PlayerTypes CvMinorCivAI::SpawnHorde() for (int iPlayerLoop = 0; iPlayerLoop < MAX_CIV_PLAYERS; iPlayerLoop++) { PlayerTypes eLoopPlayer = (PlayerTypes) iPlayerLoop; - if(eLoopPlayer != NO_PLAYER && GET_PLAYER(eLoopPlayer).isAlive() && !GET_PLAYER(eLoopPlayer).isMinorCiv() && GET_PLAYER(eLoopPlayer).getCapitalCity() != NULL) + if (GET_PLAYER(eLoopPlayer).isAlive() && !GET_PLAYER(eLoopPlayer).isMinorCiv() && GET_PLAYER(eLoopPlayer).getCapitalCity() != NULL) { - if(GET_PLAYER(eLoopPlayer).getCapitalCity()->HasSharedAreaWith(GET_PLAYER(pActiveMinor).getCapitalCity(),true,false)) + if (GET_PLAYER(eLoopPlayer).getCapitalCity()->HasSharedLandmassWith(GET_PLAYER(pActiveMinor).getCapitalCity(),true,false)) { bIsAlone = false; break; } } } - if(bIsAlone) - { + if (bIsAlone) return NO_PLAYER; - } int iTarget = 0; //Top 25% - int iTopTier = (GC.getGame().GetNumMinorCivsAlive() / 4); - if(iTopTier <= 0) - { + int iTopTier = GC.getGame().GetNumMinorCivsAlive() / 4; + if (iTopTier <= 0) iTopTier = 1; - } CvWeightedVector veMinorRankings; for (int iMinorLoop = MAX_MAJOR_CIVS; iMinorLoop < MAX_CIV_PLAYERS; iMinorLoop++) { PlayerTypes eMinorLoop = (PlayerTypes) iMinorLoop; - if(eMinorLoop != NO_PLAYER) + if (eMinorLoop == NO_PLAYER) + continue; + + CvPlayer* pMinorLoop = &GET_PLAYER(eMinorLoop); + CvCity* pCity = pMinorLoop->getCapitalCity(); + + //Let's see if our CS is juicy and vulnerable. + if (pMinorLoop->isAlive() && pMinorLoop->isMinorCiv() && pCity) { - CvPlayer* pMinorLoop = &GET_PLAYER(eMinorLoop); - CvCity* pCity = pMinorLoop->getCapitalCity(); + CvCityCitizens* pCitizens = pCity->GetCityCitizens(); - //Let's see if our CS is juicy and vulnerable. - if(pMinorLoop->isAlive() && pMinorLoop->isMinorCiv() && pCity) - { - CvCityCitizens* pCitizens = pCity->GetCityCitizens(); + int iPlots = 0; + int iWater = 0; + int iImpassable = 0; - int iPlots = 0; - int iWater = 0; - int iImpassable = 0; + // How easy to access is this minor? We'll ignore island/mountainous CSs for this quest, to help the AI. + for (int iPlotLoop = 1; iPlotLoop < pCity->GetNumWorkablePlots(); iPlotLoop++) + { + CvPlot* pPlot = pCitizens->GetCityPlotFromIndex(iPlotLoop); - // How easy to access is this minor? We'll ignore island/mountainous CSs for this quest, to help the AI. - for(int iPlotLoop = 1; iPlotLoop < pCity->GetNumWorkablePlots(); iPlotLoop++) + if (pPlot) { - CvPlot* pPlot = pCitizens->GetCityPlotFromIndex(iPlotLoop); - - if(pPlot) + if (pPlot->isWater()) { - if(pPlot->isWater()) - { - iWater++; - } - if(!pPlot->isValidMovePlot(BARBARIAN_PLAYER)) - { - iImpassable++; - } + iWater++; + } + if (!pPlot->isValidMovePlot(BARBARIAN_PLAYER)) + { + iImpassable++; } - iPlots++; - } - //50% Water? Abort. Probably an island. - if(iWater >= (iPlots / 2)) - { - continue; } + iPlots++; + } + //50% Water? Abort. Probably an island. + if (iWater >= iPlots / 2) + continue; - //50% Mountains? Abort. Probably Minas Tirith. - if(iImpassable >= (iPlots / 2)) - { - continue; - } + //50% Mountains? Abort. Probably Minas Tirith. + if (iImpassable >= iPlots / 2) + continue; - //Baseline is population. - iTarget = pCity->getPopulation(); + //Baseline is population. + iTarget = pCity->getPopulation(); - // Gold increases proclivity. - iTarget += (pMinorLoop->GetTreasury()->GetGold() / 10); - iTarget += pMinorLoop->GetTreasury()->GetImprovementGoldMaintenance(); - iTarget += pMinorLoop->GetTreasury()->CalculateBaseNetGold(); - iTarget += pMinorLoop->GetTrade()->GetNumDifferentTradingPartners(); + // Gold increases proclivity. + iTarget += pCity->getYieldRateTimes100(YIELD_GOLD, true, false) / 100; + iTarget += pMinorLoop->GetTrade()->GetNumDifferentTradingPartners() * 3; - //Less military units = higher score. - iTarget -= pMinorLoop->getNumMilitaryUnits(); + // Less military units = higher score. + iTarget -= pMinorLoop->getNumMilitaryUnits(); - if(iTarget > 0) - { - veMinorRankings.push_back(eMinorLoop, iTarget); - } - } + if (iTarget > 0) + veMinorRankings.push_back(eMinorLoop, iTarget); } } veMinorRankings.StableSortItems(); - if(veMinorRankings.size() != 0) + if (veMinorRankings.size() > 0) { - for(int iRanking = 0; iRanking < veMinorRankings.size(); iRanking++) + for (int iRanking = 0; iRanking < veMinorRankings.size(); iRanking++) { - if(veMinorRankings.GetElement(iRanking) == pActiveMinor) + if (veMinorRankings.GetElement(iRanking) == pActiveMinor) { //Are we in the top 25% of CSs? If so, the quest can fire. - if(iRanking <= iTopTier) - { + if (iRanking <= iTopTier) return pActiveMinor; - } } } } @@ -9568,90 +9681,78 @@ PlayerTypes CvMinorCivAI::SpawnHorde() /// NOTE: This should tell us if it is time to spawn rebels PlayerTypes CvMinorCivAI::SpawnRebels() { - if(!IsValidRebellion()) - { + if (!IsValidRebellion()) return NO_PLAYER; - } PlayerTypes pActiveMinor = GetPlayer()->GetID(); PlayerTypes ePlayer = GetPlayer()->GetMinorCivAI()->GetAlly(); - if(ePlayer == NO_PLAYER) + if (ePlayer == NO_PLAYER || !GET_PLAYER(ePlayer).isAlive() || !GET_PLAYER(ePlayer).isMajorCiv()) { return NO_PLAYER; } - if(GetPermanentAlly() == ePlayer) + if (GetPermanentAlly() == ePlayer) { return NO_PLAYER; } - int iRebelBuildUp = 0; - - PublicOpinionTypes eOpinionInMyCiv = m_pPlayer->GetCulture()->GetPublicOpinionType(); - PlayerProximityTypes eProximity; - eProximity = GET_PLAYER(pActiveMinor).GetProximityToPlayer(ePlayer); + PublicOpinionTypes eOpinionInMyCiv = GET_PLAYER(ePlayer).GetCulture()->GetPublicOpinionType(); + PlayerProximityTypes eProximity = GET_PLAYER(ePlayer).GetProximityToPlayer(GetPlayer()->GetID()); - //Base value is influence with CS / 100 (i.e. 80 -> 8). + //Base value is influence with CS / 10 (i.e. 80 -> 8). int iRebelBoilPoint = GetPlayer()->GetMinorCivAI()->GetEffectiveFriendshipWithMajor(ePlayer); iRebelBoilPoint /= 10; //Hard cap at 250 influence (25) - if(iRebelBoilPoint > 25) - { + if (iRebelBoilPoint > 25) iRebelBoilPoint = 25; + + // Unhappiness and Civil Resistance increase the probability. + if (GET_PLAYER(ePlayer).IsEmpireVeryUnhappy()) + { + iRebelBoilPoint /= 2; + } + if (eOpinionInMyCiv >= PUBLIC_OPINION_CIVIL_RESISTANCE) + { + iRebelBoilPoint /= 2; + } + + //How close are we? Further away = higher chance of rebellion. + if (eProximity >= PLAYER_PROXIMITY_CLOSE) + { + iRebelBoilPoint += iRebelBoilPoint * 125 / 100; + } + else if (eProximity < PLAYER_PROXIMITY_CLOSE) + { + iRebelBoilPoint += iRebelBoilPoint * 100 / 125; } - if(ePlayer != NO_PLAYER && GET_PLAYER(ePlayer).isAlive() && !GET_PLAYER(ePlayer).isMinorCiv()) + int iRebelBuildUp = 0; + if (GET_PLAYER(ePlayer).IsEmpireUnhappy()) { - if(GET_PLAYER(ePlayer).IsEmpireUnhappy()) - { - iRebelBuildUp += 2; - } - if(GET_PLAYER(ePlayer).IsEmpireVeryUnhappy()) - { - iRebelBoilPoint /= 2; - } - if(GET_PLAYER(ePlayer).GetCulture()->GetPublicOpinionUnhappiness() > 0) - { - iRebelBuildUp += 2; - } - if (eOpinionInMyCiv >= PUBLIC_OPINION_CIVIL_RESISTANCE) - { - iRebelBoilPoint /= 2; - } - //How close are we? Further away = higher chance of rebellion. - if(eProximity >= PLAYER_PROXIMITY_CLOSE) - { - iRebelBoilPoint += ((iRebelBoilPoint * 125) / 100); - } - else if(eProximity < PLAYER_PROXIMITY_CLOSE) - { - iRebelBoilPoint += ((iRebelBoilPoint * 100) / 125); - } - TeamTypes eLoopTeam; - int iWar = 0; - //CSs don't like war. - for(int iTeamLoop = 0; iTeamLoop < MAX_CIV_TEAMS; iTeamLoop++) - { - eLoopTeam = (TeamTypes) iTeamLoop; + iRebelBuildUp += 2; + } + if (GET_PLAYER(ePlayer).GetCulture()->GetPublicOpinionUnhappiness() > 0) + { + iRebelBuildUp += 2; + } - if(GET_TEAM(GET_PLAYER(ePlayer).getTeam()).isAtWar(eLoopTeam)) - { - iWar++; - } - } - if(iWar > 0) - { - iRebelBuildUp += iWar; - } + //CSs don't like war. + int iWar = 0; + for (int iTeamLoop = 0; iTeamLoop < MAX_CIV_TEAMS; iTeamLoop++) + { + TeamTypes eLoopTeam = (TeamTypes) iTeamLoop; + if (GET_TEAM(GET_PLAYER(ePlayer).getTeam()).isAtWar(eLoopTeam)) + iWar++; + } + if (iWar > 0) + iRebelBuildUp += iWar; - iRebelBuildUp += GC.getGame().randRangeExclusive(0, GC.getGame().getCurrentEra(), m_pPlayer->GetPseudoRandomSeed()); + // Random factor + iRebelBuildUp += GC.getGame().randRangeExclusive(0, GC.getGame().getCurrentEra(), CvSeeder::fromRaw(0x872edbb4).mix(m_pPlayer->GetPseudoRandomSeed())); - if(iRebelBuildUp >= iRebelBoilPoint) - { - return pActiveMinor; - } - } + if (iRebelBuildUp >= iRebelBoilPoint) + return pActiveMinor; return NO_PLAYER; } @@ -9701,34 +9802,30 @@ void CvMinorCivAI::DoRebellion() bool CvMinorCivAI::IsValidRebellion() { //Test to keep quests from firing over and over if ended. - if(GetCooldownSpawn() > 0 ) - { + if (GetCooldownSpawn() > 0) return false; - } int iActiveRebellions = 0; //Call every minor, otherwise no minor is aware of what other minors have given out. - for (int iMinorLoop = MAX_MAJOR_CIVS; iMinorLoop < MAX_CIV_PLAYERS; iMinorLoop++) { PlayerTypes eMinorLoop = (PlayerTypes) iMinorLoop; - CvPlayer* pMinorLoop = &GET_PLAYER(eMinorLoop); if (pMinorLoop && pMinorLoop->isAlive() && pMinorLoop->isMinorCiv() && (pMinorLoop != GetPlayer())) { - if(pMinorLoop->GetMinorCivAI()->IsHordeActive()) + if (pMinorLoop->GetMinorCivAI()->IsHordeActive()) { iActiveRebellions++; } - if(pMinorLoop->GetMinorCivAI()->IsRebellionActive()) + if (pMinorLoop->GetMinorCivAI()->IsRebellionActive()) { iActiveRebellions++; } } } - if(iActiveRebellions > 0) + if (iActiveRebellions > 0) { int iActivePlayers = GC.getGame().countMajorCivsAlive(); //Let's make this more granular. @@ -9738,11 +9835,10 @@ bool CvMinorCivAI::IsValidRebellion() int iMaxQuests = (iActiveRebellions / iActivePlayers); //If there are more quests active than 20% of all civs, the quest should abort, as that's too many for the AI to handle. - if(iMaxQuests >= 2) - { + if (iMaxQuests >= 2) return false; - } } + return true; }