epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Editor marker tiles layer

Browse Source
This commit is contained in:
David Wilson
2024-01-26 23:52:51 +10:00
committed by Gustas
parent 714f2c6dc2
commit 25a6b4b6b9
36 changed files with 1595 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mods/cnc/chrome.yaml
View File

@@ -759,3 +759,4 @@ editor:
actors: 802, 68, 16, 16
tools: 904, 68, 16, 16
history: 904, 51, 16, 16
erase: 818, 170, 16, 16

177
mods/cnc/chrome/editor.yaml
View File

@@ -218,6 +218,7 @@ Container@EDITOR_WORLD_ROOT:
Logic: LoadIngamePerfLogic, MapEditorLogic, ActorEditLogic, MapOverlaysLogic, MapEditorSelectionLogic
ToggleGridOverlayKey: EditorToggleGridOverlay
ToggleBuildableOverlayKey: EditorToggleBuildableOverlay
ToggleMarkerOverlayKey: EditorToggleMarkerOverlay
Children:
LogicKeyListener@OVERLAY_KEYHANDLER:
Container@PERF_ROOT:
@@ -431,25 +432,161 @@ Container@EDITOR_WORLD_ROOT:
Width: 290
Height: WINDOW_BOTTOM - 410
ClickThrough: false
Logic: MapToolsLogic
Children:
Background@TOOLS_EDIT_PANEL:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: 25
Background: panel-black
Label@TOOLS_LABEL:
Y: 1
Width: 55
Height: 25
Text: label-tools-bg-categories
Align: Right
Font: TinyBold
DropDownButton@TOOLS_DROPDOWN:
X: 60
Width: PARENT_RIGHT - 60
Height: 25
Font: Bold
ScrollPanel@MARKER_TOOL_PANEL:
Y: 24
Width: PARENT_RIGHT - 1
Height: PARENT_BOTTOM
Background: scrollpanel-bg
Checkbox@SHOW_TILE_GRID:
X: 6
Y: 7
Width: PARENT_RIGHT - 29
Height: 20
Text: label-show-tile-grid
Checkbox@SHOW_BUILDABLE_AREA:
X: 6
Y: 32
Width: PARENT_RIGHT - 29
Height: 20
Text: label-show-buildable-area
Visible: true
ScrollBar: Hidden
ScrollbarWidth: 0
Logic: MapMarkerTilesLogic
Children:
ScrollPanel@TILE_COLOR_PANEL:
X: 6
Y: 6
Width: PARENT_RIGHT - 18
Height: 31
TopBottomSpacing: 1
ItemSpacing: 1
ScrollBar: Hidden
ScrollbarWidth: 0
ContentHeight: 31
Children:
ScrollItem@TILE_COLOR_TEMPLATE:
Visible: false
Height: 29
Width: 29
IgnoreChildMouseOver: true
Children:
ColorBlock@TILE_PREVIEW:
X: 2
Y: 2
Width: 26
Height: 26
ScrollItem@TILE_ICON_TEMPLATE:
Visible: false
Height: 29
Width: 29
IgnoreChildMouseOver: true
Children:
Image@TILE_ERASE:
X: 6
Y: 6
Width: 26
Height: 26
ImageCollection: editor
ImageName: erase
Button@CLEAR_CURRENT_BUTTON:
X: 6
Y: 42
Width: 100
Height: 25
Text: button-marker-tiles-clear-current
Font: Bold
Button@CLEAR_ALL_BUTTON:
X: 111
Y: 42
Width: 75
Height: 25
Text: button-marker-tiles-clear-all
Font: Bold
Label@ALPHA_LABEL:
X: 6
Y: 72
Width: 265
Height: 25
Align: Left
Text: label-marker-alpha
Slider@ALPHA_SLIDER:
X: 130
Y: 72
Width: 128
Height: 25
Label@ALPHA_VALUE:
X: 260
Y: 72
Width: 30
Height: 25
Align: Left
Text: 85
Label@MODE_LABEL:
X: 6
Y: 102
Width: 265
Height: 25
Align: Left
Text: label-marker-mirror-mode
DropDownButton@MODE_DROPDOWN:
X: 129
Y: 102
Width: 157
Height: 25
Label@NUM_SIDES_LABEL:
X: 6
Y: 132
Width: 256
Height: 25
Align: Left
Text: label-marker-layer-num-sides
Slider@ROTATE_NUM_SIDES_SLIDER:
X: 130
Y: 132
Width: 128
Height: 25
Visible: false
Label@ROTATE_NUM_SIDES_VALUE:
X: 260
Y: 132
Width: 30
Height: 25
Align: Left
Text: 2
Visible: false
DropDownButton@FLIP_NUM_SIDES_DROPDOWN:
X: 129
Y: 132
Width: 157
Height: 25
Label@AXIS_ANGLE_LABEL:
X: 6
Y: 162
Width: 256
Height: 25
Align: Left
Text: label-marker-axis-angle
Visible: false
Slider@AXIS_ANGLE_SLIDER:
X: 130
Y: 162
Width: 128
Height: 25
Visible: false
Label@AXIS_ANGLE_VALUE:
X: 260
Y: 162
Width: 30
Height: 25
Align: Left
Text: 0
Visible: false
Container@HISTORY_WIDGETS:
Logic: HistoryLogLogic
X: WINDOW_RIGHT - 295
@@ -819,6 +956,13 @@ Container@EDITOR_WORLD_ROOT:
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-editor-world-root-paste.tooltip
TooltipContainer: TOOLTIP_CONTAINER
DropDownButton@OVERLAY_BUTTON:
X: WINDOW_RIGHT - 914
Y: 5
Width: 140
Height: 25
Text: dropdownbutton-editor-world-root-overlay-button
Font: Bold
Label@COORDINATE_LABEL:
X: 10
Width: 50
@@ -863,7 +1007,7 @@ ScrollPanel@CATEGORY_FILTER_PANEL:
ScrollPanel@OVERLAY_PANEL:
Width: 140
Height: 55
Height: 80
ItemSpacing: 5
TopBottomSpacing: 0
Children:
@@ -873,4 +1017,3 @@ ScrollPanel@OVERLAY_PANEL:
Width: PARENT_RIGHT - 29
Height: 20
Visible: false

