New option to not auto-bind activate items in the hotkeys

git-svn-id: http://svn.net-core.org/repos/t-engine4@6131 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Player.lua

@@ -1230,7 +1230,7 @@ function _M:onWear(o, bypass_set)
 		end)
 	end
 
-	if self.hotkey and o:canUseObject() then
+	if self.hotkey and o:canUseObject() and config.settings.tome.auto_hotkey_object then
 		local position
 		local name = o:getName{no_count=true, force_id=true, no_add_name=true}
 

game/modules/tome/dialogs/GameOptions.lua

@@ -302,6 +302,15 @@ function _M:generateList()
 		game:saveSettings("tome.lore_popup", ("tome.lore_popup = %s\n"):format(tostring(config.settings.tome.lore_popup)))
 		self.c_list:drawItem(item)
 	end,}
+
+	local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"If disabled items with activations will not be auto-added to your hotkeys, you will need to manualty drag them from the inventory screen.#WHITE#"}
+	list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#Always add objects to hotkeys.#WHITE##{normal}#", status=function(item)
+		return tostring(config.settings.tome.auto_hotkey_object and "enabled" or "disabled")
+	end, fct=function(item)
+		config.settings.tome.auto_hotkey_object = not config.settings.tome.auto_hotkey_object
+		game:saveSettings("tome.auto_hotkey_object", ("tome.auto_hotkey_object = %s\n"):format(tostring(config.settings.tome.auto_hotkey_object)))
+		self.c_list:drawItem(item)
+	end,}
 --[[
 	local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Your movement mode depends on which character/creature you're currently controlling.#WHITE#"}
 	list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#Actor-based movement mode#WHITE##{normal}#", status=function(item)

game/modules/tome/load.lua

@@ -78,6 +78,7 @@ if type(config.settings.tome.chat_log) == "nil" then config.settings.tome.chat_l
 if type(config.settings.tome.actor_based_movement_mode) == "nil" then config.settings.tome.actor_based_movement_mode = true end
 if type(config.settings.tome.rest_before_explore) == "nil" then config.settings.tome.rest_before_explore = true end
 if type(config.settings.tome.lore_popup) == "nil" then config.settings.tome.lore_popup = true end
+if type(config.settings.tome.auto_hotkey_object) == "nil" then config.settings.tome.auto_hotkey_object = true end
 if not config.settings.tome.fonts then config.settings.tome.fonts = {type="fantasy", size="normal"} end
 if not config.settings.tome.ui_theme2 then config.settings.tome.ui_theme2 = "metal" end
 if not config.settings.tome.uiset_mode then config.settings.tome.uiset_mode = "Minimalist" end