Fix Steam Inventory button opening the old style inventory instead of…

… the Steam Inventory

GoonMod/lua/BlackMarketGUI.lua

@@ -788,8 +788,6 @@ Hooks:RegisterHook("BlackMarketGUIOnPopulateMasks")
 Hooks:RegisterHook("BlackMarketGUIOnPopulateMasksActionList")
 function BlackMarketGui.populate_masks(self, data)
 
-	local success, err = pcall(function()
-
 	Hooks:Call("BlackMarketGUIOnPopulateMasks", self, data)
 
 	local NOT_WIN_32 = SystemInfo:platform() ~= Idstring("WIN32")
@@ -802,7 +800,7 @@ function BlackMarketGui.populate_masks(self, data)
 	local start_crafted_item = data.start_crafted_item or 1
 	local hold_crafted_item = managers.blackmarket:get_hold_crafted_item()
 	local currently_holding = hold_crafted_item and hold_crafted_item.category == "masks"
-	local max_rows = tweak_data.gui.MAX_MASK_ROWS
+	local max_rows = tweak_data.gui.MAX_MASK_ROWS or 5
 	max_items = max_rows * (data.override_slots and data.override_slots[2] or 3)
 	for i = 1, max_items do
 		data[i] = nil
@@ -1126,18 +1124,12 @@ function BlackMarketGui.populate_masks(self, data)
 
 	end
 
-	end)
-
-	if not success then Print(err) end
-
 end
 
 Hooks:RegisterHook("BlackMarketGUIOnPopulateMods")
 Hooks:RegisterHook("BlackMarketGUIOnPopulateModsActionList")
 function BlackMarketGui.populate_mods(self, data)
 
-	local success, err = pcall(function()
-
 	Hooks:Call("BlackMarketGUIOnPopulateMods", self, data)
 
 	local new_data = {}
@@ -1416,17 +1408,12 @@ function BlackMarketGui.populate_mods(self, data)
 
 	end
 
-	end)
-	if not success then Print("[Error] " .. err) end
-
 end
 
 Hooks:RegisterHook("BlackMarketGUIOnPopulateMaskMods")
 Hooks:RegisterHook("BlackMarketGUIOnPopulateMaskModsActionList")
 function BlackMarketGui.populate_choose_mask_mod(self, data)
 
-	local success, err = pcall(function()
-
 	Hooks:Call("BlackMarketGUIOnPopulateMaskMods", self, data)
 
 	local new_data = {}
@@ -1558,82 +1545,20 @@ function BlackMarketGui.populate_choose_mask_mod(self, data)
 
 	end
 
-	end)
-	if not success then Print("[Error] " .. err) end
-
 end
 
-
 Hooks:RegisterHook("BlackMarketGUIStartPageData")
 function BlackMarketGui._start_page_data(self)
 
 	local data = {}
-	table.insert(data, {
-		name = "bm_menu_primaries",
-		category = "primaries",
-		on_create_func_name = "populate_primaries",
-		identifier = self.identifiers.weapon,
-		override_slots = {3, 3}
-	})
-	table.insert(data, {
-		name = "bm_menu_secondaries",
-		category = "secondaries",
-		on_create_func_name = "populate_secondaries",
-		identifier = self.identifiers.weapon,
-		override_slots = {3, 3}
-	})
-	table.insert(data, {
-		name = "bm_menu_melee_weapons",
-		category = "melee_weapons",
-		on_create_func_name = "populate_melee_weapons",
-		allow_preview = true,
-		override_slots = {3, 3},
-		identifier = Idstring("melee_weapon")
-	})
-	table.insert(data, {
-		name = "bm_menu_grenades",
-		category = "grenades",
-		on_create_func_name = "populate_grenades",
-		allow_preview = true,
-		override_slots = {3, 3},
-		identifier = self.identifiers.grenade
-	})
-	table.insert(data, {
-		name = "bm_menu_armors",
-		category = "armors",
-		on_create_func_name = "populate_armors",
-		override_slots = {4, 2},
-		identifier = self.identifiers.armor
-	})
-	table.insert(data, {
-		name = "bm_menu_deployables",
-		category = "deployables",
-		on_create_func_name = "populate_deployables",
-		override_slots = {4, 2},
-		identifier = Idstring("deployable")
-	})
-	table.insert(data, {
-		name = "bm_menu_masks",
-		category = "masks",
-		on_create_func_name = "populate_masks",
-		identifier = self.identifiers.mask,
-		override_slots = {3, 3},
-		start_crafted_item = 1
-	})
-	if not managers.network:session() then
-		table.insert(data, {
-			name = "bm_menu_characters",
-			category = "characters",
-			on_create_func_name = "populate_characters",
-			override_slots = {5, 3},
-			identifier = self.identifiers.character
-		})
-	end
+	data.topic_id = "menu_steam_inventory"
+	data.init_callback_name = "create_steam_inventory"
+	data.init_callback_params = data
+	data.allow_tradable_reload = true
+	data.create_steam_inventory_extra = true
 
 	Hooks:Call("BlackMarketGUIStartPageData", self, data)
 
