diff --git a/mods/cnc/civilian.yaml b/mods/cnc/civilian.yaml index dc74a28bcf..00a217b64c 100644 --- a/mods/cnc/civilian.yaml +++ b/mods/cnc/civilian.yaml @@ -1,143 +1,106 @@ V01: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Capturable: true - Repairable: false - HP: 400 - Armor: wood + Valued: + Description: Church V02: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Repairable: false - HP: 400 - Armor: wood V03: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Repairable: false - HP: 400 - Armor: wood V04: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Repairable: false - HP: 400 - Armor: wood V05: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 - Repairable: false - HP: 400 - Armor: wood V06: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 - Repairable: false - HP: 400 - Armor: wood V07: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 - Repairable: false - HP: 400 - Armor: wood V08: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V09: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V10: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V11: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V12: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V13: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V14: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V15: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V16: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V17: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V18: - Inherits: ^Building + Inherits: ^CivBuilding + Valued: + Description: Field + +# TODO: Remap v20 -> v37 down to v1 -> v18 for desert theater + +BARB: + Inherits: ^Wall Building: - Repairable: false - HP: 400 - Armor: wood + HP: 100 + Armor: none + Valued: + Description: Wire Fence +WOOD: + Inherits: ^Wall + Building: + HP: 100 + Armor: none + Valued: + Description: Wooden Fence BRIDGE1: Inherits: ^Bridge @@ -147,8 +110,8 @@ BRIDGE1: Building: Footprint: ____ ____ ____ ____ Dimensions: 4,4 - Selectable: - Bounds: 96,96 +# Selectable: +# Bounds: 96,96 BRIDGE2: Inherits: ^Bridge @@ -158,8 +121,9 @@ BRIDGE2: Building: Footprint: _____ _____ _____ _____ _____ Dimensions: 5,5 - Selectable: - Bounds: 120,120 +# Selectable: +# Bounds: 120,120 + BRIDGE3: Inherits: ^Bridge Bridge: @@ -168,8 +132,8 @@ BRIDGE3: Building: Footprint: ______ ______ ______ ______ ______ Dimensions: 6,5 - Selectable: - Bounds: 144,120 +# Selectable: +# Bounds: 144,120 BRIDGE4: Inherits: ^Bridge @@ -179,5 +143,5 @@ BRIDGE4: Building: Footprint: ______ ______ ______ ______ Dimensions: 6,4 - Selectable: - Bounds: 144,96 \ No newline at end of file +# Selectable: +# Bounds: 144,96 \ No newline at end of file diff --git a/mods/cnc/defaults.yaml b/mods/cnc/defaults.yaml index f7b15b24a5..20cef07a34 100644 --- a/mods/cnc/defaults.yaml +++ b/mods/cnc/defaults.yaml @@ -97,6 +97,15 @@ MustBeDestroyed: GivesExperience: +^CivBuilding: + Inherits: ^Building + Building: + Repairable: false + HP: 400 + Armor: wood + Valued: + Description: Civilian Building + ^Wall: Category: Building Building: @@ -131,6 +140,15 @@ Footprint: __ x_ Dimensions: 2,2 +^Rock: + Category: Building + Valued: + Description: Rock + RenderBuilding: + Palette: terrain + Building: + Footprint: __ x_ + Dimensions: 2,2 ^Husk: Category: Vehicle Unit: diff --git a/mods/cnc/structures.yaml b/mods/cnc/structures.yaml index 1741e07d10..3980c37365 100644 --- a/mods/cnc/structures.yaml +++ b/mods/cnc/structures.yaml @@ -405,18 +405,6 @@ OBLI: -RenderBuilding: RenderRangeCircle: -BARB: - Inherits: ^Wall - Building: - HP: 100 - Armor: none - -WOOD: - Inherits: ^Wall - Building: - HP: 100 - Armor: none - CYCL: Category: Defense Inherits: ^Wall diff --git a/mods/cnc/trees.yaml b/mods/cnc/trees.yaml index 68abcec4ec..62a4cf09a0 100644 --- a/mods/cnc/trees.yaml +++ b/mods/cnc/trees.yaml @@ -4,28 +4,34 @@ SPLIT2: Palette: terrain SeedsResource: ResourceType:Tiberium + Valued: + Description: Blossom Tree -Selectable: + SPLIT3: Inherits: ^Building RenderBuilding: Palette: terrain SeedsResource: ResourceType:Tiberium + Valued: + Description: Blossom Tree -Selectable: + ROCK1: - Inherits: ^Tree + Inherits: ^Rock ROCK2: - Inherits: ^Tree + Inherits: ^Rock ROCK3: - Inherits: ^Tree + Inherits: ^Rock ROCK4: - Inherits: ^Tree + Inherits: ^Rock ROCK5: - Inherits: ^Tree + Inherits: ^Rock ROCK6: - Inherits: ^Tree + Inherits: ^Rock ROCK7: - Inherits: ^Tree + Inherits: ^Rock T01: Inherits: ^Tree diff --git a/mods/ra/civilian.yaml b/mods/ra/civilian.yaml index eb3ed2b1df..eab2ae1e47 100644 --- a/mods/ra/civilian.yaml +++ b/mods/ra/civilian.yaml @@ -1,5 +1,5 @@ FCOM: - Inherits: ^Building + Inherits: ^CivBuilding Building: Power: -200 Footprint: xx xx @@ -12,350 +12,90 @@ FCOM: Bib: V01: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Capturable: true - Repairable: false - HP: 400 - Armor: wood - + Valued: + Description: Church V02: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Repairable: false - HP: 400 - Armor: wood V03: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Repairable: false - HP: 400 - Armor: wood V04: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 - Repairable: false - HP: 400 - Armor: wood V05: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 - Repairable: false - HP: 400 - Armor: wood V06: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 - Repairable: false - HP: 400 - Armor: wood V07: - Inherits: ^Building + Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 - Repairable: false - HP: 400 - Armor: wood V08: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V09: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V10: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V11: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V12: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V13: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding V14: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V15: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V16: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V17: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood + Inherits: ^CivBuilding + Valued: + Description: Field V18: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -V19: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -V20: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V21: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V22: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V23: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V24: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V25: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V26: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V27: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V28: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V29: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V30: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V31: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V32: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V33: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V34: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V35: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V36: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM - -V37: - Inherits: ^Building - Building: - Repairable: false - HP: 400 - Armor: wood - -Dimensions: - -Footprint: - RenderBuilding: - Image: FCOM + Inherits: ^CivBuilding + Valued: + Description: Field BARL: Inherits: ^Building @@ -367,6 +107,8 @@ BARL: Adjacent: 0 HP: 10 Explodes: + Valued: + Description: Explosive Barrel BRL3: Inherits: ^Building @@ -378,9 +120,11 @@ BRL3: Adjacent: 0 HP: 10 Explodes: + Valued: + Description: Explosive Barrel MISS: - Inherits: ^Building + Inherits: ^CivBuilding Selectable: Priority: 0 Building: @@ -430,8 +174,8 @@ BRIDGE1: Building: Footprint: _____ _____ _____ Dimensions: 5,3 - Selectable: - Bounds: 120,48 +# Selectable: +# Bounds: 120,48 BRIDGE2: Inherits: ^Bridge Bridge: @@ -441,5 +185,5 @@ BRIDGE2: Building: Footprint: _____ _____ Dimensions: 5,2 - Selectable: - Bounds: 120,48 \ No newline at end of file +# Selectable: +# Bounds: 120,48 \ No newline at end of file diff --git a/mods/ra/defaults.yaml b/mods/ra/defaults.yaml index 1eb78b9580..91a479cfba 100644 --- a/mods/ra/defaults.yaml +++ b/mods/ra/defaults.yaml @@ -115,6 +115,15 @@ DamageStates: 2 GivesExperience: +^CivBuilding: + Inherits: ^Building + Building: + Repairable: false + HP: 400 + Armor: wood + Valued: + Description: Civilian Building + ^Tree: Category: Building Valued: @@ -144,8 +153,8 @@ Category: Building Valued: Description: Bridge - Selectable: - Bounds: 96,48 +# Selectable: +# Bounds: 96,48 BelowUnits: Building: Footprint: ____ ____ diff --git a/mods/ra/trees.yaml b/mods/ra/trees.yaml index 113c08ce28..80ebda8b6c 100644 --- a/mods/ra/trees.yaml +++ b/mods/ra/trees.yaml @@ -122,6 +122,8 @@ TC05: MINE: Inherits: ^Tree + Valued: + Description: Ore Mine SeedsResource: BOXES01: