From 1cda114657e9f28e40e358f31dadee5892703070 Mon Sep 17 00:00:00 2001 From: Goober5000 Date: Sun, 15 Aug 2021 02:44:04 -0400 Subject: [PATCH 1/2] 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. --- SaveLoadX/data/tables/saveload2-sct.tbm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SaveLoadX/data/tables/saveload2-sct.tbm b/SaveLoadX/data/tables/saveload2-sct.tbm index 77f1d5c..c5864a0 100644 --- a/SaveLoadX/data/tables/saveload2-sct.tbm +++ b/SaveLoadX/data/tables/saveload2-sct.tbm @@ -853,7 +853,7 @@ function SaveState:GetAIOrderFromEnum(orderEnum) if orderEnum == ORDER_ATTACK then order = "Attack" - elseif orderEnum == ORDER_ATTACK then + elseif orderEnum == ORDER_ATTACK_ANY then order = "Attack Any" elseif orderEnum == ORDER_DEPART then order = "Depart" @@ -911,7 +911,7 @@ function SaveState:GetAIOrderFromString(order) if order == "Attack" then orderEnum = ORDER_ATTACK elseif order == "Attack Any" then - orderEnum = ORDER_ATTACK + orderEnum = ORDER_ATTACK_ANY elseif order == "Depart" then orderEnum = ORDER_DEPART elseif order == "Disable" then From 4c8cc1cecf7a72f06c431d74b56b6b1f476b75a7 Mon Sep 17 00:00:00 2001 From: Goober5000 Date: Thu, 9 Dec 2021 22:30:33 -0500 Subject: [PATCH 2/2] explicitly check for ship targets --- SaveLoadX/data/tables/saveload2-sct.tbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SaveLoadX/data/tables/saveload2-sct.tbm b/SaveLoadX/data/tables/saveload2-sct.tbm index c5864a0..c1c8c9b 100644 --- a/SaveLoadX/data/tables/saveload2-sct.tbm +++ b/SaveLoadX/data/tables/saveload2-sct.tbm @@ -194,7 +194,7 @@ function SaveState:GetShipData(shipname) if (order:getType() == ORDER_WAYPOINTS) or (order:getType() == ORDER_WAYPOINTS_ONCE) then --tt.Target = order.Target:getList().Name else - if order.Target and order.Target:isValid() then + if order.Target and order.Target:isValid() and order.Target:getBreedName() == "Ship" then tt.Target = order.Target.Name ba.print(" Target: " .. tostring(tt.Target) .. "\n") end