Skip to content

Commit 7ebc25f

Browse files
committed
sync the "attack any" order
There is not a specific comment indicating Attack and Attack Any should be combined, so I'm guessing this was an oversight. I've also added a check that the targets of orders are ships. Somehow a checkpoint in Colt's campaign kept triggering this on a target that was not a ship. This corresponds to the old PR 7: AxemP/AxemFS2Scripts#7
1 parent 07982d3 commit 7ebc25f

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

SaveLoadX/data/tables/saveload2-sct.tbm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function SaveState:GetShipData(shipname)
194194
if (order:getType() == ORDER_WAYPOINTS) or (order:getType() == ORDER_WAYPOINTS_ONCE) then
195195
--tt.Target = order.Target:getList().Name
196196
else
197-
if order.Target and order.Target:isValid() then
197+
if order.Target and order.Target:isValid() and order.Target:getBreedName() == "Ship" then
198198
tt.Target = order.Target.Name
199199
ba.print(" Target: " .. tostring(tt.Target) .. "\n")
200200
end
@@ -853,7 +853,7 @@ function SaveState:GetAIOrderFromEnum(orderEnum)
853853

854854
if orderEnum == ORDER_ATTACK then
855855
order = "Attack"
856-
elseif orderEnum == ORDER_ATTACK then
856+
elseif orderEnum == ORDER_ATTACK_ANY then
857857
order = "Attack Any"
858858
elseif orderEnum == ORDER_DEPART then
859859
order = "Depart"
@@ -911,7 +911,7 @@ function SaveState:GetAIOrderFromString(order)
911911
if order == "Attack" then
912912
orderEnum = ORDER_ATTACK
913913
elseif order == "Attack Any" then
914-
orderEnum = ORDER_ATTACK
914+
orderEnum = ORDER_ATTACK_ANY
915915
elseif order == "Depart" then
916916
orderEnum = ORDER_DEPART
917917
elseif order == "Disable" then

0 commit comments

Comments
 (0)