[Vanillia Enhancement] Customize airstrike targets (#1633)

- By default whether or not a building can be targeted by airstrikes
depends on value of `CanC4`, which also affects other things. This can
now be changed independently by setting `AllowAirstrike`. If not set,
defaults to value of `CanC4`.
- 默认情况下建筑能否作为空袭目标取决于 `CanC4` 的值，这也会影响其他方面。现在可以通过设置 `AllowAirstrike`
来独立更改这一点，如果未设置，默认为 `CanC4` 的值。
- For non building situations, the default value is true.
- 对于不是建筑物的目标，其默认值为true。
- Now it is possible to designate air strikes against non building
targets.
- 现在可以向非建筑目标发起空袭。
- The airstrike aircraft will now aim at the target itself rather than
the cell beneath its feet.
- 空袭的飞机现在将会瞄准目标本身而不是其脚下的格子。
- Separate the AirstrikeClass pointer between the attacker/aircraft and
the target to avoid erroneous overwriting issues.
- 分离了攻击者/飞机和目标所用的空袭类对象指针，以免出现错误的指针覆写问题。
- Fixed the bug that buildings will always be tinted as airstrike owner.
- 修复当建筑物可以召唤空袭时，它将始终被染色的bug。
- Fixed bug where 'AllowAirstrike=no' cannot completely prevent air
strikes from being launched against it.
- 修复了 `AllowAirstrike=no` 不能完全阻止对其发动空袭的bug。

In `rulesmd.ini`:
```ini
[SOMETECHNO] 
AllowAirstrike=            ; boolean

[SOMEWARHEAD]
AirstrikeTargets=building  ; List of Affected Target Enumeration (none|infantry|units|buildings|all)
```

Author: NetsuNegi

CREDITS.md

@@ -379,6 +379,10 @@ This page lists all the individual contributions to the project by their author.
   - Customize parasite culling targets
   - Customize harvester dump amount
   - Select box logic
+  - Customize airstrike targets
+  - Separate the AirstrikeClass pointer between the attacker/aircraft and the target to avoid erroneous overwriting issues
+  - Fix the bug that buildings will always be tinted as airstrike owner
+  - Fix the bug that 'AllowAirstrike=no' cannot completely prevent air strikes from being launched against it
 - **Apollo** - Translucent SHP drawing patches
 - **ststl**:
   - Customizable `ShowTimer` priority of superweapons

Phobos.vcxproj

@@ -21,6 +21,7 @@
     <ClCompile Include="src\Blowfish\blowfish.cpp" />
     <ClCompile Include="src\Blowfish\Hooks.Blowfish.cpp" />
     <ClCompile Include="src\Ext\TechnoType\Hooks.MatrixOp.cpp" />
+    <ClCompile Include="src\Ext\Techno\Hooks.Airstrike.cpp" />
     <ClCompile Include="src\Ext\Unit\Hooks.Harvester.cpp" />
     <ClCompile Include="src\Ext\Unit\Hooks.Sinking.cpp" />
     <ClCompile Include="src\Misc\Hooks.AlphaImage.cpp" />

docs/Fixed-or-Improved-Logics.md

@@ -219,6 +219,9 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Fixed the bug that a unit can overlap with `Teleport` units after it's been damaged by a fallen unit lifted by `IsLocomotor=yes` warheads.
 - Fixed an issue that game crashes (EIP:7FB178) when infantry are about to enter an occupiable building that has been removed and is not real dead.
 - Fixed an issue that game crashes when spawnee has been removed and is not real dead.
+- Separated the AirstrikeClass pointer between the attacker/aircraft and the target to avoid erroneous overwriting issues.
+- Fixed the bug that buildings will always be tinted as airstrike owner.
+- Fixed the bug that 'AllowAirstrike=no' cannot completely prevent air strikes from being launched against it.
 
 ## Fixes / interactions with other extensions
 
@@ -406,16 +409,6 @@ In `rulesmd.ini`:
 AircraftDockingDir(N)=  ; Direction type (integers from 0-255)
 ```
 
-### Airstrike target eligibility
-
-- By default whether or not a building can be targeted by airstrikes depends on value of `CanC4`, which also affects other things. This can now be changed independently by setting `AllowAirstrike`. If not set, defaults to value of `CanC4`.
-
-In `rulesmd.ini`:
-```ini
-[SOMEBUILDING]   ; BuildingType
-AllowAirstrike=  ; boolean
-```
-
 ### Allowed / disallowed types for FactoryPlant
 
 - It is now possible to customize which TechnoTypes benefit from bonuses of a `FactoryPlant=true` building by listing them on `FactoryPlant.AllowTypes` and/or `FactoryPlant.DisallowTypes`.
@@ -845,6 +838,22 @@ In `artmd.ini`:
 Image=              ; name of the file that will be used as image, without extension
 ```
 
+### Airstrike target eligibility
+
+- By default whether or not a building can be targeted by airstrikes depends on value of `CanC4`, which also affects other things. This can now be changed independently by setting `AllowAirstrike`. If not set, defaults to value of `CanC4`.
+- For non building situations, the default value is true.
+- Now it is possible to designate air strikes against non building targets.
+- The airstrike aircraft will now aim at the target itself rather than the cell beneath its feet.
+
+In `rulesmd.ini`:
+```ini
+[SOMETECHNO]
+AllowAirstrike=            ; boolean
+
+[SOMEWARHEAD]
+AirstrikeTargets=building  ; List of Affected Target Enumeration (none|infantry|units|buildings|all)
+```
+
 ### Customizable veterancy insignias
 
 - You can now customize veterancy insignia of TechnoTypes.

docs/Whats-New.md

@@ -364,6 +364,7 @@ New:
 - New `Pips.HideIfNoStrength` and `SelfHealing.EnabledBy` additions for shields (by FS-21)
 - [Customize harvester dump amount](Fixed-or-Improved-Logics.md#customize-harvester-dump-amount) (by NetsuNegi)
 - Select box logic (by NetsuNegi)
+- Customize airstrike targets (by NetsuNegi)
 
 Vanilla fixes:
 - Fixed sidebar not updating queued unit numbers when adding or removing units when the production is on hold (by CrimRecya)
@@ -382,9 +383,12 @@ Vanilla fixes:
 - Fixed wrong shadow when a vehicle has hover locomotor and is being lifted by `IsLocomotor=yes` warhead (by NetsuNegi)
 - Fixed an issue that game crashes (EIP:7FB178) when infantry are about to enter an occupiable building that has been removed and is not real dead (by CrimRecya)
 - Fixed an issue that game crashes when spawnee has been removed and is not real dead (by CrimRecya)
+- Separated the AirstrikeClass pointer between the attacker/aircraft and the target to avoid erroneous overwriting issues (by NetsuNegi)
+- Fixed the bug that buildings will always be tinted as airstrike owner (by NetsuNegi)
 
 Phobos fixes:
 - Fixed an issue that MCV will self-destruct when using trigger 107 to teleport (by CrimRecya)
+- Fixed the bug that 'AllowAirstrike=no' cannot completely prevent air strikes from being launched against it (by NetsuNegi)
 
 Fixes / interactions with other extensions:
 - Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus)

src/Ext/BuildingType/Body.cpp

@@ -140,7 +140,6 @@ void BuildingTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 	if (pThis->PowersUpBuilding[0] == NULL && this->PowersUp_Buildings.size() > 0)
 		strcpy_s(pThis->PowersUpBuilding, this->PowersUp_Buildings[0]->ID);
 
-	this->AllowAirstrike.Read(exINI, pSection, "AllowAirstrike");
 	this->CanC4_AllowZeroDamage.Read(exINI, pSection, "CanC4.AllowZeroDamage");
 
 	this->InitialStrength_Cloning.Read(exINI, pSection, "InitialStrength.Cloning");
@@ -263,7 +262,6 @@ void BuildingTypeExt::ExtData::Serialize(T& Stm)
 		.Process(this->SuperWeapons)
 		.Process(this->OccupierMuzzleFlashes)
 		.Process(this->Powered_KillSpawns)
-		.Process(this->AllowAirstrike)
 		.Process(this->CanC4_AllowZeroDamage)
 		.Process(this->InitialStrength_Cloning)
 		.Process(this->ExcludeFromMultipleFactoryBonus)

src/Ext/BuildingType/Body.h

@@ -28,7 +28,6 @@ class BuildingTypeExt
 
 		std::vector<Point2D> OccupierMuzzleFlashes;
 		Valueable<bool> Powered_KillSpawns;
-		Nullable<bool> AllowAirstrike;
 		Valueable<bool> CanC4_AllowZeroDamage;
 		Valueable<bool> Refinery_UseStorage;
 		Valueable<PartialVector2D<double>> InitialStrength_Cloning;
@@ -93,7 +92,6 @@ class BuildingTypeExt
 			, PowerPlantEnhancer_Factor { 1.0 }
 			, OccupierMuzzleFlashes()
 			, Powered_KillSpawns { false }
-			, AllowAirstrike {}
 			, CanC4_AllowZeroDamage { false }
 			, InitialStrength_Cloning { { 1.0, 0.0 } }
 			, ExcludeFromMultipleFactoryBonus { false }

src/Ext/BuildingType/Hooks.cpp

@@ -153,30 +153,6 @@ DEFINE_HOOK(0x47EFAE, CellClass_Draw_It_SetPlacementGridTranslucency, 0x6)
 	return 0;
 }
 
