Add waypoint placement window option for not suggesting multiplayer starting waypoints

Author: Rampastring

src/TSMapEditor/Config/Default/UI/Windows/PlaceWaypointWindow.ini

@@ -1,10 +1,11 @@
 [PlaceWaypointWindow]
-$Width=215
+$Width=280
 $CC0=lblDescription:XNALabel
 $CC1=tbWaypointNumber:EditorNumberTextBox
 $CC2=lblWaypointColor:XNALabel
 $CC3=ddWaypointColor:XNADropDown
-$CC4=btnPlace:EditorButton
+$CC4=chkDoNotSuggestMPStartingWaypoints:XNACheckBox
+$CC5=btnPlace:EditorButton
 $Height=getBottom(btnPlace) + EMPTY_SPACE_BOTTOM
 HasCloseButton=yes
 
@@ -28,9 +29,14 @@ $X=getRight(lblWaypointColor) + HORIZONTAL_SPACING
 $Y=getY(lblWaypointColor) - 1
 $Width=getRight(tbWaypointNumber) - getX(ddWaypointColor)
 
+[chkDoNotSuggestMPStartingWaypoints]
+$X=getX(lblDescription)
+$Y=getBottom(ddWaypointColor) + VERTICAL_SPACING
+$Text=translate(Do not suggest multiplayer starting waypoints)
+
 [btnPlace]
 $Width=80
 $X=(getWidth(PlaceWaypointWindow) - getWidth(btnPlace)) / 2
-$Y=getBottom(ddWaypointColor) + EMPTY_SPACE_TOP
+$Y=getBottom(chkDoNotSuggestMPStartingWaypoints) + EMPTY_SPACE_TOP
 $Text=translate(Place)
 

src/TSMapEditor/Config/Translations/en/Translation_en.ini

@@ -336,6 +336,7 @@ UIManager.IssuesFound.Description=The map has been saved, but one or more issues
 UIManager.LoadMapFailure.Title=Failed to open map
 UIManager.MapSaved=Map saved.
 UIManager.MapAutoSaved=Map auto-saved.
+UIManager.NewMap=New map
 WindowController.NoTriggerAttached.Title=No trigger attached
 WindowController.NoTriggerAttached.Description=The specified Tag has no attached Trigger!
 ListExtensions.TaskForceParseError=Failed to load TaskForce {0}. It might be missing a section or be otherwise invalid.
@@ -360,6 +361,7 @@ TileInfoDisplay.Height=Height:\s
 TileInfoDisplay.HouseBaseNodesHeader=Base Node:\s
 TileInfoDisplay.HouseBaseNodesInfo={0} ({1}), Owner:
 TileInfoDisplay.NoToolSelected=No tool selected
+TileInfoDisplay.SelectedTool=Selected tool:\s
 TileInfoDisplay.TileSet=TileSet:\s
 TileInfoDisplay.TileNumber=Tile #:\s
 TileInfoDisplay.TerrainType=Terrain Type:\s
@@ -837,6 +839,7 @@ OpenMapWindow.NoFileSelected.Description=Please select the map file to open.
 
 PlaceWaypointWindow.lblDescription.Text=Input waypoint number:
 PlaceWaypointWindow.lblWaypointColor.Text=Color:
+PlaceWaypointWindow.chkDoNotSuggestMPStartingWaypoints.Text=Do not suggest multiplayer starting waypoints
 PlaceWaypointWindow.btnPlace.Text=Place
 PlaceWaypointWindow.DescriptionText=Input waypoint number (0-{0}):
 PlaceWaypointWindow.None=None

src/TSMapEditor/Settings/UserSettings.cs

@@ -110,6 +110,7 @@ public async Task SaveSettingsAsync()
         public BoolSetting QuickTriggerParameterSelection = new BoolSetting(General, nameof(QuickTriggerParameterSelection), true);
         public IntSetting AutoSaveInterval = new IntSetting(General, nameof(AutoSaveInterval), 300);
         public IntSetting SidebarWidth = new IntSetting(General, nameof(SidebarWidth), 250);
+        public BoolSetting DoNotSuggestMPStartingWaypoints = new BoolSetting(General, nameof(DoNotSuggestMPStartingWaypoints), false);
 
         public BoolSetting MultithreadedTextureLoading = new BoolSetting(General, nameof(MultithreadedTextureLoading), true);
         public BoolSetting LogFileLoading = new BoolSetting(General, nameof(LogFileLoading), false);

src/TSMapEditor/UI/Windows/PlaceWaypointWindow.cs

@@ -6,6 +6,7 @@
 using TSMapEditor.Models;
 using TSMapEditor.Mutations;
 using TSMapEditor.Mutations.Classes;
+using TSMapEditor.Settings;
 using TSMapEditor.UI.Controls;
 
 namespace TSMapEditor.UI.Windows
@@ -26,6 +27,7 @@ public PlaceWaypointWindow(WindowManager windowManager, Map map, MutationManager
         private EditorNumberTextBox tbWaypointNumber;
         private XNALabel lblDescription;
         private XNADropDown ddWaypointColor;
+        private XNACheckBox chkDoNotSuggestMPStartingWaypoints;
 
         private Point2D cellCoords;
 
@@ -41,12 +43,16 @@ public override void Initialize()
             lblDescription = FindChild<XNALabel>(nameof(lblDescription));
             lblDescription.Text = string.Format(Translate(this, "DescriptionText", "Input waypoint number (0-{0}):"), Constants.MaxWaypoint - 1);
 
+            chkDoNotSuggestMPStartingWaypoints = FindChild<XNACheckBox>(nameof(chkDoNotSuggestMPStartingWaypoints));
+
             FindChild<EditorButton>("btnPlace").LeftClick += BtnPlace_LeftClick;
 
             // Init color dropdown options
             ddWaypointColor = FindChild<XNADropDown>(nameof(ddWaypointColor));
             ddWaypointColor.AddItem(Translate(this, "None", "None"));
             UIHelpers.AddColorOptionsToDropDown(Waypoint.SupportedColors, ddWaypointColor);
+
+            chkDoNotSuggestMPStartingWaypoints.Checked = UserSettings.Instance.DoNotSuggestMPStartingWaypoints;
         }
 
         private void BtnPlace_LeftClick(object sender, EventArgs e)
@@ -80,6 +86,12 @@ public bool PlaceWaypoint(int waypointNumber, Point2D cellCoords)
                 return false;
             }
 
+            if (chkDoNotSuggestMPStartingWaypoints.Checked != UserSettings.Instance.DoNotSuggestMPStartingWaypoints)
+            {
+                UserSettings.Instance.DoNotSuggestMPStartingWaypoints.UserDefinedValue = chkDoNotSuggestMPStartingWaypoints.Checked;
+                _ = UserSettings.Instance.SaveSettingsAsync();
+            }
+
             string waypointColor = ddWaypointColor.SelectedItem != null ? (string)ddWaypointColor.SelectedItem.Tag : null;
 
             mutationManager.PerformMutation(new PlaceWaypointMutation(mutationTarget, cellCoords, waypointNumber, waypointColor));
@@ -114,7 +126,7 @@ public int GetAvailableWaypointNumber()
                 return -1;
             }
 
-            for (int i = 0; i < Constants.MaxWaypoint; i++)
+            for (int i = chkDoNotSuggestMPStartingWaypoints.Checked ? Constants.MultiplayerMaxPlayers : 0; i < Constants.MaxWaypoint; i++)
             {
                 if (!map.Waypoints.Exists(w => w.Identifier == i) && (Constants.IsRA2YR || i != Constants.TS_WAYPT_SPECIAL))
                 {