From 6376e1fd22cfd3610b2870429e37499bac575adc Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 9 Feb 2017 13:11:01 +0100 Subject: [PATCH 1/4] Remove unnecessary Tooltip and Buildable definitions from ^CivBuilding --- mods/ts/rules/civilian-structures.yaml | 2 ++ mods/ts/rules/defaults.yaml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index 51cb4e095b..5816f2c22f 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -1306,6 +1306,7 @@ GASPOT: Buildable: Queue: Defense Prerequisites: ~disabled + Description: Civilian Building Valued: Cost: 300 Tooltip: @@ -1357,6 +1358,7 @@ GALITE: Buildable: Queue: Defense Prerequisites: ~disabled + Description: Civilian Building SelectionDecorations: VisualBounds: 25, 35, 0, -12 -Cloak@EXTERNALCLOAK: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index fe7db063e4..87f8617aa6 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -191,11 +191,8 @@ RevealsShroud: Range: 4c0 MaxHeightDelta: 3 - Tooltip: RenderSprites: Palette: terraindecoration - Buildable: - Description: Civilian Building ^CivBillboard: Inherits: ^CivBuilding From 1b4b146308d2c5408c0ed4581f2c8cba6d0a4729 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 9 Feb 2017 13:11:01 +0100 Subject: [PATCH 2/4] Reduce duplication by introducing ^OldBase --- mods/ts/rules/civilian-structures.yaml | 66 +++----------------------- mods/ts/rules/defaults.yaml | 12 +++++ 2 files changed, 18 insertions(+), 60 deletions(-) diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index 5816f2c22f..6c63f8ee91 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -1191,88 +1191,34 @@ GAKODK: Sequence: small-lights GAOLDCC1: - Inherits: ^CivBuilding + Inherits: ^OldBase Tooltip: Name: Old Construction Yard - Building: - Footprint: xx xx - Dimensions: 2, 2 - Armor: - Type: heavy - Health: - HP: 400 - RenderSprites: - Palette: player GAOLDCC2: - Inherits: ^CivBuilding + Inherits: ^OldBase Tooltip: Name: Old Temple - Building: - Footprint: xx xx - Dimensions: 2, 2 - Armor: - Type: heavy - Health: - HP: 400 - RenderSprites: - Palette: player GAOLDCC3: - Inherits: ^CivBuilding + Inherits: ^OldBase Tooltip: Name: Old Weapons Factory - Building: - Footprint: xx xx - Dimensions: 2, 2 - Armor: - Type: heavy - Health: - HP: 400 - RenderSprites: - Palette: player GAOLDCC4: - Inherits: ^CivBuilding + Inherits: ^OldBase Tooltip: Name: Old Refinery - Building: - Footprint: xx xx - Dimensions: 2, 2 - Armor: - Type: heavy - Health: - HP: 400 - RenderSprites: - Palette: player GAOLDCC5: - Inherits: ^CivBuilding + Inherits: ^OldBase Tooltip: Name: Old Advanced Power Plant - Building: - Footprint: xx xx - Dimensions: 2, 2 - Armor: - Type: heavy - Health: - HP: 400 - RenderSprites: - Palette: player GAOLDCC6: - Inherits: ^CivBuilding + Inherits: ^OldBase Tooltip: Name: Old Silos - Building: - Footprint: xx xx - Dimensions: 2, 2 - Armor: - Type: heavy - Health: - HP: 400 - RenderSprites: - Palette: player GASAND: Inherits: ^Wall diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 87f8617aa6..fac73a12e6 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -194,6 +194,18 @@ RenderSprites: Palette: terraindecoration +^OldBase: + Inherits: ^CivBuilding + Building: + Footprint: xx xx + Dimensions: 2, 2 + Armor: + Type: heavy + Health: + HP: 400 + RenderSprites: + Palette: player + ^CivBillboard: Inherits: ^CivBuilding Building: From 7247350780abcd7ed305995d8967e1d55cbdcf2f Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 9 Feb 2017 13:11:01 +0100 Subject: [PATCH 3/4] Remove cloak from ^OldBase --- mods/ts/rules/defaults.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index fac73a12e6..ee3fcb27e2 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -205,6 +205,8 @@ HP: 400 RenderSprites: Palette: player + -Cloak@EXTERNALCLOAK: + -ExternalConditions@EXTERNALCLOAK: ^CivBillboard: Inherits: ^CivBuilding From 8ad37e6e0df35e262d16be9bf81092cf1fd036ab Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 11 Feb 2017 15:28:52 +0100 Subject: [PATCH 4/4] Remove `Buildable` from unbuildable civilian structures --- mods/ts/rules/civilian-structures.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index 6c63f8ee91..9b3da11ba9 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -714,8 +714,6 @@ CAHOSP: Capturable: CaptureNotification: ProvidesPrerequisite@BuildingName: - Buildable: - Description: Gives friendly units a medkit to heal themselves. ThrowsShrapnel@SMALL: Pieces: 5, 9 ThrowsShrapnel@LARGE: @@ -1145,8 +1143,6 @@ CTDAM: Sequence: idle-lights WithIdleOverlay@WATER: Sequence: idle-water - Buildable: - Description: Provides power for other structures ThrowsShrapnel@SMALL: Pieces: 5, 9 ThrowsShrapnel@LARGE: @@ -1249,10 +1245,6 @@ GASAND: GASPOT: Inherits: ^Building - Buildable: - Queue: Defense - Prerequisites: ~disabled - Description: Civilian Building Valued: Cost: 300 Tooltip: @@ -1301,10 +1293,6 @@ GALITE: Palette: alpha Selectable: Bounds: 24, 24, 0, -4 - Buildable: - Queue: Defense - Prerequisites: ~disabled - Description: Civilian Building SelectionDecorations: VisualBounds: 25, 35, 0, -12 -Cloak@EXTERNALCLOAK: @@ -1315,8 +1303,6 @@ TSTLAMP: RenderSprites: Image: galite Tooltip: - Buildable: - Description: light post with alpha blending GAICBM: Inherits: ^Building