Add a global CombatAlert.Default

Author: CrimRecya

docs/New-or-Enhanced-Logics.md

@@ -1534,7 +1534,7 @@ Promote.EliteAnimation=           ; Animation
 - In Vanilla, non-building technos will not generate radar events or EVAs when attacked, so players can hardly notice them until they are destroyed. You can now receive a radar event (and optionally a sound effect) when your units is attacked, so you can respond to the combats in time.
 - `[AudioVisual]->CombatAlert` is a global switch, set it to `true` to enable the entire logic.
 - These flags controlls when to trigger a combat alert.
-  - You can disable this logic on specific techno by setting `[SOMETECHNO]->CombatAlert` to `false`. It is defaultly disabled for technos with `Insignificant=yes` or `Spawned=yes`.
+  - You can disable this logic on specific techno by setting `[SOMETECHNO]->CombatAlert` to `false`, which default to `[AudioVisual]->CombatAlert.Default`. If `CombatAlert.Default` is also empty, it is defaultly disabled for technos with `Insignificant=yes` or `Spawned=yes`.
   - `[AudioVisual]->CombatAlert.IgnoreBuilding` will turn the logic off on buildings. You can override it for specific building by setting `[SOMETECHNO]->CombatAlert.NotBuilding` to true. You may hope to use it on veh-buildings.
   - `[AudioVisual]->CombatAlert.SuppressIfInScreen` decides whether to disable the logic for the units in the current screen.
   - `[AudioVisual]->CombatAlert.Interval` decides the time interval (in frames) between alerts, to prevent the alert from being anonying. It is default to 150 frames.
@@ -1552,6 +1552,7 @@ In `rulesmd.ini`:
 ```ini
 [AudioVisual]
 CombatAlert=false                      ;boolean
+CombatAlert.Default=                   ;boolean
 CombatAlert.IgnoreBuilding=true        ;boolean
 CombatAlert.SuppressIfInScreen=true    ;boolean
 CombatAlert.Interval=150               ;integer, game frames

src/Ext/Rules/Body.cpp

@@ -201,6 +201,7 @@ void RulesExt::ExtData::LoadBeforeTypeData(RulesClass* pThis, CCINIClass* pINI)
 	// this->VoxelShadowLightSource.Read(exINI, GameStrings::AudioVisual, "VoxelShadowLightSource");
 
 	this->CombatAlert.Read(exINI, GameStrings::AudioVisual, "CombatAlert");
+	this->CombatAlert_Default.Read(exINI, GameStrings::AudioVisual, "CombatAlert.Default");
 	this->CombatAlert_IgnoreBuilding.Read(exINI, GameStrings::AudioVisual, "CombatAlert.IgnoreBuilding");
 	this->CombatAlert_SuppressIfInScreen.Read(exINI, GameStrings::AudioVisual, "CombatAlert.SuppressIfInScreen");
 	this->CombatAlert_Interval.Read(exINI, GameStrings::AudioVisual, "CombatAlert.Interval");
@@ -404,6 +405,7 @@ void RulesExt::ExtData::Serialize(T& Stm)
 		// .Process(this->VoxelShadowLightSource)
 		.Process(this->BuildingWaypoint)
 		.Process(this->CombatAlert)
+		.Process(this->CombatAlert_Default)
 		.Process(this->CombatAlert_IgnoreBuilding)
 		.Process(this->CombatAlert_SuppressIfInScreen)
 		.Process(this->CombatAlert_Interval)

src/Ext/Rules/Body.h

@@ -158,6 +158,7 @@ class RulesExt
 		Valueable<double> JumpjetLevelLightMultiplier;
 
 		Valueable<bool> CombatAlert;
+		Nullable<bool> CombatAlert_Default;
 		Valueable<bool> CombatAlert_IgnoreBuilding;
 		Valueable<bool> CombatAlert_SuppressIfInScreen;
 		Valueable<int> CombatAlert_Interval;
@@ -301,6 +302,7 @@ class RulesExt
 			// , VoxelShadowLightSource { }
 
 			, CombatAlert { false }
+			, CombatAlert_Default {}
 			, CombatAlert_IgnoreBuilding { true }
 			, CombatAlert_SuppressIfInScreen { true }
 			, CombatAlert_Interval { 150 }

src/Ext/Techno/Hooks.ReceiveDamage.cpp

@@ -19,77 +19,69 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 	GET(TechnoClass*, pThis, ECX);
 	LEA_STACK(args_ReceiveDamage*, args, 0x4);
 
+	const auto pRules = RulesExt::Global();
 	const auto pExt = TechnoExt::ExtMap.Find(pThis);
-
 	int nDamageLeft = *args->Damage;
 
-	const auto pRules = RulesExt::Global();
-
 	if (pRules->CombatAlert && nDamageLeft > 1)
 	{
-		do
+		auto raiseCombatAlert = [pThis, pExt, pRules, args]()
 		{
 			const auto pHouse = pThis->Owner;
 
-			if (!pHouse || (!pThis->IsOwnedByCurrentPlayer && !pHouse->IsInPlayerControl) || !pThis->IsInPlayfield)
-				break;
-
-			const auto pSourceHouse = args->SourceHouse;
-
-			if (pRules->CombatAlert_SuppressIfAllyDamage && pHouse->IsAlliedWith(pSourceHouse))
-				break;
+			if (!pHouse->IsControlledByCurrentPlayer() || (pRules->CombatAlert_SuppressIfAllyDamage && pHouse->IsAlliedWith(args->SourceHouse)))
+				return;
 
 			const auto pHouseExt = HouseExt::ExtMap.Find(pHouse);
 
 			if (pHouseExt->CombatAlertTimer.HasTimeLeft())
-				break;
+				return;
 
-			const auto pWHExt = WarheadTypeExt::ExtMap.Find(args->WH);
+			const auto pTypeExt = pExt->TypeExtData;
+			const auto pType = pTypeExt->OwnerObject();
 
-			if (pWHExt->CombatAlert_Suppress.Get(!pWHExt->Malicious || pWHExt->Nonprovocative))
-				break;
+			if (!pTypeExt->CombatAlert.Get(pRules->CombatAlert_Default.Get(!pType->Insignificant && !pType->Spawned)) || !pThis->IsInPlayfield)
+				return;
 
-			const auto pType = pThis->GetTechnoType();
-			const auto pTypeExt = TechnoTypeExt::ExtMap.Find(pType);
+			const auto pWHExt = WarheadTypeExt::ExtMap.Find(args->WH);
 
-			if (!pType || !pTypeExt || !pTypeExt->CombatAlert.Get(!pType->Insignificant && !pType->Spawned))
-				break;
+			if (pWHExt->CombatAlert_Suppress.Get(!pWHExt->Malicious || pWHExt->Nonprovocative))
+				return;
 
-			const auto pBuilding = pThis->WhatAmI() == AbstractType::Building ? static_cast<BuildingClass*>(pThis) : nullptr;
+			const auto pBuilding = abstract_cast<BuildingClass*>(pThis);
 
 			if (pRules->CombatAlert_IgnoreBuilding && pBuilding && !pTypeExt->CombatAlert_NotBuilding.Get(pBuilding->Type->IsVehicle()))
-				break;
+				return;
 
-			const CoordStruct coordInMap = pThis->GetCoords();
+			const auto coordInMap = pThis->GetCoords();
 
 			if (pRules->CombatAlert_SuppressIfInScreen)
 			{
 				TacticalClass* const pTactical = TacticalClass::Instance;
-				const Point2D coordInScreen = pTactical->CoordsToScreen(coordInMap) - pTactical->TacticalPos;
-				const RectangleStruct screenArea = DSurface::Composite->GetRect();
+				const auto coordInScreen = pTactical->CoordsToScreen(coordInMap) - pTactical->TacticalPos;
+				const auto screenArea = DSurface::Composite->GetRect();
 
 				if (screenArea.Width >= coordInScreen.X && screenArea.Height >= coordInScreen.Y && coordInScreen.X >= 0 && coordInScreen.Y >= 0) // check if the unit is in screen
-					break;
+					return;
 			}
 
 			pHouseExt->CombatAlertTimer.Start(pRules->CombatAlert_Interval);
 			RadarEventClass::Create(RadarEventType::Combat, CellClass::Coord2Cell(coordInMap));
-
 			int index = -1;
 
 			if (!pRules->CombatAlert_MakeAVoice) // No one want to play two sound at a time, I guess?
-				break;
-			else if (pTypeExt->CombatAlert_UseFeedbackVoice.Get((const bool)pRules->CombatAlert_UseFeedbackVoice) && pType->VoiceFeedback.Count > 0) // Use VoiceFeedback first
+				return;
+			else if (pTypeExt->CombatAlert_UseFeedbackVoice.Get(pRules->CombatAlert_UseFeedbackVoice) && pType->VoiceFeedback.Count > 0) // Use VoiceFeedback first
 				VocClass::PlayGlobal(pType->VoiceFeedback.GetItem(0), 0x2000, 1.0);
-			else if (pTypeExt->CombatAlert_UseAttackVoice.Get((const bool)pRules->CombatAlert_UseAttackVoice) && pType->VoiceAttack.Count > 0) // Use VoiceAttack then
+			else if (pTypeExt->CombatAlert_UseAttackVoice.Get(pRules->CombatAlert_UseAttackVoice) && pType->VoiceAttack.Count > 0) // Use VoiceAttack then
 				VocClass::PlayGlobal(pType->VoiceAttack.GetItem(0), 0x2000, 1.0);
-			else if (pTypeExt->CombatAlert_UseEVA.Get((const bool)pRules->CombatAlert_UseEVA)) // Use Eva finally
+			else if (pTypeExt->CombatAlert_UseEVA.Get(pRules->CombatAlert_UseEVA)) // Use Eva finally
 				index = pTypeExt->CombatAlert_EVA.Get(VoxClass::FindIndex((const char*)"EVA_UnitsInCombat"));
 
 			if (index != -1)
 				VoxClass::PlayIndex(index);
-		}
-		while (false);
+		};
+		raiseCombatAlert();
 	}
 
 	if (!args->IgnoreDefenses)