From a2528ef40d2b0e772177123f8122a6821ef4b4da Mon Sep 17 00:00:00 2001 From: SpeedyFolf Date: Sat, 14 Nov 2026 01:02:43 -0600 Subject: [PATCH 1/3] Support checkpoint marker arrow customization Add EDF properties for checkpoint target arrow color and size, and apply them when creating, representing, cloning, or editing markers. Require the MTA version that supports these arrow properties. --- [editor]/edf/edf.edf | 2 ++ [editor]/edf/edf.lua | 24 +++++++++++++++++++--- [editor]/edf/meta.xml | 2 +- [editor]/edf/properties.lua | 22 +++++++++++++++++--- [editor]/edf/properties_client.lua | 18 ++++++++++++++--- [editor]/edf/sharedutil.lua | 30 ++++++++++++++++++++++++++++ [editor]/editor_main/editor_main.edf | 2 ++ 7 files changed, 90 insertions(+), 10 deletions(-) diff --git a/[editor]/edf/edf.edf b/[editor]/edf/edf.edf index 9ea99d718..2eb082ae9 100644 --- a/[editor]/edf/edf.edf +++ b/[editor]/edf/edf.edf @@ -16,6 +16,8 @@ + + diff --git a/[editor]/edf/edf.lua b/[editor]/edf/edf.lua index 6e7600083..99efdc3ad 100644 --- a/[editor]/edf/edf.lua +++ b/[editor]/edf/edf.lua @@ -51,9 +51,18 @@ local edfCreateBasic = { local r,g,b,a = getColorFromString(cdata.color) if r then cdata.colorR = r; cdata.colorG = g; cdata.colorB = b; cdata.colorA = a end local marker = createMarker(cdata.position[1], cdata.position[2], cdata.position[3], cdata.type, cdata.size, cdata.colorR, cdata.colorG, cdata.colorB, cdata.colorA) - if marker and cdata.target and cdata.target ~= "" then - setElementData(marker, "target", cdata.target) - edfSetMarkerTarget(marker, cdata.target) + if marker then + if cdata.targetcolor then + setElementData(marker, "targetcolor", cdata.targetcolor) + end + if cdata.targetsize then + setElementData(marker, "targetsize", cdata.targetsize) + end + if cdata.target and cdata.target ~= "" then + setElementData(marker, "target", cdata.target) + edfSetMarkerTarget(marker, cdata.target) + end + edfApplyMarkerTargetArrowProperties(marker, cdata.targetcolor, cdata.targetsize) end return marker end, @@ -423,6 +432,7 @@ function edfRepresentElement(theElement, resource, parentData, editorMode, restr if elementType == "marker" then edfSetMarkerTarget(theElement, parentData.target) + edfApplyMarkerTargetArrowProperties(theElement, parentData.targetcolor, parentData.targetsize) end -- get basic element properties @@ -711,7 +721,15 @@ function edfCloneElement(theElement, editorMode ) -- For things that cloneElement doesn't actually clone if elementType == "marker" then + for _, property in ipairs({"targetcolor", "targetsize"}) do + local value = getElementData(oldElement, property) + if value ~= nil then + setElementData(theElement, property, value) + end + end edfSetMarkerTarget(theElement, getElementData(oldElement, "target")) + edfApplyMarkerTargetArrowProperties(theElement, + getElementData(theElement, "targetcolor"), getElementData(theElement, "targetsize")) end if (getElementType(theElement) == "vehicle" and getVehicleType(theElement) == "Train") then setTrainDerailed(theElement, true) diff --git a/[editor]/edf/meta.xml b/[editor]/edf/meta.xml index 33079752f..60afb7521 100644 --- a/[editor]/edf/meta.xml +++ b/[editor]/edf/meta.xml @@ -1,7 +1,7 @@ - +