From 870431de411e4355109a519a91e9909177c0fd7a Mon Sep 17 00:00:00 2001
From: MegaPiggy <34462599+MegaPiggy@users.noreply.github.com>
Date: Mon, 31 May 2021 20:54:14 -0400
Subject: [PATCH] Updated to game version v210530.1

---
 Character.cs                               |  10 +-
 Console/Commands/CompleteLevelCommand.cs   |   2 +-
 Console/Commands/LoadLevelCommand.cs       |   2 +-
 Console/Commands/SwitchCharacterCommand.cs |   4 +-
 Extensions/GameObjectExtensions.cs         |   2 +
 Extensions/OtherExtensions.cs              | 109 +++++++-
 Extensions/StringExtensions.cs             |  71 ++++--
 Level.cs                                   |   4 +-
 Main.cs                                    |  41 ++-
 Patches/OptionPatches.cs                   | 170 ++++++------
 Patches/PausePatches.cs                    | 284 +++++++++++++++++++++
 Patches/VFXPatches.cs                      |  35 +++
 Registries/CharacterRegistry.cs            |  18 +-
 SALT.csproj                                |   3 +
 SAObjects.cs                               |   2 +
 Timer.cs                                   |   3 +-
 UI/ModListUI.cs                            |   8 +-
 UI/TimerUI.cs                              |   8 +-
 Utils/EnumUtils.cs                         |  33 +++
 VFXOption.cs                               |  58 +++++
 20 files changed, 728 insertions(+), 139 deletions(-)
 create mode 100644 Patches/PausePatches.cs
 create mode 100644 Patches/VFXPatches.cs
 create mode 100644 VFXOption.cs

diff --git a/Character.cs b/Character.cs
index 77e75c3..e142619 100644
--- a/Character.cs
+++ b/Character.cs
@@ -40,8 +40,16 @@ public enum Character
         /// </summary>
         KEVIN,
         /// <summary>
+        /// Subaru as a duck. Popularized in a meme during May 2021.
+        /// </summary>
+        SHUBA,
+        /// <summary>
+        /// A cow that is supposed to the be the game creator Kevin.
+        /// </summary>
+        GURA_CAT,
+        /// <summary>
         /// A character with nothing attached.
         /// </summary>
-        NONE
+        NONE// = -1,
     }
 }
diff --git a/Console/Commands/CompleteLevelCommand.cs b/Console/Commands/CompleteLevelCommand.cs
index 1f974d3..ff02b1c 100644
--- a/Console/Commands/CompleteLevelCommand.cs
+++ b/Console/Commands/CompleteLevelCommand.cs
@@ -28,7 +28,6 @@ public override bool Execute(string[] args)
                 var potClose = Object.FindObjectOfType<PotCloseTrigger>();
                 if (potClose != null)
                 {
-                    SAObjects.GetRootGameObject("PotTrap").SetActiveRecursivelyExt(true);
                     Patches.PotClosedPatch.OnPotClosed += CompleteRedHeart;
                     potClose.OnTriggerEnter2D(Main.CreatePlayerCollider());
                     return true;
@@ -41,6 +40,7 @@ public override bool Execute(string[] args)
 
         private static void CompleteRedHeart()
         {
+            SAObjects.GetRootGameObject("PotTrap").SetChildActive("LevelClearEmpty", true);
             CompleteLevel();
             Patches.PotClosedPatch.OnPotClosed -= CompleteRedHeart;
         }
diff --git a/Console/Commands/LoadLevelCommand.cs b/Console/Commands/LoadLevelCommand.cs
index 03439d3..96bc8bf 100644
--- a/Console/Commands/LoadLevelCommand.cs
+++ b/Console/Commands/LoadLevelCommand.cs
@@ -18,7 +18,7 @@ internal class LoadLevelCommand : ConsoleCommand
         public static int Increment()
         {
             i += 1;
-            if (i > 9)
+            if (i > (int)EnumUtils.GetHighestValue<Level>())
                 i = 0;
             return i;
         }
diff --git a/Console/Commands/SwitchCharacterCommand.cs b/Console/Commands/SwitchCharacterCommand.cs
index 6b1b882..5f2e31a 100644
--- a/Console/Commands/SwitchCharacterCommand.cs
+++ b/Console/Commands/SwitchCharacterCommand.cs
@@ -38,7 +38,7 @@ public override bool Execute(string[] args)
             if (name.StartsWith(UnknownStart))
             {
                 int characterNumber = name.Replace(UnknownStart, "").ToInt() + ((player.characterPacks.Count+1) - 1);
-                Main.ChangeCharacter(characterNumber);
+                Main.SetCharacter(characterNumber);
                 Console.LogSuccess("Successfully changed character");
                 return true;
             }
@@ -48,7 +48,7 @@ public override bool Execute(string[] args)
             //    Console.LogError("Character change failed");
             //    return false;
             //}
-            Main.ChangeCharacter((int)character);
+            Main.SetCharacter((int)character);
             Console.LogSuccess("Successfully changed character");
             return true;
         }
diff --git a/Extensions/GameObjectExtensions.cs b/Extensions/GameObjectExtensions.cs
index aa09ec7..f996f17 100644
--- a/Extensions/GameObjectExtensions.cs
+++ b/Extensions/GameObjectExtensions.cs
@@ -296,6 +296,8 @@ public static void PrintNamesOfComponents(this GameObject gameObject)
 
         public static void RemoveComponent<T>(this GameObject go) where T : Component => UnityEngine.Object.Destroy(go.GetComponent<T>());
 
+        public static void RemoveComponentImmediate<T>(this GameObject go) where T : Component => UnityEngine.Object.DestroyImmediate(go.GetComponent<T>());
+
         public static T AddComponent<T>(this GameObject go, T toAdd) where T : Component => go.AddComponent<T>().GetCopyOf<T>(toAdd);
 
         public static void AddChild(this GameObject obj, GameObject child)
diff --git a/Extensions/OtherExtensions.cs b/Extensions/OtherExtensions.cs
index 3a81160..221113b 100644
--- a/Extensions/OtherExtensions.cs
+++ b/Extensions/OtherExtensions.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
+using UnityEngine.Events;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -419,11 +421,116 @@ public static string GetTypeAlias(this Type type)
             return !m_TypeAliases.TryGetValue(type, out string str) ? type.ToString() : str;
         }
 