12
mods/cnc/languages/chrome/en.ftl
View File

@@ -70,8 +70,13 @@ label-copy-filters = Copy Filters
label-filter-terrain = Terrain
label-filter-resources = Resources
label-filter-actors = Actors
label-show-tile-grid = Show Tile Grid
label-show-buildable-area = Show Buildable Area
label-tools-bg-categories = Tool:
button-marker-tiles-clear-current = Clear Current
button-marker-tiles-clear-all = Clear All
label-marker-layer-num-sides = Number of Sides
label-marker-alpha = Tile Alpha
label-marker-mirror-mode = Mirror Mode
label-marker-axis-angle = Axis Angle
button-map-editor-tab-container-select-tooltip = Select
button-map-editor-tab-container-tiles-tooltip = Tiles
@@ -96,9 +101,12 @@ button-editor-world-root-redo =
.label = Redo
.tooltip = Redo last step
dropdownbutton-editor-world-root-overlay-button = Overlays
button-select-categories-buttons-all = All
button-select-categories-buttons-none = None
label-tool-marker-tiles = Marker Tiles
## gamesave-browser.yaml
label-gamesave-browser-panel-load-title = Load game
label-gamesave-browser-panel-save-title = Save game

1
mods/cnc/rules/world.yaml
View File

@@ -299,3 +299,4 @@ EditorWorld:
EditorActionManager:
BuildableTerrainOverlay:
AllowedTerrainTypes: Clear, Road
MarkerLayerOverlay:

BIN
mods/cnc/uibits/chrome-2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 406 KiB

