Disable AlphaImage during Buildup

CREDITS.md

@@ -726,6 +726,7 @@ This page lists all the individual contributions to the project by their author.
   - Fix the bug where landing direction cannot be correctly converted when set to a value exceeding 256
   - Separately define the global default values of TerrainTypes' `IsPassable` and `CanBeBuiltOn` based on `SpawnsTiberium`
   - Remove the restriction that prohibits InfantryTypes from using the InitialPayload logic
+  - Disable AlphaImage during Buildup
 - **Ollerus**:
   - Build limit group enhancement
   - Customizable rocker amplitude

docs/Fixed-or-Improved-Logics.md

@@ -1323,6 +1323,19 @@ StartFacing.Random=               ; boolean, defaults to [General] -> BuildingSt
 Unlike the identically named INI flag in Tiberian Sun, this flag uses a 256-point circle rather than an 8-point circle.
 ```
 
+### Disable AlphaImage during Buildup
+
+- Now you can disable AlphaImage before the building is completed.
+
+In `rulesmd.ini`:
+```ini
+[AudioVisual]
+NoAlphaImageOnBuildup=false  ; boolean
+
+[SOMEBUILDING]               ; BuildingType
+NoAlphaImageOnBuildup=       ; boolean, defaults to [AudioVisual] -> NoAlphaImageOnBuildup
+```
+
 ### Disable `DamageSound`
 
 - Now you can disable `DamageSound` of a building.

docs/Whats-New.md

@@ -636,6 +636,7 @@ HideShakeEffects=false           ; boolean
 - Separately define the global default values of TerrainTypes' `IsPassable` and `CanBeBuiltOn` based on `SpawnsTiberium` (by Noble_Fish)
 - Customize reveal radius of `RevealToAll` (by NetsuNegi)
 - [Customize whether aircraft is a cargo plane](Fixed-or-Improved-Logics.md#customize-whether-aircraft-is-a-cargo-plane) (by TaranDahl)
+- [Disable AlphaImage during Buildup](Fixed-or-Improved-Logics.md#disable-alphaimage-during-buildup) (by Noble_Fish)
 
 #### Vanilla fixes:
 - Fixed sidebar not updating queued unit numbers when adding or removing units when the production is on hold (by CrimRecya)

src/Ext/BuildingType/Body.cpp

@@ -217,6 +217,7 @@ void BuildingTypeExt::LoadFromINIFile(CCINIClass* const pINI)
 	this->Units_UseRepairCost.Read(exINI, pSection, "Units.UseRepairCost");
 
 	this->NoBuildAreaOnBuildup.Read(exINI, pSection, "NoBuildAreaOnBuildup");
+	this->NoAlphaImageOnBuildup.Read(exINI, pSection, "NoAlphaImageOnBuildup");
 	this->Adjacent_Allowed.Read(exINI, pSection, "Adjacent.Allowed");
 	this->Adjacent_Disallowed.Read(exINI, pSection, "Adjacent.Disallowed");
 	this->Adjacent_Disallowed_Prohibit.Read(exINI, pSection, "Adjacent.Disallowed.Prohibit");
@@ -408,6 +409,7 @@ void BuildingTypeExt::Serialize(T& Stm)
 		.Process(this->Units_RepairPercent)
 		.Process(this->Units_UseRepairCost)
 		.Process(this->NoBuildAreaOnBuildup)
+		.Process(this->NoAlphaImageOnBuildup)
 		.Process(this->Adjacent_Allowed)
 		.Process(this->Adjacent_Disallowed)
 		.Process(this->Adjacent_Disallowed_Prohibit)

src/Ext/BuildingType/Body.h

@@ -81,6 +81,7 @@ class BuildingTypeExt final : public TechnoTypeExt
 	Nullable<bool> Units_UseRepairCost;
 
 	Valueable<bool> NoBuildAreaOnBuildup;
+	Nullable<bool> NoAlphaImageOnBuildup;
 	ValueableVector<BuildingTypeClass*> Adjacent_Allowed;
 	ValueableVector<BuildingTypeClass*> Adjacent_Disallowed;
 	Valueable<bool> Adjacent_Disallowed_Prohibit;
@@ -188,6 +189,7 @@ class BuildingTypeExt final : public TechnoTypeExt
 		, Units_RepairPercent {}
 		, Units_UseRepairCost {}
 		, NoBuildAreaOnBuildup { false }
+		, NoAlphaImageOnBuildup {}
 		, Adjacent_Allowed {}
 		, Adjacent_Disallowed {}
 		, Adjacent_Disallowed_Prohibit { false }

src/Ext/Rules/Body.cpp

@@ -590,6 +590,8 @@ void RulesExt::ExtData::LoadBeforeTypeData(RulesClass* pThis, CCINIClass* pINI)
 	this->PoseDir_Production.Read(exINI, GameStrings::AudioVisual, "PoseDir.Production");
 	this->PoseDir_Field.Read(exINI, GameStrings::AudioVisual, "PoseDir.Field");
 
+	this->NoAlphaImageOnBuildup.Read(exINI, GameStrings::AudioVisual, "NoAlphaImageOnBuildup");
+
 	// Section AITargetTypes
 	int itemsCount = pINI->GetKeyCount("AITargetTypes");
 	for (int i = 0; i < itemsCount; ++i)
@@ -1058,6 +1060,7 @@ void RulesExt::ExtData::Serialize(T& Stm)
 		.Process(this->AircraftDockingDir_DefaultToPoseDir)
 		.Process(this->PoseDir_Production)
 		.Process(this->PoseDir_Field)
+		.Process(this->NoAlphaImageOnBuildup)
     ;
 }
 

src/Ext/Rules/Body.h

@@ -523,6 +523,8 @@ class RulesExt
 		Nullable<int> PoseDir_Production;
 		Nullable<int> PoseDir_Field;
 
+		Valueable<bool> NoAlphaImageOnBuildup;
+
 		ExtData(RulesClass* OwnerObject) : Extension<RulesClass>(OwnerObject)
 			, Storage_TiberiumIndex { -1 }
 			, HarvesterDumpAmount { 0.0f }
@@ -980,6 +982,8 @@ class RulesExt
 			, AircraftDockingDir_DefaultToPoseDir{ true }
 			, PoseDir_Production {}
 			, PoseDir_Field{}
+
+			, NoAlphaImageOnBuildup { false }
 		{ }
 
 		virtual ~ExtData() = default;

src/Misc/Hooks.AlphaImage.cpp

@@ -72,8 +72,16 @@ static void __fastcall UpdateAlphaShape(ObjectClass* pSource)
 
 	const auto pBuilding = abstract_cast<BuildingClass*, true>(pSource);
 
-	if (pBuilding && !inactive && pBuilding->GetCurrentMission() != Mission::Construction)
-		inactive |= !pBuilding->IsPowerOnline() || BuildingExt::Fetch(pBuilding)->LimboID != -1;
+	if (pBuilding && !inactive)
+	{
+		if (pBuilding->GetCurrentMission() == Mission::Construction)
+		{
+			if (BuildingTypeExt::Fetch(pBuilding->Type)->NoAlphaImageOnBuildup.Get(RulesExt::Global()->NoAlphaImageOnBuildup))
+				inactive = true;
+		}
+		else // Buildup phase has ended
+			inactive |= !pBuilding->IsPowerOnline() || BuildingExt::Fetch(pBuilding)->LimboID != -1;
+	}
 
 	auto& alphaExt = *AresFunctions::AlphaExtMap;