From e30ede3971bd7043e5093c769e2ce38e4e1a7f82 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 5 Jun 2015 23:47:16 +0200 Subject: [PATCH] Change Bounds/add VisualBounds in TS mod --- mods/ts/rules/aircraft.yaml | 9 +++++++ mods/ts/rules/civilian-structures.yaml | 11 +++++++-- mods/ts/rules/defaults.yaml | 6 +++-- mods/ts/rules/gdi-structures.yaml | 29 +++++++++++++++++----- mods/ts/rules/gdi-support.yaml | 4 +++- mods/ts/rules/gdi-vehicles.yaml | 4 ++++ mods/ts/rules/nod-infantry.yaml | 4 ++++ mods/ts/rules/nod-structures.yaml | 33 +++++++++++++++++++------- mods/ts/rules/nod-support.yaml | 15 +++++++++--- mods/ts/rules/shared-structures.yaml | 10 ++++++-- mods/ts/rules/shared-support.yaml | 3 +++ mods/ts/rules/shared-vehicles.yaml | 4 ++++ 12 files changed, 108 insertions(+), 24 deletions(-) diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 72fefc42cf..cdf343eb56 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -95,6 +95,8 @@ ORCA: RenderVoxels: WithVoxelBody: Hovers: + SelectionDecorations: + VisualBounds: 30,24 ORCAB: Inherits: ^Plane @@ -136,6 +138,8 @@ ORCAB: RenderVoxels: WithVoxelBody: Hovers: + SelectionDecorations: + VisualBounds: 30,24 ORCATRAN: Inherits: ^Helicopter @@ -230,6 +234,8 @@ SCRIN: RenderSprites: RenderVoxels: WithVoxelBody: + SelectionDecorations: + VisualBounds: 30,24 APACHE: Inherits: ^Helicopter @@ -270,3 +276,6 @@ APACHE: RenderVoxels: WithVoxelBody: Hovers: + SelectionDecorations: + VisualBounds: 30,24 + diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index c306a6c81d..a844475741 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -1302,7 +1302,7 @@ GASPOT: Footprint: x Dimensions: 1, 1 Selectable: - Bounds: 48, 82, 0, -25 + Bounds: 48, 30, 0, -4 Power: Amount: -10 Armor: @@ -1313,6 +1313,8 @@ GASPOT: Range: 6c0 WithIdleOverlay@LIGHTS: Sequence: idle-lights + SelectionDecorations: + VisualBounds: 48, 82, 0, -25 GALITE: Inherits: ^Building @@ -1336,10 +1338,12 @@ GALITE: Sequence: lighting Palette: alpha Selectable: - Bounds: 25, 35, 0, -12 + Bounds: 24, 24, 0, -4 Buildable: Queue: Defense Prerequisites: ~disabled + SelectionDecorations: + VisualBounds: 25, 35, 0, -12 GAICBM: Inherits: ^Building @@ -1410,3 +1414,6 @@ UFO: Type: Heavy EditorTilesetFilter: RequireTilesets: TEMPERAT + SelectionDecorations: + VisualBounds: 144, 72, 0, 0 + diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 95c5d57726..44e446f955 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -139,6 +139,8 @@ Selectable: Selectable: false Bounds: 25,25,-1,-1 + SelectionDecorations: + VisualBounds: 25,25,-1,-1 ^Wall: AppearsOnRadar: @@ -213,6 +215,7 @@ BlueTiberium: 80 SelectionDecorations: Palette: pips + VisualBounds: 14,23,-1,-9 Selectable: Bounds: 14,23,-1,-9 Voiced: @@ -279,8 +282,6 @@ ^CivilianInfantry: Inherits: ^Infantry - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Civilian Valued: @@ -502,6 +503,7 @@ BlueTiberium: 100 SelectionDecorations: Palette: pips + VisualBounds: 26,26,0,-3 Selectable: Bounds: 26,26,0,-3 TargetableUnit: diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml index 2afaf69112..63921bffac 100644 --- a/mods/ts/rules/gdi-structures.yaml +++ b/mods/ts/rules/gdi-structures.yaml @@ -25,7 +25,7 @@ GAPOWR: WithIdleOverlay@PLUG: Sequence: idle-plug Selectable: - Bounds: 90, 84, 0, -12 + Bounds: 90, 48, 0, -6 Power: Amount: 100 InfiltrateForPowerOutage: @@ -59,6 +59,8 @@ GAPOWR: UpgradeMinEnabledLevel: 1 Amount: 50 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 90, 84, 0, -12 GAPILE: Inherits: ^Building @@ -77,7 +79,7 @@ GAPILE: Footprint: xx xx Dimensions: 2,2 Selectable: - Bounds: 88, 56, 0, -8 + Bounds: 88, 48, 0, -8 Health: HP: 800 Armor: @@ -102,6 +104,8 @@ GAPILE: Power: Amount: -20 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 88, 56, 0, -8 GAWEAP: Inherits: ^Building @@ -120,7 +124,7 @@ GAWEAP: Footprint: xxx= xxx= xxx= Dimensions: 4,3 Selectable: - Bounds: 154, 100, -2, -12 + Bounds: 154, 96, -2, -12 Health: HP: 1000 RevealsShroud: @@ -149,6 +153,8 @@ GAWEAP: Power: Amount: -30 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 154, 100, -2, -12 GAHPAD: Inherits: ^Building @@ -189,6 +195,8 @@ GAHPAD: Selectable: Bounds: 88, 66, 0, -5 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 88, 66, 0, -5 GADEPT: Inherits: ^Building @@ -205,7 +213,7 @@ GADEPT: Footprint: =x= xxx =x= Dimensions: 3,3 Selectable: - Bounds: 98, 68, -6, -6 + Bounds: 96, 64, -6, -6 Health: HP: 1100 RevealsShroud: @@ -229,6 +237,8 @@ GADEPT: Power: Amount: -30 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 98, 68, -6, -6 GARADR: Inherits: ^Building @@ -247,7 +257,7 @@ GARADR: Footprint: xx xx Dimensions: 2,2 Selectable: - Bounds: 96, 118, 0, -38 + Bounds: 96, 48, 0, -6 Health: HP: 800 Armor: @@ -270,6 +280,8 @@ GARADR: Power: Amount: -50 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 96, 118, 0, -38 GATECH: Inherits: ^Building @@ -300,6 +312,8 @@ GATECH: Power: Amount: -150 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 110, 60, 3, -4 GAPLUG: Inherits: ^Building @@ -309,7 +323,7 @@ GAPLUG: Name: GDI Upgrade Center Description: Can be upgraded for additional technology. Selectable: - Bounds: 115,104,0,-24 + Bounds: 115,72,0,-12 Buildable: BuildPaletteOrder: 100 Prerequisites: proc, gatech @@ -373,3 +387,6 @@ GAPLUG: UpgradeMinEnabledLevel: 1 Sequence: idle-ioncannonb ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 115,104,0,-24 + diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index 5a84ac6bfa..825ce60465 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -36,7 +36,7 @@ GACTWR: Prerequisites: gapile, ~structures.gdi Building: Selectable: - Bounds: 48, 48, 0, -12 + Bounds: 48, 36, 0, -6 DisabledOverlay: -GivesBuildableArea: Health: @@ -128,6 +128,8 @@ GACTWR: tower.rocket: tower, tower.rocket tower.sam: tower, tower.sam ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 48, 48, 0, -12 GAVULC: Inherits: ^BuildingPlug diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index c3cc680dfd..eaef2bfeed 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -115,6 +115,8 @@ SMECH: MoveSequence: run Selectable: Bounds: 20, 32, 0, -8 + SelectionDecorations: + VisualBounds: 20, 32, 0, -8 MMCH: Inherits: ^Tank @@ -154,6 +156,8 @@ MMCH: AutoTarget: Selectable: Bounds: 30, 42, 0, -8 + SelectionDecorations: + VisualBounds: 30, 42, 0, -8 HMEC: Inherits: ^Tank diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index a536817863..873ec14e7d 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -56,6 +56,8 @@ CYBORG: WithInfantryBody: IdleSequences: idle1,idle2 WithPermanentInjury: + SelectionDecorations: + VisualBounds: 16,31,0,-10 CYC2: Inherits: ^Infantry @@ -92,6 +94,8 @@ CYC2: WithInfantryBody: IdleSequences: idle1,idle2 WithPermanentInjury: + SelectionDecorations: + VisualBounds: 16,32,-1,-12 MHIJACK: Inherits: ^Infantry diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml index b53dcc6f76..dcbfd3ca11 100644 --- a/mods/ts/rules/nod-structures.yaml +++ b/mods/ts/rules/nod-structures.yaml @@ -15,7 +15,7 @@ NAPOWR: Footprint: xx xx Dimensions: 2,2 Selectable: - Bounds: 88, 80, 2, -12 + Bounds: 88, 48, 2, -6 Health: HP: 750 Armor: @@ -32,6 +32,8 @@ NAPOWR: TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate ScalePowerWithHealth: DisabledOverlay: + SelectionDecorations: + VisualBounds: 88, 80, 2, -12 NAAPWR: Inherits: ^Building @@ -50,7 +52,7 @@ NAAPWR: Footprint: xxx xxx Dimensions: 2,3 Selectable: - Bounds: 100, 74, 0, -12 + Bounds: 100, 54, 0, -4 Health: HP: 900 Armor: @@ -67,6 +69,8 @@ NAAPWR: TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate ScalePowerWithHealth: DisabledOverlay: + SelectionDecorations: + VisualBounds: 100, 74, 0, -12 NAHAND: Inherits: ^Building @@ -85,7 +89,7 @@ NAHAND: Footprint: xxx xxx Dimensions: 3,2 Selectable: - Bounds: 116, 78, 3, -8 + Bounds: 116, 60, 3, -6 Health: HP: 800 Armor: @@ -108,6 +112,8 @@ NAHAND: Power: Amount: -20 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 116, 78, 3, -8 NAWEAP: Inherits: ^Building @@ -126,7 +132,7 @@ NAWEAP: Footprint: xxx= xxx= xxx= Dimensions: 4,3 Selectable: - Bounds: 149, 116, -3, -20 + Bounds: 149, 80, -3, -10 Health: HP: 1000 RevealsShroud: @@ -151,6 +157,8 @@ NAWEAP: Power: Amount: -30 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 149, 116, -3, -20 NAHPAD: Inherits: ^Building @@ -189,8 +197,10 @@ NAHPAD: Power: Amount: -10 Selectable: - Bounds: 78, 54, 0, -8 + Bounds: 78, 48, 0, -6 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 78, 54, 0, -8 NARADR: Inherits: ^Building @@ -209,7 +219,7 @@ NARADR: Footprint: xx xx Dimensions: 2,2 Selectable: - Bounds: 96, 82, 0, -17 + Bounds: 96, 48, 0, -6 Health: HP: 800 Armor: @@ -232,6 +242,8 @@ NARADR: Power: Amount: -50 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 96, 72, 0, -12 NATECH: Inherits: ^Building @@ -250,7 +262,7 @@ NATECH: Footprint: xx xx Dimensions: 2,2 Selectable: - Bounds: 86, 58, 0, -4 + Bounds: 86, 48, 0, -4 Health: HP: 500 Armor: @@ -262,6 +274,8 @@ NATECH: Power: Amount: -150 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 86, 58, 0, -4 NASTLH: Inherits: ^Building @@ -301,4 +315,7 @@ NASTLH: DisableSound: cloak5.aud AffectsParent: true Selectable: - Bounds: 106, 60, 8, -15 + Bounds: 106, 48, 8, -6 + SelectionDecorations: + VisualBounds: 106, 60, 8, -15 + diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index 3d699dc15f..bbed7dd7af 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -36,7 +36,7 @@ NALASR: BuildPaletteOrder: 50 Building: Selectable: - Bounds: 40, 36, -8, -8 + Bounds: 40, 30, -8, -6 RequiresPower: DisabledOverlay: -GivesBuildableArea: @@ -62,6 +62,8 @@ NALASR: AutoTarget: Power: Amount: -40 + SelectionDecorations: + VisualBounds: 40, 36, -8, -8 NAOBEL: Inherits: ^Building @@ -78,7 +80,7 @@ NAOBEL: Footprint: xx xx Dimensions: 2,2 Selectable: - Bounds: 88, 74, 0, -14 + Bounds: 88, 42, 0, -6 RequiresPower: DisabledOverlay: -GivesBuildableArea: @@ -108,6 +110,8 @@ NAOBEL: Sequence: idle-lights Power: Amount: -150 + SelectionDecorations: + VisualBounds: 88, 72, 0, -12 NASAM: Inherits: ^Building @@ -122,7 +126,7 @@ NASAM: BuildPaletteOrder: 60 Building: Selectable: - Bounds: 40, 36, -3, -8 + Bounds: 40, 30, -3, -8 RequiresPower: DisabledOverlay: -GivesBuildableArea: @@ -150,6 +154,8 @@ NASAM: LocalOffset: 512,0,512 Power: Amount: -30 + SelectionDecorations: + VisualBounds: 40, 36, -3, -8 GATICK: Inherits: ^Building @@ -300,3 +306,6 @@ NAMISL: DisplayRadarPing: True BeaconPoster: CameraActor: camera + SelectionDecorations: + VisualBounds: 75,48 + diff --git a/mods/ts/rules/shared-structures.yaml b/mods/ts/rules/shared-structures.yaml index 4fd803e3d3..18f95a456a 100644 --- a/mods/ts/rules/shared-structures.yaml +++ b/mods/ts/rules/shared-structures.yaml @@ -42,13 +42,15 @@ GACNST: Power: Amount: 0 Selectable: - Bounds: 144, 80, 0, -12 + Bounds: 144, 60, 0, -6 ProvidesPrerequisite@gdi: Race: gdi Prerequisite: structures.gdi ProvidesPrerequisite@nod: Race: nod Prerequisite: structures.nod + SelectionDecorations: + VisualBounds: 144, 80, 0, -12 PROC: Inherits: ^Building @@ -65,7 +67,7 @@ PROC: Footprint: xxx= xx== xxx= Dimensions: 4,3 Selectable: - Bounds: 134, 122, 0, -18 + Bounds: 134, 96, 0, -12 Health: HP: 900 RevealsShroud: @@ -94,6 +96,8 @@ PROC: Power: Amount: -30 ProvidesPrerequisite@buildingname: + SelectionDecorations: + VisualBounds: 134, 122, 0, -18 GASILO: Inherits: ^Building @@ -129,6 +133,8 @@ GASILO: Capacity: 1500 Power: Amount: -10 + SelectionDecorations: + VisualBounds: 80, 48, -5, 0 ANYPOWER: Tooltip: diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index c6627222f6..f9d8f22241 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -62,3 +62,6 @@ NAPULS: Sequence: turret Power: Amount: -150 + SelectionDecorations: + VisualBounds: 78, 54, 0, -12 + diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index bdbc0b43a7..2e6be2ea30 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -33,6 +33,8 @@ MCV: RenderSprites: RenderVoxels: WithVoxelBody: + SelectionDecorations: + VisualBounds: 42,42 HARV: Inherits: ^Vehicle @@ -84,6 +86,8 @@ HARV: WithHarvestAnimation: Offset: 384,0,0 Palette: effect + SelectionDecorations: + VisualBounds: 36,36 LPST: Inherits: ^Vehicle