From 05990d35393ba69cfe13f62cb9026986ec39e9b3 Mon Sep 17 00:00:00 2001 From: mszabo Date: Fri, 1 Nov 2024 23:10:57 +0100 Subject: [PATCH] Indicate target site for retaliation raids Currently, the message that pops up when a retaliation raid is impending does not indicate which world object the raid is targeting, which can be confusing if the player has multiple colonies or launched a bombardment from a temporary map. So, make the target explicit in the notification. --- Languages/English/Keyed/Messages.xml | 2 +- .../CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/English/Keyed/Messages.xml b/Languages/English/Keyed/Messages.xml index 8f50e13a60..d906df7b51 100644 --- a/Languages/English/Keyed/Messages.xml +++ b/Languages/English/Keyed/Messages.xml @@ -12,6 +12,6 @@ A group of fighters from {0} have arrived nearby.\n\nThey are preparing to attack in retaliation for the shelling of {1}. Artillery fire incoming from {0} ({1}). - A group from {0} is planning to raid {1} soon in retaliation for recent events. + A group from {0} is planning to raid {1} at {2} soon in retaliation for recent events. \ No newline at end of file diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs index 86d0654cd3..243bcc8592 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs @@ -164,7 +164,7 @@ public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetI if (ticksSinceRaided != raidMTBTicks && ticksSinceRaided > raidMTBTicks / 2f && Rand.Chance(RaidPropability / Mathf.Max(raidMTBTicks - ticksSinceRaided, 1)) && raider.TryRaid(attackerMap, revengePoints)) { lastRaidTick = GenTicks.TicksGame; - Messages.Message("CE_Message_CounterRaid".Translate(parent.Label, attackingFaction.Name), MessageTypeDefOf.ThreatBig); + Messages.Message("CE_Message_CounterRaid".Translate(parent.Label, attackingFaction.Name, attackerMap.Parent.Label), MessageTypeDefOf.ThreatBig); } } }