Huge set of commits for 5.2

.github/workflows/build-debug.yaml

@@ -5,7 +5,9 @@ on:
     branches-ignore:
     - main
     - testing
-    - '5.1'
+    - extras
+    - sgl
+    - '5.2'
   pull_request:
 
 env:

.github/workflows/build-latest.yaml

@@ -5,7 +5,9 @@ on:
     branches:
     - main
     - testing
-    - '5.1'
+    - extras
+    - sgl
+    - '5.2'
 
 env:
   # I'm not a fan of the telemetry as-is, but this also suppresses some lines in the build log.

CoreSourceGenerator/CoreSourceGenerator.csproj

@@ -11,10 +11,7 @@
         <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>

CoreSourceGenerator/FlagsSerializeGenerator.cs

@@ -58,7 +58,7 @@ private static bool IsPartialClass(SyntaxNode node)
             .Select(f =>
             {
                 // Look up the source code for the declaration to find if it has a default value
-                var equalsSyntax = f.DeclaringSyntaxReferences[0].GetSyntax() switch
+                var equalsSyntax = f.DeclaringSyntaxReferences.FirstOrDefault()?.GetSyntax() switch
                 {
                     PropertyDeclarationSyntax property => property.Initializer,
                     VariableDeclaratorSyntax variable => variable.Initializer,
@@ -81,18 +81,32 @@ private static bool IsPartialClass(SyntaxNode node)
         var serializeFields = classSymbol.GetMembers()
             .OfType<IFieldSymbol>()
             .Where(f => !HasIgnoreInFlagsAttribute(f))
-            .Select(f => new SerializedFieldInfo()
+            .Select(f =>
             {
-                FieldName = f.Name,
-                FieldType = f.Type.ToDisplayString(),
-                IsDifficultyOnly = HasDifficultyOnlyAttribute(f),
-                IsConditionallyIncluded = HasConditionallyIncludedInFlagsAttribute(f),
-                DefaultValue = GetDefaultValue(f),
-                IsEnum = f.Type.TypeKind == TypeKind.Enum,
-                EnumSymbol = f.Type.TypeKind == TypeKind.Enum ? f.Type as INamedTypeSymbol : null,
-                Minimum = GetCustomMinimum(f),
-                Maximum = GetCustomMaximum(f),
-                CustomSerializerName = GetCustomFlagSerializer(f),
+                var dictionaryInterface = f.Type.AllInterfaces
+                    .FirstOrDefault(i => i.OriginalDefinition.ToDisplayString().StartsWith("System.Collections.Generic.IDictionary"));
+                var innerType = dictionaryInterface != null ? dictionaryInterface.TypeArguments[0] : f.Type;
+
+                var equalsSyntax = f.DeclaringSyntaxReferences.FirstOrDefault()?.GetSyntax() switch
+                {
+                    PropertyDeclarationSyntax property => property.Initializer,
+                    VariableDeclaratorSyntax variable => variable.Initializer,
+                    _ => null
+                };
+
+                return new SerializedFieldInfo()
+                {
+                    FieldName = f.Name,
+                    FieldType = f.Type.ToDisplayString(),
+                    IsDifficultyOnly = HasDifficultyOnlyAttribute(f),
+                    IsConditionallyIncluded = HasConditionallyIncludedInFlagsAttribute(f),
+                    DefaultValue = equalsSyntax?.Value.ToString(),
+                    IsEnum = f.Type.TypeKind == TypeKind.Enum,
+                    EnumSymbol = f.Type.TypeKind == TypeKind.Enum ? f.Type as INamedTypeSymbol : null,
+                    Minimum = GetCustomMinimum(f),
+                    Maximum = GetCustomMaximum(f),
+                    CustomSerializerName = GetCustomFlagSerializer(f),
+                };
             }).ToList();
 
         classInfo.SerializedFields.AddRange(serializeFields);
@@ -140,14 +154,6 @@ private static bool HasDifficultyOnlyAttribute(IFieldSymbol field)
             .Any(attr => attr.AttributeClass?.Name.StartsWith("DifficultyOnly") ?? false);
     }
 
-    private static string GetDefaultValue(IFieldSymbol f)
-    {
-        var defaultAttr = f.GetAttributes()
-            .FirstOrDefault(a => a.AttributeClass?.ToDisplayString() == "System.ComponentModel.DefaultValueAttribute");
-        var arg = defaultAttr?.ConstructorArguments[0];
-        return arg != null ? FormatArgument(arg.Value) : "default";
-    }
-
     private static bool HasIgnoreInFlagsAttribute(IFieldSymbol field)
     {
         return field.GetAttributes()
@@ -317,7 +323,10 @@ private static void GenerateReactiveProperty(StringBuilder sb, ReactiveFieldInfo
         sb.AppendLine($"{indent}            {{");
         sb.AppendLine($"{indent}                {field.FieldName} = value;");
         sb.AppendLine($"{indent}                OnPropertyChanged(nameof({field.PropertyName}));");
-        sb.AppendLine($"{indent}                OnPropertyChanged(\"Flags\");");
+        sb.AppendLine($"{indent}                if (!_inDeserializeFlags)");
+        sb.AppendLine($"{indent}                {{");
+        sb.AppendLine($"{indent}                    OnPropertyChanged(\"Flags\");");
+        sb.AppendLine($"{indent}                }}");
         sb.AppendLine($"{indent}            }}");
         sb.AppendLine($"{indent}        }}");
         sb.AppendLine($"{indent}    }}{defaultValue}");

CrossPlatformUI.Browser/CrossPlatformUI.Browser.csproj

@@ -22,8 +22,14 @@
 
         <CompressionEnabled>false</CompressionEnabled>
         <BlazorEnableCompression>false</BlazorEnableCompression>
+        <WasmEmitSymbolMap>true</WasmEmitSymbolMap>
+        <EnableWorkloadRestore>true</EnableWorkloadRestore>
     </PropertyGroup>
 
+    <ItemGroup>
+        <Workload Include="wasm-tools" />
+    </ItemGroup>
+
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">
         <RunAOTCompilation>true</RunAOTCompilation>
     </PropertyGroup>

CrossPlatformUI/CrossPlatformUI.csproj

@@ -13,11 +13,6 @@
         <PublishTrimmed>true</PublishTrimmed>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <!-- ReactiveUserControl<T> ViewModel references cause IL2026 -->
-        <NoWarn>$(NoWarn);IL2026</NoWarn>
-    </PropertyGroup>
-
     <PropertyGroup Condition=" '$(Configuration)' == 'Unsafe Debug' ">
       <DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
       <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
@@ -35,6 +30,7 @@
         <PackageReference Include="AvaloniaUI.DiagnosticsSupport" />
         <PackageReference Include="DialogHost.Avalonia" />
         <PackageReference Include="Material.Avalonia" />
+        <PackageReference Include="Material.Avalonia.DataGrid" />
         <PackageReference Include="Material.Icons.Avalonia" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
         <PackageReference Include="ReactiveUI" />
@@ -46,6 +42,11 @@
         <PackageReference Include="Xaml.Behaviors.Interactions" />
     </ItemGroup>
 
+    <ItemGroup>
+        <RuntimeHostConfigurationOption Include="MaterialThemeIncludeDataGrid" Value="false"/>
+        <RuntimeHostConfigurationOption Include="MaterialThemeIncludeTreeDataGrid" Value="false"/>
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\RandomizerCore\RandomizerCore.csproj" />
     </ItemGroup>

CrossPlatformUI/Lang/Resources.resx

@@ -231,9 +231,20 @@ group is the same as the number in that group that steal EXP in vanilla.</value>
 <value>If selected, the amount of EXP each stealer steals is between 50% and 150% of the vanilla
 amount.</value>
 	</data>
-	<data name="ShuffleSwordImmunityToolTip" xml:space="preserve">
-<value>Randomly reassigns which enemies are immune to stabs. The number of enemies that are
-immune in each group is the same as the number in that group that are immune in vanilla.</value>
+	<data name="SwordImmunityOptionToolTip" xml:space="preserve">
+<value>Vanilla:
+Uses the game's original sword immunities. (Tektites and Zoras)
+
+Shuffle:
+Randomly reassigns which enemies are immune to sword attacks and require the Fire spell
+to damage. On average, the same number of enemies are immune as in the vanilla game.
+
+Shuffle/None if Fire unusable:
+Uses Shuffle if the Fire spell is usable (not replaced by Dash nor linked with Fairy).
+Otherwise, removes all sword immunities.
+
+None:
+Removes all sword immunities.</value>
 	</data>
 	<data name="ShuffleSpritePalettesToolTip" xml:space="preserve">
 <value>Randomizes the color palettes of enemies and NPCs. Health bar color is also randomized.
@@ -692,9 +703,9 @@ linear.</value>
    make room.
 
 Random Item Rooms Per Palace:
+ • Each palace gets 0–3 item rooms (varies by palace length/style).
  • Clouds in the entrance screen and Ironknuckle statues by the entrance elevator
    indicate how many items there are in the palace.</value>
- • Each palace gets 0–3 item rooms (varies by palace length/style).
 	</data>
 	<data name="IncludeVanillaRoomsToolTip" xml:space="preserve">
 <value>If selected, the normal zelda 2 rooms will be available for palace generation. Note that
@@ -766,8 +777,10 @@ considered duplicates of each other. Has no effect on vanilla palaces. Does not
 prevent duplicates for Random Walk generated palaces.</value>
 	</data>
 	<data name="BlockingRoomsinAnyPalaceToolTip" xml:space="preserve">
-<value>Allows rooms that require an item or spell to traverse to appear in any palace. Otherwise,
-palaces can only contain blocks according to the following table.</value>
+<value>Allows rooms that cannot be passed without a specific item or spell to appear in any palace.
+Otherwise, the allowed requirements for rooms in palaces are based on the items and spells
+needed to pass through every room in that palace in vanilla (from either direction).
+See the Wiki for the full table.</value>
 	</data>
 	<data name="RemoveLongDeadEndsToolTip" xml:space="preserve">
 <value>Removes dead-end rooms from the room pool. This helps newer players who are not yet

CrossPlatformUI/Presets/BeginnerPreset.cs

@@ -31,8 +31,8 @@ public static class BeginnerPreset
         EastBiome = Biome.VANILLALIKE,
         DmBiome = Biome.VANILLALIKE,
         MazeBiome = Biome.VANILLALIKE,
-        WestClimate = ClimateEnum.VANILLA_WEIGHTED_WEST,
-        EastClimate = ClimateEnum.VANILLA_WEIGHTED_EAST,
+        WestClimate = ClimateEnum.VANILLA_WEIGHTED,
+        EastClimate = ClimateEnum.VANILLA_WEIGHTED,
 
         //Palaces
         NormalPalaceStyle = PalaceStyle.VANILLA_WEIGHTED,

CrossPlatformUI/Presets/FullShufflePreset.cs

@@ -29,8 +29,8 @@ public static class FullShufflePreset
         EastBiome = Biome.RANDOM_NO_VANILLA_OR_SHUFFLE,
         DmBiome = Biome.RANDOM_NO_VANILLA_OR_SHUFFLE,
         MazeBiome = Biome.VANILLALIKE,
-        WestClimate = ClimateEnum.VANILLA_WEIGHTED_WEST,
-        EastClimate = ClimateEnum.VANILLA_WEIGHTED_EAST,
+        WestClimate = ClimateEnum.VANILLA_WEIGHTED,
+        EastClimate = ClimateEnum.VANILLA_WEIGHTED,
         ContinentConnectionType = ContinentConnectionType.ANYTHING_GOES,
 
         //Palaces
@@ -77,7 +77,7 @@ public static class FullShufflePreset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.RANDOM,
 
         //Items

CrossPlatformUI/Presets/MaxRando2025Preset.cs

@@ -79,7 +79,7 @@ public static class MaxRando2025Preset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.RANDOM,
 
         //Items

CrossPlatformUI/Presets/MaxRandoPreset.cs

@@ -90,7 +90,7 @@ public static class MaxRandoPreset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.WIDE,
 
         //Items

CrossPlatformUI/Presets/NormalPreset.cs

@@ -27,8 +27,8 @@ public static class NormalPreset
         EastBiome = Biome.RANDOM_NO_VANILLA_OR_SHUFFLE,
         MazeBiome = Biome.VANILLALIKE,
         DmBiome = Biome.RANDOM_NO_VANILLA_OR_SHUFFLE,
-        WestClimate = ClimateEnum.VANILLA_WEIGHTED_WEST,
-        EastClimate = ClimateEnum.VANILLA_WEIGHTED_EAST,
+        WestClimate = ClimateEnum.VANILLA_WEIGHTED,
+        EastClimate = ClimateEnum.VANILLA_WEIGHTED,
         ContinentConnectionType = ContinentConnectionType.TRANSPORTATION_SHUFFLE,
 
         //Palaces
@@ -70,7 +70,7 @@ public static class NormalPreset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.RANDOM,
 
         //Items

CrossPlatformUI/Presets/RandomPercentPreset.cs

@@ -88,7 +88,7 @@ public static class RandomPercentPreset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.RANDOM,
 
         //Items

CrossPlatformUI/Presets/StandardPreset.cs

@@ -74,7 +74,7 @@ public static class StandardPreset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.RANDOM,
 
         //Items

CrossPlatformUI/Presets/StandardSwissPreset.cs

@@ -73,7 +73,7 @@ public static class StandardSwissPreset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.RANDOM,
 
         //Items

CrossPlatformUI/Presets/UpstartsTournamentPreset.cs

@@ -65,7 +65,7 @@ public static class UpstartsTournamentPreset
         ShuffleBossHP = EnemyLifeOption.MEDIUM,
         ShuffleXPStealers = true,
         ShuffleXPStolenAmount = true,
-        ShuffleSwordImmunity = true,
+        SwordImmunityOption = SwordImmunityOption.SHUFFLE,
         EnemyXPDrops = XPEffectiveness.RANDOM,
 
         //Items