After

Width:  |  Height:  |  Size: 406 KiB

BIN
mods/cnc/uibits/chrome-3x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1017 KiB

After

Width:  |  Height:  |  Size: 1019 KiB

BIN
mods/cnc/uibits/chrome.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 166 KiB

191
mods/common/chrome/editor.yaml
View File

@@ -84,7 +84,7 @@ Background@SAVE_MAP_PANEL:
Y: 21
Width: 250
Height: 25
Text: label-save-map-panel-title.label
Text: label-save-map-panel-heading
Align: Center
Font: Bold
Label@TITLE_LABEL:
@@ -93,7 +93,7 @@ Background@SAVE_MAP_PANEL:
Width: 95
Height: 25
Align: Right
Text: label-save-map-panel-title.label
Text: label-save-map-panel-title
TextField@TITLE:
X: 110
Y: 60
@@ -207,6 +207,7 @@ Container@EDITOR_WORLD_ROOT:
Logic: LoadIngamePerfLogic, MapEditorLogic, ActorEditLogic, MapOverlaysLogic, MapEditorSelectionLogic
ToggleGridOverlayKey: EditorToggleGridOverlay
ToggleBuildableOverlayKey: EditorToggleBuildableOverlay
ToggleMarkerOverlayKey: EditorToggleMarkerOverlay
Children:
LogicKeyListener@OVERLAY_KEYHANDLER:
Container@PERF_ROOT:
@@ -392,19 +393,159 @@ Container@EDITOR_WORLD_ROOT:
Width: 310
Height: WINDOW_BOTTOM - 458
Visible: false
Logic: MapToolsLogic
Children:
Checkbox@SHOW_TILE_GRID:
X: 15
Y: 15
Width: PARENT_RIGHT - 15
Height: 20
Text: label-show-tile-grid
Checkbox@SHOW_BUILDABLE_AREA:
X: 15
Y: 40
Width: PARENT_RIGHT - 15
Height: 20
Text: label-show-buildable-area
Label@TOOLS_LABEL:
Y: 12
Width: 55
Height: 25
Text: label-tools-bg-categories
Align: Right
Font: TinyBold
DropDownButton@TOOLS_DROPDOWN:
X: 60
Y: 10
Width: PARENT_RIGHT - 70
Height: 25
Font: Bold
ScrollPanel@MARKER_TOOL_PANEL:
X: 9
Y: 35
Width: 290
Height: WINDOW_BOTTOM - 490
Visible: true
ScrollBar: Hidden
ScrollbarWidth: 0
Logic: MapMarkerTilesLogic
Children:
ScrollPanel@TILE_COLOR_PANEL:
X: 6
Y: 6
Width: PARENT_RIGHT - 19
Height: 31
TopBottomSpacing: 1
ItemSpacing: 1
ScrollBar: Hidden
ScrollbarWidth: 0
ContentHeight: 31
Children:
ScrollItem@TILE_COLOR_TEMPLATE:
Visible: false
Height: 29
Width: 29
IgnoreChildMouseOver: true
Children:
ColorBlock@TILE_PREVIEW:
X: 2
Y: 2
Width: 26
Height: 26
ScrollItem@TILE_ICON_TEMPLATE:
Visible: false
Height: 29
Width: 29
IgnoreChildMouseOver: true
Children:
Image@TILE_ERASE:
X: 6
Y: 6
Width: 26
Height: 26
ImageCollection: editor
ImageName: erase
Button@CLEAR_CURRENT_BUTTON:
X: 6
Y: 42
Width: 100
Height: 25
Text: button-marker-tiles-clear-current
Font: Bold
Button@CLEAR_ALL_BUTTON:
X: 111
Y: 42
Width: 75
Height: 25
Text: button-marker-tiles-clear-all
Font: Bold
Label@ALPHA_LABEL:
X: 6
Y: 72
Width: 265
Height: 25
Align: Left
Text: label-marker-alpha
Slider@ALPHA_SLIDER:
X: 130
Y: 72
Width: 128
Height: 25
Label@ALPHA_VALUE:
X: 260
Y: 72
Width: 30
Height: 25
Align: Left
Text: 85
Label@MODE_LABEL:
X: 6
Y: 102
Width: 265
Height: 25
Align: Left
Text: label-marker-mirror-mode
DropDownButton@MODE_DROPDOWN:
X: 129
Y: 102
Width: 157
Height: 25
Label@NUM_SIDES_LABEL:
X: 6
Y: 132
Width: 256
Height: 25
Align: Left
Text: label-marker-layer-num-sides
Slider@ROTATE_NUM_SIDES_SLIDER:
X: 130
Y: 132
Width: 128
Height: 25
Visible: false
Label@ROTATE_NUM_SIDES_VALUE:
X: 260
Y: 132
Width: 30
Height: 25
Align: Left
Text: 2
Visible: false
DropDownButton@FLIP_NUM_SIDES_DROPDOWN:
X: 129
Y: 132
Width: 157
Height: 25
Label@AXIS_ANGLE_LABEL:
X: 6
Y: 162
Width: 256
Height: 25
Align: Left
Text: label-marker-axis-angle
Visible: false
Slider@AXIS_ANGLE_SLIDER:
X: 130
Y: 162
Width: 128
Height: 25
Visible: false
Label@AXIS_ANGLE_VALUE:
X: 260
Y: 162
Width: 30
Height: 25
Align: Left
Text: 0
Visible: false
Container@HISTORY_WIDGETS:
X: WINDOW_RIGHT - 320
Y: 354
@@ -768,15 +909,21 @@ Container@EDITOR_WORLD_ROOT:
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-editor-world-root-paste.tooltip
TooltipContainer: TOOLTIP_CONTAINER
DropDownButton@OVERLAY_BUTTON:
X: 390
Width: 140
Height: 25
Text: dropdownbutton-editor-world-root-overlay-button
Font: Bold
Label@COORDINATE_LABEL:
X: 470
X: 540
Width: 50
Height: 25
Align: Left
Font: Bold
Contrast: true
Label@CASH_LABEL:
X: 595
X: 655
Width: 50
Height: 25
Align: Left
@@ -812,3 +959,15 @@ ScrollPanel@CATEGORY_FILTER_PANEL:
Height: 20
Visible: false
ScrollPanel@OVERLAY_PANEL:
Width: 140
Height: 80
ItemSpacing: 5
TopBottomSpacing: 0
Children:
Checkbox@CATEGORY_TEMPLATE:
X: 5
Y: 5
Width: PARENT_RIGHT - 29
Height: 20
Visible: false

5
mods/common/hotkeys/editor.yaml
View File

@@ -78,3 +78,8 @@ EditorToggleBuildableOverlay: F2
Description: Buildable Terrain Overlay
Types: Editor
Contexts: Editor
EditorToggleMarkerOverlay: F3
Description: Marker Layer Overlay
Types: Editor
Contexts: Editor

18
mods/common/languages/chrome/en.ftl
View File

@@ -43,10 +43,8 @@ label-new-map-bg-width = Width:
label-new-map-bg-height = Height:
button-new-map-bg-create = Create
label-save-map-panel-title =
.label = Save Map
.label = Title:
label-save-map-panel-heading = Save Map
label-save-map-panel-title = Title:
label-save-map-panel-author = Author:
label-save-map-panel-visibility = Visibility:
dropdownbutton-save-map-panel-visibility-dropdown = Map Visibility
@@ -68,8 +66,13 @@ label-copy-filters = Copy Filters
label-filter-terrain = Terrain
label-filter-resources = Resources
label-filter-actors = Actors
label-show-tile-grid = Show Tile Grid
label-show-buildable-area = Show Buildable Area
label-tools-bg-categories = Tool:
button-marker-tiles-clear-current = Clear Current
button-marker-tiles-clear-all = Clear All
label-marker-layer-num-sides = Number of Sides
label-marker-alpha = Tile Alpha
label-marker-mirror-mode = Mirror Mode
label-marker-axis-angle = Axis Angle
button-map-editor-tab-container-select-tooltip = Select
button-map-editor-tab-container-tiles-tooltip = Tiles
@@ -98,9 +101,12 @@ button-editor-world-root-redo =
.label = Redo
.tooltip = Redo last step
dropdownbutton-editor-world-root-overlay-button = Overlays
button-select-categories-buttons-all = All
button-select-categories-buttons-none = None
label-tool-marker-tiles = Marker Tiles
## gamesave-browser.yaml
label-gamesave-browser-panel-load-title = Load game
label-gamesave-browser-panel-save-title = Save game

