Merge pull request #8065 from pchote/ingame-map-editor

Add the new map editor.
2015-05-18 19:16:16 +03:00
parent 5d593de09d 60f96fcb7b
commit a47235d162
61 changed files with 3315 additions and 140 deletions
--- a/mods/ra/chrome/editor.yaml
+++ b/mods/ra/chrome/editor.yaml
@@ -0,0 +1,372 @@
+Background@NEW_MAP_BG:
+	Logic: NewMapLogic
+	X: (WINDOW_RIGHT - WIDTH)/2
+	Y: (WINDOW_BOTTOM - HEIGHT)/2
+	Width: 300
+	Height: 185
+	Children:
+		Label@LABEL_TITLE:
+			X: 0
+			Y: 20
+			Width: 300
+			Height: 25
+			Text: New Map
+			Align: Center
+			Font: Bold
+		Label@TILESET_LABEL:
+			X: 20
+			Y: 59
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Tileset:
+		DropDownButton@TILESET:
+			X: 120
+			Y: 60
+			Width: 160
+			Height: 25
+		Label@WIDTH_LABEL:
+			X: 20
+			Y: 94
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Width:
+		TextField@WIDTH:
+			X: 120
+			Y: 95
+			Width: 50
+			MaxLength: 3
+			Height: 25
+			Text: 128
+		Label@HEIGHT_LABEL:
+			X: 130
+			Y: 94
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Height:
+		TextField@HEIGHT:
+			X: 230
+			Y: 95
+			Width: 50
+			MaxLength: 3
+			Height: 25
+			Text: 128
+		Button@CREATE_BUTTON:
+			X: 30
+			Y: PARENT_BOTTOM - 45
+			Width: 120
+			Height: 25
+			Text: Create
+			Font: Bold
+			Key: return
+		Button@CANCEL_BUTTON:
+			X: 160
+			Y: PARENT_BOTTOM - 45
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+			Key: escape
+
+Background@SAVE_MAP_PANEL:
+	Logic: SaveMapLogic
+	X: (WINDOW_RIGHT - WIDTH)/2
+	Y: (WINDOW_BOTTOM - HEIGHT)/2
+	Width: 350
+	Height: 335
+	Children:
+		Label@LABEL_TITLE:
+			X: (PARENT_RIGHT - WIDTH)/2
+			Y: 20
+			Width: 250
+			Height: 25
+			Text: Save Map
+			Align: Center
+			Font: Bold
+		Label@TITLE_LABEL:
+			X: 10
+			Y: 59
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Title:
+		TextField@TITLE:
+			X: 110
+			Y: 60
+			Width: 220
+			MaxLength: 50
+			Height: 25
+		Label@AUTHOR_LABEL:
+			X: 10
+			Y: 94
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Author:
+		TextField@AUTHOR:
+			X: 110
+			Y: 95
+			Width: 220
+			MaxLength: 50
+			Height: 25
+		Label@DESCRIPTION_LABEL:
+			X: 10
+			Y: 129
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Description:
+		TextField@DESCRIPTION:
+			X: 110
+			Y: 130
+			Width: 220
+			MaxLength: 50
+			Height: 25
+		Label@VISIBILITY_LABEL:
+			X: 10
+			Y: 164
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Visibility:
+		DropDownButton@VISIBILITY_DROPDOWN:
+			X: 110
+			Y: 165
+			Width: 220
+			Height: 25
+		Label@DIRECTORY_LABEL:
+			X: 10
+			Y: 199
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Directory:
+		DropDownButton@DIRECTORY_DROPDOWN:
+			X: 110
+			Y: 200
+			Width: 220
+			Height: 25
+		Label@FILENAME_LABEL:
+			X: 10
+			Y: 234
+			Width: 95
+			Height: 25
+			Align: Right
+			Text: Filename:
+		TextField@FILENAME:
+			X: 110
+			Y: 235
+			Width: 105
+			Height: 25
+		DropDownButton@TYPE_DROPDOWN:
+			X: 220
+			Y: 235
+			Width: 110
+			Height: 25
+		Button@SAVE_BUTTON:
+			X: 80
+			Y: PARENT_BOTTOM - 45
+			Width: 120
+			Height: 25
+			Text: Save
+			Font: Bold
+		Button@BACK_BUTTON:
+			X: 210
+			Y: PARENT_BOTTOM - 45
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+			Key: escape
+
+Container@EDITOR_ROOT:
+	Logic: LoadMapEditorLogic
+	Children:
+		Container@WORLD_ROOT:
+		Container@MENU_ROOT:
+		TooltipContainer@TOOLTIP_CONTAINER:
+
+Container@EDITOR_WORLD_ROOT:
+	Logic: LoadIngamePerfLogic, MapEditorLogic
+	Children:
+		Container@PERF_ROOT:
+		ViewportController:
+			X: 0
+			Y: 0
+			Width: WINDOW_RIGHT
+			Height: WINDOW_BOTTOM
+			TooltipContainer: TOOLTIP_CONTAINER
+		EditorViewportController@MAP_EDITOR:
+			Width: WINDOW_RIGHT
+			Height: WINDOW_BOTTOM
+			TooltipContainer: TOOLTIP_CONTAINER
+			TooltipTemplate: SIMPLE_TOOLTIP
+			Children:
+				ActorPreview@DRAG_ACTOR_PREVIEW:
+					Visible: false
+				TerrainTemplatePreview@DRAG_TILE_PREVIEW:
+					Visible: false
+				Sprite@DRAG_LAYER_PREVIEW:
+					Visible: false
+		Background@RADAR_BG:
+			X: WINDOW_RIGHT-255
+			Y: 5
+			Width: 250
+			Height: 250
+			Children:
+				Radar@INGAME_RADAR:
+					X: 10
+					Y: 10
+					Width: PARENT_RIGHT-19
+					Height: PARENT_BOTTOM-19
+		Container@TILE_WIDGETS:
+			Logic: TileSelectorLogic
+			Children:
+				Background@TILES_BG:
+					X: WINDOW_RIGHT-250
+					Y: 290
+					Width: 240
+					Height: 360
+					Children:
+						DropDownButton@TILE_CATEGORY:
+							X: 10
+							Y: 10
+							Width: 220
+							Height: 25
+							Font: Bold
+						ScrollPanel@TILETEMPLATE_LIST:
+							X: 10
+							Y: 35
+							Width: PARENT_RIGHT-20
+							Height: PARENT_BOTTOM-45
+							ItemSpacing: 4
+							Children:
+								ScrollItem@TILEPREVIEW_TEMPLATE:
+									Visible: false
+									Width: PARENT_RIGHT - 35
+									TooltipContainer: TOOLTIP_CONTAINER
+									Children:
+										TerrainTemplatePreview@TILE_PREVIEW:
+											X: 4
+											Y: 4
+		Container@LAYER_WIDGETS:
+			Visible: false
+			Logic: LayerSelectorLogic
+			Children:
+				Background@LAYERS_BG:
+					X: WINDOW_RIGHT-250
+					Y: 290
+					Width: 240
+					Height: 360
+					Children:
+						ScrollPanel@LAYERTEMPLATE_LIST:
+							X: 10
+							Y: 10
+							Width: PARENT_RIGHT-20
+							Height: PARENT_BOTTOM-20
+							ItemSpacing: 4
+							Children:
+								ScrollItem@LAYERPREVIEW_TEMPLATE:
+									Visible: false
+									IgnoreChildMouseOver: true
+									TooltipContainer: TOOLTIP_CONTAINER
+									Children:
+										Sprite@LAYER_PREVIEW:
+											X: 4
+											Y: 4
+											Visible: false
+		Container@ACTOR_WIDGETS:
+			Visible: false
+			Logic: ActorSelectorLogic
+			Children:
+				Background@ACTORS_BG:
+					X: WINDOW_RIGHT-250
+					Y: 290
+					Width: 240
+					Height: 360
+					Children:
+						DropDownButton@OWNERS_DROPDOWN:
+							X: 10
+							Y: 10
+							Width: 220
+							Height: 25
+							Font: Bold
+						ScrollPanel@ACTORTEMPLATE_LIST:
+							X: 10
+							Y: 35
+							Width: PARENT_RIGHT-20
+							Height: PARENT_BOTTOM-45
+							ItemSpacing: 4
+							Children:
+								ScrollItem@ACTORPREVIEW_TEMPLATE:
+									Visible: false
+									Width: PARENT_RIGHT - 35
+									TooltipContainer: TOOLTIP_CONTAINER
+									IgnoreChildMouseOver: true
+									Children:
+										ActorPreview@ACTOR_PREVIEW:
+											X: 4
+											Y: 4
+											Visible: true
+		Container@MAP_EDITOR_TAB_CONTAINER:
+			Logic: MapEditorTabsLogic
+			X: WINDOW_RIGHT-245
+			Y: 260
+			Width: 240
+			Height: 25
+			Children:
+				Button@TILES_TAB:
+					X: 0
+					Width: 70
+					Height: 25
+					Text: Tiles
+					Font: Bold
+				Button@OVERLAYS_TAB:
+					X: 70
+					Width: 90
+					Height: 25
+					Text: Overlays
+					Font: Bold
+				Button@ACTORS_TAB:
+					X: 160
+					Width: 70
+					Height: 25
+					Text: Actors
+					Font: Bold
+		MenuButton@OPTIONS_BUTTON:
+			Logic: MenuButtonsChromeLogic
+			MenuContainer: INGAME_MENU
+			HideIngameUI: true
+			Pause: true
+			Width: 160
+			Height: 25
+			Text: Menu
+			TooltipText: Menu
+			TooltipContainer: TOOLTIP_CONTAINER
+			Font: Bold
+			Key: escape
+		Button@GRID_BUTTON:
+			X: 180
+			Width: 160
+			Height: 25
+			Text: Grid
+			TooltipTemplate: BUTTON_TOOLTIP
+			TooltipText: Toggle the terrain grid
+			TooltipContainer: TOOLTIP_CONTAINER
+			Font: Bold
+			Key: f1
+		Label@ZOOM_LABEL:
+			X: 345
+			Width: 50
+			Height: 25
+			Text: Zoom:
+			Align: Right
+			Font: Bold
+			Contrast: true
+		DropDownButton@ZOOM_BUTTON:
+			X: 400
+			Width: 70
+			Height: 25
+			Font: Bold
--- a/mods/ra/chrome/ingame-menu.yaml
+++ b/mods/ra/chrome/ingame-menu.yaml
@@ -66,6 +66,13 @@ Container@INGAME_MENU:
 					Height: 30
 					Text: Surrender
 					Font: Bold
