Merge draft placement with existing markers

Author: sourpuh

WaymarkStudio/WaymarkManager.cs

@@ -237,11 +237,16 @@ or ContentType.VCDungeonFinder
         return PlacementUnsafeReason.Safe;
     }
 
-    public void SafePlacePreset(WaymarkPreset preset, bool clearPlaceholder = true)
+    public void SafePlacePreset(WaymarkPreset preset, bool clearPlaceholder = true, bool mergeNative = false)
     {
         if (preset.MarkerPositions.Count > 0)
             if (IsSafeToDirectPlacePreset())
             {
+                if (mergeNative)
+                    foreach ((Waymark w, Vector3 p) in Plugin.WaymarkManager.Waymarks)
+                        if (!preset.MarkerPositions.ContainsKey(w))
+                            preset.MarkerPositions.Add(w, p);
+
                 UnsafeNativePlacePreset(preset.ToGamePreset());
                 if (clearPlaceholder) Plugin.WaymarkManager.ClearPlaceholders();
             }

WaymarkStudio/Windows/StudioWindow.cs

@@ -154,9 +154,9 @@ internal void DrawDraftSection()
         {
             if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.MapMarkedAlt, "Place Draft"))
             {
-                Plugin.WaymarkManager.SafePlacePreset(Plugin.WaymarkManager.DraftPreset);
+                Plugin.WaymarkManager.SafePlacePreset(Plugin.WaymarkManager.DraftPreset, mergeNative: true);
             }
-            HoverTooltip("Replace draft markers with real markers\nTBD how existing waymarks should be treated");
+            HoverTooltip("Replace draft markers with real markers");
         }
     }