+        public static List<TextAssetTranslation> ToAssetTranslations(this string text)
+        {
+            return new List<TextAssetTranslation>
+            {
+                new TextAssetTranslation
+                {
+                    language = Language.English,
+                    text = new TextAsset(text),
+                },
+                new TextAssetTranslation
+                {
+                    language = Language.Japanese,
+                    text = new TextAsset(text),
+                }
+            };
+        }
+
+        public static List<TextAssetTranslation> ToAssetTranslations(this string text, string jtext)
+        {
+            return new List<TextAssetTranslation>
+            {
+                new TextAssetTranslation
+                {
+                    language = Language.English,
+                    text = new TextAsset(text),
+                },
+                new TextAssetTranslation
+                {
+                    language = Language.Japanese,
+                    text = new TextAsset(jtext),
+                }
+            };
+        }
+
         public static void Edit(this TextArea textArea, string text)
         {
-            textArea.text = new TextAsset(text);
+            textArea.texts = text.ToAssetTranslations();
+            textArea.SetText();
+        }
+
+        public static void Edit(this TextArea textArea, string text, string jtext)
+        {
+            textArea.texts = text.ToAssetTranslations(jtext);
+            textArea.SetText();
+        }
+
+        public static string GetText(this TextArea textArea, Language language) => textArea.texts.FirstOrDefault(tat => tat.language == language).text.text;
+        public static string GetEnglishText(this TextArea textArea) => textArea.GetText(Language.English);
+        public static string GetJapaneseText(this TextArea textArea) => textArea.GetText(Language.Japanese);
+
+        public static List<Translation> ToTranslations(this string text)
+        {
+            return new List<Translation>
+            {
+                new Translation
+                {
+                    language = Language.English,
+                    text = text,
+                },
+                new Translation
+                {
+                    language = Language.Japanese,
+                    text = text,
+                }
+            };
+        }
+
+        public static List<Translation> ToTranslations(this string text, string jtext)
+        {
+            return new List<Translation>
+            {
+                new Translation
+                {
+                    language = Language.English,
+                    text = text,
+                },
+                new Translation
+                {
+                    language = Language.Japanese,
+                    text = jtext,
+                }
+            };
+        }
+
+        public static void Edit(this TextLanguageScript textLanguageScript, string text)
+        {
+            textLanguageScript.translations = text.ToTranslations();
+            textLanguageScript.SetLanguage();
         }
 
+        public static void Edit(this TextLanguageScript textLanguageScript, string text, string jtext)
+        {
+            textLanguageScript.translations = text.ToTranslations(jtext);
+            textLanguageScript.SetLanguage();
+        }
+
+        public static string GetText(this TextLanguageScript textLanguageScript, Language language) => textLanguageScript.translations.FirstOrDefault(translation => translation.language == language).text;
+        public static string GetEnglishText(this TextLanguageScript textLanguageScript) => textLanguageScript.GetText(Language.English);
+        public static string GetJapaneseText(this TextLanguageScript textLanguageScript) => textLanguageScript.GetText(Language.Japanese);
+
         public static void Log(this string str, bool logToFile = true) => Console.Console.Log(str, logToFile);
+
+        public static void EditLabels(this PauseOption pauseOption, string text) => pauseOption.labels = new TranslationCollection { translations = text.ToTranslations() };
+        public static void EditLabels(this PauseOption pauseOption, string text, string jtext) => pauseOption.labels = new TranslationCollection { translations = text.ToTranslations(jtext) };
+        public static void AddMethod(this PauseOption pauseOption, UnityAction state) => pauseOption.methods.AddListener(state);
+        public static void RemoveAllMethods(this PauseOption pauseOption) => pauseOption.methods.RemoveAllListeners();
+
+
+        public static void SetText(this TranslationCollection translationCollection, Language language, string text) => translationCollection.translations[translationCollection.translations.IndexOf(translationCollection.translations.FirstOrDefault(translation => translation.language == language))] = new Translation { language = language, text = text };
+        public static string GetEnglishText(this TranslationCollection translationCollection) => translationCollection.GetText(Language.English);
+        public static string GetJapaneseText(this TranslationCollection translationCollection) => translationCollection.GetText(Language.Japanese);
     }
 }
diff --git a/Extensions/StringExtensions.cs b/Extensions/StringExtensions.cs
index 2913bd8..6c65340 100644
--- a/Extensions/StringExtensions.cs
+++ b/Extensions/StringExtensions.cs
@@ -211,33 +211,33 @@ public static string ToRoman(this int i)
         /// Surround string with "i" tag
         /// </summary>
         public static string Italics(this string message) => $"<i>{message}</i>";
-        
-        /// <summary>
-        /// Checks to see if a string that came from translation is a comment.
-        /// </summary>
-        public static bool IsTranslationComment(this string line)
-        {
-            return (line.StartsWith("#") || line.Equals(string.Empty) || !line.Contains(":"));
-        }
 
-        public static Tuple<string, string> ToTranslation(this string line)
-        {
-            string key = line.Substring(0, line.IndexOf(':'));
-            string value = line.Replace($"{key}:", string.Empty);
-            return new Tuple<string, string>(key.Trim('"'), value.FixTranslatedString());
-        }
-
-        /// <summary>
-        /// Fixes the string that came from translation
-        /// </summary>
-        public static string FixTranslatedString(this string toFix)
-        {
-            return toFix.TrimStart()
-                        .TrimStart('"')
-                        .TrimEnd('"')
-                        .Replace("\\n", "\n")
-                        .Replace("\\\"", "\"");
-        }
+        // /// <summary>
+        // /// Checks to see if a string that came from translation is a comment.
+        // /// </summary>
+        // public static bool IsTranslationComment(this string line)
+        // {
+        //      return (line.StartsWith("#") || line.Equals(string.Empty) || !line.Contains(":"));
+        // }
+
+        //public static Tuple<string, string> ToTranslation(this string line)
+        //{
+        //    string key = line.Substring(0, line.IndexOf(':'));
+        //    string value = line.Replace($"{key}:", string.Empty);
+        //    return new Tuple<string, string>(key.Trim('"'), value.FixTranslatedString());
+        //}
+
+        // /// <summary>
+        // /// Fixes the string that came from translation
+        // /// </summary>
+        // public static string FixTranslatedString(this string toFix)
+        // {
+        //      return toFix.TrimStart()
+        //                 .TrimStart('"')
+        //                 .TrimEnd('"')
+        //                 .Replace("\\n", "\n")
+        //                 .Replace("\\\"", "\"");
+        //}
 
         internal static string ToQuotedString(this string str)
         {
@@ -278,6 +278,25 @@ internal static string FromQuotedString(this string str)
             }
             return str1;
         }
+
+        public static string ToYesOrNo(this bool torf) => torf ? "Yes" : "No";
+        public static string ToOnOff(this bool torf, bool japanese = false) => japanese ? (torf ? "オン" : "オフ") : (torf ? "On" : "Off");
+
+        public static string ReplaceWithJapanese(this string str)
+        {
+            string amelia = str.Replace("Amelia", "アメリア").Replace("amelia", "アメリア");
+            string watson = amelia.Replace("Watson", "ワトソン");
+            string smol = watson.Replace("Smol", "スモール").Replace("SMOL", "スモール");
+            string ame = smol.Replace("Ame", "アメ").Replace("AME", "アメ");
+            string beeg = ame;//.Replace("Beeg", "ビーグ");
+            string infinity = beeg.Replace("Infinite ", "無限");
+            string increased = infinity;//.Replace("Increased ", "倍");
+            string jump = increased.Replace("Jump", "ジャンプ");
+            string speed = jump;//.Replace("Speed", "速度");//スピード");
+            string slower = speed;//.Replace("Slower ", "ゆっくりと");//遅い");
+            string groundpound = slower.Replace("Ground Pound", "グラウンドパウンド");
+            return groundpound;
+        }
     }
 
     /// <summary>
diff --git a/Level.cs b/Level.cs
index bcb5d87..cd6acde 100644
--- a/Level.cs
+++ b/Level.cs
@@ -11,6 +11,8 @@ public enum Level
         TO_THE_MOON,
         NOTHING,
         MOGU_MOGU,
-        INUMORE
+        INUMORE,
+        RUSHIA,
+        INASCAPABLE_MADNESS
     }
 }
