Merge branch 'main' into breaking_changes

# Conflicts:
#	README.md

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '44 8 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

Mystery.py

@@ -5,6 +5,7 @@ import urllib.request
 import urllib.parse
 import typing
 import os
+from collections import Counter
 
 import ModuleUpdate
 from worlds.generic import PlandoItem, PlandoConnection
@@ -171,6 +172,7 @@ def main(args=None, callback=ERmain):
                     elif type(players_meta) == dict and players_meta[key] and option not in players_meta[key]:
                         weights_cache[path][key] = option
 
+    name_counter = Counter()
     for player in range(1, args.multi + 1):
         path = player_path_cache[player]
         if path:
@@ -213,6 +215,16 @@ def main(args=None, callback=ERmain):
             erargs.name[player] = f"Player{player}"
         elif not erargs.name[player]:  # if name was not specified, generate it from filename
             erargs.name[player] = os.path.split(path)[-1].split(".")[0]
+        new_name = []
+        name_counter[erargs.name[player]] += 1
+        for name in erargs.name[player].split("%%"):
+            if "%number%" in name:
+                name = name.replace("%number%", str(name_counter[erargs.name[player]]))
+            if "%player%" in name:
+                name = name.replace("%player%", str(player))
+            new_name.append(name)
+        erargs.name[player] = handle_name("%".join(new_name))
+        logging.info(erargs.name[player])
     erargs.names = ",".join(erargs.name[i] for i in range(1, args.multi + 1))
     del (erargs.name)
     if args.yaml_output:
