Fix a bunch of bugs

- Fixed a crash when deleting a City-State from the game with IGE
- Fixed #11096 a crash when scoring religious beliefs without having a capital city
- Fixed AI being overly eager to liberate vassals (added many sanity checks, reduced weights, and added a customizable define)
- Fixed some vassal tax money being lost due to rounding if there are multiple players on the master's team
- Fixed vassal maintenance expenses not being divided evenly amongst members of the master's team
- Fixed vassals adopting the ideology of dead masters if a still-living master is later in the player order
- Fixed Nuclear Gandhi being enabled with Random Personalities enabled and without the relevant override setting enabled
- Fixed Indian Great Prophets perishing immediately if the player chooses to build a Holy Site before founding a religion
- Also unhardcoded this exception so that it works for any improvement that a Great Prophet can create, not just Holy Sites
- Fixed human vassals not adopting their master's ideology
- Fixed broken logic preventing AI players from switching ideologies
- AI teammates of humans will attempt to adopt the first human on their team's ideology (sorting by turn order) if it would not make them lose cities from Unhappiness
- AI teammates of other AIs will adopt the ideology of the clearly leading AI, if they have at least 1.5x the evaluating AI's score
- AI teammates will switch ideologies if they have the option and either of the two conditions above are true
- AI no longer sends spies to City-States if a Sphere of Influence or Open Doors resolution has been proposed for them
- AI now considers when a player currently owns their teammate's cities as well as their own for some things
- Improve readability of DifficultyChanges.xml

(1) Community Patch/Core Files/Core Tables/DifficultyTables.sql

@@ -1,3 +1,7 @@
+-- Delete the data in the difficulty tables, replaced in DifficultyTables.xml
+DELETE FROM HandicapInfo_FreeTechs;
+DELETE FROM HandicapInfo_AIFreeTechs;
+DELETE FROM HandicapInfo_Goodies; -- This one is replaced at the end of this file instead
 DELETE FROM HandicapInfos;
 
 -- This code is necessary to avoid a UI glitch where difficulty levels do not display properly on game creation, do not remove it
@@ -226,3 +230,53 @@ VALUES
 	('GOODY_GOLDEN_AGE', 'TXT_KEY_GOODY_GOLDEN_AGE', 'TXT_KEY_GOODY_CHOOSE_GOLDEN_AGE', 0, 200, 0, 0),
 	('GOODY_TILES', 'TXT_KEY_GOODY_TILES', 'TXT_KEY_GOODY_CHOOSE_FREE_TILES', 0, 0, 4, 0),
 	('GOODY_SCIENCE', 'TXT_KEY_GOODY_SCIENCE', 'TXT_KEY_GOODY_CHOOSE_SCIENCE', 0, 0, 0, 35);
+
+-- Re-add Goody Hut rewards
+CREATE TEMP TABLE HandicapsList (
+	HandicapType text
+);
+
+INSERT INTO HandicapsList
+	(HandicapType)
+VALUES
+	('HANDICAP_SETTLER'),
+	('HANDICAP_CHIEFTAIN'),
+	('HANDICAP_WARLORD'),
+	('HANDICAP_PRINCE'),
+	('HANDICAP_KING'),
+	('HANDICAP_EMPEROR'),
+	('HANDICAP_IMMORTAL'),
+	('HANDICAP_DEITY'),
+	('HANDICAP_AI_DEFAULT');
+
+CREATE TEMP TABLE GoodyHutRewards (
+	GoodyType text
+);
+
+INSERT INTO GoodyHutRewards
+	(GoodyType)
+VALUES
+	('GOODY_POPULATION'),
+	('GOODY_CULTURE'),
+	('GOODY_PANTHEON_FAITH'),
+	('GOODY_PROPHET_FAITH'),
+	('GOODY_GOLD'),
+	('GOODY_MAP'),
+	('GOODY_TECH'),
+	('GOODY_REVEAL_NEARBY_BARBS'),
+	('GOODY_UPGRADE_UNIT');
+
+-- Settler-exclusive rewards
+INSERT INTO HandicapInfo_Goodies
+	('HANDICAP_SETTLER', 'GOODY_WORKER'),
+	('HANDICAP_SETTLER', 'GOODY_SETTLER');
+
+-- General rewards
+INSERT INTO HandicapInfo_Goodies
+	(HandicapType, GoodyType)
+SELECT
+	a.HandicapType, b.GoodyType
+FROM HandicapsList a, GoodyHutRewards b;
+
+DROP TABLE HandicapsList;
+DROP TABLE GoodyHutRewards;

(1) Community Patch/Core Files/Core Values/CoreDefines.sql

