fix invalid chars in configs

olavim · olavim · commit 365f88953667 · 2023-03-02T04:36:33.000+02:00
diff --git a/UnboundLib/Cards/CustomCard.cs b/UnboundLib/Cards/CustomCard.cs
@@ -158,7 +158,7 @@ public static void BuildCard<T>(Action<CardInfo> callback) where T : CustomCard
                     CardManager.activeCards.CollectionChanged += CardManager.CardsChanged;
                     // Register card with the toggle menu
                     CardManager.cards.Add(newCard.gameObject.name,
-                        new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), newCard.gameObject.name, true), newCardInfo));
+                        new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), newCard.gameObject.name, true), newCardInfo));
                 }
 
                 // Post-creation clean up
@@ -188,7 +188,7 @@ public static void BuildUnityCard<T>(GameObject cardPrefab, Action<CardInfo> cal
 
             if (customCard.GetEnabled())
             {
-                CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
+                CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
             }
 
             customCard.Awake();
@@ -219,7 +219,7 @@ public void BuildUnityCard(Action<CardInfo> callback)
 
             if (customCard.GetEnabled())
             {
-                CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
+                CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
             }
 
             this.Awake();
@@ -241,7 +241,7 @@ public static void RegisterUnityCard<T>(GameObject cardPrefab, Action<CardInfo>
 
             if (customCard.GetEnabled())
             {
-                CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
+                CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
             }
 
             Unbound.Instance.ExecuteAfterFrames(5, () =>
@@ -260,7 +260,7 @@ public static void RegisterUnityCard(GameObject cardPrefab, string modInitials,
 
             if (enabled)
             {
-                CardManager.cards.Add(cardInfo.gameObject.name, new Card(modInitials.Sanitize(), Unbound.config.Bind("Cards: " + cardname.Sanitize(), cardInfo.gameObject.name, true), cardInfo));
+                CardManager.cards.Add(cardInfo.gameObject.name, new Card(modInitials.Sanitize(), Unbound.BindConfig("Cards: " + cardname.Sanitize(), cardInfo.gameObject.name, true), cardInfo));
             }
 
             Unbound.Instance.ExecuteAfterFrames(5, () =>
@@ -279,7 +279,7 @@ public void RegisterUnityCard(Action<CardInfo> callback)
 
             if (this.GetEnabled())
             {
-                CardManager.cards.Add(cardInfo.gameObject.name, new Card(this.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + this.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
+                CardManager.cards.Add(cardInfo.gameObject.name, new Card(this.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + this.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));
             }
 
             Unbound.Instance.ExecuteAfterFrames(5, () =>
diff --git a/UnboundLib/GameModes/GameModeManager.cs b/UnboundLib/GameModes/GameModeManager.cs
@@ -23,8 +23,6 @@ public static class GameModeManager
         private static Dictionary<string, List<GameModeHooks.Hook>> hooks = new Dictionary<string, List<GameModeHooks.Hook>>();
         private static Dictionary<string, List<GameModeHooks.Hook>> onceHooks = new Dictionary<string, List<GameModeHooks.Hook>>();
 
-        private static bool firstTime = true;
-
         // public properties that return deep copies of the handlers and gameModes dictionarys (the values in the dictionaries returned are shallow copies)
         public static ReadOnlyDictionary<string, IGameModeHandler> Handlers => new ReadOnlyDictionary<string, IGameModeHandler>(handlers.ToDictionary(kv => kv.Key, kv => kv.Value));
         public static ReadOnlyDictionary<string, Type> GameModes => new ReadOnlyDictionary<string, Type>(gameModes.ToDictionary(kv => kv.Key, kv => kv.Value));
@@ -117,10 +115,6 @@ internal static void SetupUI()
                     group.Find("CREDITS")?.SetAsLastSibling();
                     group.Find("Quit")?.SetAsLastSibling();
                 });
-
-                firstTime = false;
-
-
             }
             var gameModeGo = GameObject.Find("/Game/UI/UI_MainMenu/Canvas/ListSelector/LOCAL");
             var onlineGo = GameObject.Find("/Game/UI/UI_MainMenu/Canvas/ListSelector/Online/Group");
diff --git a/UnboundLib/Unbound.cs b/UnboundLib/Unbound.cs
@@ -25,10 +25,10 @@ public class Unbound : BaseUnityPlugin
     {
         private const string ModId = "com.willis.rounds.unbound";
         private const string ModName = "Rounds Unbound";
-        public const string Version = "3.2.8";
+        public const string Version = "3.2.9";
 
         public static Unbound Instance { get; private set; }
-        public static readonly ConfigFile config = new ConfigFile(Path.Combine(Paths.ConfigPath, "UnboundLib.cfg"), true);
+        private static readonly ConfigFile config = new ConfigFile(Path.Combine(Paths.ConfigPath, "UnboundLib.cfg"), true);
 
         private Canvas _canvas;
         public Canvas canvas
@@ -482,6 +482,24 @@ public static bool IsNotPlayingOrConnected()
                    (PhotonNetwork.OfflineMode || !PhotonNetwork.IsConnected);
         }
 
+        internal static ConfigEntry<T> BindConfig<T>(string section, string key, T defaultValue, ConfigDescription configDescription = null)
+        {
+            return config.Bind(EscapeConfigKey(section), EscapeConfigKey(key), defaultValue, configDescription);
+        }
+
+        private static string EscapeConfigKey(string key)
+        {
+            return key
+                .Replace("=", "&eq;")
+                .Replace("\n", "&nl;")
+                .Replace("\t", "&tab;")
+                .Replace("\\", "&esc;")
+                .Replace("\"", "&dquot;")
+                .Replace("'", "&squot;")
+                .Replace("[", "&lsq;")
+                .Replace("]", "&rsq;");
+        }
+
         internal static readonly ModCredits modCredits = new ModCredits("UNBOUND", new[]
         {
             "Willis (Creation, design, networking, custom cards, custom maps, and more)",
diff --git a/UnboundLib/Utils/CardManager.cs b/UnboundLib/Utils/CardManager.cs
@@ -15,7 +15,7 @@ namespace UnboundLib.Utils
     public class CardManager : MonoBehaviour
     {
         public CardManager instance;
-        
+
         // A string array of all cardInfos
         internal static CardInfo[] allCards
         {
@@ -28,32 +28,32 @@ internal static CardInfo[] allCards
                 return _allCards.ToArray();
             }
         }
-        
+
         internal static CardInfo[] defaultCards;
         internal static ObservableCollection<CardInfo> activeCards;
         //internal static ObservableCollection<CardInfo> previousActiveCards = new ObservableCollection<CardInfo>();
         internal static List<CardInfo> inactiveCards = new List<CardInfo>();
         //internal static List<CardInfo> previousInactiveCards = new List<CardInfo>();
-        
+
         // List of all categories
         public static readonly List<string> categories = new List<string>();
         // Dictionary of category name against if it is enabled
         internal static readonly Dictionary<string, ConfigEntry<bool>> categoryBools = new Dictionary<string, ConfigEntry<bool>>();
-        
+
         public static Dictionary<string, Card> cards = new Dictionary<string, Card>();
 
         private static readonly List<Action<CardInfo[]>> FirstStartCallbacks = new List<Action<CardInfo[]>>();
 
         public void Start()
         {
             instance = this;
-            
+
             // store default cardInfos
             defaultCards = (CardInfo[]) CardChoice.instance.cards.Clone();
-            
+
             // Make activeCardsCollection and add defaultCards to it
             activeCards = new ObservableCollection<CardInfo>(defaultCards);
-            
+
             // Set activeCards CollectionChanged event
             activeCards.CollectionChanged += CardsChanged;
         }
@@ -62,7 +62,7 @@ public static void FirstTimeStart()
         {
             // Sort cardInfos
             cards = cards.Keys.OrderBy(k => k).ToDictionary(k => k, k => cards[k]);
-            
+
             // Set categories
             foreach (var card in cards.Where(card => !categories.Contains(card.Value.category)))
             {
@@ -72,7 +72,7 @@ public static void FirstTimeStart()
             // Populate the categoryBools dictionary
             foreach (var category in categories)
             {
-                categoryBools.Add(category, Unbound.config.Bind("Card categories", category, true));
+                categoryBools.Add(category, Unbound.BindConfig("Card categories", category, true));
             }
 
             foreach (Action<CardInfo[]> callback in FirstStartCallbacks)
@@ -101,7 +101,7 @@ public static void AddAllCardsCallback(Action<CardInfo[]> callback)
         {
             FirstStartCallbacks.Add(callback);
         }
-        
+
         internal static void CardsChanged(object sender, NotifyCollectionChangedEventArgs args)
         {
             if (CardChoice.instance)
@@ -143,7 +143,7 @@ public static void EnableCard(CardInfo cardInfo, bool saved = true)
 
             string cardName = cardInfo.gameObject.name;
             if (!cards.ContainsKey(cardName)) return;
-            
+
             cards[cardName].enabled = true;
 
             if (saved)
@@ -159,7 +159,7 @@ public static void DisableCards(CardInfo[] cardInfos, bool saved = true)
                 DisableCard(card, saved);
             }
         }
-        
+
         public static void DisableCard(CardInfo cardInfo, bool saved = true)
         {
             if (activeCards.Contains(cardInfo))
@@ -185,7 +185,7 @@ public static void DisableCard(CardInfo cardInfo, bool saved = true)
 
         public static void EnableCategory(string categoryName)
         {
-            if(categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = true;
+            if (categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = true;
             foreach (string cardname in GetCardsInCategory(categoryName))
             {
                 EnableCard(cards[cardname].cardInfo, true);
@@ -194,18 +194,18 @@ public static void EnableCategory(string categoryName)
 
         public static void DisableCategory(string categoryName)
         {
-            if(categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = false;
+            if (categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = false;
             foreach (string cardname in GetCardsInCategory(categoryName))
             {
                 DisableCard(cards[cardname].cardInfo, true);
             }
         }
-        
+
         public static bool IsCardActive(CardInfo card)
         {
             return activeCards.Contains(card);
         }
-        
+
         public static bool IsCategoryActive(string categoryName)
         {
             return categoryBools.ContainsKey(categoryName) && categoryBools[categoryName].Value;
@@ -236,7 +236,7 @@ public static void OnJoinedRoomAction()
                 }
             });
         }
-        
+
         // This gets executed only on master client
         [UnboundRPC]
         private static void RPC_CardHandshake(string[] cardsArray)
@@ -303,7 +303,7 @@ private static void RPC_HostCardHandshakeResponse(string[] cardsArray)
 
         #endregion
     }
-    
+
     public class Card
     {
         public bool enabled;
diff --git a/UnboundLib/Utils/LevelManager.cs b/UnboundLib/Utils/LevelManager.cs
@@ -83,14 +83,14 @@ private void Start()
             // Populate the categoryBools dictionary
             foreach (var category in categories)
             {
-                categoryBools[category] = Unbound.config.Bind("Level categories", category, true);
+                categoryBools[category] = Unbound.BindConfig("Level categories", category, true);
             }
 
             // Disable all default levels that are disabled in config
             foreach (var level in allLevels)
             {
                 levelPaths[GetVisualName(level)] = level;
-                if (!Unbound.config.Bind("Levels: " + levels[level].category, GetVisualName(level), true).Value)
+                if (!Unbound.BindConfig("Levels: " + levels[level].category, GetVisualName(level), true).Value)
                 {
                     DisableLevel(level);
                 }
@@ -145,7 +145,7 @@ public static void EnableLevel(string levelName, bool saved = true)
 
             if (!saved) return;
             levels[levelName].enabled = true;
-            Unbound.config.Bind("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = true;
+            Unbound.BindConfig("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = true;
         }
 
         public static void DisableLevels(string[] levelNames, bool saved = true)
@@ -171,7 +171,7 @@ public static void DisableLevel(string levelName, bool saved = true)
 
             if (!saved) return;
             levels[levelName].enabled = false;
-            Unbound.config.Bind("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = false;
+            Unbound.BindConfig("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = false;
         }
 
 
@@ -253,7 +253,7 @@ public static void RegisterMaps(IEnumerable<string> paths, string category = "Mo
         {
             RegisterNamedMaps(paths, new Dictionary<string, string>(), category);
         }
-        public static void RegisterNamedMaps(IEnumerable<string> paths, IDictionary<string, string> mapNames , string category = "Modded")
+        public static void RegisterNamedMaps(IEnumerable<string> paths, IDictionary<string, string> mapNames, string category = "Modded")
         {
             foreach (var path in paths.Distinct())
             {
@@ -286,9 +286,9 @@ private static void RegisterMap(string path, string name, string category)
             if (!categories.Contains(category))
             {
                 categories.Add(category);
-                categoryBools[category] = Unbound.config.Bind("Level categories", category, true);
+                categoryBools[category] = Unbound.BindConfig("Level categories", category, true);
             }
-            if (!Unbound.config.Bind("Levels: " + levels[path].category, GetVisualName(path), true).Value)
+            if (!Unbound.BindConfig("Levels: " + levels[path].category, GetVisualName(path), true).Value)
             {
                 DisableLevel(path);
             }
diff --git a/UnboundLib/Utils/UI/ToggleLevelMenuHandler.cs b/UnboundLib/Utils/UI/ToggleLevelMenuHandler.cs
@@ -248,7 +248,7 @@ public void Start()
 
                     lvlObjs.Add(mapObject);
                     UpdateVisualsLevelObj(mapObject);
-                    if (!Unbound.config.Bind("Levels: " + level.Value.category, LevelManager.GetVisualName(level.Key), true).Value)
+                    if (!Unbound.BindConfig("Levels: " + level.Value.category, LevelManager.GetVisualName(level.Key), true).Value)
                     {
                         LevelManager.DisableLevel(level.Key);
                         UpdateVisualsLevelObj(mapObject);
@@ -275,7 +275,7 @@ public void Start()
 
                         ScrollViews[category].GetComponent<ScrollRect>().normalizedPosition = new Vector2(0, 1);
                         ScrollViews[category].gameObject.SetActive(true);
-                        
+
                         viewingText.text = "Viewing: " + category;
                     });
                     var toggle = categoryObj.GetComponentInChildren<Toggle>();
@@ -440,7 +440,7 @@ private static void ChangeMapColumnAmountMenus(int amount)
                     }
             }
             cellSize *= localScale;
-            
+
             mapAmountText.text = "Maps Per Line: " + amount;
             foreach (GridLayoutGroup gridLayout in from category in LevelManager.categories select ScrollViews[category].Find("Viewport/Content") into categoryMenu where categoryMenu != null select categoryMenu.gameObject.GetComponent<GridLayoutGroup>())
             {

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public static void BuildCard<T>(Action<CardInfo> callback) where T : CustomCard`
`158`	`158`	`CardManager.activeCards.CollectionChanged += CardManager.CardsChanged;`
`159`	`159`	`// Register card with the toggle menu`
`160`	`160`	`CardManager.cards.Add(newCard.gameObject.name,`
`161`		`- new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), newCard.gameObject.name, true), newCardInfo));`
	`161`	`+ new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), newCard.gameObject.name, true), newCardInfo));`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`// Post-creation clean up`
`@@ -188,7 +188,7 @@ public static void BuildUnityCard<T>(GameObject cardPrefab, Action<CardInfo> cal`
`188`	`188`
`189`	`189`	`if (customCard.GetEnabled())`
`190`	`190`	`{`
`191`		`- CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
	`191`	`+ CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`customCard.Awake();`
`@@ -219,7 +219,7 @@ public void BuildUnityCard(Action<CardInfo> callback)`
`219`	`219`
`220`	`220`	`if (customCard.GetEnabled())`
`221`	`221`	`{`
`222`		`- CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
	`222`	`+ CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`this.Awake();`
`@@ -241,7 +241,7 @@ public static void RegisterUnityCard<T>(GameObject cardPrefab, Action<CardInfo>`
`241`	`241`
`242`	`242`	`if (customCard.GetEnabled())`
`243`	`243`	`{`
`244`		`- CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
	`244`	`+ CardManager.cards.Add(cardInfo.gameObject.name, new Card(customCard.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + customCard.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`Unbound.Instance.ExecuteAfterFrames(5, () =>`
`@@ -260,7 +260,7 @@ public static void RegisterUnityCard(GameObject cardPrefab, string modInitials,`
`260`	`260`
`261`	`261`	`if (enabled)`
`262`	`262`	`{`
`263`		`- CardManager.cards.Add(cardInfo.gameObject.name, new Card(modInitials.Sanitize(), Unbound.config.Bind("Cards: " + cardname.Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
	`263`	`+ CardManager.cards.Add(cardInfo.gameObject.name, new Card(modInitials.Sanitize(), Unbound.BindConfig("Cards: " + cardname.Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`Unbound.Instance.ExecuteAfterFrames(5, () =>`
`@@ -279,7 +279,7 @@ public void RegisterUnityCard(Action<CardInfo> callback)`
`279`	`279`
`280`	`280`	`if (this.GetEnabled())`
`281`	`281`	`{`
`282`		`- CardManager.cards.Add(cardInfo.gameObject.name, new Card(this.GetModName().Sanitize(), Unbound.config.Bind("Cards: " + this.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
	`282`	`+ CardManager.cards.Add(cardInfo.gameObject.name, new Card(this.GetModName().Sanitize(), Unbound.BindConfig("Cards: " + this.GetModName().Sanitize(), cardInfo.gameObject.name, true), cardInfo));`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`Unbound.Instance.ExecuteAfterFrames(5, () =>`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace UnboundLib.Utils`
`15`	`15`	`public class CardManager : MonoBehaviour`
`16`	`16`	`{`
`17`	`17`	`public CardManager instance;`
`18`		`-`
	`18`	`+`
`19`	`19`	`// A string array of all cardInfos`
`20`	`20`	`internal static CardInfo[] allCards`
`21`	`21`	`{`
`@@ -28,32 +28,32 @@ internal static CardInfo[] allCards`
`28`	`28`	`return _allCards.ToArray();`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`-`
	`31`	`+`
`32`	`32`	`internal static CardInfo[] defaultCards;`
`33`	`33`	`internal static ObservableCollection<CardInfo> activeCards;`
`34`	`34`	`//internal static ObservableCollection<CardInfo> previousActiveCards = new ObservableCollection<CardInfo>();`
`35`	`35`	`internal static List<CardInfo> inactiveCards = new List<CardInfo>();`
`36`	`36`	`//internal static List<CardInfo> previousInactiveCards = new List<CardInfo>();`
`37`		`-`
	`37`	`+`
`38`	`38`	`// List of all categories`
`39`	`39`	`public static readonly List<string> categories = new List<string>();`
`40`	`40`	`// Dictionary of category name against if it is enabled`
`41`	`41`	`internal static readonly Dictionary<string, ConfigEntry<bool>> categoryBools = new Dictionary<string, ConfigEntry<bool>>();`
`42`		`-`
	`42`	`+`
`43`	`43`	`public static Dictionary<string, Card> cards = new Dictionary<string, Card>();`
`44`	`44`
`45`	`45`	`private static readonly List<Action<CardInfo[]>> FirstStartCallbacks = new List<Action<CardInfo[]>>();`
`46`	`46`
`47`	`47`	`public void Start()`
`48`	`48`	`{`
`49`	`49`	`instance = this;`
`50`		`-`
	`50`	`+`
`51`	`51`	`// store default cardInfos`
`52`	`52`	`defaultCards = (CardInfo[]) CardChoice.instance.cards.Clone();`
`53`		`-`
	`53`	`+`
`54`	`54`	`// Make activeCardsCollection and add defaultCards to it`
`55`	`55`	`activeCards = new ObservableCollection<CardInfo>(defaultCards);`
`56`		`-`
	`56`	`+`
`57`	`57`	`// Set activeCards CollectionChanged event`
`58`	`58`	`activeCards.CollectionChanged += CardsChanged;`
`59`	`59`	`}`
`@@ -62,7 +62,7 @@ public static void FirstTimeStart()`
`62`	`62`	`{`
`63`	`63`	`// Sort cardInfos`
`64`	`64`	`cards = cards.Keys.OrderBy(k => k).ToDictionary(k => k, k => cards[k]);`
`65`		`-`
	`65`	`+`
`66`	`66`	`// Set categories`
`67`	`67`	`foreach (var card in cards.Where(card => !categories.Contains(card.Value.category)))`
`68`	`68`	`{`
`@@ -72,7 +72,7 @@ public static void FirstTimeStart()`
`72`	`72`	`// Populate the categoryBools dictionary`
`73`	`73`	`foreach (var category in categories)`
`74`	`74`	`{`
`75`		`- categoryBools.Add(category, Unbound.config.Bind("Card categories", category, true));`
	`75`	`+ categoryBools.Add(category, Unbound.BindConfig("Card categories", category, true));`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`foreach (Action<CardInfo[]> callback in FirstStartCallbacks)`
`@@ -101,7 +101,7 @@ public static void AddAllCardsCallback(Action<CardInfo[]> callback)`
`101`	`101`	`{`
`102`	`102`	`FirstStartCallbacks.Add(callback);`
`103`	`103`	`}`
`104`		`-`
	`104`	`+`
`105`	`105`	`internal static void CardsChanged(object sender, NotifyCollectionChangedEventArgs args)`
`106`	`106`	`{`
`107`	`107`	`if (CardChoice.instance)`
`@@ -143,7 +143,7 @@ public static void EnableCard(CardInfo cardInfo, bool saved = true)`
`143`	`143`
`144`	`144`	`string cardName = cardInfo.gameObject.name;`
`145`	`145`	`if (!cards.ContainsKey(cardName)) return;`
`146`		`-`
	`146`	`+`
`147`	`147`	`cards[cardName].enabled = true;`
`148`	`148`
`149`	`149`	`if (saved)`
`@@ -159,7 +159,7 @@ public static void DisableCards(CardInfo[] cardInfos, bool saved = true)`
`159`	`159`	`DisableCard(card, saved);`
`160`	`160`	`}`
`161`	`161`	`}`
`162`		`-`
	`162`	`+`
`163`	`163`	`public static void DisableCard(CardInfo cardInfo, bool saved = true)`
`164`	`164`	`{`
`165`	`165`	`if (activeCards.Contains(cardInfo))`
`@@ -185,7 +185,7 @@ public static void DisableCard(CardInfo cardInfo, bool saved = true)`
`185`	`185`
`186`	`186`	`public static void EnableCategory(string categoryName)`
`187`	`187`	`{`
`188`		`- if(categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = true;`
	`188`	`+ if (categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = true;`
`189`	`189`	`foreach (string cardname in GetCardsInCategory(categoryName))`
`190`	`190`	`{`
`191`	`191`	`EnableCard(cards[cardname].cardInfo, true);`
`@@ -194,18 +194,18 @@ public static void EnableCategory(string categoryName)`
`194`	`194`
`195`	`195`	`public static void DisableCategory(string categoryName)`
`196`	`196`	`{`
`197`		`- if(categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = false;`
	`197`	`+ if (categoryBools.ContainsKey(categoryName)) categoryBools[categoryName].Value = false;`
`198`	`198`	`foreach (string cardname in GetCardsInCategory(categoryName))`
`199`	`199`	`{`
`200`	`200`	`DisableCard(cards[cardname].cardInfo, true);`
`201`	`201`	`}`
`202`	`202`	`}`
`203`		`-`
	`203`	`+`
`204`	`204`	`public static bool IsCardActive(CardInfo card)`
`205`	`205`	`{`
`206`	`206`	`return activeCards.Contains(card);`
`207`	`207`	`}`
`208`		`-`
	`208`	`+`
`209`	`209`	`public static bool IsCategoryActive(string categoryName)`
`210`	`210`	`{`
`211`	`211`	`return categoryBools.ContainsKey(categoryName) && categoryBools[categoryName].Value;`
`@@ -236,7 +236,7 @@ public static void OnJoinedRoomAction()`
`236`	`236`	`}`
`237`	`237`	`});`
`238`	`238`	`}`
`239`		`-`
	`239`	`+`
`240`	`240`	`// This gets executed only on master client`
`241`	`241`	`[UnboundRPC]`
`242`	`242`	`private static void RPC_CardHandshake(string[] cardsArray)`
`@@ -303,7 +303,7 @@ private static void RPC_HostCardHandshakeResponse(string[] cardsArray)`
`303`	`303`
`304`	`304`	`#endregion`
`305`	`305`	`}`
`306`		`-`
	`306`	`+`
`307`	`307`	`public class Card`
`308`	`308`	`{`
`309`	`309`	`public bool enabled;`
Original file line number	Diff line number	Diff line change
`@@ -83,14 +83,14 @@ private void Start()`
`83`	`83`	`// Populate the categoryBools dictionary`
`84`	`84`	`foreach (var category in categories)`
`85`	`85`	`{`
`86`		`- categoryBools[category] = Unbound.config.Bind("Level categories", category, true);`
	`86`	`+ categoryBools[category] = Unbound.BindConfig("Level categories", category, true);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`// Disable all default levels that are disabled in config`
`90`	`90`	`foreach (var level in allLevels)`
`91`	`91`	`{`
`92`	`92`	`levelPaths[GetVisualName(level)] = level;`
`93`		`- if (!Unbound.config.Bind("Levels: " + levels[level].category, GetVisualName(level), true).Value)`
	`93`	`+ if (!Unbound.BindConfig("Levels: " + levels[level].category, GetVisualName(level), true).Value)`
`94`	`94`	`{`
`95`	`95`	`DisableLevel(level);`
`96`	`96`	`}`
`@@ -145,7 +145,7 @@ public static void EnableLevel(string levelName, bool saved = true)`
`145`	`145`
`146`	`146`	`if (!saved) return;`
`147`	`147`	`levels[levelName].enabled = true;`
`148`		`- Unbound.config.Bind("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = true;`
	`148`	`+ Unbound.BindConfig("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = true;`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`public static void DisableLevels(string[] levelNames, bool saved = true)`
`@@ -171,7 +171,7 @@ public static void DisableLevel(string levelName, bool saved = true)`
`171`	`171`
`172`	`172`	`if (!saved) return;`
`173`	`173`	`levels[levelName].enabled = false;`
`174`		`- Unbound.config.Bind("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = false;`
	`174`	`+ Unbound.BindConfig("Levels: " + levels[levelName].category, GetVisualName(levelName), true).Value = false;`
`175`	`175`	`}`
`176`	`176`
`177`	`177`
`@@ -253,7 +253,7 @@ public static void RegisterMaps(IEnumerable<string> paths, string category = "Mo`
`253`	`253`	`{`
`254`	`254`	`RegisterNamedMaps(paths, new Dictionary<string, string>(), category);`
`255`	`255`	`}`
`256`		`- public static void RegisterNamedMaps(IEnumerable<string> paths, IDictionary<string, string> mapNames , string category = "Modded")`
	`256`	`+ public static void RegisterNamedMaps(IEnumerable<string> paths, IDictionary<string, string> mapNames, string category = "Modded")`
`257`	`257`	`{`
`258`	`258`	`foreach (var path in paths.Distinct())`
`259`	`259`	`{`
`@@ -286,9 +286,9 @@ private static void RegisterMap(string path, string name, string category)`
`286`	`286`	`if (!categories.Contains(category))`
`287`	`287`	`{`
`288`	`288`	`categories.Add(category);`
`289`		`- categoryBools[category] = Unbound.config.Bind("Level categories", category, true);`
	`289`	`+ categoryBools[category] = Unbound.BindConfig("Level categories", category, true);`
`290`	`290`	`}`
`291`		`- if (!Unbound.config.Bind("Levels: " + levels[path].category, GetVisualName(path), true).Value)`
	`291`	`+ if (!Unbound.BindConfig("Levels: " + levels[path].category, GetVisualName(path), true).Value)`
`292`	`292`	`{`
`293`	`293`	`DisableLevel(path);`
`294`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public void Start()`
`248`	`248`
`249`	`249`	`lvlObjs.Add(mapObject);`
`250`	`250`	`UpdateVisualsLevelObj(mapObject);`
`251`		`- if (!Unbound.config.Bind("Levels: " + level.Value.category, LevelManager.GetVisualName(level.Key), true).Value)`
	`251`	`+ if (!Unbound.BindConfig("Levels: " + level.Value.category, LevelManager.GetVisualName(level.Key), true).Value)`
`252`	`252`	`{`
`253`	`253`	`LevelManager.DisableLevel(level.Key);`
`254`	`254`	`UpdateVisualsLevelObj(mapObject);`
`@@ -275,7 +275,7 @@ public void Start()`
`275`	`275`
`276`	`276`	`ScrollViews[category].GetComponent<ScrollRect>().normalizedPosition = new Vector2(0, 1);`
`277`	`277`	`ScrollViews[category].gameObject.SetActive(true);`
`278`		`-`
	`278`	`+`
`279`	`279`	`viewingText.text = "Viewing: " + category;`
`280`	`280`	`});`
`281`	`281`	`var toggle = categoryObj.GetComponentInChildren<Toggle>();`
`@@ -440,7 +440,7 @@ private static void ChangeMapColumnAmountMenus(int amount)`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`	`cellSize *= localScale;`
`443`		`-`
	`443`	`+`
`444`	`444`	`mapAmountText.text = "Maps Per Line: " + amount;`
`445`	`445`	`foreach (GridLayoutGroup gridLayout in from category in LevelManager.categories select ScrollViews[category].Find("Viewport/Content") into categoryMenu where categoryMenu != null select categoryMenu.gameObject.GetComponent<GridLayoutGroup>())`
`446`	`446`	`{`