Stuff

README.md

@@ -27,8 +27,13 @@ In addition to making IBJ completely optional, there is also:
 - **Captain Novolin** replacement sprite for _A Link to the Past_ by Fragger
 - **Non-Binary** Samus sprite for _Super Metroid_ by Glove
 - **Trans**, **Backwards**, **Upside down** and **180°** Samus sprites for _Super Metroid_ by TarThoron
-- **Shaktool** and **Shaktool Jr.** reolacement sprites for _Super Metroid_ by Pneumatic
-- **Diddy Kong** reolacement sprite for _Super Metroid_ by Di10 
+- **Shaktool** and **Shaktool Jr.** replacement sprites for _Super Metroid_ by Pneumatic
+- **Diddy Kong** replacement sprite for _Super Metroid_ by Di10 
+- **Crewmate** replacement sprite for _Super Metroid_ by _aitchFactor, and _A Link to the Past_ by Fish_waffle64
+- **Goose** replacement sprite for _A Link to the Past_ by Jam
+- **Inkling Girl** replacement sprite for _Super Metroid by ouily644
+- **Metroid** replacement sprite for _Super Metroid by Fingersmcgee
+- **Sprite** replacement sprite for _Super Metroid_ by TarThoron
 
 The original repository can be found at <https://github.com/tewtal/SMZ3Randomizer>.
 

setup/randomizer.app.iss

@@ -4,7 +4,7 @@
 #include "CodeDependencies.iss"
 
 #define MyAppName "SMZ3 Cas' Randomizer"
-#define MyAppVersion "3.2.0"
+#define MyAppVersion "3.3.1"
 #define MyAppPublisher "Vivelin"
 #define MyAppURL "https://github.com/Vivelin/SMZ3Randomizer"
 #define MyAppExeName "Randomizer.App.exe"

src/Randomizer.App/Randomizer.App.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>chozo20.ico</ApplicationIcon>
-    <Version>3.2.0</Version>
+    <Version>3.3.1</Version>
     <Title>SMZ3 Cas' Randomizer</Title>
     <AssemblyTitle>SMZ3 Cas' Randomizer</AssemblyTitle>
     <Authors>Vivelin</Authors>

src/Randomizer.App/ViewModels/PatchOptions.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using System.IO;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 using Randomizer.SMZ3;
 
@@ -49,8 +50,13 @@ public string Msu1Path
         public LowHealthBeepSpeed LowHealthBeepSpeed { get; set; }
             = LowHealthBeepSpeed.Half;
 
+        public MenuSpeed MenuSpeed { get; set; }
+            = MenuSpeed.Default;
+
         public bool DisableLowEnergyBeep { get; set; }
 
+        public bool CasualSuperMetroidPatches { get; set; }
+
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));

src/Randomizer.App/ViewModels/RandomizerOptions.cs

@@ -5,6 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+using Randomizer.Shared;
 using Randomizer.SMZ3;
 
 namespace Randomizer.App.ViewModels
@@ -19,8 +20,6 @@ public class RandomizerOptions : INotifyPropertyChanged
             }
         };
 
-        public event PropertyChangedEventHandler PropertyChanged;
-
         public RandomizerOptions()
         {
             GeneralOptions = new GeneralOptions();
@@ -38,6 +37,8 @@ public RandomizerOptions(GeneralOptions generalOptions,
             PatchOptions = patchOptions ?? new();
         }
 
+        public event PropertyChangedEventHandler PropertyChanged;
+
         [JsonPropertyName("General")]
         public GeneralOptions GeneralOptions { get; }
 
@@ -81,9 +82,14 @@ public void Save(string path)
             GameMode = GameMode.Normal,
             Z3Logic = Z3Logic.Normal,
             SMLogic = SMLogic.Normal,
-            SwordLocation = SeedOptions.SwordLocation,
-            MorphLocation = SeedOptions.MorphLocation,
-            MorphBombsLocation = SeedOptions.MorphBombsLocation,
+            ItemLocations =
+            {
+                [ItemType.ProgressiveSword] = SeedOptions.SwordLocation,
+                [ItemType.Morph] = SeedOptions.MorphLocation,
+                [ItemType.Bombs] = SeedOptions.MorphBombsLocation,
+                [ItemType.Boots] = SeedOptions.PegasusBootsLocation,
+                [ItemType.SpaceJump] = SeedOptions.SpaceJumpLocation,
+            },
             ShaktoolItemPool = SeedOptions.ShaktoolItem,
             PegWorldItemPool = SeedOptions.PegWorldItem,
             KeyShuffle = SeedOptions.Keysanity ? KeyShuffle.Keysanity : KeyShuffle.None,
@@ -92,7 +98,9 @@ public void Save(string path)
             ShuffleDungeonMusic = PatchOptions.ShuffleDungeonMusic,
             HeartColor = PatchOptions.HeartColor,
             LowHealthBeepSpeed = PatchOptions.LowHealthBeepSpeed,
-            DisableLowEnergyBeep = PatchOptions.DisableLowEnergyBeep
+            DisableLowEnergyBeep = PatchOptions.DisableLowEnergyBeep,
+            CasualSMPatches = PatchOptions.CasualSuperMetroidPatches,
+            MenuSpeed = PatchOptions.MenuSpeed
         };
 
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)

src/Randomizer.App/ViewModels/SeedOptions.cs

@@ -25,6 +25,10 @@ public class SeedOptions
 
         public ItemPlacement MorphBombsLocation { get; set; }
 
+        public ItemPlacement PegasusBootsLocation { get; set; }
+
+        public ItemPlacement SpaceJumpLocation { get; set; }
+
         public ItemPool ShaktoolItem { get; set; }
 
         public ItemPool PegWorldItem { get; set; }