@@ -447,8 +459,6 @@ def roll_settings(weights: dict, plando_options: typing.Set[str] = frozenset(("b
 
     ret = argparse.Namespace()
     ret.name = get_choice('name', weights)
-    if ret.name:
-        ret.name = handle_name(ret.name)
 
     ret.game = get_choice("game", weights, "A Link to the Past")
 
@@ -539,8 +549,11 @@ def roll_settings(weights: dict, plando_options: typing.Set[str] = frozenset(("b
 
     # change minimum to required pieces to avoid problems
     ret.triforce_pieces_available = min(max(ret.triforce_pieces_required, int(ret.triforce_pieces_available)), 90)
-
+    shuffle_slots = get_choice('shop_shuffle_slots', weights, '0')
-    ret.shop_shuffle_slots = int(get_choice('shop_shuffle_slots', weights, '0'))
+    if str(shuffle_slots).lower() == "random":
+        ret.shop_shuffle_slots = random.randint(0, 30)
+    else:
+        ret.shop_shuffle_slots = int(shuffle_slots)
 
     ret.shop_shuffle = get_choice('shop_shuffle', weights, '')
     if not ret.shop_shuffle:

WebHostLib/static/static/spriteData.json

@@ -1,10 +1,5 @@
 {
  "sprites": [
-  {
-   "file": "neslink.1.zspr",
-   "author": "MikeTrethewey/Fatmanspanda",
-   "name": " NES Link"
-  },
   {
    "file": "abigail.1.zspr",
    "author": "Fish_waffle64",
@@ -41,13 +36,13 @@
    "name": "Ark (Cape)"
   },
   {
-   "file": "ark-dorana.1.zspr",
+   "file": "ark-dorana.2.zspr",
-   "author": "Matt Dorana",
+   "author": "Dorana",
    "name": "Ark (No Cape)"
   },
   {
-   "file": "arrghus.2.zspr",
+   "file": "arrghus.3.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Arrghus"
   },
   {
@@ -56,7 +51,7 @@
    "name": "Astronaut"
   },
   {
-   "file": "asuna.1.zspr",
+   "file": "asuna.2.zspr",
    "author": "Natsuru Kiyohoshi",
    "name": "Asuna"
   },
@@ -106,13 +101,13 @@
    "name": "Bewp"
   },
   {
-   "file": "bigkey.1.zspr",
+   "file": "bigkey.2.zspr",
-   "author": "Fouton",
+   "author": "kan",
    "name": "Big Key"
   },
   {
-   "file": "birb.1.zspr",
+   "file": "birb.2.zspr",
-   "author": "Andrew Copple",
+   "author": "Dr. Deadrewski",
    "name": "Birb"
   },
   {
@@ -141,8 +136,8 @@
    "name": "Blossom"
   },
   {
-   "file": "bob.1.zspr",
+   "file": "bob.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Bob"
   },
   {
@@ -150,6 +145,11 @@
    "author": "CaptainApathy",
    "name": "Bob Ross"
   },
+  {
+   "file": "boco.2.zspr",
+   "author": "TarThoron",
+   "name": "Boco the Chocobo"
+  },
   {
    "file": "boo.2.zspr",
    "author": "Zarby89",
@@ -201,13 +201,13 @@
    "name": "Brian"
   },
   {
-   "file": "broccoli.1.zspr",
+   "file": "broccoli.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Broccoli"
   },
   {
-   "file": "bronzor.1.zspr",
+   "file": "bronzor.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Bronzor"
   },
   {
@@ -285,6 +285,11 @@
    "author": "Chrizzz",
    "name": "Chrizzz"
   },
+  {
+   "file": "cinna.1.zspr",
+   "author": "norskmatty",
+   "name": "Cinna"
+  },
   {
    "file": "cirno.1.zspr",
    "author": "Achy",
@@ -311,7 +316,17 @@
    "name": "Cornelius"
   },
   {
-   "file": "cucco.1.zspr",
+   "file": "corona.2.zspr",
+   "author": "Herowho",
+   "name": "Corona"
+  },
+  {
+   "file": "crewmate.2.zspr",
+   "author": "Fish_waffle64",
+   "name": "Crewmate"
+  },
+  {
+   "file": "cucco.2.zspr",
    "author": "Mike Trethewey",
    "name": "Cucco"
   },
@@ -400,14 +415,19 @@
    "author": "Krelbel",
    "name": "Demon Link"
   },
+  {
+   "file": "dipper.1.zspr",
+   "author": "Sharpefern",
+   "name": "Dipper"
+  },
   {
    "file": "dragonite.2.zspr",
    "author": "Fish_waffle64",
    "name": "Dragonite"
   },
   {
-   "file": "drake.1.zspr",
+   "file": "drake.2.zspr",
-   "author": "No Body The Dragon",
+   "author": "NO Body The Dragon",
    "name": "Drake The Dragon"
   },
   {
@@ -415,6 +435,11 @@
    "author": "PlaguedOne",
    "name": "Eggplant"
   },
+  {
+   "file": "ema-skye.1.zspr",
+   "author": "Linlinlin",
+   "name": "Ema Skye"
+  },
   {
    "file": "emosaru.1.zspr",
    "author": "Achy",
@@ -426,8 +451,8 @@
    "name": "Ezlo"
   },
   {
-   "file": "fierce-deity-link.2.zspr",
+   "file": "fierce-deity-link.3.zspr",
-   "author": "jeffreygriggs2",
+   "author": "Jeffreygriggs2",
    "name": "Fierce Deity Link"
   },
   {
@@ -471,8 +496,8 @@
    "name": "Freya Crescent"
   },
   {
-   "file": "frisk.1.zspr",
+   "file": "frisk.2.zspr",
-   "author": "Original by Toby Fox, sprite edit by MisterKerr",
+   "author": "Toby Fox/MisterKerr",
    "name": "Frisk"
   },
   {
@@ -496,12 +521,12 @@
    "name": "GBC Link"
   },
   {
-   "file": "gamer.1.zspr",
+   "file": "gamer.2.zspr",
-   "author": "Unknown",
+   "author": "InTheBeef",
    "name": "Gamer"
   },
   {
-   "file": "ganondorf.1.zspr",
+   "file": "ganondorf.2.zspr",
    "author": "Fish_waffle64",
    "name": "Ganondorf"
   },
@@ -521,7 +546,7 @@
    "name": "Garo Master"
   },
   {
-   "file": "geno.1.zspr",
+   "file": "geno.2.zspr",
    "author": "FedoraFriday",
    "name": "Geno"
   },
@@ -535,6 +560,11 @@
    "author": "Lantis",
    "name": "Gobli"
   },
+  {
+   "file": "gooey.1.zspr",
+   "author": "Lougaroc",
+   "name": "Gooey"
+  },
   {
    "file": "goomba.1.zspr",
    "author": "SirCzah",
@@ -561,9 +591,9 @@
    "name": "Gruncle Stan"
   },
   {
-   "file": "guiz.1.zspr",
+   "file": "guiz.2.zspr",
    "author": "GuizDP",
-   "name": "GuizDP"
+   "name": "Guiz"
   },
   {
    "file": "hanna.1.zspr",
@@ -586,8 +616,8 @@
    "name": "Hat Kid"
   },
   {
-   "file": "headlesslink.1.zspr",
+   "file": "headlesslink.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Headless Link"
   },
   {
@@ -595,6 +625,16 @@
    "author": "qeeen",
    "name": "Hello Kitty"
   },
+  {
+   "file": "hero-of-hyrule.1.zspr",
+   "author": "Vonyee",
+   "name": "Hero Of Hyrule "
+  },
+  {
+   "file": "hero-of-awakening.1.zspr",
+   "author": "Vonyee",
+   "name": "Hero of Awakening"
+  },
   {
    "file": "hidari.1.zspr",
    "author": "Hidari",
@@ -605,11 +645,6 @@
    "author": "PlaguedOne",
    "name": "Hint Tile"
   },
-  {
-   "file": "luffy.1.zspr",
-   "author": "BOtheMighty",
-   "name": "Hitsuyan1337"
-  },
   {
    "file": "hoarder-bush.1.zspr",
    "author": "Restomak",
@@ -625,6 +660,16 @@
    "author": "Restomak",
    "name": "Hoarder (Rock)"
   },
+  {
+   "file": "hollow-knight.2.zspr",
+   "author": "Chew_Terr",
+   "name": "Hollow Knight"
+  },
+  {
+   "file": "hollow-knight-winter.1.zspr",
+   "author": "Malmo and Atth3h3art0fwinter",
+   "name": "Hollow Knight (Malmo/Winter)"
+  },
   {
    "file": "homer.1.zspr",
    "author": "Fwiller",
@@ -646,15 +691,10 @@
    "name": "Hyrule Soldier"
   },
   {
-   "file": "ignignokt.2.zspr",
+   "file": "ignignokt.3.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Ignignokt"
   },
-  {
-   "file": "crewmate.1.zspr",
-   "author": "Fish_waffle64",
-   "name": "Imposter"
-  },
   {
    "file": "informant_woman.1.zspr",
    "author": "Herowho",
@@ -691,7 +731,12 @@
    "name": "Jogurt"
   },
   {
-   "file": "katsura.1.zspr",
+   "file": "kain.1.zspr",
+   "author": "Chew Terr",
+   "name": "Kain"
+  },
+  {
+   "file": "katsura.2.zspr",
    "author": "atth3h3art0fwinter",
    "name": "Katsura"
   },
@@ -700,6 +745,11 @@
    "author": "Gylergin",
    "name": "Kecleon"
   },
+  {
+   "file": "kefka.1.zspr",
+   "author": "ChewTerr",
+   "name": "Kefka"
+  },
   {
    "file": "kenny_mccormick.1.zspr",
    "author": "Artheau",
@@ -711,8 +761,8 @@
    "name": "Ketchup"
   },
   {
-   "file": "kholdstare.1.zspr",
+   "file": "kholdstare.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Kholdstare"
   },
   {
@@ -721,15 +771,25 @@
    "name": "King Gothalion"
   },
   {
-   "file": "king_graham.1.zspr",
+   "file": "king_graham.2.zspr",
    "author": "MisterKerr",
-   "name": "King Graham v1.1"
+   "name": "King Graham"
+  },
+  {
+   "file": "kinu.1.zspr",
+   "author": "UberNooga",
+   "name": "Kinu"
   },
   {
    "file": "kirby-meta.1.zspr",
    "author": "KHRoxas",
    "name": "Kirby"
   },
+  {
+   "file": "kirby-d3.1.zspr",
+   "author": "Lougaroc",
+   "name": "Kirby (Dreamland 3)"
+  },
   {
    "file": "kore8.1.zspr",
    "author": "Skewer",
@@ -740,6 +800,11 @@
    "author": "atth3h3art0fwinter",
    "name": "Korok"
   },
+  {
+   "file": "kriv.1.zspr",
+   "author": "UltChimi",
+   "name": "Kriv"
+  },
   {
    "file": "lakitu.1.zspr",
    "author": "SirCzah",
@@ -790,6 +855,11 @@
    "author": "Achy",
    "name": "Lucario"
   },
+  {
+   "file": "luffy.2.zspr",
+   "author": "BOtheMighty",
+   "name": "Luffy"
+  },
   {
    "file": "luigi.1.zspr",
    "author": "Achy",
@@ -800,6 +870,11 @@
    "author": "IkkyLights",
    "name": "Luna Maindo"
   },
+  {
+   "file": "lynel-botw.1.zspr",
+   "author": "Lougaroc",
+   "name": "Lynel (BotW)"
+  },
   {
    "file": "madeline.1.zspr",
    "author": "Jam",
@@ -821,8 +896,8 @@
    "name": "Mallow (Cat)"
   },
   {
-   "file": "mangalink.1.zspr",
+   "file": "mangalink.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Manga Link"
   },
   {
@@ -861,8 +936,8 @@
    "name": "Matthias"
   },
   {
-   "file": "meatwad.1.zspr",
+   "file": "meatwad.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Meatwad"
   },
   {
@@ -891,12 +966,12 @@
    "name": "Mike Jones"
   },
   {
-   "file": "ganon.1.zspr",
+   "file": "ganon.2.zspr",
    "author": "atth3h3art0fwinter",
    "name": "Mini Ganon"
   },
   {
-   "file": "minishcaplink.2.zspr",
+   "file": "minishcaplink.3.zspr",
    "author": "InTheBeef",
    "name": "Minish Cap Link"
   },
@@ -906,9 +981,9 @@
    "name": "Minish Link"
   },
   {
-   "file": "moblin.1.zspr",
+   "file": "moblin.2.zspr",
    "author": "Noctai_",
-   "name": "MoblinSprite"
+   "name": "Moblin"
   },
   {
    "file": "modernlink.1.zspr",
@@ -940,6 +1015,11 @@
    "author": "TehRealSalt",
    "name": "Ms. Paint Dog"
   },
+  {
+   "file": "neslink.2.zspr",
+   "author": "Mike Trethewey/kan",
+   "name": "NES Link"
+  },
   {
    "file": "naturelink.1.zspr",
    "author": "iBazly",
@@ -951,7 +1031,7 @@
    "name": "Navi"
   },
   {
-   "file": "navirou.2.zspr",
+   "file": "navirou.3.zspr",
    "author": "Lori",
    "name": "Navirou"
   },
@@ -966,14 +1046,14 @@
    "name": "Negative Link"
   },
   {
-   "file": "neosad.1.zspr",
+   "file": "neosad.2.zspr",
-   "author": "Andrew Copple",
+   "author": "Dr. Deadrewski",
    "name": "Neosad"
   },
   {
-   "file": "ness.1.zspr",
+   "file": "ness.2.zspr",
    "author": "Lantis",
-   "name": "Ness (Earthbound)"
+   "name": "Ness"
   },
   {
    "file": "nia.1.zspr",
@@ -1016,14 +1096,14 @@
    "name": "Paula"
   },
   {
-   "file": "penguinlink.1.zspr",
+   "file": "penguinlink.2.zspr",
    "author": "Fish_waffle64",
    "name": "Penguin Link"
   },
   {
-   "file": "pete.1.zspr",
+   "file": "pete.2.zspr",
    "author": "Lantis",
-   "name": "Pete (Harvest Moon)"
+   "name": "Pete"
   },
   {
    "file": "phoenix-wright.1.zspr",
@@ -1031,13 +1111,13 @@
    "name": "Phoenix Wright"
   },
   {
-   "file": "pikachu.1.zspr",
+   "file": "pikachu.2.zspr",
-   "author": "toucansham",
+   "author": "t0uchan",
    "name": "Pikachu"
   },
   {
-   "file": "pinkribbonlink.2.zspr",
+   "file": "pinkribbonlink.3.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Pink Ribbon Link"
   },
   {
@@ -1051,8 +1131,8 @@
    "name": "Plague Knight"
   },
   {
-   "file": "pokey.1.zspr",
+   "file": "pokey.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Pokey"
   },
   {
@@ -1075,6 +1155,11 @@
    "author": "PorgCollector",
    "name": "Porg Knight"
   },
+  {
+   "file": "power-ranger.1.zspr",
+   "author": "Zeta Xero",
+   "name": "Power Ranger"
+  },
   {
    "file": "mushy.1.zspr",
    "author": "Achy",
@@ -1121,8 +1206,13 @@
    "name": "Pyro"
   },
   {
-   "file": "rainbowlink.1.zspr",
+   "file": "quadbanger.1.zspr",
-   "author": "fatmanspanda",
+   "author": "Kai Gomez",
+   "name": "QuadBanger"
+  },
+  {
+   "file": "rainbowlink.2.zspr",
+   "author": "kan",
    "name": "Rainbow Link"
   },
   {
@@ -1141,18 +1231,23 @@
    "name": "Remeer"
   },
   {
-   "file": "rick.1.zspr",
+   "file": "remus-ruldufus-black.1.zspr",
-   "author": "Eric the Terrible/Devan 2002",
+   "author": "The3rdX",
-   "name": "Rick (Redacted)"
+   "name": "Remus R Black"
   },
   {
-   "file": "robotlink.1.zspr",
+   "file": "rick.2.zspr",
-   "author": "fatmanspanda",
+   "author": "Eric the Terrible/Devan 2002",
+   "name": "Rick"
+  },
+  {
+   "file": "robotlink.2.zspr",
+   "author": "kan",
    "name": "Robo-Link 9000"
   },
   {
-   "file": "rocko.1.zspr",
+   "file": "rocko.2.zspr",
-   "author": "toucansham",
+   "author": "t0uchan",
    "name": "Rocko"
   },
   {
@@ -1186,8 +1281,8 @@
    "name": "Ryu"
   },
   {
-   "file": "snes-controller.1.zspr",
+   "file": "snes-controller.2.zspr",
-   "author": "Cbass601",
+   "author": "cbass601",
    "name": "SNES Controller"
   },
   {
@@ -1196,7 +1291,7 @@
    "name": "Sailor Moon"
   },
   {
-   "file": "saitama.1.zspr",
+   "file": "saitama.2.zspr",
    "author": "Dabeanjelly/Ath3h3art0fwinter",
    "name": "Saitama"
   },
@@ -1215,6 +1310,11 @@
    "author": "Ben G",
    "name": "Samus (Super Metroid)"
   },
