feat: klik på en linje i statusvinduet sætter spilleren ind i køretøjet (v1.62.99)
This commit is contained in:
@@ -172,7 +172,7 @@ function ADStatusHud.flowEntries(adEnv, proxy)
|
||||
local action, level = vehicleAction(adEnv, vehicle)
|
||||
-- farven følger flowets niveau som Flows-listen (venter/fejl), ellers traktorens egen handling
|
||||
if runLevel == "error" or runLevel == "waiting" then level = runLevel end
|
||||
table.insert(entries, {vehicle = tostring(ADRuns.vehicleLabel(vehicle)), action = action,
|
||||
table.insert(entries, {vehicle = tostring(ADRuns.vehicleLabel(vehicle)), action = action, target = vehicle,
|
||||
fillPercent = guarded("fillPercent", fillPercent, adEnv, vehicle), level = level,
|
||||
waitingMs = waitingFor(tostring(run.id) .. ":" .. tostring(vehicleId), level, seen)})
|
||||
end
|
||||
@@ -193,10 +193,11 @@ function ADStatusHud.fieldEntries(proxy)
|
||||
for _, info in ipairs(ADFields.list()) do
|
||||
local field = ADFieldJobs.getField(info.id)
|
||||
if field ~= nil and (ADFieldModel.isWorking(field) or ADFieldJobs.awaitingPlayer(info.id) ~= nil) then
|
||||
local names = {}
|
||||
local names, target = {}, nil
|
||||
local reasonKey = type(field.reason) == "table" and field.reason.key or nil
|
||||
for _, assignment in ipairs(ADFieldJobs.assignmentsFor(info.id)) do
|
||||
table.insert(names, ADRuns.vehicleLabel(assignment.vehicle))
|
||||
target = target or assignment.vehicle
|
||||
end
|
||||
table.insert(entries, {
|
||||
fieldId = info.id,
|
||||
@@ -206,6 +207,7 @@ function ADStatusHud.fieldEntries(proxy)
|
||||
level = proxy:fieldLevel(info.id),
|
||||
reason = type(reasonKey) == "string" and reasonKey:match("^spu_field_reason_(%w+)$") or nil,
|
||||
awaiting = ADFieldJobs.awaitingPlayer(info.id) ~= nil,
|
||||
target = target,
|
||||
})
|
||||
end
|
||||
end
|
||||
@@ -280,7 +282,7 @@ function ADStatusHud.stuckEntries()
|
||||
or (ADOutbound ~= nil and ADOutbound.getHoldFor ~= nil and ADOutbound.getHoldFor(vehicle) ~= nil))
|
||||
if owned and not held then
|
||||
table.insert(entries, {text = string.format(textOf("spu_status_stuck"), tostring(ADRuns.vehicleLabel(vehicle)),
|
||||
math.floor(still.ms / 60000)), level = "error"})
|
||||
math.floor(still.ms / 60000)), level = "error", target = vehicle})
|
||||
end
|
||||
end
|
||||
return entries
|
||||
@@ -572,9 +574,25 @@ function ADStatusHud.mouseEvent(posX, posY, isDown, isUp, button)
|
||||
if not isDown or button ~= leftButton then return end
|
||||
if not ADStatusHud.visible or layout == nil or #ADStatusHud.lines == 0 then return end
|
||||
if not cursorShown() or shouldSkipDraw() or not isInside(layout, posX, posY) then return end
|
||||
-- klik på en linje med et køretøj: ind i køretøjet (brugerønske 8/10); ellers flyttes vinduet
|
||||
local index = ADStatusView.lineAt(layout.top, layout.marginY, layout.textSize, #ADStatusHud.lines, posY)
|
||||
local line = index ~= nil and ADStatusHud.lines[index] or nil
|
||||
if line ~= nil and line.target ~= nil and ADStatusHud.enterVehicle(line.target) then return end
|
||||
ADStatusHud.drag = {grabX = posX - layout.x, grabY = posY - layout.top}
|
||||
end
|
||||
|
||||
-- Sæt spilleren ind i køretøjet (et redskab: traktoren det sidder på). -> true hvis forsøgt
|
||||
function ADStatusHud.enterVehicle(vehicle)
|
||||
if isGone(vehicle) then return false end
|
||||
local root = vehicle.getRootVehicle ~= nil and vehicle:getRootVehicle() or vehicle
|
||||
if root == nil or root.spec_enterable == nil then return false end
|
||||
local player = g_localPlayer
|
||||
if player == nil or player.requestToEnterVehicle == nil then return false end
|
||||
local ok, err = pcall(player.requestToEnterVehicle, player, root)
|
||||
if not ok then logOnce("enter", err) end
|
||||
return ok
|
||||
end
|
||||
|
||||
function ADStatusHud.delete()
|
||||
deleteOverlays()
|
||||
if PlayerInputComponent ~= nil and PlayerInputComponent.spuStatusToggleHandler == registerToggleActionRef then
|
||||
|
||||
@@ -196,7 +196,9 @@ local function allLines(snapshot, textOf)
|
||||
if #entries > 0 then
|
||||
table.insert(lines, {text = ADStatusView.fit(textOf(section.header), ADStatusView.MAX_CHARS), level = "header", header = true})
|
||||
for _, entry in ipairs(entries) do
|
||||
table.insert(lines, {text = TEXT_OF_SECTION[section.key](entry), level = levelOf(entry, section.defaultLevel), header = false})
|
||||
-- target: køretøjet bag linjen (klik i statusvinduet sætter spilleren ind i det, 8/10)
|
||||
table.insert(lines, {text = TEXT_OF_SECTION[section.key](entry), level = levelOf(entry, section.defaultLevel), header = false,
|
||||
target = entry.target})
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -236,3 +238,11 @@ function ADStatusView.lines(snapshot, textOf, maxLines, mode)
|
||||
end
|
||||
return capLines(lines, maxLines, textOf)
|
||||
end
|
||||
|
||||
-- Hvilken linje ligger under musen? Linjerne tegnes fra top - marginY og nedad, textSize høje. -> indeks | nil
|
||||
function ADStatusView.lineAt(top, marginY, textSize, count, posY)
|
||||
if textSize == nil or textSize <= 0 then return nil end
|
||||
local index = math.floor((top - marginY - posY) / textSize) + 1
|
||||
if index < 1 or index > (count or 0) then return nil end
|
||||
return index
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.98.0</version>
|
||||
<version>1.62.99.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user