GOTTA, SWEEP SWEEP SWEEP!

LoneGazebo · Jul 6, 2024 · 06e2c1e · 06e2c1e
1 parent 214e297
commit 06e2c1e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 37 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvCity.cpp b/CvGameCoreDLL_Expansion2/CvCity.cpp
@@ -8488,12 +8488,8 @@ bool CvCity::hasBuildingPrerequisites(BuildingTypes eBuilding) const
 	// Check if a specific prerequisite building is needed in this city
 	BuildingTypes ePrereqBuilding = static_cast<BuildingTypes>(pkBuildingInfo->GetNeedBuildingThisCity());
 
-	// Determine if no prerequisite building is needed or the prerequisite building is present
-	bool bNoPrereqBuilding = (ePrereqBuilding == NO_BUILDING);
-	bool bHasPrereqBuilding = HasBuilding(ePrereqBuilding);
-
 	// Return true if no specific prerequisite building is needed or it is present in the city
-	return bNoPrereqBuilding || bHasPrereqBuilding;
+	return (ePrereqBuilding == NO_BUILDING) || HasBuilding(ePrereqBuilding);
 }
 
 //	--------------------------------------------------------------------------------

diff --git a/CvGameCoreDLL_Expansion2/CvDealAI.cpp b/CvGameCoreDLL_Expansion2/CvDealAI.cpp
@@ -6867,14 +6867,6 @@ int CvDealAI::GetTechValue(TechTypes eTech, bool bFromMe, PlayerTypes eOtherPlay
 		}
 	}
 
-	if(pkTechInfo->IsResearchAgreementTradingAllowed())
-	{
-		if(GC.getGame().isOption(GAMEOPTION_RESEARCH_AGREEMENTS) && !GC.getGame().isOption(GAMEOPTION_NO_SCIENCE))
-		{
-			iTechMod += 2;
-		}
-	}
-
 	// BASE COST = (TurnsLeft * 30 * (era ^ 0.7))	-- Ancient Era is 1, Classical Era is 2 because I incremented it
 	iItemValue = max(10, iTurnsLeft) * /*30*/ max(100, GC.getGame().getGameSpeedInfo().getTechCostPerTurnMultiplier());
 	float fItemMultiplier = (float)(pow( (double) std::max(1, (iTechEra)), (double) /*0.7*/ GD_FLOAT_GET(TECH_COST_ERA_EXPONENT) ) );

diff --git a/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp b/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp
@@ -7040,18 +7040,6 @@ bool CvDiplomacyAI::IsPlayerBrokenAnyPromise(PlayerTypes ePlayer, int iWithinXTu
 			return true;
 	}
 
-	if (IsPlayerBrokenBorderPromise(ePlayer))
-	{
-		if (bCheckDuration)
-		{
-			int iTurnDifference = iGameTurn - GetPlayerBorderPromiseTurn(ePlayer);
-			if (iTurnDifference <= iWithinXTurns)
-				return true;
-		}
-		else
-			return true;
-	}
-
 	if (IsPlayerBrokenBullyCityStatePromise(ePlayer))
 	{
 		if (bCheckDuration)
@@ -7168,18 +7156,6 @@ bool CvDiplomacyAI::IsPlayerIgnoredAnyPromise(PlayerTypes ePlayer, int iWithinXT
 			return true;
 	}
 
-	if (IsPlayerIgnoredBorderPromise(ePlayer))
-	{
-		if (bCheckDuration)
-		{
-			int iTurnDifference = iGameTurn - GetPlayerBorderPromiseTurn(ePlayer);
-			if (iTurnDifference <= iWithinXTurns)
-				return true;
-		}
-		else
-			return true;
-	}
-
 	if (IsPlayerIgnoredBullyCityStatePromise(ePlayer))
 	{
 		if (bCheckDuration)