+  {
+   "file": "santahat-link.1.zspr",
+   "author": "Lexitik",
+   "name": "Santa Hat Link"
+  },
   {
    "file": "santalink.2.zspr",
    "author": "HOHOHO",
@@ -1226,7 +1326,7 @@
    "name": "Scholar"
   },
   {
-   "file": "selan.1.zspr",
+   "file": "selan.2.zspr",
    "author": "atth3h3art0fwinter",
    "name": "Selan"
   },
@@ -1251,8 +1351,8 @@
    "name": "Shantae"
   },
   {
-   "file": "shuppet.1.zspr",
+   "file": "shuppet.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Shuppet"
   },
   {
@@ -1271,8 +1371,13 @@
    "name": "SighnWaive"
   },
   {
-   "file": "slowpoke.1.zspr",
+   "file": "skunk.1.zspr",
-   "author": "Joey Rat",
+   "author": "Hiveul",
+   "name": "Skunk"
+  },
+  {
+   "file": "slowpoke.2.zspr",
+   "author": "Joey_Rat",
    "name": "Slowpoke"
   },
   {
@@ -1326,13 +1431,13 @@
    "name": "Stalfos"
   },
   {
-   "file": "stan.1.zspr",
+   "file": "stan.2.zspr",
-   "author": "Kan",
+   "author": "kan",
    "name": "Stan"
   },
   {
-   "file": "staticlink.1.zspr",
+   "file": "staticlink.2.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Static Link"
   },
   {
@@ -1391,7 +1496,7 @@
    "name": "TP Zelda"
   },
   {
-   "file": "mario_tanooki.1.zspr",
+   "file": "mario_tanooki.2.zspr",
    "author": "Nocturnesthesia",
    "name": "Tanooki Mario"
   },
