From 7d1931cd80141b6d1051c35d05df74133d0769f5 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 10 Aug 2013 20:11:38 +1200 Subject: [PATCH] Remove BelowUnits from C&C bibbed structures. It interacts badly with the rewritten Bib trait. --- mods/cnc/rules/structures.yaml | 3 --- mods/cnc/rules/system.yaml | 1 - mods/cnc/sequences/misc.yaml | 2 ++ mods/cnc/sequences/structures.yaml | 14 ++++++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index a85745651d..e01adb7c19 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -275,7 +275,6 @@ AFLD: Sprite: bib1 RallyPoint: RallyPoint: 4,2 - BelowUnits: Exit@1: SpawnOffset: -24,0 ExitCell: 3,1 @@ -353,7 +352,6 @@ HPAD: SpawnOffset: 0,-6 Production: Produces: Aircraft - BelowUnits: Reservable: RepairsUnits: RallyPoint: @@ -424,7 +422,6 @@ FIX: HP: 400 RevealsShroud: Range: 5 - BelowUnits: Reservable: RepairsUnits: RallyPoint: diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml index 18506ba034..02cb6b0b23 100644 --- a/mods/cnc/rules/system.yaml +++ b/mods/cnc/rules/system.yaml @@ -403,7 +403,6 @@ CRATE: NoBaseSelectionShares: 120 Unit: mcv RenderSimple: - BelowUnits: BodyOrientation: mpspawn: diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml index b7cece7f73..0617455d36 100644 --- a/mods/cnc/sequences/misc.yaml +++ b/mods/cnc/sequences/misc.yaml @@ -165,8 +165,10 @@ allyrepair: crate: idle: wcrate Start: 0 + ZOffset: -511 land: wcrate Start: 0 + ZOffset: -511 crate-effects: airstrike: deviator diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml index 91cc44e92f..3ec9d145d4 100644 --- a/mods/cnc/sequences/structures.yaml +++ b/mods/cnc/sequences/structures.yaml @@ -132,19 +132,24 @@ afld: idle: Start: 0 Tick: 120 + ZOffset: -1023 active: Start: 0 Length: 16 Tick: 120 + ZOffset: -1023 damaged-idle: Start: 16 Tick: 120 + ZOffset: -1023 damaged-active: Start: 16 Length: 16 Tick: 120 + ZOffset: -1023 dead: Start: 32 + ZOffset: -1023 make: afldmake Start: 0 Length: * @@ -185,18 +190,23 @@ nuk2: hpad: idle: Start: 0 + ZOffset: -1023 damaged-idle: Start: 7 + ZOffset: -1023 active: Start: 1 Length: 6 Tick: 100 + ZOffset: -1023 damaged-active: Start: 8 Length: 6 Tick: 100 + ZOffset: -1023 dead: Start: 14 + ZOffset: -1023 make: hpadmake Start: 0 Length: * @@ -205,16 +215,20 @@ hpad: fix: idle: Start: 0 + ZOffset: -1c511 damaged-idle: Start: 7 active: Start: 0 Length: 7 + ZOffset: -1c511 damaged-active: Start: 7 Length: 7 + ZOffset: -1c511 dead: Start: 14 + ZOffset: -1c511 make: fixmake Start: 0 Length: 14