Merge remote-tracking branch 'upstream/master' into override-team-delays

Author: JoyfulShush

src/TSMapEditor/Config/Scripts/Activate Assign Mission Cursor Action.cs

@@ -26,8 +26,8 @@
     <ApplicationIcon>editoricon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Remove="Config\Scripts\Activate Assign Mission Cursor Action.cs" />
     <Compile Remove="Config\Scripts\Apply Animated Water.cs" />
-    <Compile Remove="Config\Scripts\Area Guard Mission Assignment Cursor Action.cs" />
     <Compile Remove="Config\Scripts\Disable All Debug Triggers.cs" />
     <Compile Remove="Config\Scripts\Make Civilian Vehicles Sleep.cs" />
     <Compile Remove="Config\Scripts\Remove All Terrain Objects.cs" />
@@ -505,10 +505,10 @@
     <Folder Include="Content\ToolIcons\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Config\Scripts\Apply Animated Water.cs">
+    <None Include="Config\Scripts\Activate Assign Mission Cursor Action.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Config\Scripts\Area Guard Mission Assignment Cursor Action.cs">
+    <None Include="Config\Scripts\Apply Animated Water.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Config\Scripts\Count Credits On Map.cs">

src/TSMapEditor/Config/Scripts/Area Guard Mission Assignment Cursor Action.cs

@@ -75,7 +75,9 @@ public override void Initialize()
             }
 
             Parser.Instance.SetPrimaryControl(this);
-            ReadINIForControl(this);
+            if (!ReadINIForControl(this))
+                throw new INIConfigException("No section '" + Name + "' found when parsing config file for INItializableWindow of the type!");
+
             ReadLateAttributesForControl(this);
 
             base.Initialize();

src/TSMapEditor/TSMapEditor.csproj

@@ -72,6 +72,10 @@ public override void OnKeyPressed(KeyPressEventArgs e, Point2D cellCoords)
                 ShiftBaseNodeEarlier(cellCoords);
                 e.Handled = true;
             }
+            else if (e.PressedKey == Microsoft.Xna.Framework.Input.Keys.M)
+            {
+                e.Handled = true;
+            }
         }
 
         public override void LeftDown(Point2D cellCoords)

src/TSMapEditor/UI/Controls/INItializableWindow.cs

@@ -19,7 +19,15 @@ public PlaceWaypointCursorAction(ICursorActionTarget cursorActionTarget) : base(
 
         public override void LeftClick(Point2D cellCoords)
         {
-            PlaceWaypointWindow.Open(cellCoords);
+            if (Keyboard.IsShiftHeldDown())
+            {
+                int availableWaypointNumber = PlaceWaypointWindow.GetAvailableWaypointNumber();
+                PlaceWaypointWindow.PlaceWaypoint(availableWaypointNumber, cellCoords);
+            }
+            else
+            {
+                PlaceWaypointWindow.Open(cellCoords);
+            }
         }
 
         public override void DrawPreview(Point2D cellCoords, Point2D cameraTopLeftPoint)

src/TSMapEditor/UI/CursorActions/ManageBaseNodesCursorAction.cs

@@ -250,7 +250,7 @@ private void BtnCloneHouse_LeftClick(object sender, InputEventArgs e)
 
             HouseType clonedHouseType = (HouseType)editedHouse.HouseType.Clone();
             clonedHouseType.ININame = editedHouse.HouseType.ININame + cloneININame;
-            clonedHouseType.Index = map.HouseTypes.Count;
+            clonedHouseType.Index = map.HouseTypes.Count + (Constants.IsRA2YR ? map.Rules.RulesHouseTypes.Count : 0);
             map.HouseTypes.Add(clonedHouseType);
 
             House clonedHouse = (House)editedHouse.Clone();

src/TSMapEditor/UI/CursorActions/PlaceWaypointCursorAction.cs

@@ -57,51 +57,67 @@ private void BtnPlace_LeftClick(object sender, EventArgs e)
                 return;
             }
 
-            if (tbWaypointNumber.Value < 0 || tbWaypointNumber.Value >= Constants.MaxWaypoint)
+            int waypointNumber = tbWaypointNumber.Value;
+
+            PlaceWaypoint(waypointNumber, cellCoords);
+            Hide();
+        }
+
+        public void PlaceWaypoint(int waypointNumber, Point2D cellCoords)
+        {
+            if (waypointNumber < 0 || waypointNumber >= Constants.MaxWaypoint)
                 return;
 
-            if (map.Waypoints.Exists(w => w.Identifier == tbWaypointNumber.Value))
+            if (map.Waypoints.Exists(w => w.Identifier == waypointNumber))
             {
                 EditorMessageBox.Show(WindowManager,
                     Translate(this, "WaypointExists.Title", "Waypoint already exists"),
-                    string.Format(Translate(this, "WaypointExists.Description", 
-                        "A waypoint with the given number {0} already exists on the map!"), tbWaypointNumber.Value),
+                    string.Format(Translate(this, "WaypointExists.Description",
+                        "A waypoint with the given number {0} already exists on the map!"), waypointNumber),
                     MessageBoxButtons.OK);
 
                 return;
             }
 
             string waypointColor = ddWaypointColor.SelectedItem != null ? ddWaypointColor.SelectedItem.Text : null;
 
-            mutationManager.PerformMutation(new PlaceWaypointMutation(mutationTarget, cellCoords, tbWaypointNumber.Value, waypointColor));
-
-            Hide();
+            mutationManager.PerformMutation(new PlaceWaypointMutation(mutationTarget, cellCoords, waypointNumber, waypointColor));
         }
 
         public void Open(Point2D cellCoords)
         {
             this.cellCoords = cellCoords;
 
+            int availableWaypointNumber = GetAvailableWaypointNumber();
+            if (availableWaypointNumber < 0)
+                return;
+
+            tbWaypointNumber.Value = availableWaypointNumber;
+
+            Show();
+        }
+
+        public int GetAvailableWaypointNumber()
+        {
             if (map.Waypoints.Count == Constants.MaxWaypoint)
             {
                 EditorMessageBox.Show(WindowManager,
                     Translate(this, "MaxWaypoints.Title", "Maximum waypoints reached"),
                     Translate(this, "MaxWaypoints.Description", "All valid waypoints on the map are already in use!"),
                     MessageBoxButtons.OK);
 
-                return;
+                return -1;
             }
 
             for (int i = 0; i < Constants.MaxWaypoint; i++)
             {
                 if (!map.Waypoints.Exists(w => w.Identifier == i) && (Constants.IsRA2YR || i != Constants.TS_WAYPT_SPECIAL))
                 {
-                    tbWaypointNumber.Value = i;
-                    break;
+                    return i;
                 }
             }
 
-            Show();
+            return -1;
         }
     }
 }