@@ -1405,11 +1510,21 @@
    "author": "All-in-one Mighty",
    "name": "Terra (Esper)"
   },
+  {
+   "file": "terry.1.zspr",
+   "author": "CD-Mestay",
+   "name": "Terry"
+  },
   {
    "file": "tetra.1.zspr",
    "author": "Ferelheart",
    "name": "Tetra Sheet"
   },
+  {
+   "file": "professor.1.zspr",
+   "author": "PlaguedOne",
+   "name": "The Professor"
+  },
   {
    "file": "pug.1.zspr",
    "author": "Achy",
@@ -1420,14 +1535,19 @@
    "author": "Devan2002",
    "name": "Thief"
   },
+  {
+   "file": "thinkdorm.1.zspr",
+   "author": "PlaguedOne",
+   "name": "ThinkDorm"
+  },
   {
    "file": "thomcrow.1.zspr",
    "author": "Thom",
    "name": "Thomcrow"
   },
   {
-   "file": "tile.2.zspr",
+   "file": "tile.3.zspr",
-   "author": "fatmanspanda",
+   "author": "kan",
    "name": "Tile"
   },
   {
@@ -1451,8 +1571,8 @@
    "name": "TotemLinks"
   },
   {
-   "file": "trogdor.1.zspr",
+   "file": "trogdor.2.zspr",
-   "author": "MikeTrethewey/Spanda",
+   "author": "Mike Trethewey/kan",
    "name": "Trogdor the Burninator"
   },
   {
@@ -1461,7 +1581,7 @@
    "name": "Tunic Color Link"
   },
   {
-   "file": "two_faced.1.zspr",
+   "file": "two_faced.2.zspr",
    "author": "Devan2002",
    "name": "TwoFaced"
   },
