From 6e2418d9405e55d8e4c67d421758981e3d671c95 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 4 Jun 2017 22:57:22 +0200 Subject: [PATCH] Add TS civilian hit-shapes --- mods/ts/rules/civilian-structures.yaml | 149 +++++++++++++++++++++---- mods/ts/rules/defaults.yaml | 1 + mods/ts/sequences/civilian.yaml | 6 +- 3 files changed, 132 insertions(+), 24 deletions(-) diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index bcd284333f..97851bad45 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -1,9 +1,10 @@ ABAN01: Inherits: ^CivBuilding + Inherits@SHAPE: ^2x6Shape Tooltip: Name: WS Logging Company Building: - Footprint: xx xx xx xx xx xx + Footprint: xx xx xx xx xx XX Dimensions: 2, 6 Armor: Type: wood @@ -18,10 +19,11 @@ ABAN01: ABAN02: Inherits: ^CivBuilding + Inherits@SHAPE: ^5x3Shape Tooltip: Name: Panullo Hacienda Building: - Footprint: xxxxx xxxxx xxxxx + Footprint: xxxxx xxxxx XXXxX Dimensions: 5, 3 Armor: Type: heavy @@ -36,10 +38,11 @@ ABAN02: ABAN03: Inherits: ^CivBuilding + Inherits@SHAPE: ^2x5Shape Tooltip: Name: Abandoned Factory Building: - Footprint: xx xx xx xx xx + Footprint: xx xx xx xx XX Dimensions: 2, 5 Armor: Type: wood @@ -54,10 +57,11 @@ ABAN03: ABAN04: Inherits: ^CivBuilding + Inherits@SHAPE: ^4x2Shape Tooltip: Name: City Hall Building: - Footprint: xxxx xxxx + Footprint: xxxX xxxX Dimensions: 4, 2 Armor: Type: heavy @@ -72,10 +76,15 @@ ABAN04: ABAN05: Inherits: ^CivBuilding + Inherits@SHAPE: ^3x2Shape + HitShape: + Type: Rectangle + TopLeft: -1536, -1024 + BottomRight: 768, 1024 Tooltip: Name: Hunting Lodge Building: - Footprint: xxx xxx + Footprint: xxX xxX Dimensions: 3, 2 Armor: Type: wood @@ -86,6 +95,7 @@ ABAN05: ABAN06: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Local Inn & Lodging Building: @@ -100,6 +110,7 @@ ABAN06: ABAN07: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Church Building: @@ -114,6 +125,7 @@ ABAN07: ABAN08: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Abandoned Warehouse Building: @@ -128,6 +140,7 @@ ABAN08: ABAN09: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Tall's Residence Building: @@ -142,6 +155,7 @@ ABAN09: ABAN10: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Denzil's Last Chance Motel Building: @@ -156,6 +170,7 @@ ABAN10: ABAN11: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Miele Manor Building: @@ -170,6 +185,7 @@ ABAN11: ABAN12: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Kettler's Place Building: @@ -226,10 +242,11 @@ ABAN15: ABAN16: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Gas Station Building: - Footprint: xx xx + Footprint: xx xX Dimensions: 2, 2 Armor: Type: wood @@ -307,6 +324,10 @@ BBOARD05: BBOARD06: Inherits: ^CivBillboard + Inherits@shape: ^1x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: -128,-192,0, 128,192,0 Tooltip: Name: Kaspm's Tiberium Warhouse Building: @@ -315,6 +336,10 @@ BBOARD06: BBOARD07: Inherits: ^CivBillboard + Inherits@shape: ^1x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: -128,-192,0, 128,192,0 Tooltip: Name: Alkaline's Battery Superstore Building: @@ -323,6 +348,10 @@ BBOARD07: BBOARD08: Inherits: ^CivBillboard + Inherits@shape: ^1x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: -128,-192,0, 128,192,0 Tooltip: Name: Alex-gators petshop just ahead! Building: @@ -356,6 +385,10 @@ BBOARD13: BBOARD14: Inherits: ^CivBillboard + Inherits@shape: ^2x1Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: -128,192,0, 128,-192,0 Tooltip: Name: Billy Bob's Harvester school Building: @@ -364,6 +397,10 @@ BBOARD14: BBOARD15: Inherits: ^CivBillboard + Inherits@shape: ^2x1Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: -128,192,0, 128,-192,0 Tooltip: Name: Pannullo's hacienda es bueno Building: @@ -372,6 +409,10 @@ BBOARD15: BBOARD16: Inherits: ^CivBillboard + Inherits@shape: ^2x1Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: -128,192,0, 128,-192,0 Tooltip: Name: Join GDI: We save lives. Building: @@ -380,10 +421,11 @@ BBOARD16: CA0001: Inherits: ^CivBuilding + Inherits@shape: ^3x3Shape Tooltip: Name: Rade's Roadhouse Building: - Footprint: xxx xxx xxx + Footprint: xxX xxX XXX Dimensions: 3, 3 Armor: Type: heavy @@ -396,10 +438,11 @@ CA0001: CA0002: Inherits: ^CivBuilding + Inherits@shape: ^3x3Shape Tooltip: Name: Sandberg and Son's Building: - Footprint: xxx xxx xxx + Footprint: xxX xxx Xxx Dimensions: 3, 3 Armor: Type: heavy @@ -412,6 +455,7 @@ CA0002: CA0003: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Temp Housing Building: @@ -424,10 +468,11 @@ CA0003: CA0004: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Waystation Building: - Footprint: xx xx + Footprint: xx xX Dimensions: 2, 2 Armor: Type: light @@ -436,6 +481,7 @@ CA0004: CA0005: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape Tooltip: Name: Ferbie's 4 Sale Building: @@ -448,6 +494,7 @@ CA0005: CA0006: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape Tooltip: Name: Deluxe Accomodations Building: @@ -460,6 +507,7 @@ CA0006: CA0007: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape Tooltip: Name: Field Generator Building: @@ -472,10 +520,11 @@ CA0007: CA0008: Inherits: ^CivBuilding + Inherits@shape: ^2x3Shape Tooltip: Name: Subterranean Dwelling Building: - Footprint: xx xx xx + Footprint: xX xX xx Dimensions: 2, 3 Armor: Type: heavy @@ -484,10 +533,11 @@ CA0008: CA0009: Inherits: ^CivBuilding + Inherits@shape: ^2x3Shape Tooltip: Name: Subterranean Dwelling Building: - Footprint: xx xx xx + Footprint: xX xx xX Dimensions: 2, 3 Armor: Type: heavy @@ -496,6 +546,7 @@ CA0009: CA0010: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Leary Traveller Inn Building: @@ -508,6 +559,7 @@ CA0010: CA0011: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape Tooltip: Name: Water Tank Building: @@ -520,6 +572,7 @@ CA0011: CA0012: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape Tooltip: Name: Greenhouse Building: @@ -532,6 +585,7 @@ CA0012: CA0013: Inherits: ^CivBuilding + Inherits@shape: ^2x1Shape Tooltip: Name: Water Purifier Building: @@ -592,6 +646,10 @@ CA0017: CA0018: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: 0,0,0, -512,-512,0 Tooltip: Name: Solar Panel Building: @@ -604,6 +662,10 @@ CA0018: CA0019: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: 0,0,0, -512,-512,0 Tooltip: Name: Solar Panel Building: @@ -616,6 +678,10 @@ CA0019: CA0020: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: 0,0,0, 512,512,0 Tooltip: Name: Solar Panel Building: @@ -628,6 +694,10 @@ CA0020: CA0021: Inherits: ^CivBuilding + Inherits@shape: ^1x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: 0,0,0, 512,512,0 Tooltip: Name: Solar Panel Building: @@ -640,6 +710,7 @@ CA0021: CAARAY: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Civilian Array Building: @@ -658,6 +729,7 @@ CAARAY: CAARMR: Inherits: ^CivBuilding + Inherits@shape: ^4x4Shape Tooltip: Name: Civilian Armory Building: @@ -696,10 +768,11 @@ CACRSH05: CAHOSP: Inherits: ^BasicBuilding + Inherits@shape: ^3x4Shape Tooltip: Name: Civilian Hospital Building: - Footprint: xxx xxx xxx xxx + Footprint: XxX xxx xxx xxx Dimensions: 3, 4 Armor: Type: concrete @@ -719,6 +792,7 @@ CAHOSP: CAPYR01: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Pyramid Building: @@ -733,6 +807,7 @@ CAPYR01: CAPYR02: Inherits: ^CivBuilding + Inherits@shape: ^4x4Shape Tooltip: Name: Pyramid Building: @@ -751,6 +826,7 @@ CAPYR02: CAPYR03: Inherits: ^CivBuilding + Inherits@shape: ^4x4Shape Tooltip: Name: Pyramid Building: @@ -769,10 +845,11 @@ CAPYR03: CITY01: Inherits: ^CivBuilding + Inherits@shape: ^4x2Shape Tooltip: Name: Connelly Court Apts. Building: - Footprint: xxxx xxxx + Footprint: xxxX XxxX Dimensions: 4, 2 Armor: Type: wood @@ -787,6 +864,7 @@ CITY01: CITY02: Inherits: ^CivBuilding + Inherits@shape: ^2x3Shape Tooltip: Name: Lightner's Luxury Suites Building: @@ -805,6 +883,7 @@ CITY02: CITY03: Inherits: ^CivBuilding + Inherits@shape: ^3x2Shape Tooltip: Name: Office Building Building: @@ -823,6 +902,7 @@ CITY03: CITY04: Inherits: ^CivBuilding + Inherits@shape: ^3x2Shape Tooltip: Name: Westwood Stock Exchange Building: @@ -841,6 +921,7 @@ CITY04: CITY05: Inherits: ^CivBuilding + Inherits@shape: ^3x2Shape Tooltip: Name: Daily Sun Times Building: @@ -859,10 +940,11 @@ CITY05: CITY06: Inherits: ^CivBuilding + Inherits@shape: ^4x2Shape Tooltip: Name: YEO-CA Cola Corp. Building: - Footprint: xxxx xxxx + Footprint: xxxx XxxX Dimensions: 4, 2 Armor: Type: concrete @@ -877,6 +959,7 @@ CITY06: CITY07: Inherits: ^CivBuilding + Inherits@shape: ^4x2Shape Tooltip: Name: Urban Housing Building: @@ -895,6 +978,7 @@ CITY07: CITY08: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Yee's Discount Liquor Building: @@ -909,6 +993,7 @@ CITY08: CITY09: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Abandoned Warehouse Building: @@ -923,6 +1008,7 @@ CITY09: CITY10: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Urban Storefront Building: @@ -937,6 +1023,7 @@ CITY10: CITY11: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Ambrose Lounge Building: @@ -951,10 +1038,11 @@ CITY11: CITY12: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Bostic Tower Building: - Footprint: xx xx + Footprint: xX xx Dimensions: 2, 2 Armor: Type: concrete @@ -965,10 +1053,11 @@ CITY12: CITY13: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Hewitt Hair Salon Building: - Footprint: xx xx + Footprint: xX Xx Dimensions: 2, 2 Armor: Type: wood @@ -993,10 +1082,11 @@ CITY14: CITY15: Inherits: ^CivBuilding + Inherits@shape: ^4x2Shape Tooltip: Name: 2nd National Bank Building: - Footprint: xxxx xxxx + Footprint: xxxX xxxX Dimensions: 4, 2 Armor: Type: heavy @@ -1011,6 +1101,7 @@ CITY15: CITY16: Inherits: ^CivBuilding + Inherits@shape: ^4x2Shape Tooltip: Name: Highrise Hotel Building: @@ -1029,10 +1120,11 @@ CITY16: CITY17: Inherits: ^CivBuilding + Inherits@shape: ^4x3Shape Tooltip: Name: The Projects Building: - Footprint: xxxx xxxx xxxx + Footprint: XxxX xxxx xxxX Dimensions: 4, 3 Armor: Type: wood @@ -1047,10 +1139,11 @@ CITY17: CITY18: Inherits: ^CivBuilding + Inherits@shape: ^3x5Shape Tooltip: Name: Archer Asylum Building: - Footprint: xxx xxx xxx xxx xxx + Footprint: xxx xxx xxx xxx xxX Dimensions: 3, 5 Armor: Type: concrete @@ -1065,10 +1158,11 @@ CITY18: CITY19: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Fill'er Up-Pump'N'Go Building: - Footprint: xx xx + Footprint: xx xX Dimensions: 2, 2 Armor: Type: wood @@ -1107,6 +1201,7 @@ CITY21: CITY22: Inherits: ^CivBuilding + Inherits@shape: ^2x2Shape Tooltip: Name: Church Building: @@ -1121,6 +1216,7 @@ CITY22: CTDAM: Inherits: ^CivBuilding + Inherits@shape: ^2x5Shape Tooltip: Name: Hydroelectric Dam Building: @@ -1148,6 +1244,7 @@ CTDAM: CTVEGA: Inherits: ^CivBuilding + Inherits@shape: ^4x4Shape Tooltip: Name: Vega's Pyramid Building: @@ -1166,10 +1263,13 @@ CTVEGA: GAKODK: Inherits: ^CivBuilding + Inherits@shape: ^4x2Shape + HitShape: + TargetableOffsets: 0,0,0, -512,512,0, -950,1024,0 Tooltip: Name: GDI Kodiak Building: - Footprint: xxxx xxxx + Footprint: xxXX xxXX Dimensions: 4, 2 Armor: Type: heavy @@ -1193,6 +1293,8 @@ GAOLDCC2: Inherits: ^OldBase Tooltip: Name: Old Temple + Building: + Footprint: xx xX GAOLDCC3: Inherits: ^OldBase @@ -1213,6 +1315,8 @@ GAOLDCC6: Inherits: ^OldBase Tooltip: Name: Old Silos + Building: + Footprint: xX Xx GASAND: Inherits: ^Wall @@ -1333,6 +1437,7 @@ GAICBM: NAMNTK: Inherits: ^CivBuilding + Inherits@shape: ^1x3Shape Tooltip: Name: NOD Montauk Building: @@ -1349,6 +1454,7 @@ NAMNTK: NTPYRA: Inherits: ^CivBuilding + Inherits@shape: ^4x4Shape Tooltip: Name: Nod Pyramid Building: @@ -1371,6 +1477,7 @@ NTPYRA: UFO: Inherits: ^CivBuilding + Inherits@shape: ^6x4Shape Building: Dimensions: 6, 4 Footprint: xxxxxx xxxxxx xxxxxx xxxxxx diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 6ee828bee7..c872e260f1 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -362,6 +362,7 @@ ^OldBase: Inherits: ^CivBuilding + Inherits@SHAPE: ^2x2Shape Building: Footprint: xx xx Dimensions: 2, 2 diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml index aeeb55d6b1..2bcf8dc776 100644 --- a/mods/ts/sequences/civilian.yaml +++ b/mods/ts/sequences/civilian.yaml @@ -359,9 +359,9 @@ cacrsh05: cahosp: Defaults: DepthSprite: isodepth.shp - DepthSpriteOffset: 12, 0 + DepthSpriteOffset: 15, 0 UseTilesetCode: true - Offset: 12, -42, 42 + Offset: 15, -36, 36 idle: ShadowStart: 3 damaged-idle: @@ -677,7 +677,7 @@ namntk: ntpyra: Defaults: DepthSprite: isodepth.shp - Offset: 0, -48, 48 + Offset: 0, -42, 42 idle: ShadowStart: 3 damaged-idle: