From 0ff22b8cbc72e8ebae6b0256ad53b1f069a20c2d Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 8 Apr 2015 00:21:32 +0200 Subject: [PATCH] Changed Bounds/added VisualBounds in RA mod --- mods/ra/rules/aircraft.yaml | 16 ++++++------ mods/ra/rules/civilian.yaml | 21 ++++++++-------- mods/ra/rules/defaults.yaml | 7 +++++- mods/ra/rules/infantry.yaml | 6 ++++- mods/ra/rules/ships.yaml | 16 +++++++++--- mods/ra/rules/structures.yaml | 28 ++++++++++++++++++++- mods/ra/rules/vehicles.yaml | 40 ++++++++++++++++-------------- mods/ra/sequences/decorations.yaml | 4 +++ 8 files changed, 95 insertions(+), 43 deletions(-) diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index d6c8daaeb3..56343c4a39 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -114,7 +114,9 @@ MIG: Ammo: 8 ReturnOnIdle: Selectable: - Bounds: 40,29,0,1 + Bounds: 36,28,0,2 + SelectionDecorations: + VisualBounds: 40,29,0,1 Contrail@1: Offset: -598,-683,0 Contrail@2: @@ -173,8 +175,8 @@ YAK: PipCount: 6 ReloadTicks: 11 ReturnOnIdle: - Selectable: - Bounds: 30,28,0,2 + SelectionDecorations: + VisualBounds: 30,28,0,2 WithMuzzleFlash: Contrail: Offset: -853,0,0 @@ -269,8 +271,8 @@ HELI: Offset: 0,0,85 AmmoPool: Ammo: 8 - Selectable: - Bounds: 36,28,0,0 + SelectionDecorations: + VisualBounds: 36,28,0,0 LeavesHusk: HuskActor: HELI.Husk SmokeTrailWhenDamaged: @@ -322,8 +324,8 @@ HIND: Ammo: 24 PipCount: 6 ReloadTicks: 8 - Selectable: - Bounds: 38,32,0,0 + SelectionDecorations: + VisualBounds: 38,32,0,0 WithMuzzleFlash: LeavesHusk: HuskActor: HIND.Husk diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index ac6688191c..1441215d72 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -3,7 +3,6 @@ C1: C2: Inherits: ^CivInfantry - Selectable: Voiced: VoiceSet: CivilianFemaleVoice @@ -12,7 +11,6 @@ C3: C4: Inherits: ^CivInfantry - Selectable: WithInfantryBody: RenderSprites: Image: C2 @@ -27,7 +25,6 @@ C5: C6: Inherits: ^CivInfantry - Selectable: WithInfantryBody: RenderSprites: Image: C2 @@ -42,7 +39,6 @@ C7: C8: Inherits: ^CivInfantry - Selectable: WithInfantryBody: RenderSprites: Image: C2 @@ -57,7 +53,6 @@ C9: C10: Inherits: ^CivInfantry - Selectable: WithInfantryBody: RenderSprites: Image: C2 @@ -639,22 +634,26 @@ LHUS: EditorTilesetFilter: RequireTilesets: TEMPERAT Selectable: - Bounds: 24,48 + Bounds: 24,24,0,16 + SelectionDecorations: + VisualBounds: 24,48 Tooltip: Name: Lighthouse Building: - Footprint: _ x - Dimensions: 1,2 + Footprint: x + Dimensions: 1,1 WINDMILL: Inherits: ^CivBuilding EditorTilesetFilter: RequireTilesets: TEMPERAT Selectable: - Bounds: 36,36 + Bounds: 24,24,0,8 + SelectionDecorations: + VisualBounds: 36,36 Tooltip: Name: Windmill Building: - Footprint: _ x - Dimensions: 1,2 + Footprint: x + Dimensions: 1,1 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index a647a3b5c9..07d2512a33 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -58,6 +58,7 @@ ROT: 5 SelectionDecorations: Selectable: + Bounds: 24, 24 TargetableUnit: TargetTypes: Ground, Repair, Vehicle Repairable: @@ -112,6 +113,7 @@ ROT: 5 SelectionDecorations: Selectable: + Bounds: 24, 24 TargetableUnit: TargetTypes: Ground, C4, Repair, Tank Repairable: @@ -179,8 +181,9 @@ Gems: 80 Beach: 80 SelectionDecorations: + VisualBounds: 12,18,0,-8 Selectable: - Bounds: 12,18,0,-6 + Bounds: 12,18,0,-8 TargetableUnit: TargetTypes: Ground, Infantry, Disguise TakeCover: @@ -257,6 +260,7 @@ Water: 100 SelectionDecorations: Selectable: + Bounds: 24,24 TargetableUnit: TargetTypes: Ground, Water, Repair HiddenUnderFog: @@ -289,6 +293,7 @@ UseLocation: true SelectionDecorations: Selectable: + Bounds: 24,24 TargetableAircraft: TargetTypes: Air GroundedTargetTypes: Ground, Repair diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 962033e668..ed6e532d14 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -13,6 +13,8 @@ DOG: GenericName: Dog Selectable: Bounds: 12,17,-1,-4 + SelectionDecorations: + VisualBounds: 12,17,-1,-4 Health: HP: 12 Mobile: @@ -561,7 +563,9 @@ Ant: BuildPaletteOrder: 1954 Prerequisites: ~bio Selectable: - Bounds: 30,30,0,-2 + Bounds: 24,24,0,-5 + SelectionDecorations: + VisualBounds: 30,30,0,-2 Health: HP: 750 Radius: 469 diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index a443786328..8386cc1bb4 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -35,8 +35,8 @@ SS: LocalOffset: 0,-171,0, 0,171,0 FireDelay: 2 AttackFrontal: - Selectable: - Bounds: 38,38 + SelectionDecorations: + VisualBounds: 38,38 Chronoshiftable: RepairableNear: AutoTarget: @@ -89,8 +89,8 @@ MSUB: LocalOffset: 0,-171,0, 0,171,0 FireDelay: 2 AttackFrontal: - Selectable: - Bounds: 44,44 + SelectionDecorations: + VisualBounds: 44,44 Chronoshiftable: RepairableNear: AutoTarget: @@ -145,6 +145,8 @@ DD: AttackTurreted: Selectable: Bounds: 38,38 + SelectionDecorations: + VisualBounds: 38,38 WithFacingSpriteBody: WithTurret: AutoTarget: @@ -208,6 +210,8 @@ CA: WithMuzzleFlash: Selectable: Bounds: 44,44 + SelectionDecorations: + VisualBounds: 44,44 WithFacingSpriteBody: WithTurret@PRIMARY: Turret: primary @@ -242,6 +246,8 @@ LST: Speed: 113 RevealsShroud: Range: 6c0 + SelectionDecorations: + VisualBounds: 36,36 RenderLandingCraft: OpenTerrainTypes: Clear, Rough, Road, Ore, Gems, Beach Cargo: @@ -290,6 +296,8 @@ PT: WithMuzzleFlash: Selectable: Bounds: 32,32 + SelectionDecorations: + VisualBounds: 32,32 WithFacingSpriteBody: WithTurret: AutoTarget: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index fc704d339e..606b70fad4 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -61,6 +61,10 @@ GAP: Building: Footprint: _ x Dimensions: 1,2 + Selectable: + Bounds: 24,28,0,12 + SelectionDecorations: + VisualBounds: 24,40,0,0 RequiresPower: CanPowerDown: DisabledOverlay: @@ -269,7 +273,9 @@ IRON: CanPowerDown: DisabledOverlay: Selectable: - Bounds: 50,50,0,-12 + Bounds: 48,28,0,2 + SelectionDecorations: + VisualBounds: 50,50,0,-12 Health: HP: 1000 Armor: @@ -380,6 +386,10 @@ TSLA: Footprint: _ x Dimensions: 1,2 RequiresPower: + Selectable: + Bounds: 24,24,0,16 + SelectionDecorations: + VisualBounds: 24,36,0,4 CanPowerDown: DisabledOverlay: -GivesBuildableArea: @@ -424,6 +434,10 @@ AGUN: Building: Footprint: _ x Dimensions: 1,2 + Selectable: + Bounds: 24,28,0,16 + SelectionDecorations: + VisualBounds: 24,36,0,12 RequiresPower: CanPowerDown: DisabledOverlay: @@ -929,6 +943,10 @@ PROC: Building: Footprint: _x_ xxx x== Dimensions: 3,3 + Selectable: + Bounds: 72,50,0,12 + SelectionDecorations: + VisualBounds: 72,70,0,-2 TargetableBuilding: TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate Health: @@ -1220,6 +1238,10 @@ APWR: Building: Footprint: ___ xxx xxx Dimensions: 3,3 + Selectable: + Bounds: 72,48,0,12 + SelectionDecorations: + VisualBounds: 72,64,0,-2 Health: HP: 700 Armor: @@ -1447,6 +1469,10 @@ FIX: Building: Footprint: _x_ xxx _x_ Dimensions: 3,3 + Selectable: + Bounds: 68,34,0,3 + SelectionDecorations: + VisualBounds: 72,48 Health: HP: 800 Armor: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 81917d5c0b..b6f342a3f1 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -20,6 +20,8 @@ V2RL: Armament: Weapon: SCUD AttackFrontal: + SelectionDecorations: + VisualBounds: 28,28 RenderSprites: AutoTarget: Explodes: @@ -111,10 +113,10 @@ V2RL: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: 2TNK.Husk - Selectable: - Bounds: 30,30 AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 28,28 3TNK: Inherits: ^Tank @@ -154,10 +156,10 @@ V2RL: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: 3TNK.Husk - Selectable: - Bounds: 30,30 AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 28,28 4TNK: Inherits: ^Tank @@ -211,10 +213,10 @@ V2RL: Ticks: 3 HealIfBelow: 50% DamageCooldown: 150 - Selectable: - Bounds: 44,38,0,-4 AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 44,38,0,-4 ARTY: Inherits: ^Tank @@ -265,7 +267,8 @@ HARV: Description: Collects Ore and Gems for processing.\n Unarmed Selectable: Priority: 7 - Bounds: 42,42 + SelectionDecorations: + VisualBounds: 42,42 Harvester: Capacity: 20 Resources: Ore,Gems @@ -309,7 +312,8 @@ MCV: Description: Deploys into another Construction Yard.\n Unarmed Selectable: Priority: 4 - Bounds: 42,42 + SelectionDecorations: + VisualBounds: 42,42 Health: HP: 600 Armor: @@ -618,8 +622,8 @@ TTNK: WithFacingSpriteBody: WithIdleOverlay@SPINNER: Sequence: spinner - Selectable: - Bounds: 28,28,0,0 + SelectionDecorations: + VisualBounds: 30,30 AutoTarget: Explodes: Weapon: UnitExplodeSmall @@ -663,10 +667,10 @@ FTRK: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall - Selectable: - Bounds: 28,28,0,0 AutoSelectionSize: RenderSprites: + SelectionDecorations: + VisualBounds: 28,28 DTRK: Inherits: ^Vehicle @@ -712,8 +716,8 @@ CTNK: Tooltip: Name: Chrono Tank Description: Chrono Tank, teleports to areas within range.\n Strong vs Vehicles, Buildings\n Weak vs Infantry, Aircraft\n Special ability: Can teleport - Selectable: - Bounds: 28,28 + SelectionDecorations: + VisualBounds: 30,30 Health: HP: 400 Armor: @@ -761,9 +765,9 @@ QTNK: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 - Selectable: - Bounds: 44,38,0,-4 WithFacingSpriteBody: + SelectionDecorations: + VisualBounds: 44,38,0,-4 Explodes: Weapon: UnitExplodeSmall MadTank: @@ -784,8 +788,8 @@ STNK: Tooltip: Name: Phase Transport Description: Lightly armored infantry transport\nwhich can cloak. Can detect cloaked units.\n Strong vs Light armor\n Weak vs Infantry, Tanks, Aircraft - Selectable: - Bounds: 28,28 + SelectionDecorations: + VisualBounds: 26,26 Health: HP: 300 Armor: diff --git a/mods/ra/sequences/decorations.yaml b/mods/ra/sequences/decorations.yaml index 63f7701fb2..a7b67df73b 100644 --- a/mods/ra/sequences/decorations.yaml +++ b/mods/ra/sequences/decorations.yaml @@ -806,6 +806,8 @@ snowhut: Tick: 120 lhus: + Defaults: + Offset: 0,-16 idle: Length: 16 Tick: 180 @@ -815,6 +817,8 @@ lhus: Length: 8 windmill: + Defaults: + Offset: 0,-16 idle: Length: 8 Tick: 80