From 1bd802c38605772f3f0392949e13d150ce5d7a28 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 12 Oct 2010 23:20:00 +1300 Subject: [PATCH] Add tech building definitions to cnc; noncapturable map decorations until they have behavior implemented. --- mods/cnc/maps/eastwest2/map.bin | Bin 26885 -> 26885 bytes mods/cnc/maps/eastwest2/map.uid | 2 +- mods/cnc/maps/eastwest2/map.yaml | 60 +++++++++++++++++++++++++++++++ mods/cnc/maps/tundra/map.uid | 2 +- mods/cnc/maps/tundra/map.yaml | 12 +++++++ mods/cnc/mod.yaml | 1 + mods/cnc/rules/civilian.yaml | 7 ++++ mods/cnc/rules/tech.yaml | 39 ++++++++++++++++++++ mods/cnc/sequences/map.yaml | 46 ++++++++++++++++++++++++ 9 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 mods/cnc/rules/tech.yaml diff --git a/mods/cnc/maps/eastwest2/map.bin b/mods/cnc/maps/eastwest2/map.bin index daa71db915d6a86176b470f0c1c55c446e98e86c..5ac8367e682645c8465ba5176f519ec8b75fde5b 100644 GIT binary patch delta 157 zcmZp@#MpX?aYKSEntsH;$)bS_41o+R{~7*6kS7C^Cj;B$ zZD1M3Kn7MM8D>ug_Q`SblbHhrcuoGuZ8Z6w t8qef~ifKRrMz6^YV(JqWxF^?%2u}`Bif8j;VDe&MohWFq`KgkE8vyf%FY5pR delta 105 zcmZp@#MpX?aYKUaJkU diff --git a/mods/cnc/maps/eastwest2/map.uid b/mods/cnc/maps/eastwest2/map.uid index 2c56558da2..42c12f1783 100644 --- a/mods/cnc/maps/eastwest2/map.uid +++ b/mods/cnc/maps/eastwest2/map.uid @@ -1 +1 @@ -e8e4a4d9fe305e86b38331b8f92021db80bbc4a6 \ No newline at end of file +a6b30d8e4d32ed5e7d54e16e2ebe0cfc87f4d1d0 \ No newline at end of file diff --git a/mods/cnc/maps/eastwest2/map.yaml b/mods/cnc/maps/eastwest2/map.yaml index ec5692e94a..1cd2d7bb30 100644 --- a/mods/cnc/maps/eastwest2/map.yaml +++ b/mods/cnc/maps/eastwest2/map.yaml @@ -25,8 +25,65 @@ Players: Race: gdi OwnsWorld: True NonCombatant: True + Playable: False + DefaultStartingUnits: False Color: 255,238,238,238 Color2: 255,44,28,24 + InitialCash: 0 + Allies: + Enemies: + PlayerReference@Multi0: + Name: Multi0 + Palette: + Race: Random + OwnsWorld: False + NonCombatant: False + Playable: True + DefaultStartingUnits: True + Color: 255,238,238,238 + Color2: 255,44,28,24 + InitialCash: 0 + Allies: + Enemies: + PlayerReference@Multi1: + Name: Multi1 + Palette: + Race: Random + OwnsWorld: False + NonCombatant: False + Playable: True + DefaultStartingUnits: True + Color: 255,238,238,238 + Color2: 255,44,28,24 + InitialCash: 0 + Allies: + Enemies: + PlayerReference@Multi2: + Name: Multi2 + Palette: + Race: Random + OwnsWorld: False + NonCombatant: False + Playable: True + DefaultStartingUnits: True + Color: 255,238,238,238 + Color2: 255,44,28,24 + InitialCash: 0 + Allies: + Enemies: + PlayerReference@Multi3: + Name: Multi3 + Palette: + Race: Random + OwnsWorld: False + NonCombatant: False + Playable: True + DefaultStartingUnits: True + Color: 255,238,238,238 + Color2: 255,44,28,24 + InitialCash: 0 + Allies: + Enemies: Actors: Actor0: split3 @@ -338,6 +395,9 @@ Actors: Actor131: v06 Location: 47,36 Owner: Neutral + Actor46: hosp + Location: 45,41 + Owner: Neutral Waypoints: wp7: 73,33 diff --git a/mods/cnc/maps/tundra/map.uid b/mods/cnc/maps/tundra/map.uid index d0e901949d..844a04aae2 100644 --- a/mods/cnc/maps/tundra/map.uid +++ b/mods/cnc/maps/tundra/map.uid @@ -1 +1 @@ -42d9c5656969095d45e62919f8cd0514613e4949 \ No newline at end of file +74f6e33fb420fa612ad5267bad4da4a7486cf8d5 \ No newline at end of file diff --git a/mods/cnc/maps/tundra/map.yaml b/mods/cnc/maps/tundra/map.yaml index 6b6bab3daa..7d8cfb642f 100644 --- a/mods/cnc/maps/tundra/map.yaml +++ b/mods/cnc/maps/tundra/map.yaml @@ -129,6 +129,18 @@ Actors: Actor22: cycl Location: 37,23 Owner: Neutral + Actor8: v19 + Location: 9,24 + Owner: Neutral + Actor24: v19 + Location: 10,24 + Owner: Neutral + Actor25: v19 + Location: 39,23 + Owner: Neutral + Actor26: v19 + Location: 38,23 + Owner: Neutral Waypoints: wp0: 35,39 diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index f60ca3ce9e..41222aed54 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -35,6 +35,7 @@ Rules: mods/cnc/rules/vehicles.yaml mods/cnc/rules/trees.yaml mods/cnc/rules/civilian.yaml + mods/cnc/rules/tech.yaml Sequences: mods/cnc/sequences/structures.yaml diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index c2ba704f03..adf71d27de 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -142,6 +142,13 @@ V33: OverrideTheater: DESERT OverrideImage: v33 +ARCO: + Inherits: ^CivBuilding + Building: + Footprint: xx + Dimensions: 2,1 + RenderBuilding: + BARB: Inherits: ^Wall Health: diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml new file mode 100644 index 0000000000..4168196ae0 --- /dev/null +++ b/mods/cnc/rules/tech.yaml @@ -0,0 +1,39 @@ +# Oil Derrick +V19: + Inherits: ^CivBuilding + RenderBuilding: + Building: + Footprint: x + Dimensions: 1,1 + Tooltip: + Name: Oil Derrick + +# Hospital +HOSP: + Inherits: ^CivBuilding + RenderBuilding: + Building: + Footprint: xx xx + Dimensions: 2,2 + Tooltip: + Name: Hospital + +# Bio Lab +BIO: + Inherits: ^CivBuilding + RenderBuilding: + Building: + Footprint: xx xx + Dimensions: 2,2 + Tooltip: + Name: Bio Lab + +# Prison / Tech Center +MISS: + Inherits: ^CivBuilding + RenderBuilding: + Building: + Footprint: xxx xxx + Dimensions: 3,2 + Tooltip: + Name: Tech Center diff --git a/mods/cnc/sequences/map.yaml b/mods/cnc/sequences/map.yaml index fb58542261..1d8636a5dc 100644 --- a/mods/cnc/sequences/map.yaml +++ b/mods/cnc/sequences/map.yaml @@ -483,3 +483,49 @@ v33: dead: Start: 2 +v19: + idle: + Start: 0 + Length: 14 + Tick: 120 + damaged-idle: + Start: 14 + Length: 14 + Tick: 120 + dead: + Start: 28 + +arco: + idle: + Start: 0 + damaged-idle: + Start: 1 + dead: + Start: 1 +hosp: + idle: + Start: 0 + damaged-idle: + Start: 1 + dead: + Start: 2 + make: hospmake + Start: 0 + Length: * +bio: + idle: + Start: 0 + damaged-idle: + Start: 1 + dead: + Start: 2 + make: biomake + Start: 0 + Length: * +miss: + idle: + Start: 0 + damaged-idle: + Start: 1 + dead: + Start: 2 \ No newline at end of file