From aab9dfcaa0253824c4666d7a9aced8b8506d2227 Mon Sep 17 00:00:00 2001 From: rob-v Date: Wed, 28 Jun 2017 23:54:39 +0200 Subject: [PATCH] Add TS Actor Categories --- mods/ts/rules/aircraft.yaml | 2 ++ mods/ts/rules/bridges.yaml | 6 +++++ mods/ts/rules/defaults.yaml | 38 ++++++++++++++++++++++++++++++ mods/ts/rules/gdi-infantry.yaml | 2 ++ mods/ts/rules/misc.yaml | 8 +++++++ mods/ts/rules/shared-infantry.yaml | 2 ++ mods/ts/rules/trees.yaml | 2 ++ 7 files changed, 60 insertions(+) diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 038fee1a55..7866111242 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -366,3 +366,5 @@ HUNTER: Palette: pips ActorLostNotification: HitShape: + EditorTilesetFilter: + Categories: System \ No newline at end of file diff --git a/mods/ts/rules/bridges.yaml b/mods/ts/rules/bridges.yaml index 9c613c9c70..a8607cfca2 100644 --- a/mods/ts/rules/bridges.yaml +++ b/mods/ts/rules/bridges.yaml @@ -15,6 +15,8 @@ CABHUT: -SelectionDecorations: -Demolishable: -Explodes: + EditorTilesetFilter: + Categories: Bridge ^LowBridgeRamp: AlwaysVisible: @@ -30,6 +32,8 @@ CABHUT: QuantizedFacings: 1 Tooltip: Name: Bridge + EditorTilesetFilter: + Categories: Bridge ^LowBridge: Inherits: ^LowBridgeRamp @@ -172,6 +176,8 @@ LOBRDG_R_SW: OccupiesSpace: false CustomSelectionSize: CustomBounds: 96, 144 + EditorTilesetFilter: + Categories: Bridge BRIDGE1: Inherits: ^ElevatedBridgePlaceholder diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 64951e31e8..9c3b701bae 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -195,6 +195,8 @@ Weapons: LargeDebris, LargeDebrisWithTrail Pieces: 1, 2 Range: 2c0, 5c0 + EditorTilesetFilter: + Categories: Building ^Building: Inherits@1: ^BasicBuilding @@ -236,6 +238,8 @@ MaxHeightDelta: 3 RenderSprites: Palette: terraindecoration + EditorTilesetFilter: + Categories: Civilian building ^OldBase: Inherits: ^CivBuilding @@ -281,6 +285,8 @@ Images: crate CustomSelectionSize: CustomBounds: 24,24 + EditorTilesetFilter: + Categories: System ^Wall: Inherits@1: ^SpriteActor @@ -320,6 +326,8 @@ TopLeft: -512, -512 BottomRight: 512, 512 VerticalTopOffset: 768 + EditorTilesetFilter: + Categories: Wall ^BuildingPlug: AlwaysVisible: @@ -414,6 +422,8 @@ HitShape: Type: Circle Radius: 128 + EditorTilesetFilter: + Categories: Infantry ^RegularInfantryDeath: WithDeathAnimation@normal: @@ -519,6 +529,8 @@ Wanders: MinMoveDelay: 150 MaxMoveDelay: 750 + EditorTilesetFilter: + Categories: Civilian infantry ^Vehicle: Inherits@2: ^ExistsInWorld @@ -601,6 +613,8 @@ EntersTunnels: Voice: Move HitShape: + EditorTilesetFilter: + Categories: Vehicle ^Tank: Inherits: ^Vehicle @@ -675,6 +689,8 @@ WithVoxelBody: RevealOnFire: HitShape: + EditorTilesetFilter: + Categories: Aircraft ^Helicopter: Inherits: ^Aircraft @@ -707,6 +723,8 @@ Moves: true Velocity: 86 HitShape: + EditorTilesetFilter: + Categories: Husk ^Visceroid: Inherits@1: ^ExistsInWorld @@ -750,6 +768,8 @@ Type: Circle Radius: 256 VerticalTopOffset: 512 + EditorTilesetFilter: + Categories: Critter ^BlossomTree: Inherits@1: ^SpriteActor @@ -769,6 +789,8 @@ ResourceType: Tiberium Interval: 55 WithIdleAnimation: + EditorTilesetFilter: + Categories: Resource spawn ^Tree: Inherits@1: ^SpriteActor @@ -784,6 +806,8 @@ Terrain: Tree Tooltip: Name: Tree + EditorTilesetFilter: + Categories: Tree ^Rock: Inherits@1: ^SpriteActor @@ -799,6 +823,8 @@ Terrain: Rock Tooltip: Name: Rock + EditorTilesetFilter: + Categories: Rock ^Decoration: Inherits@1: ^SpriteActor @@ -809,6 +835,8 @@ Building: Footprint: x Dimensions: 1, 1 + EditorTilesetFilter: + Categories: Decoration ^Box: Inherits: ^Decoration @@ -835,6 +863,8 @@ DetectCloaked: Range: 5c0 RevealOnFire: + EditorTilesetFilter: + Categories: Defense ^Train: Inherits@1: ^EmpDisable @@ -889,6 +919,8 @@ Pieces: 3, 7 Range: 2c0, 5c0 HitShape: + EditorTilesetFilter: + Categories: Railway ^TerrainOverlay: AlwaysVisible: @@ -908,6 +940,8 @@ AutoSelectionSize: ChangesTerrain: TerrainType: Rail + EditorTilesetFilter: + Categories: Railway ^Tunnel: RenderSprites: @@ -925,6 +959,8 @@ AlwaysVisible: TunnelEntrance: Dimensions: 3, 3 + EditorTilesetFilter: + Categories: Tunnel ^Gate: Inherits: ^Building @@ -960,6 +996,8 @@ TopLeft: -512, -512 BottomRight: 512, 512 VerticalTopOffset: 768 + EditorTilesetFilter: + Categories: Gate ^Gate_A: Inherits: ^Gate diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index 453f4f6091..72315eb3fe 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -183,6 +183,8 @@ JUMPJET.Husk: WithDeathAnimation@SPLASH: RequiresCondition: water-death FallbackSequence: die-splash + EditorTilesetFilter: + Categories: Husk GHOST: Inherits: ^Soldier diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml index 0adc4357c7..321cc87f7c 100644 --- a/mods/ts/rules/misc.yaml +++ b/mods/ts/rules/misc.yaml @@ -8,6 +8,8 @@ mpspawn: WithSpriteBody: BodyOrientation: QuantizedFacings: 1 + EditorTilesetFilter: + Categories: System waypoint: EditorOnlyTooltip: @@ -19,6 +21,8 @@ waypoint: WithSpriteBody: BodyOrientation: QuantizedFacings: 1 + EditorTilesetFilter: + Categories: System ^mmch.colorpicker: Inherits: MMCH @@ -51,6 +55,8 @@ CAMERA: Type: CenterPosition DetectCloaked: Range: 10c0 + EditorTilesetFilter: + Categories: System CRATE: Inherits: ^Crate @@ -94,6 +100,8 @@ CRATE: SelectionShares: 5 Condition: crate-speed Notification: 00-i080.aud + EditorTilesetFilter: + Categories: System SROCK01: Inherits: ^Rock diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index c62402351e..97538b727a 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -98,3 +98,5 @@ FLAMEGUY: FallbackSequence: die UseDeathTypeSuffix: false HitShape: + EditorTilesetFilter: + Categories: System \ No newline at end of file diff --git a/mods/ts/rules/trees.yaml b/mods/ts/rules/trees.yaml index 844451503c..03b424a43b 100644 --- a/mods/ts/rules/trees.yaml +++ b/mods/ts/rules/trees.yaml @@ -116,6 +116,8 @@ VEINHOLE: Palette: player WithSpriteBody: AutoSelectionSize: + EditorTilesetFilter: + Categories: Resource spawn ^TibFlora: Inherits: ^Tree