From 1229cd6bbf3cb95f2b6290af706c0cbc72be1808 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 27 Apr 2026 20:28:34 -0400 Subject: [PATCH] Ensure Wii and WiiU are output with correct fields --- CHANGELIST.md | 1 + MPF.Frontend/Tools/SubmissionGenerator.cs | 31 ++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index b44425fd..64cc666c 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -7,6 +7,7 @@ - User-friendly error message if checking for updates fails - Add Disc Hologram ID placeholders for all Xbox discs - Update RedumpLib to 1.10.1 +- Ensure Wii and WiiU are output with correct fields ### 3.7.1 (2026-03-30) diff --git a/MPF.Frontend/Tools/SubmissionGenerator.cs b/MPF.Frontend/Tools/SubmissionGenerator.cs index 96503e7a..87f3f002 100644 --- a/MPF.Frontend/Tools/SubmissionGenerator.cs +++ b/MPF.Frontend/Tools/SubmissionGenerator.cs @@ -719,6 +719,36 @@ namespace MPF.Frontend.Tools break; case MediaType.NintendoWiiOpticalDisc: + + // If we have a single-layer disc + if (info.SizeAndChecksums.Layerbreak == default) + { + info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer1MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0AdditionalMould = addPlaceholders ? RequiredIfExistsValue : string.Empty; + } + // If we have a dual-layer disc + else + { + info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer0AdditionalMould = addPlaceholders ? RequiredIfExistsValue : string.Empty; + + info.CommonDiscInfo.Layer1MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer1MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer1ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty; + info.CommonDiscInfo.Layer1MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty; + } + + info.Extras.BCA ??= addPlaceholders ? RequiredValue : string.Empty; + + break; + case MediaType.NintendoWiiUOpticalDisc: // If we have a single-layer disc @@ -747,7 +777,6 @@ namespace MPF.Frontend.Tools } info.Extras.DiscKey = addPlaceholders ? RequiredValue : string.Empty; - info.Extras.BCA ??= addPlaceholders ? RequiredValue : string.Empty; break;