Rando v2 (#19)

* Improve rando significantly

* Improve naming

Author: Matt-Hurd

Python/init.py

@@ -1,4 +1,5 @@
 import bl2sdk
+import os
 
 def log(s):
     s = str(s)
@@ -7,6 +8,9 @@ def log(s):
     bl2sdk.Log(s)
 print = log
 
+if os.getcwd().split('\\')[-1] == 'Win32':
+	os.chdir(os.getcwd() + '\\Plugins\\Python')
+
 class BL2MOD():
 	_Enabled = False
 	Name = ""
@@ -21,8 +25,7 @@ def Disable(self):
 bl2sdk.BL2MOD = BL2MOD
 bl2sdk.Mods = []
 
-# import commander_wannabe
-# import rando
+import randomizer
 
 def LoadModList(caller, function, parms, result):
 	caller.SetStoreHeader("Mods", 0, "By Abahbob", "Mod Manager")
@@ -37,15 +40,15 @@ def LoadModList(caller, function, parms, result):
 	caller.PostContentLoaded(True)
 	return False
 
-# bl2sdk.RemoveEngineHook("Function WillowGame.MarketplaceGFxMovie.OnDownloadableContentListRead", "InjectMods")
-# bl2sdk.RegisterEngineHook("Function WillowGame.MarketplaceGFxMovie.OnDownloadableContentListRead", "InjectMods", LoadModList)
+bl2sdk.RemoveEngineHook("WillowGame.MarketplaceGFxMovie.OnDownloadableContentListRead", "InjectMods")
+bl2sdk.RegisterEngineHook("WillowGame.MarketplaceGFxMovie.OnDownloadableContentListRead", "InjectMods", LoadModList)
 
 def process_hook(caller, function, parms, result):
 	pc = bl2sdk.GetEngine().GamePlayers[0]
 	ControllerId = parms.popInt()
 	ukey = parms.popFName()
 	event = parms.popByte()
-	if ukey.GetName() == 'Enter':
+	if ukey == 'Enter':
 		if event == 0:
 			selected_object = caller.GetSelectedObject()
 			mod = selected_object.GetString(caller.Prop_offeringId)
@@ -62,8 +65,8 @@ def process_hook(caller, function, parms, result):
 		return False
 	return True
 
-# bl2sdk.RemoveEngineHook("Function WillowGame.MarketplaceGFxMovie.ShopInputKey", "OpenModMenu")
-# bl2sdk.RegisterEngineHook("Function WillowGame.MarketplaceGFxMovie.ShopInputKey", "OpenModMenu", process_hook)
+bl2sdk.RemoveEngineHook("WillowGame.MarketplaceGFxMovie.ShopInputKey", "OpenModMenu")
+bl2sdk.RegisterEngineHook("WillowGame.MarketplaceGFxMovie.ShopInputKey", "OpenModMenu", process_hook)
 
 
 def ReplaceDLCWithMods(caller, stack, result, function):
@@ -73,18 +76,17 @@ def ReplaceDLCWithMods(caller, stack, result, function):
 	bNew = stack.popULong()
 	if Caption == "$WillowMenu.WillowScrollingListDataProviderFrontEnd.DLC":
 		Caption = "MODS"
-	print(Caption)
 	caller.AddListItem(EventID, Caption, bDisabled, bNew)
 	stack.SkipFunction()
 	return False
 
 
 def HookMainMenuPopulateForMods(caller, stack, result, function):
-	bl2sdk.RegisterScriptHook("Function WillowGame.WillowScrollingList.AddListItem", "ReplaceDLCWithMods", ReplaceDLCWithMods)
+	bl2sdk.RegisterScriptHook("WillowGame.WillowScrollingList.AddListItem", "ReplaceDLCWithMods", ReplaceDLCWithMods)
 	caller.Populate(stack.popObject())
-	bl2sdk.RemoveScriptHook("Function WillowGame.WillowScrollingList.AddListItem", "ReplaceDLCWithMods")
+	bl2sdk.RemoveScriptHook("WillowGame.WillowScrollingList.AddListItem", "ReplaceDLCWithMods")
 	stack.SkipFunction()
 	return False
 
-# bl2sdk.RemoveEngineHook("Function WillowGame.WillowScrollingListDataProviderFrontEnd.Populate", "HookMainMenuPopulateForMods")
-# bl2sdk.RegisterScriptHook("Function WillowGame.WillowScrollingListDataProviderFrontEnd.Populate", "HookMainMenuPopulateForMods", HookMainMenuPopulateForMods)
+bl2sdk.RemoveEngineHook("WillowGame.WillowScrollingListDataProviderFrontEnd.Populate", "HookMainMenuPopulateForMods")
+bl2sdk.RegisterScriptHook("WillowGame.WillowScrollingListDataProviderFrontEnd.Populate", "HookMainMenuPopulateForMods", HookMainMenuPopulateForMods)