Display (attack|assault)move-blocked cursor outside map bounds.

This makes them consistent with the regular move order.

OpenRA.Mods.Common/Traits/AttackMove.cs

@@ -156,10 +156,8 @@ namespace OpenRA.Mods.Common.Traits
 
 		public override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 		{
-			if (world.Map.Contains(cell))
-				return mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove";
-
-			return "generic-blocked";
+			var prefix = mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove";
+			return world.Map.Contains(cell) ? prefix : prefix + "-blocked";
 		}
 
 		public override bool InputOverridesSelection(World world, int2 xy, MouseInput mi)

mods/cnc/cursors.yaml

@@ -155,23 +155,41 @@ Cursors:
 		move:
 			Start: 0
 			Length: 8
-		move-minimap:
-			Start: 8
-			Length: 4
 		move-rough:
 			Start: 0
 			Length: 8
+		move-minimap:
+			Start: 8
+			Length: 4
 		attackmove:
 			Start: 12
 			Length: 8
 		attackmove-minimap:
 			Start: 20
 			Length: 4
-		move-blocked:
+		assaultmove:
 			Start: 24
+			Length: 8
+		assaultmove-minimap:
+			Start: 32
+			Length: 4
+		move-blocked:
+			Start: 36
+			Length: 1
+		attackmove-blocked:
+			Start: 37
+			Length: 1
+		assaultmove-blocked:
+			Start: 38
 			Length: 1
 		move-blocked-minimap:
-			Start: 25
+			Start: 39
+			Length: 1
+		attackmove-blocked-minimap:
+			Start: 39
+			Length: 1
+		assaultmove-blocked-minimap:
+			Start: 40
 			Length: 1
 	mouse5.shp: cursor
 		guard:
@@ -217,10 +235,3 @@ Cursors:
 			Length: 8
 		attackoutsiderange-minimap:
 			Start: 8
-	mouse8.shp: cursor
-		assaultmove:
-			Start: 0
-			Length: 8
-		assaultmove-minimap:
-			Start: 8
-			Length: 4

mods/d2k/cursors.yaml

@@ -306,6 +306,14 @@ Cursors:
 			Length: 8
 			X: -2
 			Y: -2
+		attackmove-blocked:
+			Start: 8
+			X: -2
+			Y: -2
+		attackmove-blocked-minimap:
+			Start: 8
+			X: -2
+			Y: -2
 	assaultmove.shp: mouse
 		assaultmove:
 			Start: 0
@@ -316,4 +324,12 @@ Cursors:
 			Start: 0
 			Length: 8
 			X: -2
-			Y: -2
+			Y: -2
+		assaultmove-blocked:
+			Start: 8
+			X: -2
+			Y: -2
+		assaultmove-blocked-minimap:
+			Start: 8
+			X: -2
+			Y: -2

mods/ra/cursors.yaml

@@ -217,9 +217,17 @@ Cursors:
 		attackmove-minimap:
 			Start: 4
 			Length: 4
+		attackmove-blocked:
+			Start: 16
+		attackmove-blocked-minimap:
+			Start: 18
 		assaultmove:
 			Start: 8
 			Length: 4
 		assaultmove-minimap:
 			Start: 12
 			Length: 4
+		assaultmove-blocked:
+			Start: 17
+		assaultmove-blocked-minimap:
+			Start: 19