From 42d2e016ed39b9189f93f6ce37668379b0d539c5 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sat, 24 Oct 2015 00:30:15 +0200 Subject: [PATCH] Fix broken scripted attacks in some missions In all three cases, the failure came down to the targets not being declared as enemies to the attackers. Recent changes to the attack code made it impossible to attack friendly or neutral things with the Lua API's Attack() method. Changing the allegiance of affected parties fixed it, or, in the case of Soviet 02a, using force-attack. --- mods/ra/maps/soviet-02a/soviet02a.lua | 4 ++-- mods/ra/maps/soviet-03/map.yaml | 2 +- mods/ra/maps/soviet-07/map.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ra/maps/soviet-02a/soviet02a.lua b/mods/ra/maps/soviet-02a/soviet02a.lua index 320c9d4c51..4f6205f224 100644 --- a/mods/ra/maps/soviet-02a/soviet02a.lua +++ b/mods/ra/maps/soviet-02a/soviet02a.lua @@ -91,9 +91,9 @@ WorldLoaded = function() -- Don't "shoot" at the barrels if there is noone to shoot if not FleeingUnits[1].IsDead then - FleeingUnits[1].Attack(Barrel) + FleeingUnits[1].Attack(Barrel, true, true) elseif not FleeingUnits[2].IsDead then - FleeingUnits[2].Attack(Barrel) + FleeingUnits[2].Attack(Barrel, true, true) end end end) diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml index 6c229132af..97c0cfda37 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -60,7 +60,7 @@ Players: Faction: allies ColorRamp: 161,134,236 Allies: England, Soviet - Enemies: USSR + Enemies: USSR, Creeps PlayerReference@USSR: Name: USSR AllowBots: False diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index 1118319cde..8a3ca87d18 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -50,7 +50,7 @@ Players: Faction: allies ColorRamp: 161,134,236 Allies: Soviet - Enemies: USSR + Enemies: USSR, Creeps PlayerReference@USSR: Name: USSR AllowBots: False