Z2mario

CommandLine/CommandLine.csproj

@@ -1,35 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <StartupObject>Z2Randomizer.CommandLine.Program</StartupObject>
-    <AssemblyName>Z2R</AssemblyName>
-    <Platforms>AnyCPU;x64</Platforms>
-    <RootNamespace>Z2Randomizer.CommandLine</RootNamespace>
-    <LangVersion>default</LangVersion>
-    <Configurations>Debug;Release;Unsafe Debug</Configurations>
-    <PublishTrimmed>true</PublishTrimmed>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Unsafe Debug' ">
-    <DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
-    <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Desktop.Common\Desktop.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="DefaultPlayerOptions.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <StartupObject>Z2Randomizer.CommandLine.Program</StartupObject>
+    <AssemblyName>Z2R</AssemblyName>
+    <Platforms>AnyCPU;x64</Platforms>
+    <RootNamespace>Z2Randomizer.CommandLine</RootNamespace>
+    <LangVersion>default</LangVersion>
+    <Configurations>Debug;Release;Unsafe Debug</Configurations>
+    <PublishTrimmed>true</PublishTrimmed>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Unsafe Debug' ">
+    <DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
+    <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Desktop.Common\Desktop.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="DefaultPlayerOptions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>

CommandLine/DefaultPlayerOptions.json

@@ -1,7 +1,7 @@
 {
   "DisableMusic": false,
-  "RandomizeMusic": false,
-  "MixCustomAndOriginalMusic":  true,
+  "RandomizeMusic": true,
+  "MixCustomAndOriginalMusic": false,
   "IncludeDiverseMusic": false,
   "DisableUnsafeMusic":  true,
   "FastSpellCasting": true,
@@ -16,5 +16,5 @@
   "ShieldTunicColor": "Default",
   "BeamSprite": "Default",
   "BeepThreshold": "Normal",
-  "BeepFrequency": "Normal"
+  "BeepFrequency": "Off"
 }

CommandLine/Program.cs

@@ -137,9 +137,8 @@ public async Task Randomize()
         var randomizer = new Hyrule(createAsm,palaceRooms);
         var rom = await randomizer.Randomize(vanillaRomData!, configuration, UpdateProgress, cts.Token);
 
-        if (rom.romdata != null)
+        if (rom.success)
         {
-
             char os_sep = Path.DirectorySeparatorChar;
             var filename = Rom!;
             var outpath = OutputPath;
@@ -151,7 +150,7 @@ public async Task Randomize()
                     : Directory.GetCurrentDirectory();
             }
             string newFileName =  $"{outpath}/Z2_{Seed}_{Flags}.nes";
-            await File.WriteAllBytesAsync(newFileName, rom.romdata);
+            await File.WriteAllBytesAsync(newFileName, rom.romdata!);
             logger.Info($"File {newFileName} has been created!");
             if (rom.debuginfo != null)
             {
@@ -163,6 +162,7 @@ public async Task Randomize()
         else
         {
             logger.Error("An exception occurred generating the rom");
+            logger.Error(rom.messages!);
         }
     }
 

CommandLine/Properties/PublishProfiles/FolderProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net8.0\publish\win-x64\</PublishDir>
+    <PublishDir>bin\Release\net10.0\publish\win-x64\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

CommandLine/Properties/launchSettings.json

@@ -2,7 +2,8 @@
   "profiles": {
     "CommandLine": {
       "commandName": "Project",
-      "commandLineArgs": "-c ../../../Sample.json -r ../../../../Zelda2.nes -s 12345678 -o ../../../.."
+      "commandLineArgs": "-f AAABvvyhAmLAAAAAAAAAEuPi+yAAAAAAAAAAAAAbhA -r ../Zelda2.nes -s mario -o ..",
+      "workingDirectory": "../build/"
     }
   }
 }

CommandLine/Sample.json

@@ -1,14 +1,14 @@
 {
 "AllowConnectionCavesToBeBlocked": false,
 "AllowUnsafePathEncounters": false,
-"AttackEffectiveness": "HIGH",
+"AttackEffectiveness": "DEFAULT",
 "AttackLevelCap": 8,
 "BeamSprite": "DEFAULT",
 "BeepFrequency": "Off",
 "BeepThreshold": "Normal",
 "BlockingRoomsInAnyPalace": false,
 "BossRoomsExitType": "OVERWORLD",
-"ChangePalacePallettes": true,
+"ChangePalacePallettes": false,
 "Climate":
 	{
 	"Name": "Classic",
@@ -171,5 +171,6 @@
 "UseCommunityText": true,
 "UseCustomRooms": false,
 "VanillaShuffleUsesActualTerrain": true,
-"WestBiome": "RANDOM_NO_VANILLA_OR_SHUFFLE"
+"WestBiome": "RANDOM_NO_VANILLA_OR_SHUFFLE",
+"MarioMode": true
 }

CoreSourceGenerator/CoreSourceGenerator.csproj

@@ -1,34 +1,32 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>default</LangVersion>
-        <Nullable>enable</Nullable>
-        <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-        <IsRoslynComponent>true</IsRoslynComponent>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IsPackable>false</IsPackable>
-        <Configurations>Debug;Release;Unsafe Debug</Configurations>
-        <Platforms>AnyCPU</Platforms>
-    </PropertyGroup>
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
-        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-        <IsTrimmable>true</IsTrimmable>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Unsafe Debug' ">
-      <DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
-      <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
-        <PackageReference Include="PolySharp">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>default</LangVersion>
+    <Nullable>enable</Nullable>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <IsRoslynComponent>true</IsRoslynComponent>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IsPackable>false</IsPackable>
+    <Configurations>Debug;Release;Unsafe Debug</Configurations>
+    <Platforms>AnyCPU</Platforms>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <IsTrimmable>true</IsTrimmable>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Unsafe Debug' ">
+    <DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
+    <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+    <PackageReference Include="PolySharp">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>