@@ -1475,11 +1595,6 @@
    "author": "PlaguedOne",
    "name": "Ultros"
   },
-  {
-   "file": "corona.1.zspr",
-   "author": "Unknown",
-   "name": "Untitled"
-  },
   {
    "file": "valeera.1.zspr",
    "author": "Glan",
@@ -1525,6 +1640,11 @@
    "author": "Deagans",
    "name": "Wario"
   },
+  {
+   "file": "whitemage.1.zspr",
+   "author": "TheRedMage",
+   "name": "White Mage"
+  },
   {
    "file": "will.1.zspr",
    "author": "Xenobond",
@@ -1551,12 +1671,12 @@
    "name": "Yoshi"
   },
   {
-   "file": "yunica.1.zspr",
+   "file": "yunica.2.zspr",
    "author": "Fish_waffle64",
    "name": "Yunica Tovah"
   },
   {
-   "file": "zandra.1.zspr",
+   "file": "zandra.2.zspr",
    "author": "ZandraVandra",
    "name": "Zandra"
   },
@@ -1566,7 +1686,7 @@
    "name": "Zebra Unicorn"
   },
   {
-   "file": "zeck.1.zspr",
+   "file": "zeck.2.zspr",
    "author": "aitchFactor",
    "name": "Zeckemyro"
   },
@@ -1585,24 +1705,14 @@
    "author": "Zarby, InTheBeef",
    "name": "Zora"
   },
-  {
-   "file": "boco.1.zspr",
-   "author": "",
-   "name": "boco"
-  },
-  {
-   "file": "hollow-knight.1.zspr",
-   "author": "Chew_Terr",
-   "name": "hollow_test"
-  },
   {
    "file": "ibazly.1.zspr",
    "author": "Achy",
    "name": "iBazly"
   },
   {
-   "file": "missingno.1.zspr",
+   "file": "missingno.2.zspr",
-   "author": "",
+   "author": "AAhbxsujd",
    "name": "missingno"
   }
  ]