Revert "Investment Bugfixes (#10399)"

This reverts commit a89aa5b.
LoneGazebo · Oct 30, 2023 · 4568635 · 4568635
1 parent c8959ee
commit 4568635
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 204 deletions.
diff --git a/(2) Vox Populi/LUA/InfoTooltipInclude.lua b/(2) Vox Populi/LUA/InfoTooltipInclude.lua
@@ -5,7 +5,7 @@ print("This is the modded InfoTooltipInclude from CBP- CSD")
 
 
 -- UNIT
-function GetHelpTextForUnit(iUnitID, bIncludeRequirementsInfo, pCity)
+function GetHelpTextForUnit(iUnitID, bIncludeRequirementsInfo)
 	local pUnitInfo = GameInfo.Units[iUnitID];
 
 	local pActivePlayer = Players[Game.GetActivePlayer()];
@@ -15,25 +15,14 @@ function GetHelpTextForUnit(iUnitID, bIncludeRequirementsInfo, pCity)
 
 	-- Name
 	strHelpText = strHelpText .. Locale.ToUpper(Locale.ConvertTextKey( pUnitInfo.Description ));
-	if (pCity ~= nil) then
-		if(pCity:GetUnitInvestment(iUnitID) > 0) then
-		strHelpText = strHelpText .. Locale.ConvertTextKey("TXT_KEY_INVESTED");
-		end
-	end
-
+
 	-- Cost
 	strHelpText = strHelpText .. "[NEWLINE]----------------[NEWLINE]";
 
 	-- Skip cost if it's 0
 	if(pUnitInfo.Cost > 0) then
-		local iCost = pActivePlayer:GetUnitProductionNeeded(iUnitID);
-		if (pCity ~= nil) then
-			if(pCity:GetUnitInvestment(iUnitID) > 0) then
-				iCost = pCity:GetUnitInvestment(iUnitID);
-			end
-		end
-		strHelpText = strHelpText .. Locale.ConvertTextKey("TXT_KEY_PRODUCTION_COST", iCost);
-	end			
+		strHelpText = strHelpText .. Locale.ConvertTextKey("TXT_KEY_PRODUCTION_COST", pActivePlayer:GetUnitProductionNeeded(iUnitID));
+	end
 
 	-- Moves
 	if pUnitInfo.Domain ~= "DOMAIN_AIR" then

diff --git a/(2) Vox Populi/LUA/ProductionPopup.lua b/(2) Vox Populi/LUA/ProductionPopup.lua
@@ -143,13 +143,13 @@ function ProductionSelected( ePurchaseEnum, iData)
 		elseif (eOrder == OrderTypes.ORDER_CONSTRUCT) then
 			if (city:IsCanPurchase(true, true, -1, iData, -1, eYield)) then
 				Game.CityPurchaseBuilding(city, iData, eYield);
+				Network.SendUpdateCityCitizens(cityID);
 			end
 		elseif (eOrder == OrderTypes.ORDER_CREATE) then
 			if (city:IsCanPurchase(true, true, -1, -1, iData, eYield)) then
 				Game.CityPurchaseProject(city, iData, eYield);
 			end
 		end
-		Network.SendUpdateCityCitizens(cityID);
 
 		if (eOrder == OrderTypes.ORDER_TRAIN or eOrder == OrderTypes.ORDER_CONSTRUCT or eOrder == OrderTypes.ORDER_CREATE) then
 			if (eYield == YieldTypes.YIELD_GOLD) then
@@ -824,7 +824,7 @@ function UpdateWindow( city )
 			Controls.ProductionPortrait:SetHide( false );
 
 			-- Info for this thing
-			strToolTip = Locale.ConvertTextKey(GetHelpTextForUnit(unitProduction, true, city)) .. "[NEWLINE][NEWLINE]" .. strToolTip;
+			strToolTip = Locale.ConvertTextKey(GetHelpTextForUnit(unitProduction, true)) .. "[NEWLINE][NEWLINE]" .. strToolTip;
 
 		else
 			Controls.ProductionPortrait:SetHide( true );
@@ -1237,7 +1237,7 @@ function AddProductionButton( id, description, orderType, turnsLeft, column, isD
 
 		-- Tooltip
 		local bIncludeRequirementsInfo = false;
-		local strToolTip = Locale.ConvertTextKey(GetHelpTextForUnit(id, bIncludeRequirementsInfo, pCity));
+		local strToolTip = Locale.ConvertTextKey(GetHelpTextForUnit(id, bIncludeRequirementsInfo));
 
 		-- Disabled help text
 		if (isDisabled) then

diff --git a/(2) Vox Populi/LUA/TechButtonInclude.lua b/(2) Vox Populi/LUA/TechButtonInclude.lua
@@ -778,7 +778,7 @@ function AdjustArtOnGrantedUnitButton( thisButton, thisUnitInfo, textureSize )
 
 		-- Tooltip
 		local bIncludeRequirementsInfo = true;
-		thisButton:SetToolTipString( GetHelpTextForUnit(thisUnitInfo.ID, bIncludeRequirementsInfo, nil) );
+		thisButton:SetToolTipString( GetHelpTextForUnit(thisUnitInfo.ID, bIncludeRequirementsInfo) );
 		local portraitOffset, portraitAtlas = UI.GetUnitPortraitIcon(thisUnitInfo.ID);
 		local textureOffset, textureSheet = IconLookup( portraitOffset, textureSize, portraitAtlas );				
 		if textureOffset == nil then

diff --git a/(3a) EUI Compatibility Files/LUA/CityView.lua b/(3a) EUI Compatibility Files/LUA/CityView.lua
@@ -1098,7 +1098,6 @@ local function SelectionPurchase( orderID, itemID, yieldID, soundKey )
 			if orderID == OrderTypes.ORDER_TRAIN then
 				if cityIsCanPurchase( city, true, true, itemID, -1, -1, yieldID ) then
 					Game.CityPurchaseUnit( city, itemID, yieldID )
-					Network.SendUpdateCityCitizens( cityID )
 					isPurchase = true
 				end
 			elseif orderID == OrderTypes.ORDER_CONSTRUCT then
@@ -1125,7 +1124,6 @@ local function SelectionPurchase( orderID, itemID, yieldID, soundKey )
 			elseif orderID == OrderTypes.ORDER_CREATE then
 				if cityIsCanPurchase( city, true, true, -1, -1, itemID, yieldID ) then
 					Game.CityPurchaseProject( city, itemID, yieldID )
-					Network.SendUpdateCityCitizens( cityID )
 					isPurchase = true
 				end
 			end

diff --git a/CvGameCoreDLL_Expansion2/CvBuildingProductionAI.cpp b/CvGameCoreDLL_Expansion2/CvBuildingProductionAI.cpp
@@ -686,6 +686,7 @@ int CvBuildingProductionAI::CheckBuildingBuildSanity(BuildingTypes eBuilding, in
 	}
 
 
+#if defined(MOD_BALANCE_CORE_BUILDING_INVESTMENTS)
 	if (MOD_BALANCE_CORE_BUILDING_INVESTMENTS && !bIgnoreSituational)
 	{
 		//Virtually force this.
@@ -695,7 +696,7 @@ int CvBuildingProductionAI::CheckBuildingBuildSanity(BuildingTypes eBuilding, in
 			iBonus += 1000;
 		}
 	}
-
+#endif
 	//Courthouse? Let's get it ASAP.
 	bool bCourthouse = false;
 	if(pkBuildingInfo->IsNoOccupiedUnhappiness())