Skip to content

Commit

Permalink
Update for playtest-20241228.
Browse files Browse the repository at this point in the history
  • Loading branch information
pchote committed Dec 28, 2024
1 parent ff3255d commit 32d84d3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
12 changes: 5 additions & 7 deletions OpenRA.Mods.Mobius/FileSystem/RemasterFileSystemLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class RemasterFileSystemLoader : IFileSystemLoader, IFileSystemExternalCo
[FieldLoader.Require]
public readonly string RemasterDataMount = null;
public readonly string InstallPromptMod = "remaster-content";
public readonly Dictionary<string, string> Packages = null;
public readonly Dictionary<string, string> SystemPackages = null;
public readonly Dictionary<string, string> RemasterPackages = null;

[FieldLoader.LoadUsing(nameof(LoadSources))]
Expand All @@ -39,12 +39,12 @@ static object LoadSources(MiniYaml yaml)
return ret;
}

bool contentAvailable = true;
bool contentAvailable;

public void Mount(OpenRA.FileSystem.FileSystem fileSystem, ObjectCreator objectCreator)
{
if (Packages != null)
foreach (var kv in Packages)
if (SystemPackages != null)
foreach (var kv in SystemPackages)
fileSystem.Mount(kv.Key, kv.Value);

if (RemasterPackages == null)
Expand All @@ -58,11 +58,9 @@ public void Mount(OpenRA.FileSystem.FileSystem fileSystem, ObjectCreator objectC
{
var dataPath = Path.Combine(path, "Data");
if (!Directory.Exists(dataPath))
{
contentAvailable = false;
continue;
}

contentAvailable = true;
fileSystem.Mount(dataPath, RemasterDataMount);
foreach (var p in RemasterPackages)
{
Expand Down
2 changes: 1 addition & 1 deletion mod.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
MOD_ID="cnc"

# The OpenRA engine version to use for this project.
ENGINE_VERSION="4f880f6269"
ENGINE_VERSION="728cada9a7"

##############################################################################
# Packaging
Expand Down
2 changes: 1 addition & 1 deletion mods/cnc/mod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Metadata:
PackageFormats: Mix, MegV3, ZipFile

FileSystem: RemasterFileSystem
Packages:
SystemPackages:
^EngineDir
$cnc: cnc
^EngineDir|mods/cnc: base
Expand Down

0 comments on commit 32d84d3

Please sign in to comment.