+				Button@SAVE_MAP:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 180
+					Width: 140
+					Height: 30
+					Text: Save Map
+					Font: Bold
 				Button@ABORT_MISSION:
 					X: (PARENT_RIGHT - WIDTH)/2
 					Y: 220
@@ -73,3 +80,10 @@ Container@INGAME_MENU:
 					Height: 30
 					Text: Abort Mission
 					Font: Bold
+				Button@EXIT_EDITOR:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 220
+					Width: 140
+					Height: 30
+					Text: Exit Map Editor
+					Font: Bold
--- a/mods/ra/chrome/mainmenu.yaml
+++ b/mods/ra/chrome/mainmenu.yaml
@@ -140,16 +140,23 @@ Container@MAINMENU:
 							Height: 30
 							Text: Music
 							Font: Bold
-						Button@ASSETBROWSER_BUTTON:
+						Button@MAP_EDITOR_BUTTON:
 							X: PARENT_RIGHT/2-WIDTH/2
 							Y: 140
 							Width: 140
 							Height: 30
+							Text: Map Editor
+							Font: Bold
+						Button@ASSETBROWSER_BUTTON:
+							X: PARENT_RIGHT/2-WIDTH/2
+							Y: 180
+							Width: 140
+							Height: 30
 							Text: Asset Browser
 							Font: Bold
 						Button@CREDITS_BUTTON:
 							X: PARENT_RIGHT/2-WIDTH/2
