From f9017567c15a6ba165738471f86751539180c444 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 27 Jul 2011 01:47:44 +1200 Subject: [PATCH] Implement dead civilian buildings ask husks. Fixes #149. --- mods/cnc/rules/civilian.yaml | 200 ++++++++++++++++++++++++++++++++++- mods/cnc/rules/defaults.yaml | 20 +++- mods/cnc/sequences/map.yaml | 156 ++++++++++++++++++++------- 3 files changed, 330 insertions(+), 46 deletions(-) diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index e99996aafc..f701b1f7bd 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -8,6 +8,19 @@ V01: Dimensions: 2,2 Tooltip: Name: Church + LeavesHusk: + HuskActor: V01.Husk + +V01.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v25.husk + Building: + Footprint: xx xx + Dimensions: 2,2 + Tooltip: + Name: Church (Destroyed) V02: Inherits: ^CivBuilding @@ -17,6 +30,17 @@ V02: Building: Footprint: xx xx Dimensions: 2,2 + LeavesHusk: + HuskActor: V02.Husk + +V02.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v20.husk + Building: + Footprint: xx xx + Dimensions: 2,2 V03: Inherits: ^CivBuilding @@ -26,6 +50,17 @@ V03: RenderBuilding: OverrideTileset: DESERT OverrideImage: v21 + LeavesHusk: + HuskActor: V03.Husk + +V03.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v21.husk + Building: + Footprint: xx xx + Dimensions: 2,2 V04: Inherits: ^CivBuilding @@ -35,6 +70,17 @@ V04: RenderBuilding: OverrideTileset: DESERT OverrideImage: v24 + LeavesHusk: + HuskActor: V04.Husk + +V04.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v24.husk + Building: + Footprint: xx xx + Dimensions: 2,2 V05: Inherits: ^CivBuilding @@ -44,6 +90,17 @@ V05: RenderBuilding: OverrideTileset: DESERT OverrideImage: v22 + LeavesHusk: + HuskActor: V05.Husk + +V05.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v22.husk + Building: + Footprint: xx + Dimensions: 2,1 V06: Inherits: ^CivBuilding @@ -53,6 +110,17 @@ V06: RenderBuilding: OverrideTileset: DESERT OverrideImage: v26 + LeavesHusk: + HuskActor: V06.Husk + +V06.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v26.husk + Building: + Footprint: xx + Dimensions: 2,1 V07: Inherits: ^CivBuilding @@ -62,57 +130,142 @@ V07: RenderBuilding: OverrideTileset: DESERT OverrideImage: v30 + LeavesHusk: + HuskActor: V07.Husk + +V07.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v30.husk + Building: + Footprint: xx + Dimensions: 2,1 V08: Inherits: ^CivBuilding RenderBuilding: OverrideTileset: DESERT OverrideImage: v23 + LeavesHusk: + HuskActor: V08.Husk + +V08.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v23.husk V09: Inherits: ^CivBuilding RenderBuilding: OverrideTileset: DESERT OverrideImage: v27 + LeavesHusk: + HuskActor: V09.Husk + +V09.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v27.husk V10: Inherits: ^CivBuilding RenderBuilding: OverrideTileset: DESERT OverrideImage: v28 + LeavesHusk: + HuskActor: V10.Husk + +V10.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v28.husk V11: Inherits: ^CivBuilding RenderBuilding: OverrideTileset: DESERT OverrideImage: v29 + LeavesHusk: + HuskActor: V11.Husk + +V11.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v29.husk V12: Inherits: ^CivBuilding RenderBuilding: OverrideTileset: DESERT OverrideImage: v34 + LeavesHusk: + HuskActor: V12.Husk + +V12.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v34.husk V13: Inherits: ^CivBuilding RenderBuilding: OverrideTileset: DESERT OverrideImage: v35 + LeavesHusk: + HuskActor: V13.Husk + +V13.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v35.husk V14: Inherits: ^CivField + LeavesHusk: + HuskActor: V14.Husk + +V14.Husk: + Inherits: ^CivFieldHusk V15: Inherits: ^CivField + LeavesHusk: + HuskActor: V15.Husk + +V15.Husk: + Inherits: ^CivFieldHusk V16: Inherits: ^CivField + LeavesHusk: + HuskActor: V16.Husk + +V16.Husk: + Inherits: ^CivFieldHusk V17: Inherits: ^CivField + LeavesHusk: + HuskActor: V17.Husk + +V17.Husk: + Inherits: ^CivFieldHusk V18: Inherits: ^CivField + LeavesHusk: + HuskActor: V18.Husk + +V18.Husk: + Inherits: ^CivFieldHusk + V31: Inherits: ^CivBuilding @@ -123,6 +276,19 @@ V31: Image: v05 OverrideTileset: DESERT OverrideImage: v31 + LeavesHusk: + HuskActor: V31.Husk + +V31.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + Image: v05 + OverrideTileset: DESERT + OverrideImage: v31.husk + Building: + Footprint: xx + Dimensions: 2,1 + V32: Inherits: ^CivBuilding Building: @@ -132,6 +298,19 @@ V32: Image: v05 OverrideTileset: DESERT OverrideImage: v32 + LeavesHusk: + HuskActor: V32.Husk + +V32.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + Image: v05 + OverrideTileset: DESERT + OverrideImage: v32.husk + Building: + Footprint: xx + Dimensions: 2,1 + V33: Inherits: ^CivBuilding Building: @@ -141,13 +320,32 @@ V33: Image: v05 OverrideTileset: DESERT OverrideImage: v33 + LeavesHusk: + HuskActor: V33.Husk + +V33.Husk: + Inherits: ^CivBuildingHusk + RenderBuilding: + Image: v05 + OverrideTileset: DESERT + OverrideImage: v33.husk + Building: + Footprint: xx + Dimensions: 2,1 ARCO: Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 - RenderBuilding: + LeavesHusk: + HuskActor: ARCO.Husk + +ARCO.Husk: + Inherits: ^CivBuildingHusk + Building: + Footprint: xx + Dimensions: 2,1 BARB: Inherits: ^Wall diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 290c6534b2..74407d8127 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -236,9 +236,8 @@ ^CivBuilding: Inherits: ^Building + -DeadBuildingState: -Buildable: - DeadBuildingState: - Zombie: true Health: HP: 400 Armor: @@ -267,15 +266,12 @@ Inherits: ^CivBuilding Capturable: RepairableBuilding: - -DeadBuildingState: RevealsShroud: Range: 3 ^CivField: Inherits: ^CivBuilding -Selectable: - DeadBuildingState: - Zombie: true Tooltip: Name: Field RenderBuilding: @@ -283,6 +279,20 @@ OverrideImage: v23 -WithBuildingExplosion: +^CivFieldHusk: + AppearsOnRadar: + Building: + Dimensions: 1,1 + Footprint: _ + RenderBuilding: + OverrideTileset: DESERT + OverrideImage: v23.husk + EditorAppearance: + RelativeToTopLeft: yes + Tooltip: + Name: Field (Destroyed) + BelowUnits: + ^Wall: AppearsOnRadar: Building: diff --git a/mods/cnc/sequences/map.yaml b/mods/cnc/sequences/map.yaml index 38d04f60a9..3f3986b365 100644 --- a/mods/cnc/sequences/map.yaml +++ b/mods/cnc/sequences/map.yaml @@ -212,7 +212,9 @@ v01: Start: 0 damaged-idle: Start: 1 - dead: + +v01.husk: + idle: v01 Start: 2 v25: @@ -220,7 +222,9 @@ v25: Start: 0 damaged-idle: Start: 1 - dead: + +v25.husk: + idle: v25 Start: 2 v02: @@ -228,7 +232,9 @@ v02: Start: 0 damaged-idle: Start: 1 - dead: + +v02.husk: + idle: v02 Start: 2 v20: @@ -236,7 +242,9 @@ v20: Start: 0 damaged-idle: Start: 1 - dead: + +v20.husk: + idle: v20 Start: 2 v03: @@ -244,7 +252,9 @@ v03: Start: 0 damaged-idle: Start: 1 - dead: + +v03.husk: + idle: v03 Start: 2 v21: @@ -254,7 +264,9 @@ v21: damaged-idle: Start: 3 Length: 3 - dead: + +v21.husk: + idle: v21 Start: 6 v04: @@ -262,7 +274,9 @@ v04: Start: 0 damaged-idle: Start: 1 - dead: + +v04.husk: + idle: v04 Start: 2 v24: @@ -270,7 +284,9 @@ v24: Start: 0 damaged-idle: Start: 1 - dead: + +v24.husk: + idle: v24 Start: 2 v05: @@ -278,7 +294,9 @@ v05: Start: 0 damaged-idle: Start: 1 - dead: + +v05.husk: + idle: v05 Start: 2 v22: @@ -288,7 +306,9 @@ v22: damaged-idle: Start: 3 Length: 3 - dead: + +v22.husk: + idle: v22 Start: 6 v06: @@ -296,7 +316,9 @@ v06: Start: 0 damaged-idle: Start: 1 - dead: + +v06.husk: + idle: v06 Start: 2 v26: @@ -304,7 +326,9 @@ v26: Start: 0 damaged-idle: Start: 1 - dead: + +v26.husk: + idle: v26 Start: 2 v07: @@ -312,7 +336,9 @@ v07: Start: 0 damaged-idle: Start: 2 - dead: + +v07.husk: + idle: v07 Start: 2 v30: @@ -320,7 +346,9 @@ v30: Start: 0 damaged-idle: Start: 2 - dead: + +v30.husk: + idle: v30 Start: 2 v08: @@ -328,7 +356,9 @@ v08: Start: 0 damaged-idle: Start: 1 - dead: + +v08.husk: + idle: v08 Start: 2 v23: @@ -336,7 +366,9 @@ v23: Start: 0 damaged-idle: Start: 1 - dead: + +v23.husk: + idle: v23 Start: 2 v09: @@ -344,7 +376,9 @@ v09: Start: 0 damaged-idle: Start: 1 - dead: + +v09.husk: + idle: v09 Start: 2 v27: @@ -352,7 +386,9 @@ v27: Start: 0 damaged-idle: Start: 1 - dead: + +v27.husk: + idle: v27 Start: 2 v10: @@ -360,7 +396,9 @@ v10: Start: 0 damaged-idle: Start: 1 - dead: + +v10.husk: + idle: v10 Start: 2 v28: @@ -368,7 +406,9 @@ v28: Start: 0 damaged-idle: Start: 1 - dead: + +v28.husk: + idle: v28 Start: 2 v11: @@ -376,7 +416,9 @@ v11: Start: 0 damaged-idle: Start: 1 - dead: + +v11.husk: + idle: v11 Start: 2 v29: @@ -384,7 +426,9 @@ v29: Start: 0 damaged-idle: Start: 1 - dead: + +v29.husk: + idle: v29 Start: 2 v12: @@ -392,7 +436,9 @@ v12: Start: 0 damaged-idle: Start: 1 - dead: + +v12.husk: + idle: v12 Start: 2 v34: @@ -400,7 +446,9 @@ v34: Start: 0 damaged-idle: Start: 1 - dead: + +v34.husk: + idle: v34 Start: 2 v13: @@ -408,7 +456,9 @@ v13: Start: 0 damaged-idle: Start: 1 - dead: + +v13.husk: + idle: v13 Start: 2 v35: @@ -416,7 +466,9 @@ v35: Start: 0 damaged-idle: Start: 1 - dead: + +v35.husk: + idle: v35 Start: 2 v14: @@ -424,7 +476,9 @@ v14: Start: 0 damaged-idle: Start: 1 - dead: + +v14.husk: + idle: v14 Start: 2 v15: @@ -432,7 +486,9 @@ v15: Start: 0 damaged-idle: Start: 1 - dead: + +v15.husk: + idle: v15 Start: 2 v16: @@ -440,7 +496,9 @@ v16: Start: 0 damaged-idle: Start: 1 - dead: + +v16.husk: + idle: v16 Start: 2 v17: @@ -448,7 +506,9 @@ v17: Start: 0 damaged-idle: Start: 1 - dead: + +v17.husk: + idle: v17 Start: 2 v18: @@ -456,7 +516,9 @@ v18: Start: 0 damaged-idle: Start: 1 - dead: + +v18.husk: + idle: v18 Start: 2 v31: @@ -464,7 +526,9 @@ v31: Start: 0 damaged-idle: Start: 1 - dead: + +v31.husk: + idle: v31 Start: 2 v32: @@ -472,7 +536,9 @@ v32: Start: 0 damaged-idle: Start: 1 - dead: + +v32.husk: + idle: v32 Start: 2 v33: @@ -480,7 +546,9 @@ v33: Start: 0 damaged-idle: Start: 1 - dead: + +v33.husk: + idle: v33 Start: 2 v19: @@ -492,8 +560,6 @@ v19: Start: 14 Length: 14 Tick: 120 - dead: - Start: 28 v19.husk: idle: v19 @@ -504,23 +570,30 @@ v19.husk: fire-loop: flmspt Start: 50 Length: * + arco: idle: Start: 0 damaged-idle: Start: 1 - dead: + +arco.husk: + idle: arco Start: 1 + hosp: idle: Start: 0 damaged-idle: Start: 1 - dead: - Start: 2 make: hospmake Start: 0 Length: * + +hosp.husk: + idle: hosp + Start: 2 + bio: idle: Start: 0 @@ -533,10 +606,13 @@ bio: bio.husk: idle: bio Start: 2 + miss: idle: Start: 0 damaged-idle: Start: 1 - dead: + +miss.husk: + idle: miss Start: 2 \ No newline at end of file