-DEFINE_HOOK(0x6F34B7, TechnoClass_WhatWeaponShouldIUse_AllowAirstrike, 0x6)
-{
-	enum { SkipGameCode = 0x6F34BD };
-
-	GET(BuildingTypeClass*, pThis, ECX);
-
-	const auto pExt = BuildingTypeExt::ExtMap.Find(pThis);
-	R->EAX(pExt->AllowAirstrike.Get(pThis->CanC4));
-
-	return SkipGameCode;
-}
-
-DEFINE_HOOK(0x51EAF2, TechnoClass_WhatAction_AllowAirstrike, 0x6)
-{
-	enum { SkipGameCode = 0x51EAF8 };
-
-	GET(BuildingTypeClass*, pThis, ESI);
-
-	const auto pExt = BuildingTypeExt::ExtMap.Find(pThis);
-	R->EAX(pExt->AllowAirstrike.Get(pThis->CanC4));
-
-	return SkipGameCode;
-}
-
 // Rewritten
 DEFINE_HOOK(0x465D40, BuildingTypeClass_IsVehicle, 0x6)
 {

src/Ext/Techno/Body.Internal.cpp

@@ -165,7 +165,7 @@ int TechnoExt::GetTintColor(TechnoClass* pThis, bool invulnerability, bool airst
 	{
 		if (invulnerability && pThis->IsIronCurtained())
 			tintColor |= GeneralUtils::GetColorFromColorAdd(pThis->ForceShielded ? RulesClass::Instance->ForceShieldColor : RulesClass::Instance->IronCurtainColor);
-		if (airstrike && pThis->Airstrike && pThis->Airstrike->Target == pThis)
+		if (airstrike && TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe)
 			tintColor |= GeneralUtils::GetColorFromColorAdd(RulesClass::Instance->LaserTargetColor);
 		if (berserk && pThis->Berzerk)
 			tintColor |= GeneralUtils::GetColorFromColorAdd(RulesClass::Instance->BerserkColor);

src/Ext/Techno/Body.cpp

@@ -587,6 +587,7 @@ void TechnoExt::ExtData::Serialize(T& Stm)
 		.Process(this->IsBeingChronoSphered)
 		.Process(this->KeepTargetOnMove)
 		.Process(this->LastSensorsMapCoords)
+		.Process(this->AirstrikeTargetingMe)
 		;
 }
 

src/Ext/Techno/Body.h

@@ -68,6 +68,8 @@ class TechnoExt
 		bool KeepTargetOnMove;
 		CellStruct LastSensorsMapCoords;
 
+		AirstrikeClass* AirstrikeTargetingMe;
+
 		ExtData(TechnoClass* OwnerObject) : Extension<TechnoClass>(OwnerObject)
 			, TypeExtData { nullptr }
 			, Shield {}
@@ -110,6 +112,7 @@ class TechnoExt
 			, IsBeingChronoSphered { false }
 			, KeepTargetOnMove { false }
 			, LastSensorsMapCoords { CellStruct::Empty }
+			, AirstrikeTargetingMe { nullptr }
 		{ }
 
 		void OnEarlyUpdate();