diff --git a/mods/ra/maps/allies-03b/rules.yaml b/mods/ra/maps/allies-03b/rules.yaml index ed1ce1eac6..025f0ca8dd 100644 --- a/mods/ra/maps/allies-03b/rules.yaml +++ b/mods/ra/maps/allies-03b/rules.yaml @@ -96,7 +96,7 @@ DOG: TRUK: -Demolishable: Targetable: - TargetTypes: Ground, Truk + TargetTypes: GroundActor, Truk Armor: Type: Truk diff --git a/mods/ra/maps/allies-05a/rules.yaml b/mods/ra/maps/allies-05a/rules.yaml index 5f7324ca98..1ba5740300 100644 --- a/mods/ra/maps/allies-05a/rules.yaml +++ b/mods/ra/maps/allies-05a/rules.yaml @@ -35,7 +35,7 @@ SAM: LST: -Selectable: Targetable: - TargetTypes: Ground, Water + TargetTypes: GroundActor, WaterActor Interactable: LST.IN: @@ -50,7 +50,7 @@ TRAN: RevealsShroud: Range: 4c0 Targetable@GROUND: - TargetTypes: Ground + TargetTypes: GroundActor Interactable: TRAN.IN: @@ -82,14 +82,14 @@ SPY: WEAP: -InfiltrateForSupportPower: Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure + TargetTypes: GroundActor, C4, DetonateAttack, Structure WEAP.infiltratable: Inherits: WEAP Buildable: Prerequisites: ~disabled Targetable@Spy: - TargetTypes: Ground, C4, DetonateAttack, Structure, Mission Objectives + TargetTypes: GroundActor, C4, DetonateAttack, Structure, Mission Objectives RenderSprites: Image: WEAP ProvidesPrerequisite: @@ -99,7 +99,7 @@ MISS: Tooltip: Name: Prison Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, Mission Objectives + TargetTypes: GroundActor, C4, DetonateAttack, Structure, Mission Objectives AttackOmni: Armament: Weapon: PrisonColt diff --git a/mods/ra/maps/allies-06a/rules.yaml b/mods/ra/maps/allies-06a/rules.yaml index 0339ab7022..86b62c4d5e 100644 --- a/mods/ra/maps/allies-06a/rules.yaml +++ b/mods/ra/maps/allies-06a/rules.yaml @@ -48,7 +48,7 @@ TRUK: STEK: Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, SpyInfiltrate TECH.CAM: Inherits: CAMERA diff --git a/mods/ra/maps/allies-06b/rules.yaml b/mods/ra/maps/allies-06b/rules.yaml index e6d67721c6..7618fff356 100644 --- a/mods/ra/maps/allies-06b/rules.yaml +++ b/mods/ra/maps/allies-06b/rules.yaml @@ -50,7 +50,7 @@ TECH.CAM: STEK: Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, SpyInfiltrate APWR: Buildable: diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml index 4f6172d7f4..81e6606a22 100644 --- a/mods/ra/maps/infiltration/rules.yaml +++ b/mods/ra/maps/infiltration/rules.yaml @@ -33,7 +33,7 @@ World: MISS: Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, MissionObjective, NoAutoTarget + TargetTypes: GroundActor, C4, DetonateAttack, Structure, MissionObjective, NoAutoTarget LST.Unselectable.UnloadOnly: Inherits: LST @@ -45,7 +45,7 @@ LST.Unselectable.UnloadOnly: Cargo: MaxWeight: 0 Targetable: - TargetTypes: Ground, Water, Repair, NoAutoTarget + TargetTypes: GroundActor, Water, Repair, NoAutoTarget Interactable: SPY.Strong: @@ -90,7 +90,7 @@ TRUK.Hijackable: PassengerConditions: spy.strong: mobile Targetable: - TargetTypes: Ground, Repair, Vehicle, NoAutoTarget + TargetTypes: GroundActor, Repair, Vehicle, NoAutoTarget -Huntable: Capturable: Types: MissionObjective diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 4ef55125c4..0a9ec42956 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -195,7 +195,7 @@ DOME.NoInfiltrate: Image: DOME -InfiltrateForExploration: Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, MissionObjective + TargetTypes: GroundActor, Structure, C4, DetonateAttack, MissionObjective ProvidesPrerequisite: Prerequisite: dome diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index cd050442f4..f254d5d384 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -304,7 +304,7 @@ V19: SpawnActorOnDeath: Actor: V19.Husk Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, NoAutoTarget + TargetTypes: GroundActor, C4, DetonateAttack, Structure, NoAutoTarget V19.Husk: Inherits: ^CivBuilding @@ -338,7 +338,7 @@ BARL: Armor: Type: None Targetable: - TargetTypes: Ground, DemoTruck, Barrel, NoAutoTarget + TargetTypes: GroundActor, DemoTruck, Barrel, NoAutoTarget -ShakeOnDeath: -SoundOnDamageTransition: -Demolishable: @@ -360,7 +360,7 @@ BRL3: Armor: Type: None Targetable: - TargetTypes: Ground, DemoTruck, Barrel, NoAutoTarget + TargetTypes: GroundActor, DemoTruck, Barrel, NoAutoTarget -ShakeOnDeath: -SoundOnDamageTransition: -Demolishable: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index c7340a1050..a28fb1ff8a 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -197,7 +197,7 @@ ^AutoTargetAir: AutoTarget: AutoTargetPriority@DEFAULT: - ValidTargets: Air + ValidTargets: AirborneActor InvalidTargets: NoAutoTarget ^AutoTargetAll: @@ -205,11 +205,11 @@ AttackAnythingCondition: stance-attackanything AutoTargetPriority@DEFAULT: RequiresCondition: !stance-attackanything - ValidTargets: Infantry, Vehicle, Ship, Underwater, Air, Defense, Mine + ValidTargets: Infantry, Vehicle, Ship, Underwater, AirborneActor, Defense, Mine InvalidTargets: NoAutoTarget AutoTargetPriority@ATTACKANYTHING: RequiresCondition: stance-attackanything - ValidTargets: Infantry, Vehicle, Ship, Underwater, Air, Structure, Defense, Mine + ValidTargets: Infantry, Vehicle, Ship, Underwater, AirborneActor, Structure, Defense, Mine InvalidTargets: NoAutoTarget ^AutoTargetAllAssaultMove: @@ -246,7 +246,7 @@ Bounds: 24, 24 Targetable: RequiresCondition: !parachute - TargetTypes: Ground, Vehicle + TargetTypes: GroundActor, Vehicle Targetable@REPAIR: RequiresCondition: !parachute && damaged TargetTypes: Repair @@ -331,7 +331,7 @@ DecorationBounds: 12,18,0,-8 Targetable: RequiresCondition: !parachute - TargetTypes: Ground, Infantry, Disguise + TargetTypes: GroundActor, Infantry, Disguise Targetable@HEAL: RequiresCondition: !parachute && damaged TargetTypes: Heal @@ -490,7 +490,7 @@ Selectable: Bounds: 24,24 Targetable: - TargetTypes: Ground, Water, Ship + TargetTypes: WaterActor, Ship Targetable@REPAIR: RequiresCondition: damaged TargetTypes: Repair @@ -544,10 +544,10 @@ AirborneCondition: airborne Targetable@GROUND: RequiresCondition: !airborne - TargetTypes: Ground, Vehicle + TargetTypes: GroundActor, Vehicle Targetable@AIRBORNE: RequiresCondition: airborne - TargetTypes: Air + TargetTypes: AirborneActor Targetable@REPAIR: RequiresCondition: !airborne && damaged TargetTypes: Repair @@ -625,7 +625,7 @@ Inherits@bounty: ^GlobalBounty Inherits@selection: ^SelectableBuilding Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure + TargetTypes: GroundActor, C4, DetonateAttack, Structure Building: Dimensions: 1,1 Footprint: x @@ -712,7 +712,7 @@ Selectable: Bounds: 24,24 Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, Defense + TargetTypes: GroundActor, C4, DetonateAttack, Structure, Defense MustBeDestroyed: RequiredForShortGame: false -GivesBuildableArea: @@ -755,7 +755,7 @@ LineBuildNode: Types: wall Targetable: - TargetTypes: Ground, DetonateAttack, Wall, NoAutoTarget + TargetTypes: GroundActor, DetonateAttack, Wall, NoAutoTarget -GivesExperience: RenderSprites: Palette: effect @@ -814,7 +814,7 @@ ^InfiltratableFake: Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, SpyInfiltrate InfiltrateForDecoration: Types: SpyInfiltrate Position: Top @@ -833,7 +833,7 @@ Tooltip: Name: Ammo Box Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, NoAutoTarget + TargetTypes: GroundActor, C4, DetonateAttack, Structure, NoAutoTarget Armor: Type: Light MapEditorData: @@ -997,7 +997,7 @@ WithColoredOverlay@IDISABLE: Palette: disabled Targetable: - TargetTypes: Ground, Husk, NoAutoTarget + TargetTypes: GroundActor, Husk, NoAutoTarget RequiresForceFire: true Chronoshiftable: Tooltip: @@ -1048,7 +1048,7 @@ Name: Bridge ShowOwnerRow: false Targetable: - TargetTypes: Ground, Water, Bridge + TargetTypes: GroundActor, WaterActor, Bridge RequiresForceFire: true Building: Footprint: ____ ____ @@ -1157,7 +1157,7 @@ Tooltip: Name: Mine Targetable: - TargetTypes: Ground, Mine + TargetTypes: GroundActor, Mine Immobile: OccupiesSpace: true HitShape: diff --git a/mods/ra/rules/fakes.yaml b/mods/ra/rules/fakes.yaml index 8644e928af..93b24d268c 100644 --- a/mods/ra/rules/fakes.yaml +++ b/mods/ra/rules/fakes.yaml @@ -83,7 +83,7 @@ SYRF: GenericVisibility: Enemy GenericStancePrefix: False Targetable: - TargetTypes: Ground, Water, Structure, SpyInfiltrate + TargetTypes: WaterActor, Structure, SpyInfiltrate Building: Footprint: XXX xxx XXX Dimensions: 3,3 @@ -117,7 +117,7 @@ SPEF: Selectable: Bounds: 72,48 Targetable: - TargetTypes: Ground, Water, Structure, SpyInfiltrate + TargetTypes: WaterActor, Structure, SpyInfiltrate Buildable: BuildPaletteOrder: 890 Queue: Defense diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index faa91d92bb..7f894c2dc5 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -47,7 +47,7 @@ DOG: AutoTargetPriority@DEFAULT: ValidTargets: Infantry Targetable: - TargetTypes: Ground, Infantry + TargetTypes: GroundActor, Infantry WithInfantryBody: MoveSequence: walk StandSequences: stand @@ -763,7 +763,7 @@ Ant: Armament: Weapon: mandible Targetable: - TargetTypes: Ground, Infantry, Ant + TargetTypes: GroundActor, Infantry, Ant WithDeathAnimation: UseDeathTypeSuffix: false Voiced: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index e0b2e56364..3007a1105f 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -27,7 +27,7 @@ SS: RevealsShroud@GAPGEN: Range: 5c0 Targetable: - TargetTypes: Ground, Water, Ship, Submarine, Repair + TargetTypes: WaterActor, Ship, Submarine, Repair RequiresCondition: !underwater Targetable@UNDERWATER: TargetTypes: Underwater, Submarine @@ -53,9 +53,9 @@ SS: InitialStance: HoldFire InitialStanceAI: ReturnFire AutoTargetPriority@DEFAULT: - ValidTargets: Water, Underwater + ValidTargets: WaterActor, Underwater AutoTargetPriority@ATTACKANYTHING: - ValidTargets: Water, Underwater + ValidTargets: WaterActor, Underwater DetectCloaked: CloakTypes: Underwater Range: 4c0 @@ -96,7 +96,7 @@ MSUB: RevealsShroud@GAPGEN: Range: 5c0 Targetable: - TargetTypes: Ground, Water, Ship, Submarine, Repair + TargetTypes: WaterActor, Ship, Submarine, Repair RequiresCondition: !underwater Targetable@UNDERWATER: TargetTypes: Underwater, Submarine diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 72a276c367..8e00d127c3 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -61,7 +61,7 @@ MSLO: InfiltrateForSupportPowerReset: Types: SpyInfiltrate Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate Power: Amount: -150 MustBeDestroyed: @@ -133,7 +133,7 @@ SPEN: Prerequisites: anypower, ~structures.soviet, ~techlevel.low Description: Produces and repairs\nsubmarines and transports. Targetable: - TargetTypes: Ground, Water, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: WaterActor, Structure, C4, DetonateAttack, SpyInfiltrate Building: Footprint: XXX xxx XXX Dimensions: 3,3 @@ -272,7 +272,7 @@ SYRD: Tooltip: Name: Naval Yard Targetable: - TargetTypes: Ground, Water, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: WaterActor, Structure, C4, DetonateAttack, SpyInfiltrate Building: Footprint: XXX xxx XXX Dimensions: 3,3 @@ -433,7 +433,7 @@ IRON: InfiltrateForSupportPowerReset: Types: SpyInfiltrate Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate Power: Amount: -200 MustBeDestroyed: @@ -521,7 +521,7 @@ PDOX: InfiltrateForSupportPowerReset: Types: SpyInfiltrate Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate Power: Amount: -200 MustBeDestroyed: @@ -644,7 +644,7 @@ DOME: Dimensions: 2,3 LocalCenterOffset: 0,-512,0 Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, SpyInfiltrate Health: HP: 100000 Armor: @@ -981,7 +981,7 @@ ATEK: InfiltrateForSupportPowerReset: Types: SpyInfiltrate Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate Power: Amount: -200 ProvidesPrerequisite@buildingname: @@ -1086,7 +1086,7 @@ WEAP: Amount: -30 ProvidesPrerequisite@buildingname: Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate InfiltrateForSupportPower: Proxy: vehicles.upgraded Types: SpyInfiltrate @@ -1227,7 +1227,7 @@ PROC: Bounds: 72,50,0,4 DecorationBounds: 72,70,0,-2 Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, ThiefInfiltrate, SpyInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, ThiefInfiltrate, SpyInfiltrate Health: HP: 90000 Armor: @@ -1300,7 +1300,7 @@ SILO: Valued: Cost: 150 Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, ThiefInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, ThiefInfiltrate Tooltip: Name: Silo -GivesBuildableArea: @@ -1415,7 +1415,7 @@ HPAD: Prerequisite: aircraft.germany ProvidesPrerequisite@buildingname: Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate InfiltrateForSupportPower: Proxy: aircraft.upgraded Types: SpyInfiltrate @@ -1556,7 +1556,7 @@ AFLD: ProvidesPrerequisite@buildingname: Prerequisite: afld Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate InfiltrateForSupportPower: Proxy: aircraft.upgraded Types: SpyInfiltrate @@ -1605,7 +1605,7 @@ POWR: Power: Amount: 100 Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, SpyInfiltrate ScalePowerWithHealth: WithDeathAnimation: DeathSequence: dead @@ -1645,7 +1645,7 @@ APWR: Power: Amount: 200 Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: GroundActor, Structure, C4, DetonateAttack, SpyInfiltrate ScalePowerWithHealth: WithDeathAnimation: DeathSequence: dead @@ -1771,7 +1771,7 @@ BARR: Proxy: barracks.upgraded Types: SpyInfiltrate Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate KENN: Inherits: ^Building @@ -1938,7 +1938,7 @@ TENT: Proxy: barracks.upgraded Types: SpyInfiltrate Targetable: - TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate + TargetTypes: GroundActor, C4, DetonateAttack, Structure, SpyInfiltrate FIX: Inherits: ^Building diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 892c9a7e47..cc89443ff1 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -517,7 +517,7 @@ MNLY: Rearmable: RearmActors: fix Targetable: - TargetTypes: Ground, Vehicle, Mine + TargetTypes: GroundActor, Vehicle, Mine WithAmmoPipsDecoration: Position: BottomLeft Margin: 4, 3 @@ -829,7 +829,7 @@ QTNK: Color: FFFF0080 Range: 7c0 Targetable: - TargetTypes: Ground, MADTank, Vehicle + TargetTypes: GroundActor, MADTank, Vehicle Selectable: DecorationBounds: 44,38,0,-4