-							Y: 180
+							Y: 220
 							Width: 140
 							Height: 30
 							Text: Credits
@@ -162,6 +169,40 @@ Container@MAINMENU:
 							Height: 30
 							Text: Back
 							Font: Bold
+				Background@MAP_EDITOR_MENU:
+					Width: PARENT_RIGHT
+					Height: PARENT_BOTTOM
+					Children:
+						Label@MAP_EDITOR_MENU_TITLE:
+							X: 0
+							Y: 20
+							Width: 200
+							Height: 30
+							Text: Map Editor
+							Align: Center
+							Font: Bold
+						Button@NEW_MAP_BUTTON:
+							X: PARENT_RIGHT/2-WIDTH/2
+							Y: 60
+							Width: 140
+							Height: 30
+							Text: New Map
+							Font: Bold
+						Button@LOAD_MAP_BUTTON:
+							X: PARENT_RIGHT/2-WIDTH/2
+							Y: 100
+							Width: 140
+							Height: 30
+							Text: Load Map
+							Font: Bold
+						Button@BACK_BUTTON:
+							X: PARENT_RIGHT/2-WIDTH/2
+							Key: escape
+							Y: 260
+							Width: 140
+							Height: 30
+							Text: Back
+							Font: Bold
 		Container@PERFORMANCE_INFO:
 			Logic: PerfDebugLogic
 			Children:
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -114,6 +114,7 @@ ChromeLayout:
 	./mods/ra/chrome/assetbrowser.yaml
 	./mods/ra/chrome/missionbrowser.yaml
 	./mods/ra/chrome/confirmation-dialogs.yaml
