Skip to content

sync the "attack any" order #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goober5000 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

sync the "attack any" order #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cda114
sync the "attack any" order
Goober5000 Aug 15, 2021
4c8cc1c
explicitly check for ship targets
Goober5000 Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SaveLoadX/data/tables/saveload2-sct.tbm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down