From a44b50c2adf2e0744c2eee2bb9c673d98fff9212 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 19 Dec 2015 13:06:28 +0000 Subject: [PATCH] Increase wall blocking geometry to a full cell. --- mods/cnc/rules/civilian.yaml | 4 ---- mods/cnc/rules/defaults.yaml | 5 +++++ mods/cnc/rules/structures.yaml | 4 ---- mods/d2k/rules/structures.yaml | 3 +++ mods/ra/rules/defaults.yaml | 5 +++++ mods/ra/rules/structures.yaml | 6 ------ mods/ts/rules/defaults.yaml | 3 +++ 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index dbe3303e1f..5c4edd2b49 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -276,8 +276,6 @@ ARCO.Husk: BARB: Inherits: ^Wall - Health: - HP: 100 Armor: Type: Light Tooltip: @@ -292,8 +290,6 @@ BARB: WOOD: Inherits: ^Wall - Health: - HP: 100 Armor: Type: Wood Tooltip: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 1b2375ccc2..df5c3c6dbb 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -579,6 +579,11 @@ Guardable: FrozenUnderFog: ScriptTriggers: + Health: + HP: 100 + Shape: Rectangle + TopLeft: -512, -512 + BottomRight: 512, 512 ^Tree: Inherits@1: ^SpriteActor diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 9bed45effe..f8fb9ee6c0 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -855,8 +855,6 @@ SBAG: BuildPaletteOrder: 20 Prerequisites: fact Queue: Defence.GDI - Health: - HP: 100 Armor: Type: Light LineBuild: @@ -880,8 +878,6 @@ CYCL: BuildPaletteOrder: 20 Prerequisites: fact Queue: Defence.Nod - Health: - HP: 100 Armor: Type: Light LineBuild: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index dc37d9ae9a..8a1e8dfd02 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -613,6 +613,9 @@ wall: TerrainTypes: Rock, Concrete Health: HP: 2000 + Shape: Rectangle + TopLeft: -512, -512 + BottomRight: 512, 512 Armor: Type: none RevealsShroud: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 2e9849ad09..0769f52f55 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -501,6 +501,11 @@ Guardable: FrozenUnderFog: GpsRemoveFrozenActor: + Health: + HP: 100 + Shape: Rectangle + TopLeft: -512, -512 + BottomRight: 512, 512 ^TechBuilding: Inherits: ^BasicBuilding diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 88e52554ee..121f83cc93 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1664,8 +1664,6 @@ CYCL: Inherits: ^Wall Tooltip: Name: Chain-Link Barrier - Health: - HP: 100 Armor: Type: Wood LineBuild: @@ -1679,8 +1677,6 @@ BARB: Inherits: ^Wall Tooltip: Name: Barbed-Wire Fence - Health: - HP: 100 Armor: Type: Wood LineBuild: @@ -1694,8 +1690,6 @@ WOOD: Inherits: ^Wall Tooltip: Name: Wooden Fence - Health: - HP: 100 Armor: Type: Wood LineBuild: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 9161b90d82..32ed1eebf9 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -216,6 +216,9 @@ InitialDelay: 0 CloakDelay: 90 IsPlayerPalette: true + Health: + Shape: Circle + Radius: 363 ^BuildingPlug: AlwaysVisible: