From 8df0fe9884ad98f2cd89123dff31af83706039d0 Mon Sep 17 00:00:00 2001
From: Mustafa Alperen Seki <mustafaoyunda37@gmail.com>
Date: Tue, 20 Aug 2024 11:17:41 +0300
Subject: [PATCH] Workaround for Solo speaker effects on some vehciles.

---
 mods/gen/rules/vehicles.yaml | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/mods/gen/rules/vehicles.yaml b/mods/gen/rules/vehicles.yaml
index 4050ba27..fdd7a670 100644
--- a/mods/gen/rules/vehicles.yaml
+++ b/mods/gen/rules/vehicles.yaml
@@ -1021,13 +1021,18 @@ vehicle.ambulance:
 	Crushable:
 		WarnProbability: 0
 		CrushClasses: vehicle
-	WithRangeCircle:
+	WithRangeCircle@AMBULANCEHEAL:
 		Type: heal
 		Range: 4c0
 		Color: DD000066
-	ProximityExternalCondition:
+	ProximityExternalCondition@AMBULANCEHEAL:
 		Condition: ambulanceheal
 		Range: 4c0
+		RequiresCondition: ambulanceheal_enabled ## HACK, ProximityExternalCondition affect parent unit if enabled at actor creation.
+	GrantConditionAfterDelay@AMBULANCEHEAL:
+		Condition: ambulanceheal_enabled
+		Delay: 1
+		ShowSelectionBar: false
 	Cargo:
 		Types: Infantry, GLAInfantry, Hacker, Pilot
 		MaxWeight: 3
@@ -2257,7 +2262,12 @@ vehicle.assault_troop_crawler:
 	ProximityExternalCondition@SPEAKER:
 		Condition: speaker_tower
 		Range: 4c0
-	WithRangeCircle:
+		RequiresCondition: speaker_upgrade ## HACK, ProximityExternalCondition affect parent unit if enabled at actor creation.
+	GrantConditionAfterDelay@SPEAKER:
+		Condition: speaker_upgrade
+		Delay: 1
+		ShowSelectionBar: false
+	WithRangeCircle@SPEAKER:
 		Type: speaker
 		Range: 4c0
 		Color: DD000066
@@ -2400,7 +2410,12 @@ vehicle.attack_outpost:
 	ProximityExternalCondition@SPEAKER:
 		Condition: speaker_tower
 		Range: 4c0
-	WithRangeCircle:
+		RequiresCondition: speaker_upgrade ## HACK, ProximityExternalCondition affect parent unit if enabled at actor creation.
+	GrantConditionAfterDelay@SPEAKER:
+		Condition: speaker_upgrade
+		Delay: 1
+		ShowSelectionBar: false
+	WithRangeCircle@SPEAKER:
 		Type: speaker
 		Range: 4c0
 		Color: DD000066
@@ -3706,7 +3721,7 @@ vehicle.overlord_tank:
 		RevokeDelay: 25
 		RevokeAll: true
 		IsCyclic: false
-	WithRangeCircle:
+	WithRangeCircle@SPEAKER:
 		Type: speaker
 		Range: 4c0
 		Color: DD000066
@@ -3788,10 +3803,14 @@ vehicle.emparor_overlord:
 		ProductionType: queue.emparor_overlord_merged
 	WithSpriteTurret@Speaker:
 		-RequiresCondition:
-	WithRangeCircle:
+	WithRangeCircle@SPEAKER:
 		-RequiresCondition:
 	ProximityExternalCondition@SPEAKER:
-		-RequiresCondition:
+		RequiresCondition: speaker_upgrade ## HACK, ProximityExternalCondition affect parent unit if enabled at actor creation.
+	GrantConditionAfterDelay@SPEAKER:
+		Condition: speaker_upgrade
+		Delay: 1
+		ShowSelectionBar: false
 	ThrowsShrapnel@Turret:
 		Weapons: debris.emperor_overlord
 	Selectable: