diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 977088e953..41364123bf 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -19,7 +19,6 @@ Chronoshiftable: Passenger: CargoType: Vehicle - IronCurtainable: HiddenUnderFog: GainsExperience: GivesExperience: @@ -70,7 +69,6 @@ Chronoshiftable: Passenger: CargoType: Vehicle - IronCurtainable: HiddenUnderFog: GainsExperience: GivesExperience: diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index f5787dfdf0..aa4d76f978 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -1,7 +1,7 @@ BADR: + Inherits: ^Plane ParaDrop: DropRange: 4c0 - Inherits: ^Plane Health: HP: 300 Armor: @@ -12,7 +12,6 @@ BADR: Repulsable: False RenderUnit: WithShadow: - IronCurtainable: Cargo: MaxWeight: 10 -Selectable: @@ -36,10 +35,10 @@ BADR: RejectsOrders: BADR.Bomber: + Inherits: ^Plane AttackBomber: Armament: Weapon: ParaBomb - Inherits: ^Plane Health: HP: 300 Armor: @@ -53,7 +52,6 @@ BADR.Bomber: RenderUnit: Image: badr WithShadow: - IronCurtainable: -Selectable: -GainsExperience: Tooltip: @@ -113,7 +111,6 @@ MIG: WithShadow: LimitedAmmo: Ammo: 8 - IronCurtainable: ReturnOnIdle: Selectable: Bounds: 40,29,0,1 @@ -173,7 +170,6 @@ YAK: Ammo: 18 PipCount: 6 ReloadTicks: 11 - IronCurtainable: ReturnOnIdle: Selectable: Bounds: 30,28,0,2 @@ -224,7 +220,6 @@ TRAN: Types: Infantry MaxWeight: 8 PipCount: 8 - IronCurtainable: LeavesHusk: HuskActor: TRAN.Husk @@ -270,7 +265,6 @@ HELI: WithShadow: LimitedAmmo: Ammo: 8 - IronCurtainable: Selectable: Bounds: 36,28,0,0 LeavesHusk: @@ -324,7 +318,6 @@ HIND: Ammo: 24 PipCount: 6 ReloadTicks: 8 - IronCurtainable: Selectable: Bounds: 38,32,0,0 WithMuzzleFlash: @@ -345,7 +338,6 @@ U2: Repulsable: False RenderUnit: WithShadow: - IronCurtainable: AttackBomber: -Selectable: -GainsExperience: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 7771b9f1f4..4fa5754fab 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -247,6 +247,7 @@ HealIfBelow: 1 DamageCooldown: 125 RequiresUpgrade: selfheal + IronCurtainable: ^Plane: AppearsOnRadar: @@ -290,6 +291,7 @@ HealIfBelow: 1 DamageCooldown: 125 RequiresUpgrade: selfheal + IronCurtainable: ^Helicopter: Inherits: ^Plane @@ -345,7 +347,8 @@ LuaScriptEvents: Demolishable: ScriptTriggers: - + IronCurtainable: + ^Defense: Inherits: ^Building TargetableBuilding: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 28534d6e4c..e384d9e1e4 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -38,7 +38,6 @@ SS: Selectable: Bounds: 38,38 Chronoshiftable: - IronCurtainable: RepairableNear: AutoTarget: InitialStance: ReturnFire @@ -90,7 +89,6 @@ MSUB: Selectable: Bounds: 44,44 Chronoshiftable: - IronCurtainable: RepairableNear: AutoTarget: InitialStance: ReturnFire @@ -141,7 +139,6 @@ DD: WithTurret: AutoTarget: Chronoshiftable: - IronCurtainable: RepairableNear: DetectCloaked: CloakTypes: Underwater @@ -206,7 +203,6 @@ CA: Turret: secondary AutoTarget: Chronoshiftable: - IronCurtainable: RepairableNear: Explodes: Weapon: UnitExplodeShip @@ -238,7 +234,6 @@ LST: Types: Infantry, Vehicle MaxWeight: 5 PipCount: 5 - IronCurtainable: RepairableNear: Explodes: Weapon: UnitExplodeShip @@ -284,7 +279,6 @@ PT: WithTurret: AutoTarget: Chronoshiftable: - IronCurtainable: RepairableNear: DetectCloaked: CloakTypes: Underwater diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index de58836ac8..363809b66e 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -19,7 +19,6 @@ MSLO: Type: Wood RevealsShroud: Range: 5c0 - IronCurtainable: NukePower: Icon: abomb ChargeTime: 540 @@ -75,7 +74,6 @@ GAP: HasMinibib: Yes CreatesShroud: Range: 6c0 - IronCurtainable: RenderShroudCircle: Power: Amount: -60 @@ -127,7 +125,6 @@ SPEN: Production: Produces: Ship, Submarine PrimaryBuilding: - IronCurtainable: -EmitInfantryOnSell: RepairsUnits: RallyPoint: @@ -181,7 +178,6 @@ SYRD: Production: Produces: Ship, Boat PrimaryBuilding: - IronCurtainable: -EmitInfantryOnSell: RepairsUnits: RallyPoint: @@ -217,7 +213,6 @@ IRON: Range: 10c0 Bib: HasMinibib: Yes - IronCurtainable: IronCurtainPower: Icon: invuln ChargeTime: 120 @@ -260,7 +255,6 @@ PDOX: Range: 10c0 Bib: HasMinibib: Yes - IronCurtainable: ChronoshiftPower: Icon: chrono ChargeTime: 120 @@ -314,7 +308,6 @@ TSLA: MaxCharges: 3 ReloadTime: 120 AutoTarget: - IronCurtainable: -RenderBuilding: RenderRangeCircle: -AcceptsSupplies: @@ -361,7 +354,6 @@ AGUN: AttackTurreted: WithMuzzleFlash: AutoTarget: - IronCurtainable: -RenderBuilding: RenderRangeCircle: RangeCircleType: aa @@ -399,7 +391,6 @@ DOME: Range: 10c0 Bib: ProvidesRadar: - IronCurtainable: InfiltrateForExploration: DetectCloaked: Range: 10 @@ -428,7 +419,6 @@ PBOX: Range: 6c0 Bib: HasMinibib: Yes - IronCurtainable: -AcceptsSupplies: Turreted: ROT: 255 @@ -476,7 +466,6 @@ HBOX: Cloak: InitialDelay: 125 CloakDelay: 60 - IronCurtainable: -AcceptsSupplies: Turreted: ROT: 255 @@ -534,7 +523,6 @@ GUN: AttackTurreted: WithMuzzleFlash: AutoTarget: - IronCurtainable: -RenderBuilding: RenderRangeCircle: -AcceptsSupplies: @@ -575,7 +563,6 @@ FTUR: BodyOrientation: QuantizedFacings: 8 AutoTarget: - IronCurtainable: RenderRangeCircle: -AcceptsSupplies: DrawLineToTarget: @@ -620,7 +607,6 @@ SAM: AttackTurreted: WithMuzzleFlash: AutoTarget: - IronCurtainable: -RenderBuilding: RenderRangeCircle: RangeCircleType: aa @@ -654,7 +640,6 @@ ATEK: RevealsShroud: Range: 10c0 Bib: - IronCurtainable: GpsPower: Icon: gps OneShot: yes @@ -712,7 +697,6 @@ WEAP: RequiresPrerequisites: structures.soviet Prerequisite: vehicles.soviet PrimaryBuilding: - IronCurtainable: ProductionBar: Power: Amount: -30 @@ -741,7 +725,6 @@ FACT: Bib: Production: Produces: Building,Defense - IronCurtainable: Valued: Cost: 2500 Tooltip: @@ -793,7 +776,6 @@ PROC: StoresResources: PipCount: 17 Capacity: 2000 - IronCurtainable: DrawLineToTarget: CustomSellValue: Value: 600 @@ -837,7 +819,6 @@ SILO: StoresResources: PipCount: 5 Capacity: 1500 - IronCurtainable: -RenderBuilding: -EmitInfantryOnSell: Power: @@ -872,7 +853,6 @@ HPAD: Production: Produces: Aircraft, Helicopter Reservable: - IronCurtainable: ProductionBar: PrimaryBuilding: Power: @@ -907,7 +887,6 @@ AFLD: Production: Produces: Aircraft, Plane Reservable: - IronCurtainable: AirstrikePower: Icon: spyplane ChargeTime: 180 @@ -962,7 +941,6 @@ POWR: RevealsShroud: Range: 4c0 Bib: - IronCurtainable: DeadBuildingState: Power: Amount: 100 @@ -996,7 +974,6 @@ APWR: RevealsShroud: Range: 4c0 Bib: - IronCurtainable: DeadBuildingState: Power: Amount: 200 @@ -1030,7 +1007,6 @@ STEK: RevealsShroud: Range: 4c0 Bib: - IronCurtainable: Power: Amount: -100 @@ -1065,7 +1041,6 @@ BARR: Production: Produces: Infantry, Soldier PrimaryBuilding: - IronCurtainable: ProductionBar: ProvidesCustomPrerequisite: Prerequisite: barracks @@ -1101,7 +1076,6 @@ KENN: Production: Produces: Infantry, Dog PrimaryBuilding: - IronCurtainable: ProductionBar: -EmitInfantryOnSell: Power: @@ -1138,7 +1112,6 @@ TENT: Production: Produces: Infantry, Soldier PrimaryBuilding: - IronCurtainable: ProductionBar: ProvidesCustomPrerequisite: Prerequisite: barracks @@ -1169,7 +1142,6 @@ FIX: HasMinibib: Yes Reservable: RallyPoint: - IronCurtainable: RepairsUnits: Interval: 10 WithRepairAnimation: @@ -1200,7 +1172,6 @@ FACF: RenderBuilding: Image: FACT Fake: - IronCurtainable: -EmitInfantryOnSell: Power: Amount: -2 @@ -1231,7 +1202,6 @@ WEAF: RenderBuildingWarFactory: Image: WEAP Fake: - IronCurtainable: -EmitInfantryOnSell: Power: Amount: -2 diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index e639c11e81..94a831c7a0 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -113,7 +113,6 @@ GAPILE: Production: Produces: Infantry PrimaryBuilding: - IronCurtainable: ProductionBar: WithProductionOverlay@LIGHTS: Sequence: production-lights @@ -338,7 +337,6 @@ NAHAND: Production: Produces: Infantry PrimaryBuilding: - IronCurtainable: ProductionBar: WithIdleOverlay@LIGHTS: Sequence: idle-lights