Add Playable column for City-States in XML

Author: RecursiveVision

(1) Community Patch/Database Changes/Minors/MinorTableChanges.sql

@@ -1,7 +1,10 @@
+-- Toggles whether the minor civ can appear at all (without needing to delete it from the database)
+ALTER TABLE MinorCivilizations ADD Playable boolean DEFAULT 1;
+
 -- This minor civ always has this personality instead of picking a random one
 -- Overrides the BALANCE_CITY_STATE_PERSONALITIES option
 ALTER TABLE MinorCivilizations ADD FixedPersonality text REFERENCES MinorCivPersonalityTypes (Type);
 
 -- The unit class given to the bully when this minor civ is heavy tributed
 -- Overridden by the BALANCE_CORE_MINOR_VARIABLE_BULLYING option, which does not give units
-ALTER TABLE MinorCivilizations ADD BullyUnitClass text REFERENCES UnitClasses (Type) DEFAULT 'UNITCLASS_WORKER';
+ALTER TABLE MinorCivilizations ADD BullyUnitClass text REFERENCES UnitClasses (Type) DEFAULT 'UNITCLASS_WORKER';

CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp

@@ -18968,13 +18968,12 @@ void CvMinorCivAI::SetDisableNotifications(bool bDisableNotifications)
 //					CvMinorCivInfo
 //======================================================================================================
 CvMinorCivInfo::CvMinorCivInfo() :
+	m_bPlayable(false),
 	m_iDefaultPlayerColor(NO_PLAYERCOLOR),
 	m_iArtStyleType(NO_ARTSTYLE),
 	m_iMinorCivTrait(NO_MINOR_CIV_TRAIT_TYPE),
 	m_eFixedPersonality(NO_MINOR_CIV_PERSONALITY_TYPE),
-#if defined(MOD_BALANCE_CORE)
 	m_iBullyUnit(NO_UNITCLASS),
-#endif
 	m_piFlavorValue(NULL)
 {
 }
@@ -18984,6 +18983,11 @@ CvMinorCivInfo::~CvMinorCivInfo()
 	SAFE_DELETE_ARRAY(m_piFlavorValue);
 }
 //------------------------------------------------------------------------------
+int CvMinorCivInfo::IsPlayable() const
+{
+	return m_bPlayable;
+}
+//------------------------------------------------------------------------------
 int CvMinorCivInfo::getDefaultPlayerColor() const
 {
 	return m_iDefaultPlayerColor;
@@ -19102,12 +19106,10 @@ MinorCivPersonalityTypes CvMinorCivInfo::MinorCivPersonalityFromString(const cha
 	return NO_MINOR_CIV_PERSONALITY_TYPE;
 }
 //------------------------------------------------------------------------------
-#if defined(MOD_BALANCE_CORE)
 int CvMinorCivInfo::GetBullyUnit() const
 {
 	return m_iBullyUnit;
 }
-#endif
 //------------------------------------------------------------------------------
 int CvMinorCivInfo::getFlavorValue(int i) const
 {
@@ -19137,6 +19139,7 @@ bool CvMinorCivInfo::CacheResults(Database::Results& kResults, CvDatabaseUtility
 		return false;
 
 	//Basic Properties
+	m_bPlayable = kResults.GetBool("Playable");
 	const char* szTextVal = NULL;
 
 	szTextVal = kResults.GetText("ShortDescription");
@@ -19167,10 +19170,8 @@ bool CvMinorCivInfo::CacheResults(Database::Results& kResults, CvDatabaseUtility
 	szTextVal = kResults.GetText("FixedPersonality");
 	m_eFixedPersonality = MinorCivPersonalityFromString(szTextVal);
 
-#if defined(MOD_BALANCE_CORE)
 	szTextVal = kResults.GetText("BullyUnitClass");
 	m_iBullyUnit = GC.getInfoTypeForString(szTextVal, true);
-#endif
 
 	//Arrays
 	const char* szType = GetType();

CvGameCoreDLL_Expansion2/CvMinorCivAI.h

@@ -994,17 +994,13 @@ class CvMinorCivInfo : public CvBaseInfo
 	virtual bool CacheResults(Database::Results& kResults, CvDatabaseUtility& kUtility);
 
 protected:
+	bool m_bPlayable;
 	int m_iDefaultPlayerColor;
 	int m_iArtStyleType;
 	int m_iNumLeaders;				 // the number of leaders the Civ has, this is needed so that random leaders can be generated easily
 	int m_iMinorCivTrait;
 	MinorCivPersonalityTypes m_eFixedPersonality;
-#if defined(MOD_BALANCE_CORE)
 	int m_iBullyUnit;
-#endif
-
-	bool m_bAIPlayable;
-	bool m_bPlayable;
 
 	CvString m_strArtDefineTag;
 	CvString m_strArtStylePrefix;

CvGameCoreDLL_Expansion2/CvPreGame.cpp

@@ -2876,6 +2876,11 @@ vector<MinorCivTypes> GetAvailableMinorCivTypes(vector<MinorCivTypes>& vCultured
 		if (pkCityState == NULL)
 			continue;
 
+		// Turned off in XML?
+		if (!pkCityState->IsPlayable())
+			continue;
+
+		// Blocked by game options?
 		MinorCivTraitTypes eTrait = (MinorCivTraitTypes)pkCityState->GetMinorCivTrait();
 		if (eTrait == MINOR_CIV_TRAIT_RELIGIOUS && bNoReligion)
 			continue;