diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml index 75d1894213..4f6172d7f4 100644 --- a/mods/ra/maps/infiltration/rules.yaml +++ b/mods/ra/maps/infiltration/rules.yaml @@ -44,7 +44,6 @@ LST.Unselectable.UnloadOnly: Prerequisites: ~disabled Cargo: MaxWeight: 0 - PipCount: 0 Targetable: TargetTypes: Ground, Water, Repair, NoAutoTarget Interactable: @@ -80,6 +79,7 @@ DOG.Patrol: TRUK.Hijackable: Inherits: TRUK + Inherits@CARGOPIPS: ^CargoPips Buildable: Prerequisites: ~disabled Mobile: @@ -87,7 +87,6 @@ TRUK.Hijackable: Cargo: Types: Infantry MaxWeight: 5 - PipCount: 5 PassengerConditions: spy.strong: mobile Targetable: diff --git a/mods/ra/maps/soviet-03/rules.yaml b/mods/ra/maps/soviet-03/rules.yaml index a84338e87c..9aa48f12c0 100644 --- a/mods/ra/maps/soviet-03/rules.yaml +++ b/mods/ra/maps/soviet-03/rules.yaml @@ -30,10 +30,10 @@ FENC: HP: 900000 V01: + Inherits@CARGOPIPS: ^CargoPips Cargo: Types: Infantry MaxWeight: 1 - PipCount: 1 V05: SpawnActorOnDeath: diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 13e6008604..85c46478cb 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -14,8 +14,7 @@ BADR: Cargo: MaxWeight: 10 -Selectable: - SelectionDecorations: - RenderSelectionBars: False + Interactable: -Voiced: Tooltip: Name: Badger @@ -35,49 +34,19 @@ BADR: RejectsOrders: GivesExperience: Experience: 1000 - Interactable: BADR.Bomber: - Inherits: ^NeutralPlane - AttackBomber: - Armament: - Weapon: ParaBomb - Health: - HP: 30000 - Aircraft: - CruiseAltitude: 2560 - TurnSpeed: 5 - Speed: 180 - Repulsable: False - MaximumPitch: 56 - AmmoPool: - Ammo: 5 - -Selectable: - SelectionDecorations: - RenderSelectionBars: False - -Voiced: - Tooltip: - Name: Badger - Contrail@1: - Offset: -432,560,0 - Contrail@2: - Offset: -432,-560,0 - SpawnActorOnDeath: - Actor: BADR.Husk - SmokeTrailWhenDamaged@0: - Offset: -432,560,0 - Interval: 2 - SmokeTrailWhenDamaged@1: - Offset: -432,-560,0 - Interval: 2 - -EjectOnDeath: + Inherits: BADR + -ParaDrop: + -Cargo: -MapEditorData: - RejectsOrders: RenderSprites: Image: badr - GivesExperience: - Experience: 1000 - Interactable: + AttackBomber: + AmmoPool: + Ammo: 5 + Armament: + Weapon: ParaBomb MIG: Inherits: ^Plane @@ -129,7 +98,6 @@ MIG: Selectable: Bounds: 36,28,0,2 DecorationBounds: 40,29,0,1 - SelectionDecorations: Contrail@1: Offset: -598,-683,0 Contrail@2: @@ -143,6 +111,10 @@ MIG: Prerequisites: aircraft.upgraded Rearmable: RearmActors: afld, afld.ukraine + WithAmmoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true YAK: Inherits: ^Plane @@ -196,10 +168,8 @@ YAK: InitialStanceAI: HoldFire AmmoPool: Ammo: 18 - PipCount: 6 ReloadDelay: 11 AmmoCondition: ammo - SelectionDecorations: WithMuzzleOverlay: Contrail: Offset: -853,0,0 @@ -214,9 +184,15 @@ YAK: DecorationBounds: 30,28,0,2 Rearmable: RearmActors: afld, afld.ukraine + WithAmmoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 6 TRAN: Inherits: ^Helicopter + Inherits@CARGOPIPS: ^CargoPips Buildable: Queue: Aircraft BuildAtProductionType: Helicopter @@ -262,11 +238,9 @@ TRAN: Cargo: Types: Infantry MaxWeight: 8 - PipCount: 8 AfterUnloadDelay: 40 SpawnActorOnDeath: Actor: TRAN.Husk - SelectionDecorations: Selectable: DecorationBounds: 40,36 @@ -324,7 +298,6 @@ HELI: AmmoPool: Ammo: 8 AmmoCondition: ammo - SelectionDecorations: SpawnActorOnDeath: Actor: HELI.Husk SmokeTrailWhenDamaged: @@ -335,6 +308,10 @@ HELI: DecorationBounds: 36,28 Rearmable: RearmActors: hpad + WithAmmoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true HIND: Inherits: ^Helicopter @@ -390,10 +367,8 @@ HIND: RequiresCondition: !airborne AmmoPool: Ammo: 24 - PipCount: 6 ReloadDelay: 8 AmmoCondition: ammo - SelectionDecorations: WithMuzzleOverlay: SpawnActorOnDeath: Actor: HIND.Husk @@ -405,6 +380,11 @@ HIND: DecorationBounds: 38,32 Rearmable: RearmActors: hpad + WithAmmoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 6 U2: Inherits: ^NeutralPlane @@ -420,8 +400,6 @@ U2: MaximumPitch: 56 AttackBomber: -Selectable: - SelectionDecorations: - RenderSelectionBars: False -Voiced: -Targetable@AIRBORNE: Contrail@1: @@ -491,10 +469,8 @@ MH60: RequiresCondition: !airborne AmmoPool: Ammo: 24 - PipCount: 6 ReloadDelay: 8 AmmoCondition: ammo - SelectionDecorations: WithMuzzleOverlay: SpawnActorOnDeath: Actor: MH60.Husk @@ -506,3 +482,8 @@ MH60: DecorationBounds: 38,32 Rearmable: RearmActors: hpad + WithAmmoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 6 diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index db45414478..cd050442f4 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -317,8 +317,6 @@ V19.Husk: StartSequence: fire-start Sequence: fire-loop -Selectable: - SelectionDecorations: - RenderSelectionBars: False -Targetable: -Demolishable: -HitShape: @@ -330,8 +328,6 @@ V19.Husk: BARL: Inherits: ^TechBuilding -Selectable: - SelectionDecorations: - RenderSelectionBars: False Health: HP: 1000 Explodes: @@ -354,8 +350,6 @@ BARL: BRL3: Inherits: ^TechBuilding -Selectable: - SelectionDecorations: - RenderSelectionBars: False Health: HP: 1000 Explodes: @@ -887,7 +881,6 @@ WINDMILL: Selectable: Bounds: 24,24,0,-14 DecorationBounds: 36,36,0,-14 - SelectionDecorations: Tooltip: Name: Windmill Building: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index edde743a5d..955681b427 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -111,34 +111,34 @@ Image: rank Sequence: rank-veteran-1 Palette: effect - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 ValidStances: Ally, Enemy, Neutral RequiresCondition: rank-veteran == 1 - ZOffset: 256 WithDecoration@RANK-2: Image: rank Sequence: rank-veteran-2 Palette: effect - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 ValidStances: Ally, Enemy, Neutral RequiresCondition: rank-veteran == 2 - ZOffset: 256 WithDecoration@RANK-3: Image: rank Sequence: rank-veteran-3 Palette: effect - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 ValidStances: Ally, Enemy, Neutral RequiresCondition: rank-veteran == 3 - ZOffset: 256 WithDecoration@RANK-ELITE: Image: rank Sequence: rank-elite Palette: effect - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 ValidStances: Ally, Enemy, Neutral RequiresCondition: rank-elite - ZOffset: 256 ^InfantryExperienceHospitalOverrides: WithDecoration@RANK-1: @@ -233,14 +233,11 @@ Huntable: OwnerLostAction: Action: Kill - DrawLineToTarget: UpdatesPlayerStatistics: Mobile: PauseOnCondition: being-captured Locomotor: wheeled TurnSpeed: 5 - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 24, 24 Targetable: @@ -318,7 +315,6 @@ OwnerLostAction: Action: Kill DeathTypes: DefaultDeath - DrawLineToTarget: Health: HP: 2500 Armor: @@ -328,8 +324,6 @@ Mobile: Speed: 56 Locomotor: foot - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 18,20,0,-6 DecorationBounds: 12,18,0,-8 @@ -389,7 +383,7 @@ WithDecoration@REDCROSS: Image: pips Sequence: medic - ReferencePoint: Bottom, Right + Position: BottomRight RequiresCondition: hospitalheal BlinkInterval: 32 BlinkPattern: Off, On @@ -458,7 +452,7 @@ RevealsShroud: Range: 3c0 Passenger: - PipType: Gray + CustomPipType: gray ProximityCaptor: Types: CivilianInfantry ScaredyCat: @@ -488,12 +482,9 @@ Huntable: OwnerLostAction: Action: Kill - DrawLineToTarget: UpdatesPlayerStatistics: Mobile: Locomotor: naval - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 24,24 Targetable: @@ -540,14 +531,11 @@ Huntable: OwnerLostAction: Action: Kill - DrawLineToTarget: Armor: Type: Light UpdatesPlayerStatistics: AppearsOnRadar: UseLocation: true - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 24,24 Aircraft: @@ -634,8 +622,6 @@ Inherits@shape: ^1x1Shape Inherits@bounty: ^GlobalBounty Inherits@selection: ^SelectableBuilding - SelectionDecorations: - WithSpriteControlGroupDecoration: Targetable: TargetTypes: Ground, C4, DetonateAttack, Structure Building: @@ -709,7 +695,7 @@ WithBuildingRepairDecoration: Image: allyrepair Sequence: repair - ReferencePoint: Center + Position: Center Palette: player IsPlayerPalette: True @@ -729,7 +715,6 @@ RequiredForShortGame: false -GivesBuildableArea: -AcceptsDeliveredCash: - DrawLineToTarget: RenderRangeCircle: Explodes: Weapon: SmallBuildingExplode @@ -815,11 +800,11 @@ RevealsShroud: Range: 1c0 WithDecoration@fake: + Position: Top + Margin: 0, 4 RequiresSelection: true Image: pips Sequence: tag-fake - ReferencePoint: Top - ZOffset: 256 -SpawnActorsOnSell: -MustBeDestroyed: MapEditorData: @@ -830,17 +815,15 @@ TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate InfiltrateForDecoration: Types: SpyInfiltrate + Position: Top + Margin: 0, 4 RequiresSelection: true Image: pips Sequence: tag-fake - ReferencePoint: Top - ZOffset: 256 ^AmmoBox: Inherits: ^TechBuilding -Selectable: - SelectionDecorations: - RenderSelectionBars: False Health: HP: 1000 Explodes: @@ -884,7 +867,6 @@ -Explodes: -Explodes@CIVPANIC: -Selectable: - -SelectionDecorations: Tooltip: Name: Field -Targetable: @@ -1209,7 +1191,7 @@ Sequence: offline Palette: chrome RequiresCondition: powerdown - ReferencePoint: Center + Position: Center Offsets: repairing: 10, 0 PowerMultiplier@POWERDOWN: @@ -1235,25 +1217,60 @@ Power: RequiresCondition: !disabled +^Selectable: + Selectable: + SelectionDecorations: + WithSpriteControlGroupDecoration: + Margin: -2, 0 + DrawLineToTarget: + ^SelectableCombatUnit: + Inherits@selectiondecorations: ^Selectable Selectable: Priority: 10 PriorityModifiers: Ctrl ^SelectableSupportUnit: + Inherits@selectiondecorations: ^Selectable Selectable: Priority: 8 PriorityModifiers: Ctrl, Alt ^SelectableEconomicUnit: + Inherits@selectiondecorations: ^Selectable Selectable: Priority: 6 PriorityModifiers: Ctrl, Alt ^SelectableCombatBuilding: + Inherits@selectiondecorations: ^Selectable Selectable: Priority: 4 ^SelectableBuilding: + Inherits@selectiondecorations: ^Selectable Selectable: Priority: 2 + +^CargoPips: + WithCargoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + CustomPipSequences: + gray: pip-gray + yellow: pip-yellow + blue: pip-blue + red: pip-red + +^PrimaryBuilding: + PrimaryBuilding: + PrimaryCondition: primary + SelectionNotification: PrimaryBuildingSelected + WithDecoration@primary: + RequiresCondition: primary + Position: Top + Margin: 0, 4 + RequiresSelection: true + Image: pips + Sequence: tag-primary diff --git a/mods/ra/rules/fakes.yaml b/mods/ra/rules/fakes.yaml index 3d7edbe897..8644e928af 100644 --- a/mods/ra/rules/fakes.yaml +++ b/mods/ra/rules/fakes.yaml @@ -293,7 +293,6 @@ FAPW: Selectable: Bounds: 72,48 DecorationBounds: 72,68,0,-10 - SelectionDecorations: Valued: Cost: 50 diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 3ce6a30488..faa91d92bb 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -16,7 +16,6 @@ DOG: Selectable: Bounds: 12,17,-1,-4 DecorationBounds: 12,17,-1,-4 - SelectionDecorations: Health: HP: 1800 Mobile: @@ -265,7 +264,7 @@ E6: StandSequences: parachute RequiresCondition: parachute Passenger: - PipType: Yellow + CustomPipType: yellow EngineerRepair: RepairsBridges: CaptureManager: @@ -312,7 +311,7 @@ SPY: RevealsShroud: Range: 5c0 Passenger: - PipType: Blue + CustomPipType: blue Voice: Move Disguise: DisguisedCondition: disguise @@ -330,11 +329,11 @@ SPY: IdleSequences: idle1,idle2 StandSequences: stand,stand2 WithDecoration@disguise: + Margin: 6, 10 Image: pips Sequence: pip-disguise Palette: effect - ReferencePoint: Top, Right - ZOffset: 256 + Position: TopRight RequiresCondition: disguise IgnoresDisguise: Armament: @@ -386,7 +385,7 @@ E7: DetonationDelay: 45 Voice: Demolish Passenger: - PipType: Red + CustomPipType: red Voice: Move Armament@PRIMARY: Weapon: Colt45 @@ -431,7 +430,7 @@ MEDI: RevealsShroud: Range: 3c0 Passenger: - PipType: Blue + CustomPipType: blue Armament: Weapon: Heal Cursor: heal @@ -470,7 +469,7 @@ MECH: RevealsShroud: Range: 3c0 Passenger: - PipType: Blue + CustomPipType: blue Voice: Move Armament: Weapon: Repair @@ -573,7 +572,7 @@ THF: RevealsShroud: Range: 5c0 Passenger: - PipType: Blue + CustomPipType: blue CaptureManager: Captures: CaptureTypes: vehicle @@ -669,7 +668,7 @@ SNIPER: Health: HP: 8000 Passenger: - PipType: Red + CustomPipType: red RevealsShroud: Range: 6c0 AutoTarget: @@ -749,7 +748,6 @@ Ant: Selectable: Bounds: 24,24,0,-5 DecorationBounds: 30,30,0,-2 - SelectionDecorations: Health: HP: 75000 Mobile: diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index 4cbf1f3f2d..11071e42d1 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -420,7 +420,6 @@ CTFLAG: -Health: -Explodes: -Selectable: - -SelectionDecorations: -Targetable: MapEditorData: Categories: Decoration diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 978d81b2cb..e0b2e56364 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -49,7 +49,6 @@ SS: LocalOffset: 0,-171,0, 0,171,0 FireDelay: 2 AttackFrontal: - SelectionDecorations: AutoTarget: InitialStance: HoldFire InitialStanceAI: ReturnFire @@ -125,7 +124,6 @@ MSUB: AttackFrontal: TargetFrozenActors: True ForceFireIgnoresActors: True - SelectionDecorations: AutoTarget: InitialStance: HoldFire InitialStanceAI: ReturnFire @@ -184,7 +182,6 @@ DD: LocalOffset: 0,-100,0, 0,100,0 LocalYaw: 64, -64 AttackTurreted: - SelectionDecorations: WithSpriteTurret: DetectCloaked: CloakTypes: Underwater @@ -249,7 +246,6 @@ CA: TargetFrozenActors: True ForceFireIgnoresActors: True WithMuzzleOverlay: - SelectionDecorations: WithSpriteTurret@PRIMARY: Turret: primary WithSpriteTurret@SECONDARY: @@ -259,6 +255,7 @@ CA: LST: Inherits: ^Ship + Inherits@CARGOPIPS: ^CargoPips Buildable: Queue: Ship BuildPaletteOrder: 10 @@ -284,13 +281,11 @@ LST: RevealGeneratedShroud: False RevealsShroud@GAPGEN: Range: 5c0 - SelectionDecorations: WithLandingCraftAnimation: OpenTerrainTypes: Clear, Rough, Road, Ore, Gems, Beach Cargo: Types: Infantry, Vehicle MaxWeight: 5 - PipCount: 5 PassengerFacing: 0 LoadingCondition: notmobile -Chronoshiftable: @@ -338,7 +333,6 @@ PT: MuzzleSequence: muzzle AttackTurreted: WithMuzzleOverlay: - SelectionDecorations: WithSpriteTurret: DetectCloaked: CloakTypes: Underwater diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 5bee548f00..bbf64849e0 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -80,7 +80,6 @@ GAP: Selectable: Bounds: 24,24 DecorationBounds: 24,48,0,-12 - SelectionDecorations: WithSpriteBody: PauseOnCondition: disabled Health: @@ -114,6 +113,7 @@ GAP: SPEN: Inherits: ^Building + Inherits@PRIMARY: ^PrimaryBuilding Selectable: Bounds: 72,48 InfiltrateForSupportPower: @@ -198,9 +198,6 @@ SPEN: ProductionTypes: Ship Production: Produces: Ship, Submarine - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected -SpawnActorsOnSell: RepairsUnits: HpPerStep: 1000 @@ -243,13 +240,6 @@ SPEN: ProvidesPrerequisite@buildingname: MapEditorData: ExcludeTilesets: INTERIOR - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary HitShape: Type: Rectangle TopLeft: -1536, -598 @@ -262,6 +252,7 @@ SPEN: SYRD: Inherits: ^Building + Inherits@PRIMARY: ^PrimaryBuilding Selectable: Bounds: 72,48 InfiltrateForSupportPower: @@ -321,9 +312,6 @@ SYRD: ProductionTypes: Ship, Boat Production: Produces: Ship, Boat - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected -SpawnActorsOnSell: RepairsUnits: HpPerStep: 1000 @@ -372,13 +360,6 @@ SYRD: ProvidesPrerequisite@buildingname: MapEditorData: ExcludeTilesets: INTERIOR - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary HitShape: TargetableOffsets: 768,0,0, 768,-1024,0, 768,1024,0 Type: Rectangle @@ -410,7 +391,6 @@ IRON: Selectable: Bounds: 48,28,0,2 DecorationBounds: 50,50,0,-12 - SelectionDecorations: Health: HP: 100000 Armor: @@ -547,7 +527,6 @@ TSLA: Selectable: Bounds: 24,24 DecorationBounds: 24,40,0,-8 - SelectionDecorations: Health: HP: 40000 Armor: @@ -593,7 +572,6 @@ AGUN: Selectable: Bounds: 24,24 DecorationBounds: 24,32,0,-4 - SelectionDecorations: Health: HP: 40000 Armor: @@ -679,6 +657,7 @@ DOME: PBOX: Inherits: ^Defense Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@CARGOPIPS: ^CargoPips Tooltip: Name: Pillbox Building: @@ -711,7 +690,6 @@ PBOX: Cargo: Types: Infantry MaxWeight: 1 - PipCount: 1 InitialUnits: e1 -SpawnActorsOnSell: AttackGarrisoned: @@ -730,6 +708,7 @@ PBOX: HBOX: Inherits: ^Defense Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@CARGOPIPS: ^CargoPips Tooltip: Name: Camo Pillbox Building: @@ -768,7 +747,6 @@ HBOX: Cargo: Types: Infantry MaxWeight: 1 - PipCount: 1 InitialUnits: e1 -SpawnActorsOnSell: DetectCloaked: @@ -980,6 +958,7 @@ ATEK: WEAP: Inherits: ^Building Inherits@shape: ^3x2Shape + Inherits@PRIMARY: ^PrimaryBuilding Selectable: Bounds: 72,48 Buildable: @@ -1070,9 +1049,6 @@ WEAP: ProvidesPrerequisite@ukrainianstructure: RequiresPrerequisites: structures.ukraine Prerequisite: vehicles.ukraine - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected ProductionBar: ProductionType: Vehicle Power: @@ -1083,13 +1059,6 @@ WEAP: InfiltrateForSupportPower: Proxy: vehicles.upgraded Types: SpyInfiltrate - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary -ActorPreviewPlaceBuildingPreview: SequencePlaceBuildingPreview: Sequence: place @@ -1226,7 +1195,6 @@ PROC: Selectable: Bounds: 72,50,0,4 DecorationBounds: 72,70,0,-2 - SelectionDecorations: Targetable: TargetTypes: Ground, Structure, C4, DetonateAttack, ThiefInfiltrate, SpyInfiltrate Health: @@ -1243,9 +1211,7 @@ PROC: DockAngle: 64 DockOffset: 1,2 StoresResources: - PipCount: 17 Capacity: 2000 - DrawLineToTarget: CustomSellValue: Value: 300 FreeActor: @@ -1284,6 +1250,12 @@ PROC: SequencePlaceBuildingPreview: Sequence: idle SequencePalette: placebuilding + WithResourceStoragePipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 17 + FullSequence: pip-yellow SILO: Inherits: ^Building @@ -1318,7 +1290,6 @@ SILO: WithResourceLevelSpriteBody: Sequence: stages StoresResources: - PipCount: 5 Capacity: 3000 -SpawnActorsOnSell: Power: @@ -1326,10 +1297,17 @@ SILO: Explodes: Weapon: SmallBuildingExplode EmptyWeapon: SmallBuildingExplode + WithResourceStoragePipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 5 + FullSequence: pip-yellow HPAD: Inherits: ^Building Inherits@shape: ^2x2Shape + Inherits@PRIMARY: ^PrimaryBuilding Selectable: Bounds: 48,48 HitShape: @@ -1372,9 +1350,6 @@ HPAD: Reservable: ProductionBar: ProductionType: Aircraft - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected Power: Amount: -10 ProvidesPrerequisite@allies: @@ -1413,17 +1388,11 @@ HPAD: InfiltrateForSupportPower: Proxy: aircraft.upgraded Types: SpyInfiltrate - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary AFLD: Inherits: ^Building Inherits@shape: ^3x2Shape + Inherits@PRIMARY: ^PrimaryBuilding HitShape: UseTargetableCellsOffsets: false TargetableOffsets: 0,0,0, 420,0,0, 420,-1024,0, 420,1024,0, -777,0,0, -777,-1024,0, -777,1024,0 @@ -1551,9 +1520,6 @@ AFLD: ProductionBar: ProductionType: Aircraft SupportPowerChargeBar: - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected Power: Amount: -20 ProvidesPrerequisite@buildingname: @@ -1563,13 +1529,6 @@ AFLD: InfiltrateForSupportPower: Proxy: aircraft.upgraded Types: SpyInfiltrate - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary WithResupplyAnimation: RequiresCondition: !build-incomplete @@ -1645,7 +1604,6 @@ APWR: Selectable: Bounds: 72,48 DecorationBounds: 72,68,0,-10 - SelectionDecorations: Health: HP: 70000 Armor: @@ -1702,6 +1660,7 @@ STEK: BARR: Inherits: ^Building Inherits@shape: ^2x2Shape + Inherits@PRIMARY: ^PrimaryBuilding Selectable: Bounds: 48,48 HitShape: @@ -1746,9 +1705,6 @@ BARR: Produces: Infantry, Soldier GrantExternalConditionToProduced: Condition: produced - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected ProductionBar: ProductionType: Infantry ProvidesPrerequisite: @@ -1785,16 +1741,10 @@ BARR: Types: SpyInfiltrate Targetable: TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary KENN: Inherits: ^Building + Inherits@PRIMARY: ^PrimaryBuilding Selectable: Bounds: 24,24 Buildable: @@ -1861,26 +1811,17 @@ KENN: ProductionTypes: Dog, Infantry Production: Produces: Infantry, Dog - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected ProductionBar: ProductionType: Infantry -SpawnActorsOnSell: Power: Amount: -10 ProvidesPrerequisite@buildingname: - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary TENT: Inherits: ^Building Inherits@shape: ^2x2Shape + Inherits@PRIMARY: ^PrimaryBuilding Selectable: Bounds: 48,48 HitShape: @@ -1925,9 +1866,6 @@ TENT: Produces: Infantry, Soldier GrantExternalConditionToProduced: Condition: produced - PrimaryBuilding: - PrimaryCondition: primary - SelectionNotification: PrimaryBuildingSelected ProductionBar: ProductionType: Infantry ProvidesPrerequisite@barracks: @@ -1970,13 +1908,6 @@ TENT: Types: SpyInfiltrate Targetable: TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate - WithDecoration@primary: - RequiresSelection: true - Image: pips - Sequence: tag-primary - ReferencePoint: Top - ZOffset: 256 - RequiresCondition: primary FIX: Inherits: ^Building @@ -1995,7 +1926,6 @@ FIX: Selectable: Bounds: 68,34,0,3 DecorationBounds: 72,48 - SelectionDecorations: Health: HP: 80000 Armor: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index c7730a7ba6..97cd2b0424 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -40,7 +40,6 @@ V2RL: RequiresCondition: reloading Sequence: empty-idle Name: reloading - SelectionDecorations: Explodes: Weapon: V2Explode ProducibleWithLevel: @@ -133,7 +132,6 @@ V2RL: WithSpriteTurret: SpawnActorOnDeath: Actor: 2TNK.Husk - SelectionDecorations: ProducibleWithLevel: Prerequisites: vehicles.upgraded Selectable: @@ -180,7 +178,6 @@ V2RL: WithSpriteTurret: SpawnActorOnDeath: Actor: 3TNK.Husk - SelectionDecorations: ProducibleWithLevel: Prerequisites: vehicles.upgraded Selectable: @@ -240,7 +237,6 @@ V2RL: Delay: 3 HealIfBelow: 50 DamageCooldown: 150 - SelectionDecorations: ProducibleWithLevel: Prerequisites: vehicles.upgraded Selectable: @@ -305,7 +301,6 @@ HARV: GenericName: Harvester Selectable: DecorationBounds: 42,42 - SelectionDecorations: Harvester: Capacity: 20 Resources: Ore,Gems @@ -342,6 +337,14 @@ HARV: WithHarvesterSpriteBody: ImageByFullness: harvempty, harvhalf, harv -WithFacingSpriteBody: + WithHarvesterPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 7 + ResourceSequences: + Ore: pip-yellow + Gems: pip-red MCV: Inherits: ^Vehicle @@ -358,7 +361,6 @@ MCV: Name: Mobile Construction Vehicle Selectable: DecorationBounds: 42,42 - SelectionDecorations: Health: HP: 60000 Armor: @@ -386,6 +388,7 @@ JEEP: Inherits: ^Vehicle Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@CARGOPIPS: ^CargoPips Buildable: Queue: Vehicle BuildPaletteOrder: 130 @@ -424,7 +427,6 @@ JEEP: Cargo: Types: Infantry MaxWeight: 1 - PipCount: 1 LoadingCondition: notmobile ProducibleWithLevel: Prerequisites: vehicles.upgraded @@ -433,6 +435,7 @@ APC: Inherits: ^TrackedVehicle Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@CARGOPIPS: ^CargoPips Buildable: Queue: Vehicle BuildPaletteOrder: 120 @@ -466,7 +469,6 @@ APC: Cargo: Types: Infantry MaxWeight: 5 - PipCount: 5 LoadingCondition: notmobile ProducibleWithLevel: Prerequisites: vehicles.upgraded @@ -647,7 +649,6 @@ TTNK: Turreted: WithIdleOverlay@SPINNER: Sequence: spinner - SelectionDecorations: ProducibleWithLevel: Prerequisites: vehicles.upgraded Selectable: @@ -697,7 +698,6 @@ FTRK: AttackTurreted: WithMuzzleOverlay: WithSpriteTurret: - SelectionDecorations: ProducibleWithLevel: Prerequisites: vehicles.upgraded Selectable: @@ -758,7 +758,6 @@ CTNK: GenericName: Tank UpdatesPlayerStatistics: AddToArmyValue: true - SelectionDecorations: Health: HP: 45000 Armor: @@ -818,7 +817,6 @@ QTNK: RevealGeneratedShroud: False RevealsShroud@GAPGEN: Range: 4c0 - SelectionDecorations: MadTank: DeployedCondition: deployed WithRangeCircle: @@ -833,6 +831,7 @@ STNK: Inherits: ^Vehicle Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@CARGOPIPS: ^CargoPips Buildable: Queue: Vehicle BuildPaletteOrder: 330 @@ -871,7 +870,6 @@ STNK: Cargo: Types: Infantry MaxWeight: 4 - PipCount: 4 LoadingCondition: notmobile Cloak: InitialDelay: 125 diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index c543b1ed8a..ca554ecae5 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -151,7 +151,6 @@ ResourceType@ore: Type: Ore Name: Valuable Minerals - PipColor: Yellow ResourceType: 1 TerrainType: Ore Palette: player @@ -163,7 +162,6 @@ ResourceType@gem: Type: Gems Name: Valuable Minerals - PipColor: Red ResourceType: 2 TerrainType: Gems Palette: player