diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index c98a30fe19..1c34d44183 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -612,6 +612,8 @@ StartsRevealed: true ScriptTriggers: WithMakeAnimation: + EditorTilesetFilter: + RequireTilesets: DESERT ^Husk: Health: diff --git a/mods/cnc/rules/trees.yaml b/mods/cnc/rules/trees.yaml index e68f027384..3d44a050cf 100644 --- a/mods/cnc/rules/trees.yaml +++ b/mods/cnc/rules/trees.yaml @@ -82,6 +82,8 @@ T03: T04: Inherits: ^Tree + EditorTilesetFilter: + RequireTilesets: DESERT T05: Inherits: ^Tree @@ -109,6 +111,8 @@ T09: Building: Footprint: x_ Dimensions: 2,1 + EditorTilesetFilter: + RequireTilesets: DESERT T10: Inherits: ^Tree @@ -159,6 +163,8 @@ T17: T18: Inherits: ^Tree + EditorTilesetFilter: + RequireTilesets: DESERT TC01: Inherits: ^Tree diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 09df99650c..ff1d5b5f6d 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -114,7 +114,7 @@ V01: RevealsShroud: Range: 10c0 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V02: Inherits: ^CivBuilding @@ -122,7 +122,7 @@ V02: Footprint: xx xx Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V03: Inherits: ^CivBuilding @@ -130,7 +130,7 @@ V03: Footprint: xx xx Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V04: Inherits: ^CivBuilding @@ -138,7 +138,7 @@ V04: Footprint: xx xx Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V05: Inherits: ^CivBuilding @@ -146,7 +146,7 @@ V05: Footprint: xx Dimensions: 2,1 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V06: Inherits: ^CivBuilding @@ -154,7 +154,7 @@ V06: Footprint: xx Dimensions: 2,1 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V07: Inherits: ^CivBuilding @@ -162,62 +162,62 @@ V07: Footprint: xx Dimensions: 2,1 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V08: Inherits: ^CivBuilding EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V09: Inherits: ^CivBuilding EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V10: Inherits: ^CivBuilding EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V11: Inherits: ^CivBuilding EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V12: Inherits: ^CivBuilding EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V13: Inherits: ^CivBuilding EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V14: Inherits: ^CivField EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V15: Inherits: ^CivField EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V16: Inherits: ^CivField EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V17: Inherits: ^CivField EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V18: Inherits: ^CivField EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR V19: Inherits: ^CivBuilding @@ -617,7 +617,7 @@ RUSHOUSE: ASIANHUT: Inherits: ^CivBuilding EditorTilesetFilter: - ExcludeTilesets: DESERT + RequireTilesets: TEMPERAT SNOWHUT: Inherits: ^CivBuilding diff --git a/mods/ra/rules/decoration.yaml b/mods/ra/rules/decoration.yaml index a081b5a30c..f70f72d617 100644 --- a/mods/ra/rules/decoration.yaml +++ b/mods/ra/rules/decoration.yaml @@ -4,7 +4,7 @@ T01: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T02: Inherits: ^Tree @@ -12,7 +12,7 @@ T02: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T03: Inherits: ^Tree @@ -20,13 +20,15 @@ T03: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T04: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: INTERIOR T05: Inherits: ^Tree @@ -34,7 +36,7 @@ T05: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T06: Inherits: ^Tree @@ -42,7 +44,7 @@ T06: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T07: Inherits: ^Tree @@ -50,7 +52,7 @@ T07: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T08: Inherits: ^Tree @@ -64,7 +66,7 @@ T10: Footprint: __ xx Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T11: Inherits: ^Tree @@ -72,7 +74,7 @@ T11: Footprint: __ xx Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T12: Inherits: ^Tree @@ -80,7 +82,7 @@ T12: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T13: Inherits: ^Tree @@ -88,7 +90,7 @@ T13: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T14: Inherits: ^Tree @@ -96,7 +98,7 @@ T14: Footprint: ___ xx_ Dimensions: 3,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T15: Inherits: ^Tree @@ -104,7 +106,7 @@ T15: Footprint: ___ xx_ Dimensions: 3,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T16: Inherits: ^Tree @@ -112,7 +114,7 @@ T16: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR T17: Inherits: ^Tree @@ -120,13 +122,15 @@ T17: Footprint: __ x_ Dimensions: 2,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR TC01: Inherits: ^Tree Building: Footprint: ___ xx_ Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: INTERIOR TC02: Inherits: ^Tree @@ -134,7 +138,7 @@ TC02: Footprint: _x_ xx_ Dimensions: 3,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR TC03: Inherits: ^Tree @@ -142,7 +146,7 @@ TC03: Footprint: xx_ xx_ Dimensions: 3,2 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR TC04: Inherits: ^Tree @@ -150,7 +154,7 @@ TC04: Footprint: ____ xxx_ x___ Dimensions: 4,3 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR TC05: Inherits: ^Tree @@ -158,52 +162,70 @@ TC05: Footprint: __x_ xxx_ _xx_ Dimensions: 4,3 EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR BOXES01: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES02: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES03: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES04: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES05: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES06: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES07: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES08: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT BOXES09: Inherits: ^Tree Tooltip: Name: Boxes + EditorTilesetFilter: + ExcludeTilesets: DESERT ICE01: Inherits: ^Tree @@ -213,7 +235,7 @@ ICE01: Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR ICE02: Inherits: ^Tree @@ -223,7 +245,7 @@ ICE02: Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR ICE03: Inherits: ^Tree @@ -233,21 +255,21 @@ ICE03: Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR ICE04: Inherits: ^Tree Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR ICE05: Inherits: ^Tree Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT + ExcludeTilesets: DESERT, INTERIOR ROCK1: Inherits: ^Rock diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 0af700de3d..ffdb85f4a8 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -252,6 +252,8 @@ MustBeDestroyed: AnnounceOnSeen: Notification: EnemyDetected + EditorTilesetFilter: + ExcludeTilesets: INTERIOR ^Plane: Inherits@1: ^ExistsInWorld @@ -471,6 +473,8 @@ Palette: terrain EditorAppearance: UseTerrainPalette: true + EditorTilesetFilter: + ExcludeTilesets: INTERIOR ^CivField: Inherits: ^CivBuilding @@ -481,6 +485,8 @@ -Demolishable: ProximityCaptor: Types: CivilianField + EditorTilesetFilter: + ExcludeTilesets: INTERIOR ^Tree: Tooltip: @@ -507,6 +513,8 @@ FrozenUnderFog: StartsRevealed: true ScriptTriggers: + EditorTilesetFilter: + ExcludeTilesets: INTERIOR ^Husk: Husk: @@ -599,11 +607,15 @@ FrozenUnderFog: StartsRevealed: true ScriptTriggers: + EditorTilesetFilter: + RequireTilesets: DESERT ^DesertCivBuilding: Inherits: ^CivBuilding RenderBuilding: Palette: terrain + EditorTilesetFilter: + RequireTilesets: DESERT ^Crate: Tooltip: diff --git a/mods/ra/rules/fakes.yaml b/mods/ra/rules/fakes.yaml index 84c37697a1..afdebc0466 100644 --- a/mods/ra/rules/fakes.yaml +++ b/mods/ra/rules/fakes.yaml @@ -68,6 +68,8 @@ SYRF: Image: SYRD Valued: Cost: 100 + EditorTilesetFilter: + ExcludeTilesets: INTERIOR SPEF: Inherits: ^FakeBuilding @@ -93,6 +95,8 @@ SPEF: Image: SPEN Valued: Cost: 100 + EditorTilesetFilter: + ExcludeTilesets: INTERIOR DOMF: Inherits: ^FakeBuilding diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index be67feffea..21c354830e 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -271,6 +271,8 @@ RAILMINE: UseTerrainPalette: false AutoTargetIgnore: BodyOrientation: + EditorTilesetFilter: + ExcludeTilesets: INTERIOR QUEE: Tooltip: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index d2a0fad564..354c4e46ac 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -159,6 +159,8 @@ SPEN: RequiresPrerequisites: structures.ukraine Prerequisite: ships.ukraine ProvidesPrerequisite@buildingname: + EditorTilesetFilter: + ExcludeTilesets: INTERIOR SYRD: Inherits: ^Building @@ -244,6 +246,8 @@ SYRD: RequiresPrerequisites: structures.germany Prerequisite: ships.germany ProvidesPrerequisite@buildingname: + EditorTilesetFilter: + ExcludeTilesets: INTERIOR IRON: Inherits: ^Building diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index 9a3bfd9be0..c306a6c81d 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -373,6 +373,8 @@ CA0001: Type: heavy Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0002: Inherits: ^CivBuilding @@ -385,6 +387,8 @@ CA0002: Type: heavy Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0003: Inherits: ^CivBuilding @@ -397,6 +401,8 @@ CA0003: Type: light Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0004: Inherits: ^CivBuilding @@ -409,6 +415,8 @@ CA0004: Type: light Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0005: Inherits: ^CivBuilding @@ -421,6 +429,8 @@ CA0005: Type: light Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0006: Inherits: ^CivBuilding @@ -433,6 +443,8 @@ CA0006: Type: heavy Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0007: Inherits: ^CivBuilding @@ -445,6 +457,8 @@ CA0007: Type: light Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0008: Inherits: ^CivBuilding @@ -457,6 +471,8 @@ CA0008: Type: heavy Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0009: Inherits: ^CivBuilding @@ -469,6 +485,8 @@ CA0009: Type: heavy Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0010: Inherits: ^CivBuilding @@ -481,6 +499,8 @@ CA0010: Type: heavy Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0011: Inherits: ^CivBuilding @@ -493,6 +513,8 @@ CA0011: Type: heavy Health: HP: 200 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0012: Inherits: ^CivBuilding @@ -505,6 +527,8 @@ CA0012: Type: light Health: HP: 100 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0013: Inherits: ^CivBuilding @@ -517,6 +541,8 @@ CA0013: Type: heavy Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0014: Inherits: ^CivBuilding @@ -529,6 +555,8 @@ CA0014: Type: heavy Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0015: Inherits: ^CivBuilding @@ -541,6 +569,8 @@ CA0015: Type: light Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0016: Inherits: ^CivBuilding @@ -553,6 +583,8 @@ CA0016: Type: light Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0017: Inherits: ^CivBuilding @@ -565,6 +597,8 @@ CA0017: Type: heavy Health: HP: 300 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0018: Inherits: ^CivBuilding @@ -577,6 +611,8 @@ CA0018: Type: light Health: HP: 200 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0019: Inherits: ^CivBuilding @@ -589,6 +625,8 @@ CA0019: Type: light Health: HP: 200 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0020: Inherits: ^CivBuilding @@ -601,6 +639,8 @@ CA0020: Type: light Health: HP: 200 + EditorTilesetFilter: + ExcludeTilesets: SNOW CA0021: Inherits: ^CivBuilding @@ -613,6 +653,8 @@ CA0021: Type: light Health: HP: 200 + EditorTilesetFilter: + ExcludeTilesets: SNOW CAARAY: Inherits: ^CivBuilding @@ -666,6 +708,8 @@ CACRSH01: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CACRSH02: Inherits: ^CivBuilding @@ -678,6 +722,8 @@ CACRSH02: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CACRSH03: Inherits: ^CivBuilding @@ -690,6 +736,8 @@ CACRSH03: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CACRSH04: Inherits: ^CivBuilding @@ -702,6 +750,8 @@ CACRSH04: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CACRSH05: Inherits: ^CivBuilding @@ -714,6 +764,8 @@ CACRSH05: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CAHOSP: Inherits: ^CivBuilding @@ -740,6 +792,8 @@ CAPYR01: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CAPYR02: Inherits: ^CivBuilding @@ -752,6 +806,8 @@ CAPYR02: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CAPYR03: Inherits: ^CivBuilding @@ -764,6 +820,8 @@ CAPYR03: Type: concrete Health: HP: 400 + EditorTilesetFilter: + ExcludeTilesets: SNOW CITY01: Inherits: ^CivBuilding @@ -1089,6 +1147,8 @@ CTDAM: HP: 1000 ProvidesPrerequisite: Prerequisite: anypower + EditorTilesetFilter: + ExcludeTilesets: SNOW CTVEGA: Inherits: ^CivBuilding @@ -1101,6 +1161,8 @@ CTVEGA: Type: none Health: HP: 100 + EditorTilesetFilter: + ExcludeTilesets: SNOW GAKODK: Inherits: ^CivBuilding