diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index c2b35f7d75..8d1fe13d23 100644 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -504,7 +504,7 @@ namespace OpenRA if (!visibilityModifier.IsVisible(this, player)) return false; - return defaultVisibility.IsVisible(this, player); + return defaultVisibility?.IsVisible(this, player) ?? true; } public BitSet GetAllTargetTypes() diff --git a/OpenRA.Mods.Common/Lint/CheckDefaultVisibility.cs b/OpenRA.Mods.Common/Lint/CheckDefaultVisibility.cs index bb01118cc6..756d9bab8b 100644 --- a/OpenRA.Mods.Common/Lint/CheckDefaultVisibility.cs +++ b/OpenRA.Mods.Common/Lint/CheckDefaultVisibility.cs @@ -36,14 +36,11 @@ namespace OpenRA.Mods.Common.Lint // Catch TypeDictionary errors. try { - if (Enum.TryParse(actorInfo.Key, true, out _)) - continue; - var visibilityTypes = actorInfo.Value.TraitInfos(); var count = visibilityTypes.Count; if (count == 0) - emitError($"Actor type `{actorInfo.Key}` does not define a default visibility type."); + continue; else if (count > 1) emitError( $"Actor type `{actorInfo.Key}` defines multiple default visibility types: " + diff --git a/OpenRA.Mods.Common/Traits/Modifiers/AlwaysVisible.cs b/OpenRA.Mods.Common/Traits/Modifiers/AlwaysVisible.cs deleted file mode 100644 index d21fc3f95b..0000000000 --- a/OpenRA.Mods.Common/Traits/Modifiers/AlwaysVisible.cs +++ /dev/null @@ -1,25 +0,0 @@ -#region Copyright & License Information -/* - * Copyright (c) The OpenRA Developers and Contributors - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. For more - * information, see COPYING. - */ -#endregion - -using OpenRA.Traits; - -namespace OpenRA.Mods.Common.Traits -{ - [Desc("The actor is always considered visible for targeting and rendering purposes.")] - public class AlwaysVisibleInfo : TraitInfo, IDefaultVisibilityInfo { } - public class AlwaysVisible : IDefaultVisibility - { - public bool IsVisible(Actor self, Player byPlayer) - { - return true; - } - } -} diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20250330/RemoveAlwaysVisible.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20250330/RemoveAlwaysVisible.cs new file mode 100644 index 0000000000..bdc61512aa --- /dev/null +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20250330/RemoveAlwaysVisible.cs @@ -0,0 +1,27 @@ +#region Copyright & License Information +/* + * Copyright (c) The OpenRA Developers and Contributors + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. For more + * information, see COPYING. + */ +#endregion + +using System.Collections.Generic; + +namespace OpenRA.Mods.Common.UpdateRules.Rules +{ + public class RemoveAlwaysVisible : UpdateRule + { + public override string Name => "Remove AlwaysVisible"; + public override string Description => "AlwaysVisible trait was removed and now is the default behavior."; + + public override IEnumerable UpdateActorNode(ModData modData, MiniYamlNodeBuilder actorNode) + { + actorNode.RemoveNodes("AlwaysVisible"); + yield break; + } + } +} diff --git a/mods/cnc/maps/eviction-notice/rules.yaml b/mods/cnc/maps/eviction-notice/rules.yaml index f02a4ae3cb..90ffbf65ae 100644 --- a/mods/cnc/maps/eviction-notice/rules.yaml +++ b/mods/cnc/maps/eviction-notice/rules.yaml @@ -115,13 +115,11 @@ AIHProcUpgrade: ProvidesPrerequisite: Prerequisite: diffhard Interactable: - AlwaysVisible: AINProcUpgrade: ProvidesPrerequisite: Prerequisite: diffnorm Interactable: - AlwaysVisible: HTNK: Buildable: diff --git a/mods/cnc/maps/the-tiberium-strain/rules.yaml b/mods/cnc/maps/the-tiberium-strain/rules.yaml index a1f6712b0b..cf96641540 100644 --- a/mods/cnc/maps/the-tiberium-strain/rules.yaml +++ b/mods/cnc/maps/the-tiberium-strain/rules.yaml @@ -39,7 +39,6 @@ Player: # Spawned on Easy difficulty. VillageTargetableSwitch: - AlwaysVisible: ProvidesPrerequisite: Prerequisite: village-targetable-switch diff --git a/mods/cnc/maps/twist-of-fate/rules.yaml b/mods/cnc/maps/twist-of-fate/rules.yaml index 061c3592b1..c3580691bc 100644 --- a/mods/cnc/maps/twist-of-fate/rules.yaml +++ b/mods/cnc/maps/twist-of-fate/rules.yaml @@ -52,7 +52,6 @@ AIHProcUpgrade: StoresResources: Capacity: 25000 Interactable: - AlwaysVisible: AINProcUpgrade: ProvidesPrerequisite: @@ -60,22 +59,18 @@ AINProcUpgrade: StoresResources: Capacity: 15000 Interactable: - AlwaysVisible: AiAnyhqPrerequisite: ProvidesPrerequisite: Prerequisite: anyhq Interactable: - AlwaysVisible: AiTmplPrerequisite: ProvidesPrerequisite: Prerequisite: tmpl Interactable: - AlwaysVisible: Astk.proxy: - AlwaysVisible: AirstrikePower: StartFullyCharged: True Prerequisites: ~techlevel.superweapons diff --git a/mods/cnc/rules/campaign-maprules.yaml b/mods/cnc/rules/campaign-maprules.yaml index 91bdc90cb4..a2b52114f4 100644 --- a/mods/cnc/rules/campaign-maprules.yaml +++ b/mods/cnc/rules/campaign-maprules.yaml @@ -55,7 +55,6 @@ Player: Type: campaign airstrike.proxy: - AlwaysVisible: AirstrikePower: Icon: airstrike StartFullyCharged: True diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 90195a00cd..7e1361d8e2 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -454,7 +454,6 @@ BRIDGE4: Bounds: 6144, 4096 BRIDGEHUT: - AlwaysVisible: Building: Footprint: __ __ Dimensions: 2,2 diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 8ed9e45239..7e3316cf9c 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -1130,7 +1130,6 @@ ^Bridge: Inherits@shape: ^1x1Shape - AlwaysVisible: Tooltip: Name: meta-bridge-name ShowOwnerRow: false diff --git a/mods/cnc/rules/misc.yaml b/mods/cnc/rules/misc.yaml index b131659e6f..0e2234387a 100644 --- a/mods/cnc/rules/misc.yaml +++ b/mods/cnc/rules/misc.yaml @@ -51,7 +51,6 @@ mpspawn: Interactable: EditorOnlyTooltip: Name: actor-mpspawn-name - AlwaysVisible: Immobile: OccupiesSpace: false WithSpriteBody: @@ -67,7 +66,6 @@ waypoint: Interactable: EditorOnlyTooltip: Name: actor-waypoint-name - AlwaysVisible: Immobile: OccupiesSpace: false WithSpriteBody: @@ -91,7 +89,6 @@ CAMERA: Interactable: EditorOnlyTooltip: Name: actor-camera-name - AlwaysVisible: WithSpriteBody: RenderSpritesEditorOnly: BodyOrientation: @@ -108,7 +105,6 @@ CAMERA.small: Interactable: EditorOnlyTooltip: Name: actor-camera-small-name - AlwaysVisible: WithSpriteBody: RenderSpritesEditorOnly: Image: camera diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 55ba543b74..12acd5811e 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -1335,25 +1335,21 @@ BRIK: Type: concrete BARRACKS: - AlwaysVisible: Interactable: Tooltip: Name: actor-barracks-name VEHICLEPRODUCTION: - AlwaysVisible: Interactable: Tooltip: Name: actor-vehicleproduction-name ANYPOWER: - AlwaysVisible: Interactable: Tooltip: Name: actor-anypower-name ANYHQ: - AlwaysVisible: Interactable: Tooltip: Name: actor-anyhq-name diff --git a/mods/d2k/maps/atreides-04/rules.yaml b/mods/d2k/maps/atreides-04/rules.yaml index c7e0bd3d3d..e1b80fad3c 100644 --- a/mods/d2k/maps/atreides-04/rules.yaml +++ b/mods/d2k/maps/atreides-04/rules.yaml @@ -74,7 +74,6 @@ upgrade.conyard: # HACK: AI units can't attack the sietch if it was on a real rock tile475: - AlwaysVisible: Immobile: OccupiesSpace: false RenderSprites: @@ -92,7 +91,6 @@ tile475: # Placed after the sietch is destroyed so that the cliff is still unpassable invisibleBlocker: - AlwaysVisible: Building: Footprint: xx xx Dimensions: 2,2 diff --git a/mods/d2k/rules/arrakis.yaml b/mods/d2k/rules/arrakis.yaml index bffa9cc4c3..d9f99a23f6 100644 --- a/mods/d2k/rules/arrakis.yaml +++ b/mods/d2k/rules/arrakis.yaml @@ -2,7 +2,6 @@ spicebloom.spawnpoint: Interactable: EditorOnlyTooltip: Name: actor-spicebloom-spawnpoint-name - AlwaysVisible: RenderSpritesEditorOnly: Image: spicebloom.editor WithSpriteBody: diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index 5c1ab6b960..f383c1b6c3 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -143,7 +143,6 @@ mpspawn: Interactable: EditorOnlyTooltip: Name: actor-mpspawn-name - AlwaysVisible: Immobile: OccupiesSpace: false RenderSpritesEditorOnly: @@ -159,7 +158,6 @@ waypoint: Interactable: EditorOnlyTooltip: Name: actor-waypoint-name - AlwaysVisible: Immobile: OccupiesSpace: false RenderSpritesEditorOnly: @@ -184,7 +182,6 @@ camera: Interactable: EditorOnlyTooltip: Name: actor-camera-name - AlwaysVisible: RenderSpritesEditorOnly: WithSpriteBody: BodyOrientation: @@ -201,7 +198,6 @@ wormspawner: Interactable: EditorOnlyTooltip: Name: actor-wormspawner-name - AlwaysVisible: Immobile: OccupiesSpace: false RenderSpritesEditorOnly: @@ -213,7 +209,6 @@ wormspawner: Categories: System upgrade.conyard: - AlwaysVisible: Interactable: ScriptTriggers: Tooltip: @@ -238,7 +233,6 @@ upgrade.conyard: ProvidesPrerequisite@upgradename: upgrade.barracks: - AlwaysVisible: Interactable: ScriptTriggers: Tooltip: @@ -263,7 +257,6 @@ upgrade.barracks: ProvidesPrerequisite@upgradename: upgrade.light: - AlwaysVisible: Interactable: ScriptTriggers: Tooltip: @@ -288,7 +281,6 @@ upgrade.light: ProvidesPrerequisite@upgradename: upgrade.heavy: - AlwaysVisible: Interactable: ScriptTriggers: Tooltip: @@ -314,7 +306,6 @@ upgrade.heavy: ProvidesPrerequisite@upgradename: upgrade.hightech: - AlwaysVisible: Interactable: ScriptTriggers: Tooltip: @@ -334,7 +325,6 @@ upgrade.hightech: ProvidesPrerequisite@upgradename: deathhand: - AlwaysVisible: Interactable: Tooltip: Name: actor-deathhand.name diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 7d788f7ac8..e961af7560 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -1,5 +1,4 @@ ^concrete: - AlwaysVisible: Interactable: D2kBuilding: TerrainTypes: Rock diff --git a/mods/ra/maps/allies-03b/rules.yaml b/mods/ra/maps/allies-03b/rules.yaml index 728570b395..7cb89f3681 100644 --- a/mods/ra/maps/allies-03b/rules.yaml +++ b/mods/ra/maps/allies-03b/rules.yaml @@ -61,7 +61,6 @@ CAMERA.VeryLarge: Range: 40c0 CAMERA.Jeep: - AlwaysVisible: Mobile: Locomotor: immobile RevealsShroud: diff --git a/mods/ra/maps/allies-10a/rules.yaml b/mods/ra/maps/allies-10a/rules.yaml index 0870f6822d..5daafcbb38 100644 --- a/mods/ra/maps/allies-10a/rules.yaml +++ b/mods/ra/maps/allies-10a/rules.yaml @@ -27,7 +27,6 @@ Player: PARADROP: ParatroopersPower: DropItems: E1, E1, E1, E2, E2 - AlwaysVisible: FCOM: Capturable: diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml b/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml index 1e983494e1..e1f8724d1f 100644 --- a/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml +++ b/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml @@ -18,19 +18,16 @@ INSERTIONDROP: ParatroopersPower: DisplayBeacon: False DropItems: E7, GNRL - AlwaysVisible: INSERTIONDROPHARD: ParatroopersPower: DisplayBeacon: False DropItems: E7.noautotarget, GNRL.noautotarget - AlwaysVisible: RIFLEDROP: ParatroopersPower: DisplayBeacon: False DropItems: E1, E1, E1, E1, E1 - AlwaysVisible: LST.Reinforcement: Inherits: LST diff --git a/mods/ra/maps/fall-of-greece-2-evacuation/rules.yaml b/mods/ra/maps/fall-of-greece-2-evacuation/rules.yaml index cd3a633bbd..c6c05fe2d0 100644 --- a/mods/ra/maps/fall-of-greece-2-evacuation/rules.yaml +++ b/mods/ra/maps/fall-of-greece-2-evacuation/rules.yaml @@ -22,12 +22,10 @@ World: PARADROP: ParatroopersPower: DropItems: E1, E1, E1, E2, E2 - AlwaysVisible: FLAMERDROP: ParatroopersPower: DropItems: E2, E2, E4, E4, E4 - AlwaysVisible: ^CivInfantry: Infiltrates: diff --git a/mods/ra/maps/in-the-nick-of-time/rules.yaml b/mods/ra/maps/in-the-nick-of-time/rules.yaml index 700bd74310..65ecc7eb8f 100644 --- a/mods/ra/maps/in-the-nick-of-time/rules.yaml +++ b/mods/ra/maps/in-the-nick-of-time/rules.yaml @@ -29,18 +29,15 @@ TRAN.Reinforcement: PARADROP1: ParatroopersPower: DropItems: E2, E2, E2, E3, E3 - AlwaysVisible: PARADROP2: ParatroopersPower: DropItems: E1, E1, SHOK, E4, E4 - AlwaysVisible: PARADROP3: ParatroopersPower: DisplayBeacon: False DropItems: 1TNK, 2TNK - AlwaysVisible: V01: SpawnActorOnDeath: diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml index c728376872..d072dde777 100644 --- a/mods/ra/maps/intervention/rules.yaml +++ b/mods/ra/maps/intervention/rules.yaml @@ -52,7 +52,6 @@ WEAP: Prerequisite: givefix MAINLAND: - AlwaysVisible: Interactable: Tooltip: Name: actor-mainland-name @@ -68,7 +67,6 @@ FIX: Prerequisites: givefix GIVEFIX: - AlwaysVisible: Interactable: Tooltip: Name: actor-givefix-name diff --git a/mods/ra/maps/negotiations/rules.yaml b/mods/ra/maps/negotiations/rules.yaml index 44878b4251..2b660c0156 100644 --- a/mods/ra/maps/negotiations/rules.yaml +++ b/mods/ra/maps/negotiations/rules.yaml @@ -33,7 +33,6 @@ ai.hard: ProvidesPrerequisite: Prerequisite: ai.hard Interactable: - AlwaysVisible: paradrop.allies: Inherits: powerproxy.paratroopers @@ -43,7 +42,6 @@ paradrop.allies: DisplayBeacon: false powerproxy.chronoshift: - AlwaysVisible: ChronoshiftPower: Dimensions: 1, 1 Footprint: x diff --git a/mods/ra/maps/production-disruption/rules.yaml b/mods/ra/maps/production-disruption/rules.yaml index dc5128fd8d..c47a8f6e4e 100644 --- a/mods/ra/maps/production-disruption/rules.yaml +++ b/mods/ra/maps/production-disruption/rules.yaml @@ -18,7 +18,6 @@ World: Default: normal powerproxy.chronoshift: - AlwaysVisible: ChronoshiftPower: Dimensions: 1, 1 Footprint: x @@ -31,20 +30,17 @@ CHALK1: ParatroopersPower: DisplayBeacon: False DropItems: E1, E1, E1, E1, E1 - AlwaysVisible: CHALK2: ParatroopersPower: DisplayBeacon: False DropItems: E3, E3, E3, E3, MEDI - AlwaysVisible: CHALK3: ParatroopersPower: DisplayBeacon: False DropItems: E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1, E1 SquadSize: 4 - AlwaysVisible: CTNK: Chronoshiftable: diff --git a/mods/ra/maps/shock-therapy/rules.yaml b/mods/ra/maps/shock-therapy/rules.yaml index b39c2ec5fe..e294ee7cc4 100644 --- a/mods/ra/maps/shock-therapy/rules.yaml +++ b/mods/ra/maps/shock-therapy/rules.yaml @@ -10,7 +10,6 @@ SHOCKDROP: ParatroopersPower: DisplayBeacon: False DropItems: SHOK, SHOK, SHOK, SHOK, SHOK - AlwaysVisible: LST.Reinforcement: Inherits: LST diff --git a/mods/ra/maps/siberian-conflict-3-wasteland/rules.yaml b/mods/ra/maps/siberian-conflict-3-wasteland/rules.yaml index 7fcb5b7e1c..78ea90cf1a 100644 --- a/mods/ra/maps/siberian-conflict-3-wasteland/rules.yaml +++ b/mods/ra/maps/siberian-conflict-3-wasteland/rules.yaml @@ -28,7 +28,6 @@ MONEYCRATE: PARATROOPERS: ParatroopersPower: DropItems: E1,E1,E1,E2,E2 - AlwaysVisible: MCV: Buildable: diff --git a/mods/ra/maps/soviet-08a/rules.yaml b/mods/ra/maps/soviet-08a/rules.yaml index bcdac409a0..7c33b46d21 100644 --- a/mods/ra/maps/soviet-08a/rules.yaml +++ b/mods/ra/maps/soviet-08a/rules.yaml @@ -38,7 +38,6 @@ SCRIPTEDDROP: ParatroopersPower: DisplayBeacon: False DropItems: E1,E1,E4,E4,E4 - AlwaysVisible: AFLD: AirstrikePower@parabombs: diff --git a/mods/ra/maps/soviet-08b/rules.yaml b/mods/ra/maps/soviet-08b/rules.yaml index d0f2a328d5..d904264b54 100644 --- a/mods/ra/maps/soviet-08b/rules.yaml +++ b/mods/ra/maps/soviet-08b/rules.yaml @@ -38,7 +38,6 @@ SCRIPTEDDROP: ParatroopersPower: DisplayBeacon: False DropItems: E1,E1,E4,E4,E4 - AlwaysVisible: AFLD: AirstrikePower@parabombs: diff --git a/mods/ra/maps/soviet-10/rules.yaml b/mods/ra/maps/soviet-10/rules.yaml index b8d1ee67e2..8e0155e00c 100644 --- a/mods/ra/maps/soviet-10/rules.yaml +++ b/mods/ra/maps/soviet-10/rules.yaml @@ -25,7 +25,6 @@ ENGIDROP: ParatroopersPower: DisplayBeacon: False DropItems: E6, E6, E6 - AlwaysVisible: AFLD: ParatroopersPower@paratroopers: diff --git a/mods/ra/maps/top-o-the-world/rules.yaml b/mods/ra/maps/top-o-the-world/rules.yaml index 8ebbdfbaa3..a9171cd7da 100644 --- a/mods/ra/maps/top-o-the-world/rules.yaml +++ b/mods/ra/maps/top-o-the-world/rules.yaml @@ -49,7 +49,6 @@ SCAMERA: Range: 5c512 powerproxy.spyplane: - AlwaysVisible: AirstrikePower: OrderName: SovietSpyPlane Icon: spyplane diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index d329f7154b..7bda8fd3b9 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -760,7 +760,6 @@ SBRIDGE4: SpawnOffset: 2,1 BRIDGEHUT: - AlwaysVisible: Building: Footprint: __ __ Dimensions: 2,2 @@ -772,7 +771,6 @@ BRIDGEHUT: TargetTypes: BridgeHut, C4 BRIDGEHUT.small: - AlwaysVisible: Building: Footprint: _ Dimensions: 1,1 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 1687667532..37536efaca 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -1128,7 +1128,6 @@ ^Bridge: Inherits@shape: ^1x1Shape - AlwaysVisible: Tooltip: Name: meta-bridge-name ShowOwnerRow: false diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index b4195e5084..dd3c9d479f 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -182,7 +182,6 @@ CAMERA: Interactable: EditorOnlyTooltip: Name: actor-camera-name - AlwaysVisible: Immobile: OccupiesSpace: false RevealsShroud: @@ -343,7 +342,6 @@ LAR2: Name: actor-lar2-name powerproxy.parabombs: - AlwaysVisible: AirstrikePower: Icon: parabombs Name: actor-powerproxy-parabombs.name @@ -363,7 +361,6 @@ powerproxy.parabombs: CircleSequence: circles powerproxy.sonarpulse: - AlwaysVisible: SpawnActorPower: Icon: sonar Name: actor-powerproxy-sonarpulse.name @@ -385,7 +382,6 @@ powerproxy.sonarpulse: BlockedCursor: move-blocked powerproxy.paratroopers: - AlwaysVisible: ParatroopersPower: Icon: paratroopers Name: actor-powerproxy-paratroopers.name @@ -403,22 +399,18 @@ powerproxy.paratroopers: CircleSequence: circles barracks.upgraded: - AlwaysVisible: ProvidesPrerequisite: vehicles.upgraded: - AlwaysVisible: ProvidesPrerequisite: aircraft.upgraded: - AlwaysVisible: ProvidesPrerequisite: mpspawn: Interactable: EditorOnlyTooltip: Name: actor-mpspawn-name - AlwaysVisible: Immobile: OccupiesSpace: false WithSpriteBody: @@ -434,7 +426,6 @@ waypoint: Interactable: EditorOnlyTooltip: Name: actor-waypoint-name - AlwaysVisible: Immobile: OccupiesSpace: false WithSpriteBody: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 37bb95e301..9d2cccd0e7 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -2194,19 +2194,16 @@ WOOD: Type: woodfence BARRACKS: - AlwaysVisible: Interactable: Tooltip: Name: actor-barracks-name TECHCENTER: - AlwaysVisible: Interactable: Tooltip: Name: actor-techcenter-name ANYPOWER: - AlwaysVisible: Interactable: Tooltip: Name: actor-anypower-name diff --git a/mods/ts/rules/bridges.yaml b/mods/ts/rules/bridges.yaml index 67398f4569..5cb226c3b4 100644 --- a/mods/ts/rules/bridges.yaml +++ b/mods/ts/rules/bridges.yaml @@ -23,7 +23,6 @@ CABHUT: Categories: Bridge ^LowBridgeRamp: - AlwaysVisible: RenderSprites: Palette: terraindecoration WithSpriteBody: @@ -171,7 +170,6 @@ LOBRDG_R_SW: Name: actor-lobrdg-r-name ^ElevatedBridgePlaceholder: - AlwaysVisible: RenderSprites: Palette: terraindecoration WithSpriteBody: diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index 00ac8cbb9e..1ca6d7db1b 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -1524,7 +1524,6 @@ INGALITE: Interactable: EditorOnlyTooltip: Name: actor-ingalite-name - AlwaysVisible: Immobile: OccupiesSpace: false RenderSpritesEditorOnly: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index d9b1a7bc83..ac089c2a00 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -535,7 +535,6 @@ ^BuildingPlug: Interactable: - AlwaysVisible: Building: BuildSounds: place2.aud UndeploySounds: cashturn.aud @@ -1226,7 +1225,6 @@ Condition: inside-tunnel ^TerrainOverlay: - AlwaysVisible: Immobile: OccupiesSpace: False RenderSprites: @@ -1257,7 +1255,6 @@ Dimensions: 3, 3 Footprint: ___ ___ ___ Targetable: - AlwaysVisible: TunnelEntrance: MapEditorData: Categories: Tunnel diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml index e97975d8a7..63e265bab2 100644 --- a/mods/ts/rules/gdi-structures.yaml +++ b/mods/ts/rules/gdi-structures.yaml @@ -83,7 +83,6 @@ GAPOWR: Height: 48 GAPOWR.SOCKET: - AlwaysVisible: Interactable: Tooltip: Name: actor-gapowr-socket-name @@ -702,13 +701,11 @@ GAPLUG: Height: 48 GAPLUG.SOCKET.IONCANNON: - AlwaysVisible: Interactable: Tooltip: Name: actor-gaplug-socket-ioncannon-name GAPLUG.SOCKET.HUNTERSEEKER: - AlwaysVisible: Interactable: Tooltip: Name: actor-gaplug-socket-hunterseeker-name diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index e5e76916e3..b80c88b784 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -152,7 +152,6 @@ GACTWR: Height: 48 GACTWR.SOCKET: - AlwaysVisible: Interactable: Tooltip: Name: actor-gactwr-socket-name diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml index ff8543208a..b1b8b53e12 100644 --- a/mods/ts/rules/misc.yaml +++ b/mods/ts/rules/misc.yaml @@ -2,7 +2,6 @@ mpspawn: Interactable: EditorOnlyTooltip: Name: actor-mpspawn-name - AlwaysVisible: Immobile: OccupiesSpace: false RenderSpritesEditorOnly: @@ -18,7 +17,6 @@ waypoint: Interactable: EditorOnlyTooltip: Name: actor-waypoint-name - AlwaysVisible: Immobile: OccupiesSpace: false RenderSpritesEditorOnly: @@ -59,7 +57,6 @@ CAMERA: Interactable: EditorOnlyTooltip: Name: actor-camera-name - AlwaysVisible: RenderSpritesEditorOnly: WithSpriteBody: BodyOrientation: diff --git a/mods/ts/rules/shared-structures.yaml b/mods/ts/rules/shared-structures.yaml index 5207e05def..80d88d29dc 100644 --- a/mods/ts/rules/shared-structures.yaml +++ b/mods/ts/rules/shared-structures.yaml @@ -231,31 +231,26 @@ GASILO: Palette: pips ANYPOWER: - AlwaysVisible: Interactable: Tooltip: Name: actor-anypower-name BARRACKS: - AlwaysVisible: Interactable: Tooltip: Name: actor-barracks-name FACTORY: - AlwaysVisible: Interactable: Tooltip: Name: actor-factory-name RADAR: - AlwaysVisible: Interactable: Tooltip: Name: actor-radar-name TECH: - AlwaysVisible: Interactable: Tooltip: Name: actor-tech-name