-	data.topic_id = "menu_inventory"
-	self:_cleanup_blackmarket()
 	return data
 
 end

GoonMod/lua/WeaponTweakData.lua

@@ -1,8 +1,20 @@
 
 CloneClass( WeaponTweakData )
 
+Hooks:RegisterHook("WeaponTweakDataPostInit")
+function WeaponTweakData.init(self, tweak_data)
+	self.orig.init(self, tweak_data)
+	Hooks:Call("WeaponTweakDataPostInit", self, tweak_data)
+end
+
 Hooks:RegisterHook("WeaponTweakDataPostInitPlayerWeaponData")
 function WeaponTweakData._init_data_player_weapons(self, tweak_data)
 	self.orig._init_data_player_weapons(self, tweak_data)
 	Hooks:Call("WeaponTweakDataPostInitPlayerWeaponData", self, tweak_data)
 end
+
+Hooks:RegisterHook("WeaponTweakDataPostInitNewWeapons")
+function WeaponTweakData._init_new_weapons(self, autohit_rifle_default, autohit_pistol_default, autohit_shotgun_default, autohit_lmg_default, autohit_snp_default, autohit_smg_default, autohit_minigun_default, damage_melee_default, damage_melee_effect_multiplier_default, aim_assist_rifle_default, aim_assist_pistol_default, aim_assist_shotgun_default, aim_assist_lmg_default, aim_assist_snp_default, aim_assist_smg_default, aim_assist_minigun_default)
+	self.orig._init_new_weapons(self, autohit_rifle_default, autohit_pistol_default, autohit_shotgun_default, autohit_lmg_default, autohit_snp_default, autohit_smg_default, autohit_minigun_default, damage_melee_default, damage_melee_effect_multiplier_default, aim_assist_rifle_default, aim_assist_pistol_default, aim_assist_shotgun_default, aim_assist_lmg_default, aim_assist_snp_default, aim_assist_smg_default, aim_assist_minigun_default)
+	Hooks:Call("WeaponTweakDataPostInitNewWeapons", self, autohit_rifle_default, autohit_pistol_default, autohit_shotgun_default, autohit_lmg_default, autohit_snp_default, autohit_smg_default, autohit_minigun_default, damage_melee_default, damage_melee_effect_multiplier_default, aim_assist_rifle_default, aim_assist_pistol_default, aim_assist_shotgun_default, aim_assist_lmg_default, aim_assist_snp_default, aim_assist_smg_default, aim_assist_minigun_default)
+end

GoonMod/mods/mutators.lua

@@ -129,7 +129,7 @@ Hooks:Add("MenuManagerBuildCustomMenus", "MenuManagerBuildCustomMenus_MutatorsMe
 		MenuHelper:AddMenuItem( menu_nodes.main, menu_id, "Mutators_OptionsName", "Mutators_OptionsDesc", "safehouse", "after" )
 	end
 	if menu_nodes.lobby ~= nil then
-		MenuHelper:AddMenuItem( menu_nodes.lobby, menu_id, "Mutators_OptionsName", "Mutators_OptionsDesc", "skilltree", "after" )
+		MenuHelper:AddMenuItem( menu_nodes.lobby, menu_id, "Mutators_OptionsName", "Mutators_OptionsDesc", "options", "after" )
 	end
 
 	-- Add to ingame menu

GoonMod/mutators/mutator_suicide_cloakers.lua

@@ -49,7 +49,7 @@ function Mutator:Detonate(spooc)
 	if LuaNetworking:IsMultiplayer() and LuaNetworking:IsHost() then
 
 		local grenade_type = "launcher_frag"
-		local unit_name = Idstring(tweak_data.blackmarket.grenades[grenade_type].unit)
+		local unit_name = Idstring(tweak_data.blackmarket.projectiles[grenade_type].unit)
 		local unit = World:spawn_unit(unit_name, pos, Rotation(math.random(0, 360), math.UP))
 		unit:base():_detonate()