From 6ca76635793c237c10ba86cafe371ff1f11d5032 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 19 Mar 2016 14:28:04 +0000 Subject: [PATCH] Extract common cnc campaign rules to shared includes. --- mods/cnc/maps/cnc64gdi01/map.yaml | 2 +- mods/cnc/maps/cnc64gdi01/rules.yaml | 112 --------------------- mods/cnc/maps/funpark01/map.yaml | 2 +- mods/cnc/maps/funpark01/rules.yaml | 100 ++----------------- mods/cnc/maps/gdi01/map.yaml | 2 +- mods/cnc/maps/gdi01/rules.yaml | 116 ---------------------- mods/cnc/maps/gdi02/map.yaml | 2 +- mods/cnc/maps/gdi02/rules.yaml | 114 --------------------- mods/cnc/maps/gdi03/map.yaml | 2 +- mods/cnc/maps/gdi03/rules.yaml | 124 ----------------------- mods/cnc/maps/gdi04a/map.yaml | 2 +- mods/cnc/maps/gdi04a/rules.yaml | 112 --------------------- mods/cnc/maps/gdi04b/map.yaml | 2 +- mods/cnc/maps/gdi04b/rules.yaml | 112 --------------------- mods/cnc/maps/gdi04c/map.yaml | 2 +- mods/cnc/maps/gdi04c/rules.yaml | 130 ++---------------------- mods/cnc/maps/gdi05a/map.yaml | 2 +- mods/cnc/maps/gdi05a/rules.yaml | 111 ++------------------- mods/cnc/maps/gdi05b/map.yaml | 2 +- mods/cnc/maps/gdi05b/rules.yaml | 126 +++-------------------- mods/cnc/maps/gdi06/map.yaml | 2 +- mods/cnc/maps/gdi06/rules.yaml | 109 -------------------- mods/cnc/maps/nod01/map.yaml | 2 +- mods/cnc/maps/nod01/rules.yaml | 138 +++----------------------- mods/cnc/maps/nod02a/map.yaml | 2 +- mods/cnc/maps/nod02b/map.yaml | 2 +- mods/cnc/maps/nod02b/rules.yaml | 116 +--------------------- mods/cnc/maps/nod03a/map.yaml | 2 +- mods/cnc/maps/nod03a/rules.yaml | 128 +----------------------- mods/cnc/maps/nod03b/map.yaml | 2 +- mods/cnc/maps/nod03b/rules.yaml | 128 +----------------------- mods/cnc/maps/nod04a/map.yaml | 2 +- mods/cnc/maps/nod04a/rules.yaml | 131 ++---------------------- mods/cnc/maps/nod04b/map.yaml | 2 +- mods/cnc/maps/nod04b/rules.yaml | 118 +--------------------- mods/cnc/maps/nod05/map.yaml | 2 +- mods/cnc/maps/nod05/rules.yaml | 125 ++--------------------- mods/cnc/maps/nod06a/map.yaml | 2 +- mods/cnc/maps/nod06a/rules.yaml | 121 +--------------------- mods/cnc/maps/nod06b/map.yaml | 2 +- mods/cnc/maps/nod06b/rules.yaml | 131 ++---------------------- mods/cnc/maps/nod06c/map.yaml | 2 +- mods/cnc/maps/nod06c/rules.yaml | 119 +--------------------- mods/cnc/rules/campaign-maprules.yaml | 28 ++++++ mods/cnc/rules/campaign-palettes.yaml | 53 ++++++++++ mods/cnc/rules/campaign-tooltips.yaml | 59 +++++++++++ 46 files changed, 261 insertions(+), 2444 deletions(-) create mode 100644 mods/cnc/rules/campaign-maprules.yaml create mode 100644 mods/cnc/rules/campaign-palettes.yaml create mode 100644 mods/cnc/rules/campaign-tooltips.yaml diff --git a/mods/cnc/maps/cnc64gdi01/map.yaml b/mods/cnc/maps/cnc64gdi01/map.yaml index 9d2df12020..df48a228a7 100644 --- a/mods/cnc/maps/cnc64gdi01/map.yaml +++ b/mods/cnc/maps/cnc64gdi01/map.yaml @@ -712,6 +712,6 @@ Actors: Owner: Nod Location: 26,14 -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Sequences: sequences.yaml diff --git a/mods/cnc/maps/cnc64gdi01/rules.yaml b/mods/cnc/maps/cnc64gdi01/rules.yaml index ac88b6cfc1..60c82f31c4 100644 --- a/mods/cnc/maps/cnc64gdi01/rules.yaml +++ b/mods/cnc/maps/cnc64gdi01/rules.yaml @@ -1,29 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: cnc64gdi01.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: aoi MissionData: @@ -31,84 +8,11 @@ World: StartVideo: obel.vqa WinVideo: orcabomb.vqa LossVideo: cutout.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False PlayerResources: - DefaultCashLocked: True DefaultCash: 10000 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - BIO.Husk: Tooltip: ShowOwnerRow: false @@ -141,22 +45,6 @@ OLDLST: Cargo: Types: disabled -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player - airstrike.proxy: AlwaysVisible: AirstrikePower: diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml index ca949972ab..9310eb6440 100644 --- a/mods/cnc/maps/funpark01/map.yaml +++ b/mods/cnc/maps/funpark01/map.yaml @@ -409,7 +409,7 @@ Actors: Location: 16,50 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Sequences: sequences.yaml diff --git a/mods/cnc/maps/funpark01/rules.yaml b/mods/cnc/maps/funpark01/rules.yaml index cce98fe443..e3481c0e83 100644 --- a/mods/cnc/maps/funpark01/rules.yaml +++ b/mods/cnc/maps/funpark01/rules.yaml @@ -1,111 +1,35 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Civilian: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Dinosaur: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - EnemyWatcher: - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 0 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: LuaScript: Scripts: scj01ea.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: j1 MissionData: Briefing: There have been some reports of strange animals in this area. \n\nTake your units to investigate, and report back your findings. BriefingVideo: generic.vqa StartVideo: dino.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False MapOptions: Difficulties: Easy, Normal ShortGameLocked: True ShortGameEnabled: False -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false +Player: + EnemyWatcher: + PlayerResources: + DefaultCash: 0 -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Dinosaur: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + IndexedPlayerPalette@units: + PlayerIndex: + Dinosaur: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 ^CivInfantry: -ActorLostNotification: ^CivBuilding: AnnounceOnSeen: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false OLDLST: Inherits: LST @@ -138,6 +62,4 @@ STEG: Speed: 32 ^DINO: - Tooltip: - ShowOwnerRow: false MustBeDestroyed: diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 350711b2e0..d5cff65287 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -394,7 +394,7 @@ Actors: Location: 54,53 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Sequences: sequences.yaml diff --git a/mods/cnc/maps/gdi01/rules.yaml b/mods/cnc/maps/gdi01/rules.yaml index d332746533..fd10648247 100644 --- a/mods/cnc/maps/gdi01/rules.yaml +++ b/mods/cnc/maps/gdi01/rules.yaml @@ -1,29 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi01.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: aoi MissionData: @@ -33,83 +10,6 @@ World: StartVideo: landing.vqa WinVideo: consyard.vqa LossVideo: gameover.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 5000 - -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units NUKE: -Sellable: @@ -203,19 +103,3 @@ OLDLST: RejectsOrders: Cargo: Types: disabled - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 7fd83da33d..e161f3f412 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -623,6 +623,6 @@ Actors: Location: 54,55 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Sequences: sequences.yaml diff --git a/mods/cnc/maps/gdi02/rules.yaml b/mods/cnc/maps/gdi02/rules.yaml index ce5c05efd5..074c3118f0 100644 --- a/mods/cnc/maps/gdi02/rules.yaml +++ b/mods/cnc/maps/gdi02/rules.yaml @@ -1,29 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi02.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: befeared MissionData: @@ -31,97 +8,14 @@ World: BriefingVideo: gdi2.vqa WinVideo: flag.vqa LossVideo: gameover.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 5000 - -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false SBAG: -Crushable: -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - HARV: Harvester: SearchFromProcRadius: 32 SearchFromOrderRadius: 20 - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player PROC: Buildable: @@ -218,11 +112,3 @@ OLDLST: RejectsOrders: Cargo: Types: disabled - -MCV: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 1c446029a1..fc6482b105 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -697,4 +697,4 @@ Actors: Location: 37,51 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/gdi03/rules.yaml b/mods/cnc/maps/gdi03/rules.yaml index a7e5512443..ca539e1a0a 100644 --- a/mods/cnc/maps/gdi03/rules.yaml +++ b/mods/cnc/maps/gdi03/rules.yaml @@ -1,29 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi03.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: crep226m MissionData: @@ -32,95 +9,10 @@ World: StartVideo: samdie.vqa WinVideo: bombaway.vqa LossVideo: gameover.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 5000 - -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false SBAG: -Crushable: -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - WEAP: Buildable: Prerequisites: ~disabled @@ -209,19 +101,3 @@ airstrike.proxy: BeaconPoster: airstrike DisplayRadarPing: True CameraActor: camera - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index 90b5fafa71..9d078e72ba 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -455,6 +455,6 @@ Actors: Location: 27,58 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/cnc/maps/gdi04a/rules.yaml b/mods/cnc/maps/gdi04a/rules.yaml index c6cd287883..aaa6e24231 100644 --- a/mods/cnc/maps/gdi04a/rules.yaml +++ b/mods/cnc/maps/gdi04a/rules.yaml @@ -1,29 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi04a.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: fist226m MissionData: @@ -33,96 +10,7 @@ World: StartVideo: nitejump.vqa WinVideo: burdet1.vqa LossVideo: gameover.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False PlayerResources: - DefaultCashLocked: True DefaultCash: 0 - -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index d3a1744d74..c9b01b49cf 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -526,6 +526,6 @@ Actors: Location: 50,45 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/cnc/maps/gdi04b/rules.yaml b/mods/cnc/maps/gdi04b/rules.yaml index e48e13021f..52ff6e64bf 100644 --- a/mods/cnc/maps/gdi04b/rules.yaml +++ b/mods/cnc/maps/gdi04b/rules.yaml @@ -1,29 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi04b.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: fist226m MissionData: @@ -33,100 +10,11 @@ World: StartVideo: nitejump.vqa WinVideo: burdet1.vqa LossVideo: gameover.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False PlayerResources: - DefaultCashLocked: True DefaultCash: 0 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - E3: AutoTarget: ScanRadius: 5 - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index ab0ef808f4..44de030dce 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -740,6 +740,6 @@ Actors: Location: 28,47 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/cnc/maps/gdi04c/rules.yaml b/mods/cnc/maps/gdi04c/rules.yaml index 53c05d4729..b918627adb 100644 --- a/mods/cnc/maps/gdi04c/rules.yaml +++ b/mods/cnc/maps/gdi04c/rules.yaml @@ -1,31 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi04c.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: ind MissionData: @@ -35,15 +10,6 @@ World: StartVideo: nodsweep.vqa WinVideo: burdet1.vqa LossVideo: gameover.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False SmudgeLayer@SCORCH: InitialSmudges: 58,38: sc5,0 @@ -61,103 +27,21 @@ World: 23,32: cr1,0 Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False PlayerResources: - DefaultCashLocked: True DefaultCash: 0 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + IndexedPlayerPalette@units: + PlayerIndex: + Civillians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 ^CivInfantry: Health: HP: 125 -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - ^Bridge: DamageMultiplier@INVULNERABLE: Modifier: 0 - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/gdi05a/map.yaml b/mods/cnc/maps/gdi05a/map.yaml index 93ab176306..ad3e020d39 100644 --- a/mods/cnc/maps/gdi05a/map.yaml +++ b/mods/cnc/maps/gdi05a/map.yaml @@ -754,6 +754,6 @@ Actors: Location: 44,40 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/cnc/maps/gdi05a/rules.yaml b/mods/cnc/maps/gdi05a/rules.yaml index 80e4d4ec14..7dda4d4989 100644 --- a/mods/cnc/maps/gdi05a/rules.yaml +++ b/mods/cnc/maps/gdi05a/rules.yaml @@ -1,31 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi05a.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: rain MissionData: @@ -35,12 +10,6 @@ World: StartVideo: seige.vqa WinVideo: nodlose.vqa LossVideo: gdilose.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False MapOptions: Difficulties: Easy, Normal, Hard ShortGameLocked: True @@ -60,75 +29,21 @@ World: 11,51: cr1,0 Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true EnemyWatcher: - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False PlayerResources: - DefaultCashLocked: True DefaultCash: 2000 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 + IndexedPlayerPalette@units: + PlayerIndex: + AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 ^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false AnnounceOnSeen: -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - E2: Buildable: Prerequisites: ~pyle @@ -154,12 +69,6 @@ HARV: SearchFromOrderRadius: 24 Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player LTNK: Buildable: @@ -168,12 +77,6 @@ LTNK: MCV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player MTNK: Buildable: diff --git a/mods/cnc/maps/gdi05b/map.yaml b/mods/cnc/maps/gdi05b/map.yaml index f049a6906e..3cfb072c66 100644 --- a/mods/cnc/maps/gdi05b/map.yaml +++ b/mods/cnc/maps/gdi05b/map.yaml @@ -607,4 +607,4 @@ Actors: Location: 26,37 Owner: Nod -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/gdi05b/rules.yaml b/mods/cnc/maps/gdi05b/rules.yaml index 970950e4f2..032297a92b 100644 --- a/mods/cnc/maps/gdi05b/rules.yaml +++ b/mods/cnc/maps/gdi05b/rules.yaml @@ -1,47 +1,8 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - EnemyWatcher: - MusicPlaylist: - StartingMusic: rain - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 4000 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES LuaScript: Scripts: gdi05b.lua + MusicPlaylist: + StartingMusic: rain MissionData: Briefing: A GDI field base is under attack. They have fended off one attack but will not survive another.\n\nMove to the base, repair the structures and then launch a strike force to destroy the Nod base in the area.\n\nDestroy all Nod units and structures. BackgroundVideo: podium.vqa @@ -49,15 +10,6 @@ World: StartVideo: seige.vqa WinVideo: nodlose.vqa LossVideo: gdilose.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False SmudgeLayer@SCORCH: InitialSmudges: 15,56: sc3,0 @@ -67,62 +19,22 @@ World: 24,52: sc1,0 39,51: sc4,0 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +Player: + EnemyWatcher: + PlayerResources: + DefaultCash: 4000 -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 + IndexedPlayerPalette@units: + PlayerIndex: + AbandonedBase: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 ^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false AnnounceOnSeen: -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - SBAG: Buildable: Prerequisites: ~disabled @@ -186,12 +98,6 @@ E3: HARV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player MTNK: Buildable: @@ -212,12 +118,6 @@ MSAM: MCV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player FTNK: Buildable: diff --git a/mods/cnc/maps/gdi06/map.yaml b/mods/cnc/maps/gdi06/map.yaml index 404886d000..109db1eac9 100644 --- a/mods/cnc/maps/gdi06/map.yaml +++ b/mods/cnc/maps/gdi06/map.yaml @@ -1016,7 +1016,7 @@ Actors: Owner: GDI Location: 55,61 -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml Sequences: sequences.yaml diff --git a/mods/cnc/maps/gdi06/rules.yaml b/mods/cnc/maps/gdi06/rules.yaml index 857e84169c..bedfbcf8b1 100644 --- a/mods/cnc/maps/gdi06/rules.yaml +++ b/mods/cnc/maps/gdi06/rules.yaml @@ -1,29 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: LuaScript: Scripts: gdi06.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: BackgroundMusic: rain-ambient StartingMusic: rain @@ -53,85 +30,15 @@ World: StartVideo: nitejump.vqa WinVideo: sabotage.vqa LossVideo: gdilose.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False MapOptions: Difficulties: Easy, Normal, Hard ShortGameLocked: True ShortGameEnabled: True Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False PlayerResources: - DefaultCashLocked: True DefaultCash: 0 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - FLARE: RevealsShroud: Range: 5c0 @@ -181,19 +88,3 @@ E3.sticky: AllowMovement: false RenderSprites: Image: E3 - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index 00a9d77148..fde94524da 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -253,4 +253,4 @@ Actors: Location: 24,17 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod01/rules.yaml b/mods/cnc/maps/nod01/rules.yaml index 7ef5c643eb..30229c1e69 100644 --- a/mods/cnc/maps/nod01/rules.yaml +++ b/mods/cnc/maps/nod01/rules.yaml @@ -1,44 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 0 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: LuaScript: Scripts: nod01.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: nomercy VictoryMusic: nod_win1 @@ -47,15 +9,18 @@ World: BackgroundVideo: intro2.vqa BriefingVideo: nod1.vqa LossVideo: nodlose.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False + +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + IndexedPlayerPalette@units: + PlayerIndex: + Villagers: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + +Player: + PlayerResources: + DefaultCash: 0 C10: Tooltip: @@ -67,85 +32,6 @@ C10: ^CivBuilding: MustBeDestroyed: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false ^CivInfantry: MustBeDestroyed: - -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml index 2e2a860250..04818c1a0d 100644 --- a/mods/cnc/maps/nod02a/map.yaml +++ b/mods/cnc/maps/nod02a/map.yaml @@ -194,4 +194,4 @@ Actors: Location: 56,38 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml index 2b03f78555..decde62eab 100644 --- a/mods/cnc/maps/nod02b/map.yaml +++ b/mods/cnc/maps/nod02b/map.yaml @@ -236,4 +236,4 @@ Actors: Location: 30,44 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod02b/rules.yaml b/mods/cnc/maps/nod02b/rules.yaml index 914aa78ad5..dc7e3ba8c8 100644 --- a/mods/cnc/maps/nod02b/rules.yaml +++ b/mods/cnc/maps/nod02b/rules.yaml @@ -1,40 +1,4 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 4000 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES LuaScript: Scripts: nod02b.lua MusicPlaylist: @@ -46,70 +10,10 @@ World: StartVideo: seige.vqa WinVideo: airstrk.vqa LossVideo: deskill.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +Player: + PlayerResources: + DefaultCash: 4000 NUK2: Buildable: @@ -170,12 +74,6 @@ MLRS: MCV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player LST: Buildable: @@ -228,11 +126,3 @@ EYE: ATWR: Buildable: Prerequisites: ~disabled - -HARV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 5cc7cda469..56d0bcca17 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -430,4 +430,4 @@ Actors: Location: 32,47 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod03a/rules.yaml b/mods/cnc/maps/nod03a/rules.yaml index 765d8e7e73..4c20331bb0 100644 --- a/mods/cnc/maps/nod03a/rules.yaml +++ b/mods/cnc/maps/nod03a/rules.yaml @@ -1,42 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 4000 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: LuaScript: Scripts: nod03a.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: chrg226m VictoryMusic: nod_win1 @@ -46,80 +10,10 @@ World: StartVideo: dessweep.vqa WinVideo: desflees.vqa LossVideo: flag.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +Player: + PlayerResources: + DefaultCash: 4000 HQ: AirstrikePower: @@ -196,19 +90,3 @@ MISS: Name: Prison Capturable: CaptureThreshold: 1 - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 7e17e4fe98..f7560247f8 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -474,4 +474,4 @@ Actors: Location: 23,20 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod03b/rules.yaml b/mods/cnc/maps/nod03b/rules.yaml index abbb9e462e..5bb60d3644 100644 --- a/mods/cnc/maps/nod03b/rules.yaml +++ b/mods/cnc/maps/nod03b/rules.yaml @@ -1,42 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 4000 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: LuaScript: Scripts: nod03b.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: chrg226m VictoryMusic: nod_win1 @@ -46,80 +10,10 @@ World: StartVideo: dessweep.vqa WinVideo: desflees.vqa LossVideo: flag.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +Player: + PlayerResources: + DefaultCash: 4000 HQ: AirstrikePower: @@ -196,19 +90,3 @@ MISS: Name: Prison Capturable: CaptureThreshold: 1 - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml index a09ffb84c2..f1da768d2c 100644 --- a/mods/cnc/maps/nod04a/map.yaml +++ b/mods/cnc/maps/nod04a/map.yaml @@ -534,4 +534,4 @@ Actors: Facing: 160 SubCell: 2 -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod04a/rules.yaml b/mods/cnc/maps/nod04a/rules.yaml index ee018acc69..5fa188dc16 100644 --- a/mods/cnc/maps/nod04a/rules.yaml +++ b/mods/cnc/maps/nod04a/rules.yaml @@ -1,45 +1,6 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - EnemyWatcher: - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 0 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: LuaScript: Scripts: nod04a.lua - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: valkyrie VictoryMusic: nod_win1 @@ -48,88 +9,32 @@ World: BriefingVideo: nod4b.vqa StartVideo: retro.vqa LossVideo: deskill.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False SmudgeLayer@SCORCH: InitialSmudges: 37,24: sc6,0 36,18: sc6,0 +Player: + EnemyWatcher: + PlayerResources: + DefaultCash: 0 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + IndexedPlayerPalette@units: + PlayerIndex: + NodSupporter: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 ^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false AnnounceOnSeen: - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false ^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false AnnounceOnSeen: ^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false AnnounceOnSeen: -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - NUK2: Buildable: Prerequisites: ~disabled @@ -189,12 +94,6 @@ MLRS: MCV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player LST: Buildable: @@ -235,11 +134,3 @@ EYE: ATWR: Buildable: Prerequisites: ~disabled - -HARV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml index be61006167..ae9d5d3b10 100644 --- a/mods/cnc/maps/nod04b/map.yaml +++ b/mods/cnc/maps/nod04b/map.yaml @@ -476,4 +476,4 @@ Actors: Location: 32,22 Owner: Neutral -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod04b/rules.yaml b/mods/cnc/maps/nod04b/rules.yaml index ded41ae338..70bb6411d4 100644 --- a/mods/cnc/maps/nod04b/rules.yaml +++ b/mods/cnc/maps/nod04b/rules.yaml @@ -1,41 +1,4 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - EnemyWatcher: - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 0 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES LuaScript: Scripts: nod04b.lua MusicPlaylist: @@ -45,91 +8,20 @@ World: Briefing: A small village friendly to our cause has been increasingly harassed by GDI, and the Brotherhood wishes you to assist them in their efforts.\n\nSeek out the enemy village and destroy it. The event will be disguised as a GDI attack. BriefingVideo: nod4b.vqa LossVideo: nodlose.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False + +Player: + EnemyWatcher: + PlayerResources: + DefaultCash: 0 ^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false AnnounceOnSeen: - RenderSprites: - PlayerPalette: player-units ^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false AnnounceOnSeen: - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units TRAN: RejectsOrders: -Selectable: RevealsShroud: Range: 5c0 - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml index 8d6660f296..1ed6f93abe 100644 --- a/mods/cnc/maps/nod05/map.yaml +++ b/mods/cnc/maps/nod05/map.yaml @@ -373,4 +373,4 @@ Actors: Location: 26,13 Owner: GDI -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod05/rules.yaml b/mods/cnc/maps/nod05/rules.yaml index 23f38986d7..41e2c512ee 100644 --- a/mods/cnc/maps/nod05/rules.yaml +++ b/mods/cnc/maps/nod05/rules.yaml @@ -1,42 +1,4 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 5000 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES LuaScript: Scripts: nod05.lua MusicPlaylist: @@ -49,78 +11,17 @@ World: StartVideo: samsite.vqa WinVideo: insites.vqa LossVideo: flag.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False SmudgeLayer@CRATER: InitialSmudges: 46,48: cr1,0 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^Wall: - Tooltip: - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + IndexedPlayerPalette@units: + PlayerIndex: + Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 NUK2: Buildable: @@ -169,12 +70,6 @@ MLRS: MCV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player LST: Buildable: @@ -205,12 +100,6 @@ HARV: Prerequisites: ~disabled Harvester: SearchFromOrderRadius: 24 - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player FTNK: Buildable: diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml index ab143ed338..82bcdb71d5 100644 --- a/mods/cnc/maps/nod06a/map.yaml +++ b/mods/cnc/maps/nod06a/map.yaml @@ -643,4 +643,4 @@ Actors: Location: 57,32 Owner: GDI -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod06a/rules.yaml b/mods/cnc/maps/nod06a/rules.yaml index 31ecf9e42f..fbaea154e6 100644 --- a/mods/cnc/maps/nod06a/rules.yaml +++ b/mods/cnc/maps/nod06a/rules.yaml @@ -1,41 +1,4 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - EnemyWatcher: - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 0 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES LuaScript: Scripts: nod06a.lua MusicPlaylist: @@ -46,86 +9,18 @@ World: BriefingVideo: nod6.vqa StartVideo: sundial.vqa LossVideo: banner.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +Player: + EnemyWatcher: + PlayerResources: + DefaultCash: 0 ^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false AnnounceOnSeen: - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false HARV: Harvester: SearchFromProcRadius: 64 - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player FLARE: Tooltip: @@ -133,11 +28,3 @@ FLARE: TRAN: -Selectable: - -MCV: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml index c8831b579f..215bd8e519 100644 --- a/mods/cnc/maps/nod06b/map.yaml +++ b/mods/cnc/maps/nod06b/map.yaml @@ -586,4 +586,4 @@ Actors: Owner: GDI SubCell: 1 -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod06b/rules.yaml b/mods/cnc/maps/nod06b/rules.yaml index 60b7591363..a006ce6dbe 100644 --- a/mods/cnc/maps/nod06b/rules.yaml +++ b/mods/cnc/maps/nod06b/rules.yaml @@ -1,42 +1,4 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 0 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES LuaScript: Scripts: nod06b.lua MusicPlaylist: @@ -47,75 +9,18 @@ World: BriefingVideo: nod6.vqa StartVideo: sundial.vqa LossVideo: banner.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units +Player: + PlayerResources: + DefaultCash: 0 -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + IndexedPlayerPalette@units: + PlayerIndex: + Civilians: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 FLARE: Tooltip: @@ -123,19 +28,3 @@ FLARE: TRAN: -Selectable: - -HARV: - RenderSprites: - PlayerPalette: player - -MCV: - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml index 9fd3806641..7c9ad795b7 100644 --- a/mods/cnc/maps/nod06c/map.yaml +++ b/mods/cnc/maps/nod06c/map.yaml @@ -463,4 +463,4 @@ Actors: Location: 20,21 Owner: GDI -Rules: rules.yaml +Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/nod06c/rules.yaml b/mods/cnc/maps/nod06c/rules.yaml index 4fcda860ad..6e695d60b0 100644 --- a/mods/cnc/maps/nod06c/rules.yaml +++ b/mods/cnc/maps/nod06c/rules.yaml @@ -1,40 +1,4 @@ -^Palettes: - -PlayerColorPalette: - IndexedPlayerPalette: - BasePalette: terrain - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - IndexedPlayerPalette@units: - BasePalette: terrain - BaseName: player-units - RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - PlayerIndex: - GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 - Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 - Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 - -Player: - -ConquestVictoryConditions: - MissionObjectives: - EarlyGameOver: true - Shroud: - FogLocked: True - FogEnabled: True - ExploredMapLocked: True - ExploredMapEnabled: False - PlayerResources: - DefaultCashLocked: True - DefaultCash: 4000 - World: - -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: - ObjectivesPanel: - PanelName: MISSION_OBJECTIVES LuaScript: Scripts: nod06c.lua MusicPlaylist: @@ -45,15 +9,6 @@ World: BriefingVideo: nod6.vqa StartVideo: sundial.vqa LossVideo: banner.vqa - MapCreeps: - Locked: True - Enabled: False - MapBuildRadius: - AllyBuildRadiusLocked: True - AllyBuildRadiusEnabled: False - MapOptions: - ShortGameLocked: True - ShortGameEnabled: False SmudgeLayer@SCORCH: InitialSmudges: 41,40: sc2,0 @@ -68,65 +23,9 @@ World: 42,39: cr1,0 43,36: cr1,0 -^Vehicle: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Tank: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Infantry: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Helicopter: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^Plane: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Ship: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - -^Building: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CivBuilding: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false - -^CommonHuskDefaults: - Tooltip: - GenericVisibility: Enemy - ShowOwnerRow: false - RenderSprites: - PlayerPalette: player-units - -^CivBuildingHusk: - Tooltip: - GenericVisibility: Enemy, Neutral - ShowOwnerRow: false +Player: + PlayerResources: + DefaultCash: 4000 ^Bridge: DamageMultiplier@INVULNERABLE: @@ -195,12 +94,6 @@ MLRS: MCV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -MCV.Husk: - RenderSprites: - PlayerPalette: player LST: Buildable: @@ -233,12 +126,6 @@ E3: HARV: Buildable: Prerequisites: ~disabled - RenderSprites: - PlayerPalette: player - -HARV.Husk: - RenderSprites: - PlayerPalette: player MTNK: Buildable: diff --git a/mods/cnc/rules/campaign-maprules.yaml b/mods/cnc/rules/campaign-maprules.yaml new file mode 100644 index 0000000000..ff9579bdc2 --- /dev/null +++ b/mods/cnc/rules/campaign-maprules.yaml @@ -0,0 +1,28 @@ +World: + -SpawnMPUnits: + -MPStartLocations: + -CrateSpawner: + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES + MapCreeps: + Locked: True + Enabled: False + MapBuildRadius: + AllyBuildRadiusLocked: True + AllyBuildRadiusEnabled: False + MapOptions: + ShortGameLocked: True + ShortGameEnabled: False + +Player: + -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true + Shroud: + FogLocked: True + FogEnabled: True + ExploredMapLocked: True + ExploredMapEnabled: False + PlayerResources: + DefaultCashLocked: True + DefaultCash: 5000 diff --git a/mods/cnc/rules/campaign-palettes.yaml b/mods/cnc/rules/campaign-palettes.yaml new file mode 100644 index 0000000000..2550d58bf1 --- /dev/null +++ b/mods/cnc/rules/campaign-palettes.yaml @@ -0,0 +1,53 @@ +^Palettes: + -PlayerColorPalette: + IndexedPlayerPalette: + BasePalette: terrain + RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 + PlayerIndex: + GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 + Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 + Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + IndexedPlayerPalette@units: + BasePalette: terrain + BaseName: player-units + RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 + PlayerIndex: + GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 + Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 + Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 + +^Vehicle: + RenderSprites: + PlayerPalette: player-units + +^Tank: + RenderSprites: + PlayerPalette: player-units + +^Helicopter: + RenderSprites: + PlayerPalette: player-units + +^Infantry: + RenderSprites: + PlayerPalette: player-units + +^CommonHuskDefaults: + RenderSprites: + PlayerPalette: player-units + +HARV: + RenderSprites: + PlayerPalette: player + +MCV: + RenderSprites: + PlayerPalette: player + +HARV.Husk: + RenderSprites: + PlayerPalette: player + +MCV.Husk: + RenderSprites: + PlayerPalette: player diff --git a/mods/cnc/rules/campaign-tooltips.yaml b/mods/cnc/rules/campaign-tooltips.yaml new file mode 100644 index 0000000000..612cc76353 --- /dev/null +++ b/mods/cnc/rules/campaign-tooltips.yaml @@ -0,0 +1,59 @@ + +^Vehicle: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + +^Tank: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + +^Helicopter: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + +^Infantry: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + +^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + +^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + +^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + +^Wall: + Tooltip: + ShowOwnerRow: false + +^CivBuilding: + Tooltip: + GenericVisibility: Enemy, Neutral + ShowOwnerRow: false + +^CivBuildingHusk: + Tooltip: + GenericVisibility: Enemy, Neutral + ShowOwnerRow: false + +^CommonHuskDefaults: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + +^DINO: + Tooltip: + ShowOwnerRow: false