578a9fe457
In 4312a4d3f4 MiniYaml merging was adjusted. One effect of this change was that duplicate keys in files that did not previously require merging was previously allowed, but was now an error. (Test case `TestMergeConflictsNoMerge`)
The installer files were relying on the previous behaviour to allow multiple `ContentPackage` keys. The above change caused a regression where attempting to manage mod content would crash due to now erroring on the duplicate keys.
We fix the issue by applying a unique ID suffix, as is a common pattern elsewhere in our yaml files, and teach InstallFromSourceLogic to recognise and strip it.
94 lines
4.6 KiB
YAML
94 lines
4.6 KiB
YAML
nod95: C&C Gold (Nod Disc, English)
|
|
Type: Disc
|
|
IDFiles:
|
|
DISK.WAV: 83a0235525afa5cd6096f2967e3eae032996e38c
|
|
CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
|
|
Install:
|
|
# Base game files:
|
|
ContentPackage@base:
|
|
Name: base
|
|
Actions:
|
|
Copy: .
|
|
^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
|
|
^SupportDir|Content/cnc/desert.mix: DESERT.MIX
|
|
^SupportDir|Content/cnc/general.mix: GENERAL.MIX
|
|
^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
|
|
^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
|
|
^SupportDir|Content/cnc/winter.mix: WINTER.MIX
|
|
ExtractBlast: INSTALL/SETUP.Z
|
|
^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
|
|
^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
|
|
^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
|
|
# Base game music (optional):
|
|
ContentPackage@music:
|
|
Name: music
|
|
Actions:
|
|
Copy: .
|
|
^SupportDir|Content/cnc/scores.mix: SCORES.MIX
|
|
# Nod campaign briefings (optional):
|
|
ContentPackage@movies-nod:
|
|
Name: movies-nod
|
|
Actions:
|
|
ExtractMix: MOVIES.MIX
|
|
^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
|
|
^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
|
|
^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
|
|
^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
|
|
^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
|
|
^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
|
|
^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
|
|
^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
|
|
^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
|
|
^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
|
|
^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
|
|
^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
|
|
^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
|
|
^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
|
|
^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
|
|
^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
|
|
^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
|
|
^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
|
|
^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
|
|
^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
|
|
^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
|
|
^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
|
|
^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
|
|
^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
|
|
^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
|
|
^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
|
|
^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
|
|
^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
|
|
^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
|
|
^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
|
|
^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
|
|
^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
|
|
^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
|
|
^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
|
|
^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
|
|
^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
|
|
^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
|
|
^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
|
|
^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
|
|
^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
|
|
^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
|
|
^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
|
|
^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
|
|
^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
|
|
^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
|
|
^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
|
|
^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
|
|
^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
|
|
^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
|
|
^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
|
|
^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
|
|
^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
|
|
^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
|
|
^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
|
|
^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
|
|
^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
|
|
^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
|
|
^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
|
|
^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
|
|
^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
|
|
^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
|