+	./mods/ra/chrome/editor.yaml

 Weapons:
 	./mods/ra/weapons/explosions.yaml
--- a/mods/ra/rules/world.yaml
+++ b/mods/ra/rules/world.yaml
@@ -1,25 +1,9 @@
-World:
+^BaseWorld:
 	Inherits: ^Palettes
-	ChatCommands:
-	DevCommands:
-	PlayerCommands:
-	HelpCommand:
-	ScreenMap:
 	ActorMap:
+	ScreenMap:
+	TerrainGeometryOverlay:
 	LoadWidgetAtGameStart:
-	ScreenShaker:
-	BuildingInfluence:
-	ProductionQueueFromSelection:
-		ProductionPaletteWidget: PRODUCTION_PALETTE
-	BridgeLayer:
-		Bridges: bridge1, bridge2, br1, br2, br3, sbridge1, sbridge2, sbridge3, sbridge4
-	CrateSpawner:
-		DeliveryAircraft: badr
-		QuantizedFacings: 16
-		Minimum: 1
-		Maximum: 3
-		SpawnInterval: 120
-		WaterChance: .2
 	ShroudRenderer:
 		FogVariants: shroud
 		Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255
@@ -77,16 +61,6 @@ World:
 		RandomRaceMembers: russia, ukraine
 		Side: Random
 		Description: A random Soviet country.
-	DomainIndex:
-	SmudgeLayer@SCORCH:
-		Type: Scorch
-		Sequence: scorches
-		SmokePercentage: 50
-	SmudgeLayer@CRATER:
-		Type: Crater
-		Sequence: craters
-	ResourceLayer:
-	ResourceClaimLayer:
 	ResourceType@ore:
 		ResourceType: 1
 		Palette: player
@@ -111,8 +85,37 @@ World:
 		AllowedTerrainTypes: Clear,Road
 		AllowUnderActors: true
 		TerrainType: Gems
+
+World:
+	Inherits: ^BaseWorld
+	ChatCommands:
+	DevCommands:
+	PlayerCommands:
+	HelpCommand:
+	ScreenShaker:
+	BuildingInfluence:
+	ProductionQueueFromSelection:
+		ProductionPaletteWidget: PRODUCTION_PALETTE
+	BridgeLayer:
+		Bridges: bridge1, bridge2, br1, br2, br3, sbridge1, sbridge2, sbridge3, sbridge4
+	CrateSpawner:
+		DeliveryAircraft: badr
+		QuantizedFacings: 16
+		Minimum: 1
+		Maximum: 3
+		SpawnInterval: 120
+		WaterChance: .2
+	DomainIndex:
+	SmudgeLayer@SCORCH:
+		Type: Scorch
+		Sequence: scorches
+		SmokePercentage: 50
+	SmudgeLayer@CRATER:
+		Type: Crater
+		Sequence: craters
+	ResourceLayer:
+	ResourceClaimLayer:
 	PathfinderDebugOverlay:
-	TerrainGeometryOverlay:
 	SpawnMapActors:
 	CreateMPPlayers:
 	MPStartUnits@mcvonly:
@@ -162,3 +165,7 @@ World:
 	ObjectivesPanel:
 		PanelName: SKIRMISH_STATS

+EditorWorld:
+	Inherits: ^BaseWorld
+	EditorActorLayer:
+	EditorResourceLayer: