diff --git a/mods/cnc/maps/cnc64gdi01/rules.yaml b/mods/cnc/maps/cnc64gdi01/rules.yaml index f0d7f79c1c..3287ef05f6 100644 --- a/mods/cnc/maps/cnc64gdi01/rules.yaml +++ b/mods/cnc/maps/cnc64gdi01/rules.yaml @@ -41,8 +41,6 @@ OLDLST: Inherits: LST -WithRoof: -Selectable: - SelectionDecorations: - RenderSelectionBars: False RejectsOrders: Cargo: Types: disabled diff --git a/mods/cnc/maps/funpark01/rules.yaml b/mods/cnc/maps/funpark01/rules.yaml index 9eb95e7f8b..f0896531d8 100644 --- a/mods/cnc/maps/funpark01/rules.yaml +++ b/mods/cnc/maps/funpark01/rules.yaml @@ -42,8 +42,6 @@ OLDLST: Inherits: LST -WithRoof: -Selectable: - SelectionDecorations: - RenderSelectionBars: False RejectsOrders: Cargo: Types: disabled diff --git a/mods/cnc/maps/gdi01/rules.yaml b/mods/cnc/maps/gdi01/rules.yaml index 342940baed..075fdf27f9 100644 --- a/mods/cnc/maps/gdi01/rules.yaml +++ b/mods/cnc/maps/gdi01/rules.yaml @@ -114,8 +114,6 @@ OLDLST: Inherits: LST -WithRoof: -Selectable: - SelectionDecorations: - RenderSelectionBars: False RejectsOrders: Cargo: Types: disabled diff --git a/mods/cnc/maps/gdi02/rules.yaml b/mods/cnc/maps/gdi02/rules.yaml index ff7d520372..aff6966cfa 100644 --- a/mods/cnc/maps/gdi02/rules.yaml +++ b/mods/cnc/maps/gdi02/rules.yaml @@ -116,8 +116,6 @@ OLDLST: Inherits: LST -WithRoof: -Selectable: - SelectionDecorations: - RenderSelectionBars: False RejectsOrders: Cargo: Types: disabled diff --git a/mods/cnc/maps/gdi06/rules.yaml b/mods/cnc/maps/gdi06/rules.yaml index 8e095ee486..7eabbc85eb 100644 --- a/mods/cnc/maps/gdi06/rules.yaml +++ b/mods/cnc/maps/gdi06/rules.yaml @@ -61,8 +61,6 @@ OLDLST: Inherits: LST -WithRoof: -Selectable: - SelectionDecorations: - RenderSelectionBars: False RejectsOrders: Cargo: Types: disabled diff --git a/mods/cnc/maps/gdi07/rules.yaml b/mods/cnc/maps/gdi07/rules.yaml index f98d931b06..3ec8ddbdec 100644 --- a/mods/cnc/maps/gdi07/rules.yaml +++ b/mods/cnc/maps/gdi07/rules.yaml @@ -112,8 +112,6 @@ OLDLST: Inherits: LST -WithRoof: -Selectable: - SelectionDecorations: - RenderSelectionBars: False RejectsOrders: Cargo: Types: disabled diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 4d171c5780..c803146de0 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -1,5 +1,6 @@ TRAN: Inherits: ^Helicopter + Inherits@TRANSPORT: ^Transport Valued: Cost: 750 Tooltip: @@ -41,11 +42,9 @@ TRAN: Cargo: Types: Infantry MaxWeight: 10 - PipCount: 10 AfterUnloadDelay: 40 SpawnActorOnDeath: Actor: TRAN.Husk - SelectionDecorations: Selectable: DecorationBounds: 41,41 @@ -94,7 +93,6 @@ HELI: AttackType: Hover AmmoPool: Ammo: 10 - PipCount: 5 AmmoCondition: ammo WithIdleOverlay@ROTORAIR: Offset: 0,0,85 @@ -107,12 +105,16 @@ HELI: WithMuzzleOverlay: SpawnActorOnDeath: Actor: HELI.Husk - SelectionDecorations: ReloadAmmoPool: Delay: 40 Count: 1 Selectable: DecorationBounds: 30,24 + WithAmmoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 5 ORCA: Inherits: ^Helicopter @@ -156,21 +158,24 @@ ORCA: AttackType: Hover AmmoPool: Ammo: 6 - PipCount: 6 AmmoCondition: ammo SpawnActorOnDeath: Actor: ORCA.Husk WithMoveAnimation: MoveSequence: move - SelectionDecorations: ReloadAmmoPool: Delay: 100 Count: 2 Selectable: DecorationBounds: 30,24 + WithAmmoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true C17: Inherits: ^Plane + Inherits@TRANSPORT: ^Transport Interactable: Tooltip: Name: Supply Aircraft @@ -186,7 +191,6 @@ C17: Type: CenterPosition Cargo: MaxWeight: 10 - PipCount: 10 DamageMultiplier@INVULNERABLE: Modifier: 0 Contrail@1: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 08c21c6680..60da10162f 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -123,30 +123,30 @@ Image: rank Sequence: rank-veteran-1 Palette: effect - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 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 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 RequiresCondition: rank-veteran == 3 - ZOffset: 256 WithDecoration@RANK-ELITE: Image: rank Sequence: rank-elite Palette: effect - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 RequiresCondition: rank-elite - ZOffset: 256 ^InfantryExperienceHospitalHazmatOverrides: WithDecoration@RANK-1: @@ -242,6 +242,25 @@ Condition: cloak-force-disabled ValidDamageStates: Critical +^Transport: + Cargo: + WithCargoPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + CustomPipSequences: + gray: pip-gray + yellow: pip-yellow + red: pip-red + +^StoresResources: + StoresResources: + WithResourceStoragePipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 10 + ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@3: ^SpriteActor @@ -252,8 +271,6 @@ Mobile: Locomotor: wheeled TurnSpeed: 5 - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 24,24 Targetable: @@ -265,7 +282,6 @@ ActorLostNotification: HiddenUnderFog: AttackMove: - DrawLineToTarget: WithDamageOverlay: WithFacingSpriteBody: Explodes: @@ -307,8 +323,6 @@ Targetable@AIRBORNE: TargetTypes: Air RequiresCondition: airborne - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 24,24 Repairable: @@ -330,7 +344,6 @@ Weapon: HeliExplode EmptyWeapon: HeliExplode AttackMove: - DrawLineToTarget: Guard: Guardable: Tooltip: @@ -367,8 +380,6 @@ Range: 5c0 Mobile: Locomotor: foot - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 18,18,0,-6 DecorationBounds: 12,17,0,-6 @@ -388,7 +399,6 @@ TiberiumDeath: 6 CrushedSequence: die-crushed AttackMove: - DrawLineToTarget: Passenger: CargoType: Infantry HiddenUnderFog: @@ -410,7 +420,8 @@ WithDecoration@HAZMAT: Image: pips Sequence: pip-hazmat - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 RequiresCondition: hazmatsuits ActorLostNotification: SpawnActorOnDeath: @@ -442,7 +453,8 @@ WithDecoration@REDCROSS: Image: pips Sequence: pip-heal - ReferencePoint: Bottom, Right + Position: BottomRight + Margin: 5, 6 RequiresCondition: hospitalheal BlinkInterval: 32 BlinkPattern: On, Off @@ -496,7 +508,7 @@ RevealsShroud: Range: 2c0 Passenger: - PipType: Gray + CustomPipType: gray ActorLostNotification: Notification: CivilianKilled NotifyAll: true @@ -544,8 +556,6 @@ Locomotor: critter Speed: 113 Voice: Move - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 24,24 Targetable: @@ -565,7 +575,6 @@ Voice: Attack AttackFrontal: Voice: Attack - DrawLineToTarget: DeathSounds: Voiced: VoiceSet: DinoVoice @@ -591,8 +600,6 @@ Voice: Move Speed: 71 Locomotor: critter - SelectionDecorations: - WithSpriteControlGroupDecoration: Selectable: Bounds: 24,24 Targetable: @@ -601,7 +608,6 @@ ScanRadius: 5 AttackMove: Voice: Attack - DrawLineToTarget: HiddenUnderFog: Valued: Cost: 1000 @@ -664,15 +670,11 @@ Huntable: OwnerLostAction: Action: Kill - SelectionDecorations: - WithSpriteControlGroupDecoration: - Selectable: Targetable: TargetTypes: Ground, Water HiddenUnderFog: ActorLostNotification: AttackMove: - DrawLineToTarget: WithDamageOverlay: Explodes: Weapon: UnitExplodeShip @@ -695,8 +697,6 @@ Huntable: OwnerLostAction: Action: Kill - SelectionDecorations: - WithSpriteControlGroupDecoration: Targetable: TargetTypes: Ground, C4, Structure Armor: @@ -772,7 +772,7 @@ WithBuildingRepairDecoration: Image: allyrepair Sequence: repair - ReferencePoint: Center + Position: Center Palette: player IsPlayerPalette: True @@ -829,14 +829,13 @@ WithBuildingRepairDecoration: Image: allyrepair Sequence: repair - ReferencePoint: Center + Position: Center Palette: player IsPlayerPalette: True ^CivField: Inherits: ^CivBuilding -Selectable: - -SelectionDecorations: Interactable: Tooltip: GenericName: Field @@ -1161,25 +1160,37 @@ RequiresCondition: lowpower Palette: 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 diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 704cbfc2c9..08bf57d5bf 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -179,7 +179,7 @@ E6: Health: HP: 3000 Passenger: - PipType: Yellow + CustomPipType: yellow EngineerRepair: RepairsBridges: CaptureManager: @@ -218,7 +218,7 @@ RMBO: Health: HP: 15000 Passenger: - PipType: Red + CustomPipType: red Voice: Move RevealsShroud: Range: 6c0 @@ -277,7 +277,6 @@ TREX: Selectable: Bounds: 48,36,2,1 DecorationBounds: 52,38 - SelectionDecorations: Buildable: Description: Bipedal carnivore with a massive skull @@ -287,7 +286,6 @@ TRIC: Name: Triceratops Armament: Weapon: horn - SelectionDecorations: Buildable: Description: Quadruped with large bony frill and three horns Selectable: diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index c8caa8244b..cb3aafaee8 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -35,7 +35,6 @@ BOAT: AutoTarget: AllowMovement: false RejectsOrders: - SelectionDecorations: GrantConditionOnDamageState@HEAVY: Condition: heavy-damage ValidDamageStates: Heavy @@ -51,6 +50,7 @@ BOAT: LST: Inherits: ^Ship + Inherits@TRANSPORT: ^Transport Valued: Cost: 300 Tooltip: @@ -81,6 +81,5 @@ LST: Cargo: Types: Infantry, Vehicle MaxWeight: 5 - PipCount: 5 PassengerFacing: 0 LoadingCondition: notmobile diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 7d585959e6..0139432961 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -200,6 +200,7 @@ NUK2: PROC: Inherits: ^BaseBuilding + Inherits@RESOURCES: ^StoresResources HitShape: Type: Rectangle TopLeft: -1536, -512 @@ -233,8 +234,6 @@ PROC: DragLength: 12 TickRate: 15 StoresResources: - PipColor: Green - PipCount: 10 Capacity: 1000 Selectable: Bounds: 72,56 @@ -251,11 +250,11 @@ PROC: Power: Amount: -40 ProvidesPrerequisite@buildingname: - SelectionDecorations: SILO: Inherits: ^BaseBuilding Inherits@shape: ^2x1Shape + Inherits@RESOURCES: ^StoresResources Valued: Cost: 100 Tooltip: @@ -279,15 +278,12 @@ SILO: WithResourceLevelSpriteBody: Sequence: stages StoresResources: - PipCount: 10 - PipColor: Green Capacity: 3000 -SpawnActorsOnSell: Power: Amount: -10 MustBeDestroyed: RequiredForShortGame: false - SelectionDecorations: -AcceptsDeliveredCash: Selectable: Bounds: 48,24 @@ -402,7 +398,6 @@ HAND: Selectable: Bounds: 48,48 DecorationBounds: 48,68,0,-10 - SelectionDecorations: AFLD: Inherits: ^BaseBuilding @@ -487,7 +482,6 @@ WEAP: Selectable: Bounds: 72,48 DecorationBounds: 72,64,0,-16 - SelectionDecorations: Health: HP: 110000 RevealsShroud: @@ -618,7 +612,6 @@ HQ: Selectable: Bounds: 48,40,0,9 DecorationBounds: 48,53,0,-4 - SelectionDecorations: WithSpriteBody: PauseOnCondition: lowpower Health: @@ -682,7 +675,6 @@ FIX: Selectable: Bounds: 64,34,0,3 DecorationBounds: 72,48 - SelectionDecorations: Health: HP: 80000 RevealsShroud: @@ -728,7 +720,6 @@ EYE: Selectable: Bounds: 48,40,0,9 DecorationBounds: 48,53,0,-4 - SelectionDecorations: WithSpriteBody: PauseOnCondition: lowpower Health: @@ -788,7 +779,6 @@ TMPL: Selectable: Bounds: 72,48 DecorationBounds: 72,68,0,-12 - SelectionDecorations: Health: HP: 210000 RevealsShroud: @@ -950,7 +940,6 @@ OBLI: Selectable: Bounds: 24,24 DecorationBounds: 22,44,0,-10 - SelectionDecorations: Health: HP: 75000 Armor: @@ -1038,7 +1027,6 @@ ATWR: Selectable: Bounds: 24,24 DecorationBounds: 22,48,0,-12 - SelectionDecorations: Health: HP: 55000 Armor: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index e922dc7269..201909b1bb 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -38,7 +38,6 @@ MCV: Actor: MCV.Husk OwnerType: InternalName EffectiveOwnerFromOwner: true - SelectionDecorations: HARV: Inherits: ^Tank @@ -60,7 +59,6 @@ HARV: DecorationBounds: 36,36 Harvester: Resources: Tiberium, BlueTiberium - PipCount: 7 Capacity: 20 BaleLoadDelay: 12 BaleUnloadDelay: 6 @@ -86,13 +84,21 @@ HARV: Explodes: RequiresCondition: !no-tiberium Weapon: TiberiumExplosion - SelectionDecorations: + WithHarvesterPipsDecoration: + Position: BottomLeft + Margin: 4, 3 + RequiresSelection: true + PipCount: 7 + ResourceSequences: + Tiberium: pip-green + BlueTiberium: pip-blue APC: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience Inherits@CLOAK: ^AcceptsCloakCrate Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove + Inherits@TRANSPORT: ^Transport Valued: Cost: 600 Tooltip: @@ -139,7 +145,6 @@ APC: Cargo: Types: Infantry MaxWeight: 5 - PipCount: 5 LoadingCondition: notmobile SpawnActorOnDeath: Actor: APC.Husk @@ -441,7 +446,6 @@ MTNK: Actor: MTNK.Husk OwnerType: InternalName EffectiveOwnerFromOwner: true - SelectionDecorations: Selectable: DecorationBounds: 28,28 @@ -500,7 +504,6 @@ HTNK: Actor: HTNK.Husk OwnerType: InternalName EffectiveOwnerFromOwner: true - SelectionDecorations: Selectable: DecorationBounds: 34,34,0,-3 @@ -588,7 +591,6 @@ MLRS: LocalOffset: 0,-171,0, 0,171,0 AmmoPool: Ammo: 2 - PipCount: 0 AmmoCondition: ammo AttackTurreted: WithSpriteTurret: diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index 2777d62d1f..9dd9990b71 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -140,7 +140,6 @@ ResourceType@green-tib: Type: Tiberium Name: Tiberium - PipColor: Green ResourceType: 1 Palette: staticterrain TerrainType: Tiberium @@ -152,7 +151,6 @@ ResourceType@blue-tib: Type: BlueTiberium Name: Tiberium - PipColor: Blue ResourceType: 2 Palette: bluetiberium TerrainType: BlueTiberium