diff --git a/Main.cs b/Main.cs
index 79bd41c..fa38364 100644
--- a/Main.cs
+++ b/Main.cs
@@ -15,7 +15,7 @@ namespace SALT
 {
     public class Main
     {
-        public const string Version = "1.1";
+        public const string Version = "1.1b";
         private static string NewLine { get => System.Environment.NewLine + "  "; }
 
         private static bool isPreInitialized;
@@ -24,7 +24,10 @@ public class Main
 
         public static GameObject context { get; internal set; }
         public static MainScript mainScript => MainScript.main != null ? MainScript.main : (Main.context != null ? Main.context.GetComponent<MainScript>() : null);
+        
+        [Obsolete("Please use characterOption instead.")]
         public static OptionsScript options { get; internal set; }
+        public static CharacterOption characterOption { get; internal set; }
 
         public static GameObject player { get; internal set; }
         public static PlayerScript actualPlayer => PlayerScript.player != null ? PlayerScript.player : (Main.player != null ? Main.player.GetComponent<PlayerScript>() : null);
@@ -32,16 +35,30 @@ public class Main
         internal static void NextCharacter()
         {
             int num = (MainScript.currentCharacter + 1) % actualPlayer.characterPacks.Count;
-            ChangeCharacter(num);
+            SetCharacter(num);
         }
 
-        internal static void ChangeCharacter(int num)
+        internal static void LastCharacter()
+        {
+            int num = MainScript.currentCharacter;
+            --num;
+            if (num < 0)
+                num = actualPlayer.characterPacks.Count - 1;
+            SetCharacter(num);
+        }
+
+        internal static void SetCharacter(int num)
         {
             MainScript.currentCharacter = num;
             PlayerPrefs.SetInt("character", num);
             actualPlayer.currentCharacter = num;
-            if (Main.options != null)
-                Main.options.charSpriteRend.sprite = Main.options.charSprites[MainScript.currentCharacter];
+            if (characterOption != null)
+            {
+                characterOption.po.currentSelection = MainScript.currentCharacter;
+                characterOption.charSprite.sprite = characterOption.charIcons[MainScript.currentCharacter];
+            }
+            //if (Main.options != null)
+            //    Main.options.charSpriteRend.sprite = Main.options.charSprites[MainScript.currentCharacter];
             //if (actualPlayer.GetComponent<Rigidbody2D>().velocity.magnitude <= 0.25f)
             //    actualPlayer.SpawnCharacter(num);
         }
@@ -208,7 +225,7 @@ private static void MainMenu()
                 tmrRT.offsetMax = vRT.offsetMax;
                 tmrRT.anchoredPosition3D = vRT.anchoredPosition3D;
                 tmrRT.SetSiblingIndex(vRT.GetSiblingIndex() + 2);
-                tmrRT.localPosition = tmrRT.localPosition.SetY((-vRT.localPosition.y) + 20);
+                tmrRT.localPosition = tmrRT.localPosition.SetY((-vRT.localPosition.y) + 4.5f);
                 var txt = timerObject.GetComponent<TextMeshProUGUI>();
                 txt.text = UI.TimerUI.defaultTime;
                 //txt.alignment = TextAlignmentOptions.TopRight;
@@ -238,16 +255,22 @@ private static void MainMenu()
             modUI.name = "Mods";
             GameObject modsTitle = modUI.FindChild("Text (TMP)", true);
             modsTitle.name = "modsTitle";
-            modsTitle.GetComponent<TextMeshProUGUI>().text = modsTitle.GetComponent<TextMeshProUGUI>().text.Replace("Credits", "SALT (Smol Ame Loader Thing)");
+            TextLanguageScript textLanguageScript = modsTitle.GetComponent<TextLanguageScript>();
+            textLanguageScript.Edit(textLanguageScript.GetEnglishText().Replace("Credits", "SALT (Smol Ame Loader Thing)"), textLanguageScript.GetEnglishText().Replace("Credits", "SALT (スモール アメ ローダー シング)"));
             GameObject loaderCreator = modUI.FindChild("Text (TMP) (1)", true);
             loaderCreator.name = "LoaderCreator";
-            loaderCreator.GetComponent<TextMeshProUGUI>().text = loaderCreator.GetComponent<TextMeshProUGUI>().text.Replace("Game by Kevin Stevens", "Mod Loader by MegaPiggy");
+            string oldText = loaderCreator.GetComponent<TextMeshProUGUI>().text;
+            string enText = oldText.Replace("Game by Kevin Stevens", "Mod Loader by MegaPiggy");
+            string jaText = oldText.Replace("Game by Kevin Stevens", "Modローダー by MegaPiggy");//"MegaPiggyによるModローダー");
+            loaderCreator.GetComponent<TextMeshProUGUI>().text = enText;
+            loaderCreator.AddComponent<TextLanguageScript>().Edit(enText, jaText);
             GameObject modList = desk.FindChild(creditsObject.name, true);
             modList.name = "ModsEmpty";
             modList.AddComponent<UI.ModListUI>();
             TextArea modsArea = modList.GetComponentInChildren<TextArea>();
             string modText = $"<size=25>Press Ctrl+Tab to open up the command console.</size><size=5>{System.Environment.NewLine}{System.Environment.NewLine}</size><size=40>Mods:</size><size=10>{System.Environment.NewLine}{System.Environment.NewLine}</size>";
-            modsArea.Edit(modText);
+            string modJaText = $"<size=25>CTRL+TABを押し: オープンcommand console</size><size=5>{System.Environment.NewLine}{System.Environment.NewLine}</size><size=40>Mods:</size><size=10>{System.Environment.NewLine}{System.Environment.NewLine}</size>";
+            modsArea.Edit(modText, modJaText);
 
             GameObject bookObject = UnityEngine.Object.FindObjectsOfType<BookRandomColor>().FirstOrDefault(b => b.GetComponent<BouncyScript>().bounceFactor == 1.5f).gameObject;
             GameObject book = bookObject.CloneInstance();
diff --git a/Patches/OptionPatches.cs b/Patches/OptionPatches.cs
index 1242347..6b247cb 100644
--- a/Patches/OptionPatches.cs
+++ b/Patches/OptionPatches.cs
@@ -8,95 +8,105 @@
 
 namespace SALT.Patches
 {
-    [HarmonyPatch(typeof(OptionsScript))]
-    [HarmonyPatch("Awake")]
-    internal static class OptionAwakePatch
-    {
-        [HarmonyPriority(Priority.First)]
-        public static void Prefix(OptionsScript __instance)
-        {
-            Main.options = __instance;
-            int index = 0;
-            foreach (Sprite spr in __instance.charSprites)
-            {
-                CharacterRegistry.AddSprite((Character)index, spr);
-                index++;
-            }
-        }
+    //[HarmonyPatch(typeof(OptionsScript))]
+    //[HarmonyPatch("Awake")]
+    //internal static class OptionAwakePatch
+    //{
+    //    [HarmonyPriority(Priority.First)]
+    //    public static void Prefix(OptionsScript __instance)
+    //    {
+    //        Main.options = __instance;
+    //        int index = 0;
+    //        foreach (Sprite spr in __instance.charSprites)
+    //        {
+    //            CharacterRegistry.AddSprite((Character)index, spr);
+    //            index++;
+    //        }
+    //    }
 
-        [HarmonyPriority(Priority.First)]
-        public static void Postfix(OptionsScript __instance)
-        {
-            Main.options = __instance;
-            foreach (KeyValuePair<Character, Sprite> kvp in CharacterRegistry.spritesToPatch)
-            {
-                Character id = kvp.Key;
-                Sprite spr = kvp.Value;
-                int idnt = (int)id;
-                try { if (__instance.charSprites[idnt]) __instance.charSprites[idnt] = spr; }
-                catch
-                {
-                    for (int i = 0; i < (idnt + 1); i++)
-                    {
-                        if (__instance.charSprites.Count < i)
-                        {
-                            __instance.charSprites.Add(null);
-                        }
-                    }
-                    __instance.charSprites.Add(spr);
-                }
-            }
-        }
-    }
+    //    [HarmonyPriority(Priority.First)]
+    //    public static void Postfix(OptionsScript __instance)
+    //    {
+    //        Main.options = __instance;
+    //        foreach (KeyValuePair<Character, Sprite> kvp in CharacterRegistry.spritesToPatch)
+    //        {
+    //            Character id = kvp.Key;
+    //            Sprite spr = kvp.Value;
+    //            int idnt = (int)id;
+    //            try { if (__instance.charSprites[idnt]) __instance.charSprites[idnt] = spr; }
+    //            catch
+    //            {
+    //                for (int i = 0; i < (idnt + 1); i++)
+    //                {
+    //                    if (__instance.charSprites.Count < i)
+    //                    {
+    //                        __instance.charSprites.Add(null);
+    //                    }
+    //                }
+    //                __instance.charSprites.Add(spr);
+    //            }
+    //        }
+    //    }
+    //}
 
-    [HarmonyPatch(typeof(OptionsScript))]
-    [HarmonyPatch("Start")]
-    internal static class OptionStartPatch
-    {
-        [HarmonyPriority(Priority.First)]
-        public static void Prefix(OptionsScript __instance)
-        {
-            Main.options = __instance;
-            if (MainScript.currentCharacter == Character.NONE.ToInt())
-            {
-                int num = Character.AMELIA.ToInt();
-                MainScript.currentCharacter = num;
-                PlayerPrefs.SetInt("character", num);
-                Main.actualPlayer.currentCharacter = num;
-            }
-            if ((__instance.charSprites.Count - 1) < MainScript.currentCharacter)
-            {
-                int num = Character.AMELIA.ToInt();
-                MainScript.currentCharacter = num;
-                PlayerPrefs.SetInt("character", num);
-                Main.actualPlayer.currentCharacter = num;
-            }
-        }
+    //[HarmonyPatch(typeof(OptionsScript))]
+    //[HarmonyPatch("Start")]
+    //internal static class OptionStartPatch
+    //{
+    //    [HarmonyPriority(Priority.First)]
+    //    public static void Prefix(OptionsScript __instance)
+    //    {
+    //        Main.options = __instance;
+    //        if (MainScript.currentCharacter == Character.NONE.ToInt())
+    //        {
+    //            int num = Character.AMELIA.ToInt();
+    //            MainScript.currentCharacter = num;
+    //            PlayerPrefs.SetInt("character", num);
+    //            Main.actualPlayer.currentCharacter = num;
+    //        }
+    //        if ((__instance.charSprites.Count - 1) < MainScript.currentCharacter)
+    //        {
+    //            int num = Character.AMELIA.ToInt();
+    //            MainScript.currentCharacter = num;
+    //            PlayerPrefs.SetInt("character", num);
+    //            Main.actualPlayer.currentCharacter = num;
+    //        }
+    //    }
 
-        [HarmonyPriority(Priority.First)]
-        public static void Postfix(OptionsScript __instance)
-        {
-            Main.options = __instance;
-        }
-    }
+    //    [HarmonyPriority(Priority.First)]
+    //    public static void Postfix(OptionsScript __instance)
+    //    {
+    //        Main.options = __instance;
+    //        __instance.charSpriteRend.sprite = __instance.charSprites[MainScript.currentCharacter];
+    //    }
+    //}
 
-    [HarmonyPatch(typeof(OptionsScript))]
-    [HarmonyPatch("OnDestroy")]
-    internal static class OptionDestroyPatch
+    [HarmonyPatch(typeof(OptionsScript), "DeleteSave")]
+    internal static class OptionsDeleteSavePatch
     {
-        [HarmonyPriority(Priority.First)]
-        public static void Prefix()
+        internal static void Prefix(OptionsScript __instance)
         {
-            Main.options = null;
-        }
-
-        [HarmonyPriority(Priority.First)]
-        public static void Postfix()
-        {
-            Main.options = null;
+            //__instance.deleteText.text.CopyToClipboard();
         }
     }
 
+    //[HarmonyPatch(typeof(OptionsScript))]
+    //[HarmonyPatch("OnDestroy")]
+    //internal static class OptionDestroyPatch
+    //{
+    //    [HarmonyPriority(Priority.First)]
+    //    public static void Prefix()
+    //    {
+    //        Main.options = null;
+    //    }
+
+    //    [HarmonyPriority(Priority.First)]
+    //    public static void Postfix()
+    //    {
+    //        Main.options = null;
+    //    }
+    //}
+
     [HarmonyPatch(typeof(AltMusicScript))]
     [HarmonyPatch("Start")]
     internal static class AltMusicPatch
diff --git a/Patches/PausePatches.cs b/Patches/PausePatches.cs
new file mode 100644
index 0000000..7e15858
--- /dev/null
+++ b/Patches/PausePatches.cs
@@ -0,0 +1,284 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using HarmonyLib;
+using SALT.Extensions;
+using SALT.Registries;
+
+namespace SALT.Patches
+{
+    [HarmonyPatch(typeof(CharacterOption))]
+    [HarmonyPatch("Awake")]
+    internal static class CharacterOptionAwakePatch
+    {
+        [HarmonyPriority(Priority.First)]
+        public static void Prefix(CharacterOption __instance)
+        {
+            Main.characterOption = __instance;
+            __instance.po = __instance.GetComponent<PauseOption>();
+            int index = 0;
+            foreach (Sprite spr in __instance.charIcons)
+            {
+                CharacterRegistry.AddSprite((Character)index, spr);
+                index++;
+            }
+        }
+
+        [HarmonyPriority(Priority.First)]
+        public static void Postfix(CharacterOption __instance)
+        {
+            Main.characterOption = __instance;
+            var selectionStrings = new List<string>();
+            foreach (Character character in EnumUtils.GetAll<Character>())
+            {
+                if (__instance.charIcons.ElementAtOrDefault(character.ToInt()) == null)
+                {
+                    if (CharacterRegistry.spritesToPatch.TryGetValue(character, out Sprite spr))
+                        __instance.charIcons.Add(spr);
+                    else
+                    {
+                        __instance.charIcons.Add(null);
+                        if (character != Character.NONE)
+                            (character.ToFriendlyName() + " does not have sprite").Log();
+                    }
+                }
+                selectionStrings.Add(" ");
+            }
+            __instance.po.selectionStrings = selectionStrings;
+        }
+    }
+
+    [HarmonyPatch(typeof(CharacterOption))]
+    [HarmonyPatch("Start")]
+    internal static class CharacterOptionStartPatch
+    {
+        [HarmonyPriority(Priority.First)]
+        public static void Prefix(CharacterOption __instance)
+        {
+            Main.characterOption = __instance;
+
+            if (MainScript.currentCharacter == Character.NONE.ToInt())
+            {
+                int num = Character.AMELIA.ToInt();
+                MainScript.currentCharacter = num;
+                PlayerPrefs.SetInt("character", num);
+                Main.actualPlayer.currentCharacter = num;
+                __instance.po.currentSelection = num;
+            }
+            if ((__instance.charIcons.Count - 1) < MainScript.currentCharacter)
+            {
+                int num = Character.AMELIA.ToInt();
+                MainScript.currentCharacter = num;
+                PlayerPrefs.SetInt("character", num);
+                Main.actualPlayer.currentCharacter = num;
+                __instance.po.currentSelection = num;
+            }
+        }
+
+        [HarmonyPriority(Priority.First)]
+        public static void Postfix(CharacterOption __instance)
+        {
+            Main.characterOption = __instance;
+            __instance.po.currentSelection = MainScript.currentCharacter;
+            __instance.charSprite.sprite = __instance.charIcons[MainScript.currentCharacter];
+        }
+    }
+
+    [HarmonyPatch(typeof(CharacterOption))]
+    [HarmonyPatch("Update")]
+    internal static class CharacterOptionUpdatePatch
+    {
+        public static int lastSelected = Character.NONE.ToInt();
+
+        [HarmonyPriority(Priority.First)]
+        public static void Prefix(CharacterOption __instance)
+        {
+            Main.characterOption = __instance;
+            //if (__instance.po.currentSelection != lastSelected)
+            //{
+            //    (lastSelected.ToCharacter().ToFriendlyName() + "=>" + __instance.po.currentSelection.ToCharacter().ToFriendlyName()).Log();
+            //}
+            if (__instance.po.currentSelection == Character.NONE.ToInt())
+            {
+                if (lastSelected == Character.NONE.ToInt()-1)
+                    __instance.po.currentSelection = Character.NONE.ToInt()+1;
+                else if (lastSelected == (Character.NONE.ToInt() + 1) || lastSelected == Character.AMELIA.ToInt())
+                    __instance.po.currentSelection = Character.NONE.ToInt()-1;
+                else
+                    __instance.po.currentSelection = Character.AMELIA.ToInt();
+            }
+
+            if ((__instance.charIcons.Count - 1) < __instance.po.currentSelection)
+            {
+                __instance.po.currentSelection = Character.AMELIA.ToInt();
+            }
+
+            lastSelected = __instance.po.currentSelection;
+        }
+
+        [HarmonyPriority(Priority.First)]
+        public static void Postfix(CharacterOption __instance)
+        {
+            Main.characterOption = __instance;
+            __instance.po.currentSelection = MainScript.currentCharacter;
+            __instance.charSprite.sprite = __instance.charIcons[MainScript.currentCharacter];
+        }
+    }
+
+    [HarmonyPatch(typeof(CharacterOption))]
+    [HarmonyPatch("OnDestroy")]
+    internal static class CharacterOptionDestroyPatch
+    {
+        [HarmonyPriority(Priority.First)]
+        public static void Prefix()
+        {
+            Main.characterOption = null;
+        }
+
+        [HarmonyPriority(Priority.First)]
+        public static void Postfix()
+        {
+            Main.characterOption = null;
+        }
+    }
+
+    [HarmonyPatch(typeof(VsyncOption))]
+    [HarmonyPatch("Awake")]
+    internal static class VsyncAwakePatch
+    {
+        [HarmonyPriority(Priority.First)]
+        public static void Prefix(VsyncOption __instance)
+        {
+            GameObject option = Utils.PrefabUtils.CopyPrefab(__instance.gameObject);
+            option.name = "Option";
+            option.RemoveComponentImmediate<VsyncOption>();
+            PauseOption po = option.GetComponent<PauseOption>();
+            po.label = "Placeholder";
+            po.EditLabels("Placeholder");
+            po.SetSelections(new List<string> { "" });
+            po.currentSelection = 0;
+            po.Update();
+            po.RemoveAllMethods();
+            po.SetLabelText(false);
+            SAObjects.OptionPrefab = option;
+            RectTransform vsyncRT = __instance.gameObject.GetComponent<RectTransform>();
+            GameObject vfxOption = UnityEngine.Object.Instantiate(SAObjects.OptionPrefab, vsyncRT.position, vsyncRT.rotation, vsyncRT.parent);
+            RectTransform vfxRT = vfxOption.GetComponent<RectTransform>();
+            vfxOption.name = "VFXOption";
+            vfxRT.localPosition = vsyncRT.localPosition.SetY(-285);
+            var vfx = vfxOption.AddComponent<VFXOption>();
+            PauseOption vpo = vfxOption.GetComponent<PauseOption>();
+            vpo.label = "VFX";
+            vpo.EditLabels("VFX");//, "視覚効果");
+            vpo.AddMethod(vfx.SetVFX);
+            vpo.SetLabelText(false);
+            vfxOption.SetActive(true);
+            Utils.DumpUtils.DumpObject(__instance.transform.parent.gameObject);
+            __instance.po = __instance.GetComponent<PauseOption>();
+            __instance.po.EditLabels("Framerate Cap", "フレームレート制限");
+        }
+    }
+
+    [HarmonyPatch(typeof(VsyncOption))]
+    [HarmonyPatch("SetStrings")]
+    internal static class VsyncSetStringsPatch
+    {
+        [HarmonyPriority(Priority.First)]
+        public static bool Prefix(VsyncOption __instance)
+        {
+            List<string> stringList = new List<string>();
+            if (MainScript.language == Language.Japanese)
+            {
+                stringList.Add("垂直同期オン");
+                stringList.Add("リフレッシュレート");
+                stringList.Add("なし");
+                stringList.Add("60fps");
+                stringList.Add("100fps");
+                stringList.Add("144fps");
+            }
+            else
+            {
+                stringList.Add("Vsync On");
+                stringList.Add("Refresh Rate");
+                stringList.Add("Uncapped");
+                stringList.Add("60fps");
+                stringList.Add("100fps");
+                stringList.Add("144fps");
+            }
+            __instance.po.selectionStrings = stringList;
+            __instance.currentLanguage = MainScript.language;
+            return false;
+        }
+    }
+
+    [HarmonyPatch(typeof(VsyncOption))]
+    [HarmonyPatch("SetVsync")]
+    internal static class SetVsyncPatch
+    {
+        [HarmonyPriority(Priority.First)]
+        public static bool Prefix(VsyncOption __instance)
+        {
+            if (__instance.po.currentSelection == 0)
+                MainScript.SetFramerateLock(-1);
+            else if (__instance.po.currentSelection == 1)
+                MainScript.SetFramerateLock(Screen.currentResolution.refreshRate);
+            else if (__instance.po.currentSelection == 2)
+                MainScript.SetFramerateLock(0);
+            else if (__instance.po.currentSelection == 3)
+                MainScript.SetFramerateLock(60);
+            else if (__instance.po.currentSelection == 4)
+                MainScript.SetFramerateLock(100);
+            else if (__instance.po.currentSelection == 5)
+                MainScript.SetFramerateLock(144);
+            PlayerPrefs.SetInt("vsync", __instance.po.currentSelection);
+            return false;
+        }
+    }
+
+    [HarmonyPatch(typeof(LanguageOption))]
+    [HarmonyPatch("Awake")]
+    internal static class LanguageOptionAwakePatch
+    {
+
+        [HarmonyPriority(Priority.First)]
+        public static void Prefix(LanguageOption __instance)
+        {
+            if (PlayerPrefs.GetInt("Language", -1) == -1)
+            {
+                switch (Application.systemLanguage)
+                {
+                    case SystemLanguage.Japanese:
+                        PlayerPrefs.SetInt("Language", (int)Language.Japanese);
+                        break;
+                    default:
+                        PlayerPrefs.SetInt("Language", (int)Language.English);
+                        break;
+                }
+            }
+        }
+    }
+
+    [HarmonyPatch(typeof(LanguageOption))]
+    [HarmonyPatch("Update")]
+    internal static class LanguageOptionUpdatePatch
+    {
+        [HarmonyPriority(Priority.First)]
+        public static void Prefix(LanguageOption __instance)
+        {
+            //MainScript.language = __instance.languages[__instance.po.currentSelection];
+        }
+    }
+
+    [HarmonyPatch(typeof(PauseOption))]
+    [HarmonyPatch("Update")]
+    internal static class PauseOptionUpdatePatch
+    {
+        internal static bool Prefix(PauseOption __instance)
+        {
+            if (string.IsNullOrEmpty(__instance.selectionStrings.ElementAtOrDefault(__instance.currentSelection)))
+                return false;
+            return true;
+        }
+    }
+}
diff --git a/Patches/VFXPatches.cs b/Patches/VFXPatches.cs
new file mode 100644
index 0000000..1df21bd
--- /dev/null
+++ b/Patches/VFXPatches.cs
@@ -0,0 +1,35 @@
+using UnityEngine;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
+
+namespace SALT.Patches
+{
+    [HarmonyPatch(typeof(PoundVFXScript), "Awake")]
+    internal static class PoundVFXPatch
+    {
+        private static bool enabled = true;
+        public static void SetEnabled(bool torf) => enabled = torf;
+        internal static bool GetEnabled() => enabled;
+
+        internal static void Prefix(PoundVFXScript __instance)
+        {
+            if (!enabled)
+                Object.Destroy(__instance.gameObject);
+        }
+    }
+
+    [HarmonyPatch(typeof(PoundVFXScript), "Update")]
+    internal static class PoundVFXPatch2
+    {
+        internal static bool Prefix(PoundVFXScript __instance)
+        {
+            if (!PoundVFXPatch.GetEnabled())
+            {
+                Object.Destroy(__instance.gameObject);
+                return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/Registries/CharacterRegistry.cs b/Registries/CharacterRegistry.cs
index d0399f6..5208c31 100644
--- a/Registries/CharacterRegistry.cs
+++ b/Registries/CharacterRegistry.cs
@@ -237,20 +237,12 @@ public static void RegisterCharacterSprite(Character id, Sprite spr)
                     AddSprite(id, spr);
                     break;
                 default:
-                    spritesToPatch.Add(id, spr);
+                    if (!spritesToPatch.ContainsKey(id))
+                        spritesToPatch.Add(id, spr);
+                    else
+                        spritesToPatch[id] = spr;
                     int idnt = (int)id;
-                    try { if (Main.options.charSprites[idnt]) Main.options.charSprites[idnt] = spr; }
-                    catch
-                    {
-                        for (int i = 0; i < (idnt + 1); i++)
-                        {
-                            if (Main.options.charSprites.Count < i)
-                            {
-                                Main.options.charSprites.Add(null);
-                            }
-                        }
-                        Main.options.charSprites.Add(spr);
-                    }
+                    Main.characterOption.charIcons[idnt] = spr;
                     AddSprite(id, spr);
                     break;
             }
diff --git a/SALT.csproj b/SALT.csproj
index 6ce695e..1b43d4e 100644
--- a/SALT.csproj
+++ b/SALT.csproj
@@ -162,6 +162,8 @@
     <Compile Include="Console\Commands\ClearCommand.cs" />
     <Compile Include="Console\Commands\CompleteLevelCommand.cs" />
     <Compile Include="Console\Commands\ConfigCommand.cs" />
+    <Compile Include="Patches\VFXPatches.cs" />
+    <Compile Include="VFXOption.cs" />
     <None Include=".editorconfig" />
     <None Include="Console\Commands\OldDumpCommand.cs" />
     <Compile Include="Console\Commands\DumpCommand.cs" />
@@ -226,6 +228,7 @@
     <Compile Include="Patches\GPtutPatch.cs" />
     <Compile Include="Patches\MainPatches.cs" />
     <Compile Include="Patches\OptionPatches.cs" />
+    <Compile Include="Patches\PausePatches.cs" />
     <Compile Include="Patches\PlayerPatches.cs" />
     <Compile Include="Patches\PotPatches.cs" />
     <Compile Include="Patches\SaveFilePatches.cs" />
diff --git a/SAObjects.cs b/SAObjects.cs
index 419818f..89d439a 100644
--- a/SAObjects.cs
+++ b/SAObjects.cs
@@ -11,6 +11,8 @@ namespace SALT
 	/// </summary>
 	public static class SAObjects
 	{
+		public static GameObject OptionPrefab;
+
 
 		// Static Constructors to load the base objects
 		static SAObjects()
diff --git a/Timer.cs b/Timer.cs
index 0175643..ed34150 100644
--- a/Timer.cs
+++ b/Timer.cs
@@ -16,7 +16,8 @@ private static void TogglePause(bool torf, bool affectCursor)
         {
             isPaused = torf;
             UserInputService.MouseVisible = affectCursor ? torf : false;
-            //Time.timeScale = torf ? 0 : 1;
+            if (!MainScript.paused)
+                Time.timeScale = torf ? 0 : 1;
         }
 
         public static bool HasPauser() => isPaused;
diff --git a/UI/ModListUI.cs b/UI/ModListUI.cs
index f39335a..2f92173 100644
--- a/UI/ModListUI.cs
+++ b/UI/ModListUI.cs
@@ -27,7 +27,13 @@ public void Start()
 
         public void AddModInfo(ModInfo info)
         {
-            modArea.Edit(modArea.text.text + ModString(info.Name, info.Description, info.Version, info.Author));
+            string originalText = modArea.GetEnglishText();
+            string originalJapaneseText = modArea.GetJapaneseText();
+            string jaName = info.Name.ReplaceWithJapanese();
+            string jaDesc = info.Description.ReplaceWithJapanese();
+            string enText = originalText + ModString(info.Name, info.Description, info.Version, info.Author);
+            string jaText = originalJapaneseText + ModString(jaName, jaDesc, info.Version, info.Author);
+            modArea.Edit(enText, jaText);
         }
     }
 }
diff --git a/UI/TimerUI.cs b/UI/TimerUI.cs
index 268445a..d707da9 100644
--- a/UI/TimerUI.cs
+++ b/UI/TimerUI.cs
@@ -1,4 +1,5 @@
 using SALT.Extensions;
+using System.Linq;
 using TMPro;
 using UnityEngine;
 
@@ -7,7 +8,7 @@ namespace SALT.UI
     internal class TimerUI : MonoBehaviour
     {
         private TextMeshProUGUI tmp;
-        public static string defaultTime => string.Format("{0:00}:{1:00}.{2:000}", 0, 0, 0) + System.Environment.NewLine + "Deaths: 0" + System.Environment.NewLine + "Saves Enabled: true";
+        public static string defaultTime => string.Format("{0:00}:{1:00}.{2:000}", 0, 0, 0) + System.Environment.NewLine + "Deaths: 0" + System.Environment.NewLine + "Bubbas: 0" + System.Environment.NewLine + "Saves Enabled: Yes";
 
         public void Init()
         {
@@ -26,7 +27,10 @@ public void Update()
                 if (!MainScript.victory)
                 {
                     System.TimeSpan timeSpan = System.TimeSpan.FromSeconds(Main.mainScript.levelTime);
-                    tmp.text = string.Format("{0:00}:{1:00}.{2:000}", timeSpan.Minutes, timeSpan.Seconds, timeSpan.Milliseconds) + System.Environment.NewLine + "Deaths: " + LevelManager.levelManager.deaths + System.Environment.NewLine + "Saves Enabled: " + Main.SavesEnabled; 
+                    if (MainScript.language == Language.Japanese)
+                        tmp.text = string.Format("{0:00}:{1:00}.{2:000}", timeSpan.Minutes, timeSpan.Seconds, timeSpan.Milliseconds) + System.Environment.NewLine + "デス数: " + LevelManager.levelManager.deaths + System.Environment.NewLine + "Bubba: " + LevelManager.levelManager.bubbaTokens.Where(torf => torf == true).Count() + System.Environment.NewLine + "セーブデータ: " + Main.SavesEnabled.ToOnOff(true);
+                    else
+                        tmp.text = string.Format("{0:00}:{1:00}.{2:000}", timeSpan.Minutes, timeSpan.Seconds, timeSpan.Milliseconds) + System.Environment.NewLine + "Deaths: " + LevelManager.levelManager.deaths + System.Environment.NewLine + "Bubba: " + LevelManager.levelManager.bubbaTokens.Where(torf => torf == true).Count() + System.Environment.NewLine + "Saves Enabled: " + Main.SavesEnabled.ToYesOrNo(); 
                 }
                 tmp.enabled = true;
                 return;
diff --git a/Utils/EnumUtils.cs b/Utils/EnumUtils.cs
index ae68780..d3a5f1e 100644
--- a/Utils/EnumUtils.cs
+++ b/Utils/EnumUtils.cs
@@ -164,6 +164,9 @@ public static T GetLowestValue<T>() where T : Enum
         if (typeof(T) == typeof(SALT.Character))
             return (T)(object)SALT.Character.AMELIA;
 
+        if (typeof(T) == typeof(SALT.Level))
+            return (T)(object)SALT.Level.MAIN_MENU;
+
         T lowest = default;
         object lval = Convert.ChangeType(lowest, lowest.GetTypeCode());
         int lnum = (int)lval;
@@ -180,4 +183,34 @@ public static T GetLowestValue<T>() where T : Enum
 
         return lowest;
     }
+
+    /// <summary>
+    /// Checks all values in an enum to get the highest.
+    /// </summary>
+    /// <typeparam name="T">Type of the enum</typeparam>
+    /// <returns>enum with the highest value attached to it.</returns>
+    public static T GetHighestValue<T>() where T : Enum
+    {
+        if (!typeof(T).IsEnum)
+            throw new Exception($"The given type isn't an enum ({typeof(T).Name} isn't an Enum)");
+
+        if (typeof(T) == typeof(SALT.Level))
+            return (T)(object)SALT.Level.INASCAPABLE_MADNESS;
+
+        T highest = default;
+        object hval = Convert.ChangeType(highest, highest.GetTypeCode());
+        int hnum = (int)hval;
+
+        foreach (T value in GetAll<T>())
+        {
+            object val = Convert.ChangeType(value, value.GetTypeCode());
+            int number = (int)val;
+            if (number > hnum)
+            {
+                highest = value;
+            }
+        }
+
+        return highest;
+    }
 }
\ No newline at end of file
diff --git a/VFXOption.cs b/VFXOption.cs
new file mode 100644
index 0000000..029f485
--- /dev/null
+++ b/VFXOption.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace SALT
+{
+    public class VFXOption : MonoBehaviour
+    {
+        private PauseOption po;
+        private Language currentLanguage;
+
+        private void Start()
+        {
+            this.po = this.GetComponent<PauseOption>();
+            this.SetStrings();
+            this.po.currentSelection = PlayerPrefs.GetInt("vfx", 0);
+            this.SetVFX();
+        }
+
+        private void Update()
+        {
+            if (this.currentLanguage == MainScript.language)
+                return;
+            this.SetStrings();
+        }
+
+        internal void SetStrings()
+        {
+            List<string> stringList = new List<string>();
+            if (MainScript.language == Language.Japanese)
+            {
+                stringList.Add("オン");
+                stringList.Add("オフ");
+            }
+            else
+            {
+                stringList.Add("On");
+                stringList.Add("Off");
+            }
+            this.po.selectionStrings = stringList;
+            this.currentLanguage = MainScript.language;
+        }
+
+        public void SetVFX()
+        {
+            Patches.PoundVFXPatch.SetEnabled(this.po.currentSelection == 0);
+            PlayerPrefs.SetInt("vfx", this.po.currentSelection);
+        }
+
+        private void Awake()
+        {
+        }
+
+        private void OnDestroy()
+        {
+        }
+    }
+}