@@ -1497,6 +1497,7 @@ INSERT INTO Defines (Name, Value) SELECT 'VASSALAGE_VASSAL_MASTER_CITY_PERCENT_T
 INSERT INTO Defines (Name, Value) SELECT 'VASSALAGE_VASSAL_MASTER_POP_PERCENT_THRESHOLD', 60;
 
 INSERT INTO Defines (Name, Value) SELECT 'VASSALAGE_CAPITULATE_BASE_THRESHOLD', 100; -- How likely is a vassal to voluntarily capitulate?
+INSERT INTO Defines (Name, Value) SELECT 'VASSALAGE_LIBERATE_BASE_THRESHOLD', 100; -- How likely is a master to voluntarily liberate a vassal?
 
 -- Border growth tile selection
 UPDATE Defines SET Value = 200 WHERE Name = 'PLOT_INFLUENCE_RING_COST';

(2) Vox Populi/Database Changes/Difficulty/DifficultyChanges.sql

@@ -1,3 +1,57 @@
+-- New Goody Hut rewards
+CREATE TEMP TABLE HandicapsList (
+	HandicapType text
+);
+
+INSERT INTO HandicapsList
+	(HandicapType)
+VALUES
+	('HANDICAP_SETTLER'),
+	('HANDICAP_CHIEFTAIN'),
+	('HANDICAP_WARLORD'),
+	('HANDICAP_PRINCE'),
+	('HANDICAP_KING'),
+	('HANDICAP_EMPEROR'),
+	('HANDICAP_IMMORTAL'),
+	('HANDICAP_DEITY'),
+	('HANDICAP_AI_DEFAULT');
+
+CREATE TEMP TABLE GoodyHutRewards (
+	GoodyType text
+);
+
+INSERT INTO GoodyHutRewards
+	(GoodyType)
+VALUES
+	('GOODY_POPULATION'),
+	('GOODY_CULTURE'),
+	('GOODY_PANTHEON_FAITH'),
+	('GOODY_PROPHET_FAITH'),
+	('GOODY_GOLD'),
+	('GOODY_MAP'),
+	('GOODY_UPGRADE_UNIT'),
+	('GOODY_PRODUCTION'),
+	('GOODY_GOLDEN_AGE'),
+	('GOODY_TILES'),
+	('GOODY_SCIENCE');
+
+-- Settler-exclusive rewards
+INSERT INTO HandicapInfo_Goodies
+	('HANDICAP_SETTLER', 'GOODY_WORKER'),
+	('HANDICAP_SETTLER', 'GOODY_SETTLER');
+
+-- General rewards
+INSERT INTO HandicapInfo_Goodies
+	(HandicapType, GoodyType)
+SELECT
+	a.HandicapType, b.GoodyType
+FROM HandicapsList a, GoodyHutRewards b;
+
+DROP TABLE HandicapsList;
+DROP TABLE GoodyHutRewards;
+
+
+
 CREATE TEMP TABLE TriggerYields (
 	HistoricEventType text,
 	YieldType text

(2) Vox Populi/Database Changes/Difficulty/PreDifficultyChanges.sql

@@ -1,5 +1,7 @@
--- Delete the data in the difficulty tables, replaced in DifficultyChanges.xml
+-- Delete the data in the difficulty tables, replaced in DifficultyChanges.xml and GoodyHutChanges.sql
+DELETE FROM HandicapInfo_DifficultyBonus;
+DELETE FROM HandicapInfo_AIDifficultyBonus;
 DELETE FROM HandicapInfo_FreeTechs;
 DELETE FROM HandicapInfo_AIFreeTechs;
 DELETE FROM HandicapInfo_Goodies;
-DELETE FROM HandicapInfos;
+DELETE FROM HandicapInfos;

CvGameCoreDLLUtil/include/CvDllInterfaces2.h

@@ -103,8 +103,7 @@ class ICvNetMessageHandler3 : public ICvNetMessageHandler2
 	virtual void DLLCALL ResponseGoodyChoice(PlayerTypes ePlayer, int iPlotX, int iPlotY, GoodyTypes eGoody, int iUnitID) = 0;
 	virtual void DLLCALL ResponseSetSwappableGreatWork(PlayerTypes ePlayer, int iWorkClass, int iWorkIndex) = 0;
 	virtual void DLLCALL ResponseSwapGreatWorks(PlayerTypes ePlayer1, int iWorkIndex1, PlayerTypes PlayerTypes2, int iWorkIndex2) = 0;
-	virtual void DLLCALL ResponseMoveGreatWorks(PlayerTypes ePlayer, int iCity1, int iBuildingClass1, int iWorkIndex1, 
-																																	 int iCity2, int iBuildingClass2, int iWorkIndex2) = 0;
+	virtual void DLLCALL ResponseMoveGreatWorks(PlayerTypes ePlayer, int iCity1, int iBuildingClass1, int iWorkIndex1, int iCity2, int iBuildingClass2, int iWorkIndex2) = 0;
 	virtual void DLLCALL ResponseChangeIdeology(PlayerTypes ePlayer) = 0;
 };