diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 2e346a3fc7..6cbdb96c33 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -9,8 +9,6 @@ TRAN: BuildPaletteOrder: 10 Prerequisites: hpad Queue: Aircraft.GDI, Aircraft.Nod - Selectable: - Bounds: 41,41 Helicopter: LandWhenIdle: true ROT: 5 @@ -42,6 +40,8 @@ TRAN: EmptyWeapon: HeliExplode AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 41,41 HELI: Inherits: ^Helicopter @@ -54,8 +54,6 @@ HELI: BuildPaletteOrder: 20 Prerequisites: hpad, anyhq, ~techlevel.medium Queue: Aircraft.Nod - Selectable: - Bounds: 30,24 Helicopter: RearmBuildings: hpad ROT: 4 @@ -95,6 +93,8 @@ HELI: EmptyWeapon: HeliExplode AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 30,24 ORCA: Inherits: ^Helicopter @@ -107,8 +107,6 @@ ORCA: BuildPaletteOrder: 20 Prerequisites: hpad, anyhq, ~techlevel.medium Queue: Aircraft.GDI - Selectable: - Bounds: 30,24 Helicopter: RearmBuildings: hpad ROT: 4 @@ -144,6 +142,8 @@ ORCA: AutoSelectionSize: WithMoveAnimation: MoveSequence: move + SelectionDecorations: + VisualBounds: 30,24 C17: ParaDrop: diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 0ed6a8ffd4..f08639e6c3 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -438,7 +438,10 @@ VICE: Tiberium: 100 BlueTiberium: 100 Beach: 60 + SelectionDecorations: + VisualBounds: 24,24 Selectable: + Bounds: 24,24 TargetableUnit: TargetTypes: Ground AutoTarget: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 0b459c094d..42adf35550 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -33,7 +33,9 @@ Beach: 50 ROT: 5 SelectionDecorations: + VisualBounds: 24,24 Selectable: + Bounds: 24,24 TargetableUnit: TargetTypes: Ground, Vehicle Repairable: @@ -80,7 +82,9 @@ Beach: 70 ROT: 5 SelectionDecorations: + VisualBounds: 24,24 Selectable: + Bounds: 24,24 TargetableUnit: TargetTypes: Ground, Vehicle Repairable: @@ -124,7 +128,9 @@ TargetTypes: Air GroundedTargetTypes: Ground SelectionDecorations: + VisualBounds: 24,24 Selectable: + Bounds: 24,24 Helicopter: RepairBuildings: hpad RearmBuildings: @@ -177,6 +183,7 @@ PathingCost: 300 Beach: 80 SelectionDecorations: + VisualBounds: 12,17,0,-6 Selectable: Bounds: 12,17,0,-6 TargetableUnit: @@ -248,7 +255,6 @@ -AutoTarget: -TakeCover: AppearsOnRadar: - SelectionDecorations: Valued: Cost: 70 Tooltip: @@ -298,7 +304,10 @@ Tiberium: 70 BlueTiberium: 70 Beach: 80 + SelectionDecorations: + VisualBounds: 24,24 Selectable: + Bounds: 24,24 TargetableUnit: TargetTypes: Ground, Infantry HiddenUnderFog: @@ -328,7 +337,9 @@ AppearsOnRadar: UseLocation: yes SelectionDecorations: + VisualBounds: 24,24 Selectable: + Bounds: 24,24 TargetableUnit: TargetTypes: Air HiddenUnderFog: @@ -664,4 +675,6 @@ Selectable: Selectable: false Bounds: 15,15,-1,-1 + SelectionDecorations: + VisualBounds: 15,15,-1,-1 diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 88f5852d0a..95e1c43bd5 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -225,8 +225,6 @@ STEG: WithDeathAnimation: DeathSequencePalette: terrain DeathPaletteIsPlayerPalette: false - Selectable: - Bounds: 24,20,0,4 TREX: Inherits: ^DINO @@ -236,7 +234,9 @@ TREX: Armament: Weapon: teeth Selectable: - Bounds: 52,38 + Bounds: 48,36,2,1 + SelectionDecorations: + VisualBounds: 52,38 TRIC: Inherits: ^DINO @@ -245,8 +245,8 @@ TRIC: Description: Quadruped with large bony frill and three horns Armament: Weapon: horn - Selectable: - Bounds: 34,24,0,2 + SelectionDecorations: + VisualBounds: 34,24,0,2 RAPT: Inherits: ^DINO @@ -255,6 +255,4 @@ RAPT: Description: Bipedal with enlarged sickle-shaped claw on each hindfoot Armament: Weapon: claw - Selectable: - Bounds: 20,20 diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 0cf681618b..bb26dd8d6e 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -29,6 +29,8 @@ BOAT: AllowMovement: false WithSmoke: RejectsOrders: + SelectionDecorations: + VisualBounds: 42,24 LST: Inherits: ^Ship diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 976285795f..28bcee7632 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -167,7 +167,7 @@ PROC: DockAngle: 112 DockOffset: 0,2 IsDragRequired: True - DragOffset: -640,341,0 + DragOffset: -554,512,0 DragLength: 12 TickRate: 15 StoresResources: @@ -175,7 +175,7 @@ PROC: PipCount: 10 Capacity: 2000 Selectable: - Bounds: 73,72 + Bounds: 72,56,0,12 CustomSellValue: Value: 500 FreeActor: @@ -187,6 +187,8 @@ PROC: Power: Amount: -50 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 73,72 SILO: Inherits: ^BaseBuilding @@ -214,14 +216,14 @@ SILO: PipCount: 10 PipColor: Green Capacity: 2000 - Selectable: - Bounds: 49,30 -RenderBuilding: -EmitInfantryOnSell: Power: Amount: -10 MustBeDestroyed: RequiredForShortGame: false + SelectionDecorations: + VisualBounds: 49,30 PYLE: Inherits: ^BaseBuilding @@ -301,6 +303,8 @@ HAND: Power: Amount: -20 ProvidesPrerequisite@buildingname: + Selectable: + Bounds: 48,48,0,10 AFLD: Inherits: ^BaseBuilding @@ -361,6 +365,8 @@ WEAP: Building: Footprint: ___ xxx === Dimensions: 3,3 + Selectable: + Bounds: 72,48,0,12 Health: HP: 1000 RevealsShroud: @@ -449,6 +455,8 @@ HQ: Building: Footprint: x_ xx Dimensions: 2,2 + Selectable: + Bounds: 48,36,0,12 RequiresPower: CanPowerDown: DisabledOverlay: @@ -499,6 +507,10 @@ FIX: Building: Footprint: _x_ xxx _x_ Dimensions: 3,3 + Selectable: + Bounds: 64,34,0,3 + SelectionDecorations: + VisualBounds: 72,48 Health: HP: 400 RevealsShroud: @@ -529,6 +541,8 @@ EYE: Building: Footprint: x_ xx Dimensions: 2,2 + Selectable: + Bounds: 48,36,0,12 RequiresPower: CanPowerDown: DisabledOverlay: @@ -578,6 +592,8 @@ TMPL: Building: Footprint: ___ xxx xxx Dimensions: 3,3 + Selectable: + Bounds: 72,48,0,16 RequiresPower: CanPowerDown: DisabledOverlay: @@ -713,6 +729,8 @@ OBLI: Building: Footprint: _ x Dimensions: 1,2 + Selectable: + Bounds: 24,24,0,12 RequiresPower: DisabledOverlay: -GivesBuildableArea: @@ -802,6 +820,8 @@ ATWR: Building: Footprint: _ x Dimensions: 1,2 + Selectable: + Bounds: 24,24,0,12 RequiresPower: DisabledOverlay: -GivesBuildableArea: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 28375f9e83..c2fd3bfe38 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -39,6 +39,8 @@ MCV: EmptyWeapon: UnitExplodeSmall AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 36,36 HARV: Inherits: ^Tank @@ -55,7 +57,6 @@ HARV: InitialActivity: FindResources Selectable: Priority: 7 - Bounds: 36,36 Harvester: Resources: Tiberium, BlueTiberium PipCount: 7 @@ -78,6 +79,8 @@ HARV: RenderHarvester: Explodes: Weapon: TiberiumExplosion + SelectionDecorations: + VisualBounds: 36,36 APC: Inherits: ^Tank @@ -391,10 +394,10 @@ MTNK: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall - Selectable: - Bounds: 28,28 AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 28,28 HTNK: Inherits: ^Tank @@ -446,10 +449,10 @@ HTNK: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall - Selectable: - Bounds: 34,34,0,-3 AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 34,34,0,-3 MSAM: Inherits: ^Tank diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml index f49502ba1c..7aa23c2e56 100644 --- a/mods/cnc/sequences/structures.yaml +++ b/mods/cnc/sequences/structures.yaml @@ -49,23 +49,27 @@ proc: idle: Length: 6 Tick: 120 + Offset: 2,4 damaged-idle: Start: 30 Length: 6 Tick: 120 + Offset: 2,4 dead: Start: 60 Tick: 800 + Offset: 2,4 make: procmake Length: * Tick: 80 + Offset: 2,4 resources: proctwr Length: 6 - Offset: -32,-21 + Offset: -30,-17 damaged-resources: proctwr Start: 6 Length: 6 - Offset: -32,-21 + Offset: -30,-17 bib: bib2 UseTilesetExtension: true Length: *