More minor stealth fixes (#75)

* more small fixes

fix mods being added to menu twice when offline

fix hidden options being unusable

* make skill rando bl2 only

* bump version number

Author: apple1417

Mods/ModMenu/MenuManager.py

@@ -155,6 +155,7 @@ def AddListItem(caller: unrealsdk.UObject, function: unrealsdk.UFunction, params
         Using it cause it simplifies the code to replace the caption.
         """
         if params.Caption == "$WillowMenu.WillowScrollingListDataProviderFrontEnd.DLC":
+            unrealsdk.DoInjectedCallNext()
             caller.AddListItem(_MODS_EVENT_ID, _MODS_MENU_NAME, False, False)
             return False
 
@@ -169,6 +170,30 @@ def AddListItem(caller: unrealsdk.UObject, function: unrealsdk.UFunction, params
     return False
 
 
+def _RefreshDLC(caller: unrealsdk.UObject, function: unrealsdk.UFunction, params: unrealsdk.FStruct) -> bool:
+    """
+    This function is called to refresh the DLC menu. We're mostly interested in it because Gearbox
+     has amazing code, and calls `OnDownloadableContentListRead` twice if you're offline.
+
+    This happens right at the end of the function, so it's easiest to just recreate it.
+
+    We can ignore the filter stuff, `OnDownloadableContentListRead` overwrites it right after, and
+     we can also remove the small meaningless loading message that some people get hung up on.
+    """
+    if caller.bDelegateFired:
+        caller.ShowMarketplaceElements(False)
+        caller.SetShoppingTooltips(False, False, False, False, True)
+        caller.SetContentData()
+        caller.bDelegateFired = False
+
+        # Here's the issue: earlier they setup a delegate for this call, but when it fails they
+        #  also manually call the delgate again - we just don't
+        caller.WPCOwner.OnlineSub.ContentInterface.ObjectPointer.ReadDownloadableContentList(
+            caller.WPCOwner.GetMyControllerId()
+        )
+    return False
+
+
 def _OnDownloadableContentListRead(caller: unrealsdk.UObject, function: unrealsdk.UFunction, params: unrealsdk.FStruct) -> bool:
     """ This function is called to fill in the dlc menu, we overwrite it with our mods instead. """
     global _current_mod_list
@@ -189,7 +214,7 @@ def _OnDownloadableContentListRead(caller: unrealsdk.UObject, function: unrealsd
 
     for idx, mod in enumerate(_current_mod_list):
         # This is weird and crashes if you don't have the second arg, but also crashes most the time
-        #  when you try to access something on it
+        #  when you try to access something on it - seems like a garbage pointer
         item, _ = caller.CreateMarketplaceItem()
 
         item.SetString(caller.Prop_offeringId, str(idx), translation_context)
@@ -248,7 +273,7 @@ def update_item() -> None:
         #  were, but we have to call this to actually update the visuals
         # This also resets filters, and for some reason none of the filter functions want to work
         #  right now either :/
-        caller.RefreshDLC()
+        _RefreshDLC(caller, None, None)
 
     if key == "Q":
         if event == KeybindManager.InputEvent.Released:
@@ -386,6 +411,7 @@ def _FrontEndUpdateTooltips(caller: unrealsdk.UObject, function: unrealsdk.UFunc
 
 
 unrealsdk.RunHook("WillowGame.WillowScrollingListDataProviderFrontEnd.Populate", "ModMenu.MenuManager", _FrontEndPopulate)
+unrealsdk.RunHook("WillowGame.MarketplaceGFxMovie.RefreshDLC", "ModMenu.MenuManager", _RefreshDLC)
 unrealsdk.RunHook("WillowGame.MarketplaceGFxMovie.OnDownloadableContentListRead", "ModMenu.MenuManager", _OnDownloadableContentListRead)
 unrealsdk.RunHook("WillowGame.MarketplaceGFxMovie.ShopInputKey", "ModMenu.MenuManager", _ShopInputKey)
 unrealsdk.RunHook("WillowGame.MarketplaceGFxMovie.extOnOfferingChanged", "ModMenu.MenuManager", _extOnOfferingChanged)

Mods/ModMenu/Options.py

@@ -2,7 +2,6 @@
 from typing import Any, Optional, Sequence, Tuple
 
 from . import DeprecationHelper as dh
-from . import SettingsManager
 
 
 class Base(ABC):
@@ -71,8 +70,6 @@ class Hidden(Value):
         StartingValue: The default value of the option.
         IsHidden: If the option is hidden from the options menu. This is forced to True.
     """
-    _current_value: Any
-
     def __init__(
         self,
         Caption: str,
@@ -108,15 +105,6 @@ def IsHidden(self) -> bool:  # type: ignore
     def IsHidden(self, val: bool) -> None:
         pass
 
-    @property
-    def CurrentValue(self) -> Any:
-        return self._current_value
-
-    @CurrentValue.setter
-    def CurrentValue(self, val: Any) -> None:
-        self._current_value = val
-        SettingsManager.SaveAllModSettings()
-
 
 class Slider(Value):
     """

Mods/ModMenu/__init__.py

@@ -4,7 +4,7 @@
 
 # Need to define these up here so that they're accessable when importing the other files
 VERSION_MAJOR = 2
-VERSION_MINOR = 1
+VERSION_MINOR = 2
 
 unrealsdk.Log(f"[ModMenu] Version: {VERSION_MAJOR}.{VERSION_MINOR}")
 

Mods/SkillRandomizer/__init__.py

@@ -6,18 +6,22 @@
 import os
 
 from ..ModManager import BL2MOD, RegisterMod
+from Mods.ModMenu import Game
 
 class CrossSkillRandomizer(BL2MOD):
+    Name = "Cross Class Skill Randomizer ({})"
     Description = "Randomize all the skills!"
+    
+    SupportedGames = Game.BL2
 
     LocalModDir = os.path.dirname(os.path.realpath(__file__))
 
     def __init__(self, seed=None):
         self.Seed = seed
         if seed:
-            self.Name = "Cross Class Skill Randomizer ({})".format(self.Seed)
+            self.Name = self.Name.format(self.Seed)
         else:
-            self.Name = "Cross Class Skill Randomizer (New Seed)"
+            self.Name = self.Name.format("New Seed")
 
     def RecordSeed(self):
         with open(self.LocalModDir + "\\log.json", "r+") as f: