Polish Actor Categories

This commit is contained in:
rob-v
2017-07-05 19:39:10 +00:00
committed by reaperrr
parent aab9dfcaa0
commit 1a546d9baf
9 changed files with 42 additions and 8 deletions

View File

@@ -137,6 +137,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void InitializeActorPreviews() void InitializeActorPreviews()
{ {
panel.RemoveChildren(); panel.RemoveChildren();
if (!selectedCategories.Any())
return;
var actors = mapRules.Actors.Where(a => !a.Value.Name.Contains('^')) var actors = mapRules.Actors.Where(a => !a.Value.Name.Contains('^'))
.Select(a => a.Value); .Select(a => a.Value);

View File

@@ -897,7 +897,7 @@
ScriptTriggers: ScriptTriggers:
EditorTilesetFilter: EditorTilesetFilter:
RequireTilesets: DESERT RequireTilesets: DESERT
Categories: Rock Categories: Decoration
^CommonHuskDefaults: ^CommonHuskDefaults:
Inherits@1: ^SpriteActor Inherits@1: ^SpriteActor

View File

@@ -722,7 +722,7 @@ wall:
TopLeft: -512, -512 TopLeft: -512, -512
BottomRight: 512, 512 BottomRight: 512, 512
EditorTilesetFilter: EditorTilesetFilter:
Categories: Wall Categories: Defense
medium_gun_turret: medium_gun_turret:
Inherits: ^Defense Inherits: ^Defense

View File

@@ -304,6 +304,8 @@ BARL:
-ShakeOnDeath: -ShakeOnDeath:
-SoundOnDamageTransition: -SoundOnDamageTransition:
-Demolishable: -Demolishable:
EditorTilesetFilter:
Categories: Decoration
BRL3: BRL3:
Inherits: ^TechBuilding Inherits: ^TechBuilding
@@ -326,6 +328,8 @@ BRL3:
-ShakeOnDeath: -ShakeOnDeath:
-SoundOnDamageTransition: -SoundOnDamageTransition:
-Demolishable: -Demolishable:
EditorTilesetFilter:
Categories: Decoration
AMMOBOX1: AMMOBOX1:
Inherits: ^AmmoBox Inherits: ^AmmoBox

View File

@@ -219,6 +219,7 @@ BOXES01:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES02: BOXES02:
Inherits: ^Tree Inherits: ^Tree
@@ -226,6 +227,7 @@ BOXES02:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES03: BOXES03:
Inherits: ^Tree Inherits: ^Tree
@@ -233,6 +235,7 @@ BOXES03:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES04: BOXES04:
Inherits: ^Tree Inherits: ^Tree
@@ -240,6 +243,7 @@ BOXES04:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES05: BOXES05:
Inherits: ^Tree Inherits: ^Tree
@@ -247,6 +251,7 @@ BOXES05:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES06: BOXES06:
Inherits: ^Tree Inherits: ^Tree
@@ -254,6 +259,7 @@ BOXES06:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES07: BOXES07:
Inherits: ^Tree Inherits: ^Tree
@@ -261,6 +267,7 @@ BOXES07:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES08: BOXES08:
Inherits: ^Tree Inherits: ^Tree
@@ -268,6 +275,7 @@ BOXES08:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
BOXES09: BOXES09:
Inherits: ^Tree Inherits: ^Tree
@@ -275,6 +283,7 @@ BOXES09:
Name: Boxes Name: Boxes
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
ICE01: ICE01:
Inherits: ^Tree Inherits: ^Tree
@@ -285,6 +294,7 @@ ICE01:
Name: Ice Floe Name: Ice Floe
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT, INTERIOR ExcludeTilesets: DESERT, INTERIOR
Categories: Decoration
ICE02: ICE02:
Inherits: ^Tree Inherits: ^Tree
@@ -295,6 +305,7 @@ ICE02:
Name: Ice Floe Name: Ice Floe
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT, INTERIOR ExcludeTilesets: DESERT, INTERIOR
Categories: Decoration
ICE03: ICE03:
Inherits: ^Tree Inherits: ^Tree
@@ -305,6 +316,7 @@ ICE03:
Name: Ice Floe Name: Ice Floe
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT, INTERIOR ExcludeTilesets: DESERT, INTERIOR
Categories: Decoration
ICE04: ICE04:
Inherits: ^Tree Inherits: ^Tree
@@ -312,6 +324,7 @@ ICE04:
Name: Ice Floe Name: Ice Floe
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT, INTERIOR ExcludeTilesets: DESERT, INTERIOR
Categories: Decoration
ICE05: ICE05:
Inherits: ^Tree Inherits: ^Tree
@@ -319,6 +332,7 @@ ICE05:
Name: Ice Floe Name: Ice Floe
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT, INTERIOR ExcludeTilesets: DESERT, INTERIOR
Categories: Decoration
ROCK1: ROCK1:
Inherits: ^Rock Inherits: ^Rock
@@ -368,6 +382,7 @@ UTILPOL1:
Name: Utility Pole Name: Utility Pole
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
UTILPOL2: UTILPOL2:
Inherits: ^Tree Inherits: ^Tree
@@ -375,6 +390,7 @@ UTILPOL2:
Name: Utility Pole Name: Utility Pole
EditorTilesetFilter: EditorTilesetFilter:
ExcludeTilesets: DESERT ExcludeTilesets: DESERT
Categories: Decoration
TANKTRAP1: TANKTRAP1:
Inherits: ^Rock Inherits: ^Rock

View File

@@ -693,7 +693,7 @@
ClosingSound: cashturn.aud ClosingSound: cashturn.aud
TerrainTypes: Clear, Road TerrainTypes: Clear, Road
EditorTilesetFilter: EditorTilesetFilter:
Categories: Gate Categories: Wall
^TechBuilding: ^TechBuilding:
Inherits: ^BasicBuilding Inherits: ^BasicBuilding
@@ -759,6 +759,8 @@
Type: Light Type: Light
Targetable: Targetable:
TargetTypes: Ground, DetonateAttack TargetTypes: Ground, DetonateAttack
EditorTilesetFilter:
Categories: Decoration
^CivBuilding: ^CivBuilding:
Inherits: ^TechBuilding Inherits: ^TechBuilding
@@ -952,7 +954,7 @@
ScriptTriggers: ScriptTriggers:
EditorTilesetFilter: EditorTilesetFilter:
RequireTilesets: DESERT RequireTilesets: DESERT
Categories: Rock Categories: Decoration
^DesertCivBuilding: ^DesertCivBuilding:
Inherits: ^CivBuilding Inherits: ^CivBuilding

View File

@@ -195,7 +195,7 @@ FLARE:
ShowOwnerRow: false ShowOwnerRow: false
AutoSelectionSize: AutoSelectionSize:
EditorTilesetFilter: EditorTilesetFilter:
Categories: System Categories: Decoration
MINE: MINE:
Inherits@1: ^SpriteActor Inherits@1: ^SpriteActor
@@ -395,4 +395,4 @@ CTFLAG:
-SelectionDecorations: -SelectionDecorations:
-Targetable: -Targetable:
EditorTilesetFilter: EditorTilesetFilter:
Categories: System Categories: Decoration

View File

@@ -714,6 +714,8 @@ CAHOSP:
Pieces: 5, 9 Pieces: 5, 9
ThrowsShrapnel@LARGE: ThrowsShrapnel@LARGE:
Pieces: 2, 4 Pieces: 2, 4
EditorTilesetFilter:
Categories: Civilian building
CAPYR01: CAPYR01:
Inherits: ^CivBuilding Inherits: ^CivBuilding
@@ -1263,6 +1265,8 @@ GASPOT:
Sequence: idle-lights Sequence: idle-lights
SelectionDecorations: SelectionDecorations:
VisualBounds: 48, 82, 0, -25 VisualBounds: 48, 82, 0, -25
EditorTilesetFilter:
Categories: Civilian building
GALITE: GALITE:
Inherits: ^Building Inherits: ^Building
@@ -1294,6 +1298,8 @@ GALITE:
-Cloak@EXTERNALCLOAK: -Cloak@EXTERNALCLOAK:
-ExternalCondition@CLOAKGENERATOR: -ExternalCondition@CLOAKGENERATOR:
-ExternalCondition@CRATE-CLOAK: -ExternalCondition@CRATE-CLOAK:
EditorTilesetFilter:
Categories: Civilian building
TSTLAMP: TSTLAMP:
Inherits: GALITE Inherits: GALITE
@@ -1322,6 +1328,8 @@ GAICBM:
TransformSounds: place2.aud TransformSounds: place2.aud
NoTransformSounds: NoTransformSounds:
-WithDeathAnimation: -WithDeathAnimation:
EditorTilesetFilter:
Categories: Vehicle
NAMNTK: NAMNTK:
Inherits: ^CivBuilding Inherits: ^CivBuilding

View File

@@ -271,6 +271,8 @@
Pieces: 1, 3 Pieces: 1, 3
ThrowsShrapnel@LARGE: ThrowsShrapnel@LARGE:
Pieces: 1, 1 Pieces: 1, 1
EditorTilesetFilter:
Categories: Billboard
^Crate: ^Crate:
HiddenUnderFog: HiddenUnderFog:
@@ -824,7 +826,7 @@
Tooltip: Tooltip:
Name: Rock Name: Rock
EditorTilesetFilter: EditorTilesetFilter:
Categories: Rock Categories: Decoration
^Decoration: ^Decoration:
Inherits@1: ^SpriteActor Inherits@1: ^SpriteActor
@@ -997,7 +999,7 @@
BottomRight: 512, 512 BottomRight: 512, 512
VerticalTopOffset: 768 VerticalTopOffset: 768
EditorTilesetFilter: EditorTilesetFilter:
Categories: Gate Categories: Wall
^Gate_A: ^Gate_A:
Inherits: ^Gate Inherits: ^Gate