Skip to content

fix waypoint order save/load and giveOrder priority scale #77

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

Draft
Goober5000 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix waypoint order save/load and giveOrder priority scale #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 44 additions & 22 deletions SaveLoadX/data/tables/saveload2-sct.tbm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,14 @@ function SaveState:GetShipData(shipname)
tt.Type = self:GetAIOrderFromEnum(order:getType())
ba.print(" Type: " .. tostring(tt.Type) .. "\n")
if (order:getType() == ORDER_WAYPOINTS) or (order:getType() == ORDER_WAYPOINTS_ONCE) then
--tt.Target = order.Target:getList().Name
if order.WaypointList and order.WaypointList:isValid() then
tt.WaypointList = order.WaypointList.Name
tt.WaypointIndex = order.WaypointIndex
tt.WaypointsInReverse = order.WaypointsInReverse
ba.print(" Waypoint List: " .. tostring(tt.WaypointList) .. "\n")
ba.print(" Waypoint Index: " .. tostring(tt.WaypointIndex) .. "\n")
ba.print(" Reverse: " .. tostring(tt.WaypointsInReverse) .. "\n")
end
else
if order.Target and order.Target:isValid() and order.Target:getBreedName() == "Ship" then
tt.Target = order.Target.Name
Expand Down Expand Up @@ -486,27 +493,44 @@ function SaveState:GiveOrders(ship,data)

for i=1, #data.Orders do
ba.print(" Order " .. i .. ":")

local thisOrder = data.Orders[i]
local order = self:GetAIOrderFromString(thisOrder.Type)
local targetShip

if thisOrder.Target then
targetShip = mn.Ships[thisOrder.Target]
end

local targetSubsystem = thisOrder.Subsystem

ba.print(tostring(order) .. " Target: " .. tostring(targetShip) .. " Target Subsystem: " .. tostring(targetSubsystem) .. "\n")

if order and targetShip and targetShip:isValid() then
if targetSubsystem then
ship:giveOrder(order, targetShip, targetShip[targetSubsystem], thisOrder.Priority)
else
ship:giveOrder(order, targetShip, nil, thisOrder.Priority)
local priority = (thisOrder.Priority or 0) / 100 -- because ship:giveOrder uses [0.0, 1.0] rather than [0, 100]

if order == ORDER_WAYPOINTS or order == ORDER_WAYPOINTS_ONCE then
local wpl = thisOrder.WaypointList and mn.WaypointLists[thisOrder.WaypointList]
if wpl and wpl:isValid() then
local wp = wpl[thisOrder.WaypointIndex]
if wp and wp:isValid() then
ba.print(tostring(order) .. " Waypoint List: " .. tostring(thisOrder.WaypointList) .. " Index: " .. tostring(thisOrder.WaypointIndex) .. "\n")
ship:giveOrder(order, wp, nil, priority)
if thisOrder.WaypointsInReverse then
local newOrder = ship.Orders[#ship.Orders]
if newOrder and newOrder:isValid() then
newOrder.WaypointsInReverse = true
end
end
end
end
else
local targetShip
if thisOrder.Target then
targetShip = mn.Ships[thisOrder.Target]
end
local targetSubsystem = thisOrder.Subsystem

ba.print(tostring(order) .. " Target: " .. tostring(targetShip) .. " Target Subsystem: " .. tostring(targetSubsystem) .. "\n")

if order and targetShip and targetShip:isValid() then
if targetSubsystem then
ship:giveOrder(order, targetShip, targetShip[targetSubsystem], priority)
else
ship:giveOrder(order, targetShip, nil, priority)
end
end
end

end

end
Expand Down Expand Up @@ -946,11 +970,9 @@ function SaveState:GetAIOrderFromString(order)
elseif order == "Undock" then
orderEnum = ORDER_UNDOCK
elseif order == "Waypoints" then
orderEnum = nil
--orderEnum = ORDER_WAYPOINTS
orderEnum = ORDER_WAYPOINTS
elseif order == "Waypoints Once" then
orderEnum = nil
--orderEnum = ORDER_WAYPOINTS_ONCE
orderEnum = ORDER_WAYPOINTS_ONCE
elseif order == "Attack Wing" then
orderEnum = ORDER_ATTACK_WING
elseif order == "Guard Wing" then
Expand Down