20
mods/common/languages/en.ftl
View File

@@ -823,9 +823,29 @@ notification-added-resource =
notification-added-tile = Added tile { $id }
notification-filled-tile = Filled with tile { $id }
## EditorMarkerLayerBrush
notification-added-marker-tiles =
{ $amount ->
[one] Added one marker tile of type { $type }
*[other] Added { $amount } marker tiles of type { $type }
}
notification-removed-marker-tiles =
{ $amount ->
[one] Removed one marker tile
*[other] Removed { $amount } marker tiles
}
notification-cleared-selected-marker-tiles = Cleared { $amount } marker tiles of type { $type }
notification-cleared-all-marker-tiles = Cleared { $amount } marker tiles
## EditorActionManager
notification-opened = Opened
## MapOverlaysLogic
mirror-mode =
.none = None
.flip = Flip
.rotate = Rotate
## ActorEditLogic
notification-edited-actor = Edited { $name } ({ $id })

1
mods/d2k/chrome.yaml
View File

@@ -521,3 +521,4 @@ editor:
actors: 34, 68, 16, 16
tools: 34, 144, 16, 16
history: 136, 51, 16, 16
erase: 67, 144, 16, 16

1
mods/d2k/rules/world.yaml
View File

@@ -265,3 +265,4 @@ EditorWorld:
EditorActionManager:
BuildableTerrainOverlay:
AllowedTerrainTypes: Rock, Concrete
MarkerLayerOverlay:

BIN
mods/d2k/uibits/glyphs-2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
mods/d2k/uibits/glyphs-3x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 90 KiB

BIN
mods/d2k/uibits/glyphs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 27 KiB

1
mods/ra/chrome.yaml
View File

@@ -665,3 +665,4 @@ editor:
actors: 34, 68, 16, 16
tools: 136, 68, 16, 16
history: 136, 51, 16, 16
erase: 50, 187, 16, 16

1
mods/ra/rules/world.yaml
View File

@@ -321,3 +321,4 @@ EditorWorld:
EditorActionManager:
BuildableTerrainOverlay:
AllowedTerrainTypes: Clear, Road
MarkerLayerOverlay:

BIN
mods/ra/uibits/glyphs-2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 75 KiB

BIN
mods/ra/uibits/glyphs-3x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 155 KiB

BIN
mods/ra/uibits/glyphs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB

1
mods/ts/chrome.yaml
View File

@@ -796,3 +796,4 @@ editor:
actors: 34, 68, 16, 16
tools: 34, 144, 16, 16
history: 136, 51, 16, 16
erase: 67, 144, 16, 16

1
mods/ts/rules/world.yaml
View File

@@ -430,3 +430,4 @@ EditorWorld:
AllowedTerrainTypes: Clear, Rough, Road, DirtRoad, Green, Sand, Pavement
Palette: ra
Alpha: 0.35
MarkerLayerOverlay:

BIN
mods/ts/uibits/glyphs-2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
mods/ts/uibits/glyphs-3x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 73 KiB

BIN
mods/ts/uibits/glyphs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB