Add copy/paste to the map editor.

2015-11-04 19:45:20 +00:00
parent 1c06297ff7
commit a081321790
15 changed files with 348 additions and 13 deletions
--- a/mods/cnc/chrome/editor.yaml
+++ b/mods/cnc/chrome/editor.yaml
@@ -362,7 +362,7 @@ Container@EDITOR_WORLD_ROOT:
 					Text: Actors
 					Font: Bold
 		Button@GRID_BUTTON:
-			X: WINDOW_RIGHT - 420
+			X: WINDOW_RIGHT - 500
 			Y: 5
 			Width: 100
 			Height: 25
@@ -373,7 +373,7 @@ Container@EDITOR_WORLD_ROOT:
 			TooltipText: Toggle the terrain grid
 			TooltipContainer: TOOLTIP_CONTAINER
 		Label@ZOOM_LABEL:
-			X: WINDOW_RIGHT - 500 - 55
+			X: WINDOW_RIGHT - 580 - 55
 			Y: 5
 			Width: 50
 			Height: 25
@@ -382,11 +382,17 @@ Container@EDITOR_WORLD_ROOT:
 			Font: Bold
 			Contrast: true
 		DropDownButton@ZOOM_BUTTON:
-			X: WINDOW_RIGHT - 500
+			X: WINDOW_RIGHT - 580
 			Y: 5
 			Width: 70
 			Height: 25
 			Font: Bold
+		Button@COPYPASTE_BUTTON:
+			X: WINDOW_RIGHT-390
+			Y: 5
+			Width: 96
+			Height: 25
+			Text: Copy/Paste
 		Label@COORDINATE_LABEL:
 			X: 10
 			Width: 50
--- a/mods/cnc/rules/world.yaml
+++ b/mods/cnc/rules/world.yaml
@@ -154,4 +154,5 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorResourceLayer:
+	EditorSelectionLayer:

--- a/mods/cnc/sequences/misc.yaml
+++ b/mods/cnc/sequences/misc.yaml
@@ -240,6 +240,12 @@ overlay:
 	target-invalid:
 		Start: 1

+editor-overlay:
+	copy: overlay
+		Start: 0
+	paste: overlay
+		Start: 1
+
 poweroff:
 	offline:
 		Length: *
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -148,4 +148,5 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	D2kEditorResourceLayer:
+	EditorSelectionLayer:

--- a/mods/d2k/sequences/misc.yaml
+++ b/mods/d2k/sequences/misc.yaml
@@ -126,19 +126,23 @@ rank:
 		Length: *

 overlay:
-	build-valid-arrakis: DATA.R8
+	Defaults: DATA.R8
 		Offset: -16,-16
-	build-invalid: DATA.R8
+	build-valid-arrakis:
+	build-invalid:
 		Start: 1
-		Offset: -16,-16
-	target-select: DATA.R8
+	target-select:
 		Start: 2
-		Offset: -16,-16
-	target-valid-arrakis: DATA.R8
-		Offset: -16,-16
-	target-invalid: DATA.R8
+	target-valid-arrakis:
+	target-invalid:
 		Start: 1
+
+editor-overlay:
+	Defaults: DATA.R8
 		Offset: -16,-16
+	copy:
+	paste:
+		Start: 1

 rallypoint:
 	flag: flagfly.shp
--- a/mods/ra/chrome/editor.yaml
+++ b/mods/ra/chrome/editor.yaml
@@ -351,9 +351,15 @@ Container@EDITOR_WORLD_ROOT:
 			TooltipContainer: TOOLTIP_CONTAINER
 			Font: Bold
 			Key: escape
+		Button@COPYPASTE_BUTTON:
+			X: 170
+			Width: 90
+			Height: 25
+			Text: Copy/Paste
+			Font: Bold
 		Button@GRID_BUTTON:
-			X: 180
-			Width: 160
+			X: 270
+			Width: 70
 			Height: 25
 			Text: Grid
 			TooltipTemplate: BUTTON_TOOLTIP
--- a/mods/ra/rules/world.yaml
+++ b/mods/ra/rules/world.yaml
@@ -173,4 +173,5 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorResourceLayer:
+	EditorSelectionLayer:

--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -474,6 +474,12 @@ overlay:
 	target-invalid:
 		Start: 1

+editor-overlay:
+	copy: overlay
+		Start: 0
+	paste: overlay
+		Start: 1
+
 resources:
 	Defaults:
 		Length: *
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -175,4 +175,6 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorResourceLayer:
+	EditorSelectionLayer:
+		Palette: placebuilding

--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -7,6 +7,13 @@ overlay:
 		Start: 1
 	target-select:

+editor-overlay:
+	Defaults: place
+		Offset: 0, -12
+	copy:
+	paste:
+		Start: 1
+
 poweroff:
 	offline:
 		Length: *