From 8b997a5656d215c1332e8bec622fd3fb82bfc49b Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Sun, 17 Nov 2024 16:33:50 +0200 Subject: [PATCH] Just some package definition reordering Mostly superficial, but in case of file name collisions we want the mod-specific files to override the common ones. (cherry picked from commit f210b39bbcc427bb6c36dfadb71cc15cb1fec2f9) --- mods/cnc/mod.yaml | 2 +- mods/d2k/mod.yaml | 4 ++-- mods/ra/mod.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index cb1df1c3f8..896b27cfe5 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -13,8 +13,8 @@ FileSystem: ContentInstallerFileSystem $cnc: cnc ^EngineDir|mods/common: common ~^SupportDir|Content/cnc: content - cnc|scripts common|scripts + cnc|scripts cnc|uibits ContentPackages: content|speech.mix diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index a406fb9b04..9a45c7dee1 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -13,8 +13,8 @@ FileSystem: ContentInstallerFileSystem $d2k: d2k ^EngineDir|mods/common: common ~^SupportDir|Content/d2k/v3/: content - d2k|scripts common|scripts + d2k|scripts d2k|uibits ContentPackages: content|SOUND.RS @@ -23,13 +23,13 @@ FileSystem: ContentInstallerFileSystem ~content|Movies d2k|bits ContentFiles: - content|DATA.R16 content|BLOXBASE.R16 content|BLOXBAT.R16 content|BLOXBGBS.R16 content|BLOXICE.R16 content|BLOXTREE.R16 content|BLOXWAST.R16 + content|DATA.R16 content|MOUSE.R16 content|PALETTE.BIN ContentInstallerMod: d2k-content diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 3f40ab0187..e143a74fe7 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -13,8 +13,8 @@ FileSystem: ContentInstallerFileSystem $ra: ra ^EngineDir|mods/common: common ~^SupportDir|Content/ra/v2/: content - ra|scripts common|scripts + ra|scripts ra|uibits ContentPackages: content|allies.mix