Super Metroid: more path fixes

WebHostLib/static/assets/tutorial/zelda3/multiworld_en.md

@@ -1,10 +1,10 @@
 # A Link to the Past Randomizer Setup Guide
 
 ## Required Software
-- [Z3Client](https://github.com/ArchipelagoMW/Z3Client/releases) or the LttPClient included with
+- [Z3Client](https://github.com/ArchipelagoMW/Z3Client/releases) or the SNIClient included with
 [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
-    - If installing Archipelago, make sure to check the box for LttPClient during install, or SNI will not be included
-- [SNI](https://github.com/alttpo/sni/releases) (Included in both Z3Client and LttPClient)
+    - If installing Archipelago, make sure to check the box for SNIClient -> A Link to the Past Patch Setup during install, or SNI will not be included
+- [SNI](https://github.com/alttpo/sni/releases) (Included in both Z3Client and SNIClient)
 - Hardware or software capable of loading and playing SNES ROM files
     - An emulator capable of connecting to SNI
       ([snes9x Multitroid](https://drive.google.com/drive/folders/1_ej-pwWtCAHYXIrvs5Hro16A1s9Hi3Jz),
@@ -76,7 +76,7 @@ Firewall.
 4. In the new window, click **Browse...**
 5. Select the connector lua file included with your client
      - Z3Client users should download `sniConnector.lua` from the client download page
-     - LttPClient users should look in their Archipelago folder for `/sni/Connector.lua`
+     - SNIClient users should look in their Archipelago folder for `/sni/Connector.lua`
 
 ##### BizHawk
 1. Ensure you have the BSNES core loaded. You may do this by clicking on the Tools menu in BizHawk and following
@@ -88,7 +88,7 @@ Firewall.
 4. Click the button to open a new Lua script.
 5. Select the `sniConnector.lua` file you downloaded above
      - Z3Client users should download `sniConnector.lua` from the client download page
-     - LttPClient users should look in their Archipelago folder for `/sni/Connector.lua`
+     - SNIClient users should look in their Archipelago folder for `/sni/Connector.lua`
 
 #### With hardware
 This guide assumes you have downloaded the correct firmware for your device. If you have not

worlds/sm/variaRandomizer/patches/patchaccess.py

@@ -2,16 +2,15 @@ import os, importlib
 from logic.logic import Logic
 from patches.common.patches import patches, additional_PLMs
 from utils.parameters import appDir
-from Utils import is_frozen
 
 class PatchAccess(object):
     def __init__(self):
         # load all ips patches
         self.patchesPath = {}
-        commonDir = os.path.join(appDir, 'lib' if is_frozen() else '', 'worlds/sm/variaRandomizer/patches/common/ips/')
+        commonDir = os.path.join(appDir, 'worlds/sm/variaRandomizer/patches/common/ips/')
         for patch in os.listdir(commonDir):
             self.patchesPath[patch] = commonDir
-        logicDir = os.path.join(appDir, 'lib' if is_frozen() else '', 'worlds/sm/variaRandomizer/patches/{}/ips/'.format(Logic.patches))
+        logicDir = os.path.join(appDir, 'worlds/sm/variaRandomizer/patches/{}/ips/'.format(Logic.patches))
         for patch in os.listdir(logicDir):
             self.patchesPath[patch] = logicDir
 

worlds/sm/variaRandomizer/randomizer.py

@@ -352,7 +352,7 @@ class VariaRandomizer:
                     sys.exit(-1)
             else:
                 preset = 'default'
-                PresetLoader.factory('{}/{}/{}.json'.format(appDir, getPresetDir('casual'), 'casual')).load(self.player)
+                PresetLoader.factory(os.path.join(appDir, getPresetDir('casual'), 'casual.json')).load(self.player)
 
         
 

worlds/sm/variaRandomizer/utils/utils.py

@@ -1,19 +1,17 @@
-import os, json, sys, re, random
+import os, json, re, random
 
 from utils.parameters import Knows, Settings, Controller, isKnows, isSettings, isButton
 from utils.parameters import easy, medium, hard, harder, hardcore, mania, text2diff
 from logic.smbool import SMBool
 
-from Utils import is_frozen
-
 def isStdPreset(preset):
     return preset in ['newbie', 'casual', 'regular', 'veteran', 'expert', 'master', 'samus', 'solution', 'Season_Races', 'SMRAT2021']
 
-def getPresetDir(preset):
+def getPresetDir(preset) -> str:
     if isStdPreset(preset):
-        return 'lib/worlds/sm/variaRandomizer/standard_presets' if is_frozen() else 'worlds/sm/variaRandomizer/standard_presets'
+        return 'worlds/sm/variaRandomizer/standard_presets'
     else:
-        return 'lib/worlds/sm/variaRandomizer/community_presets' if is_frozen() else 'worlds/sm/variaRandomizer/community_presets'
+        return 'worlds/sm/variaRandomizer/community_presets'
 
 def removeChars(string, toRemove):
     return re.sub('[{}]+'.format(toRemove), '', string)