New option to use either the new icons hotkey toolbar or the old textual one

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

game/modules/tome/class/Game.lua

@@ -124,9 +124,13 @@ function _M:run()
 	profile.chat:enableFading(config.settings.tome.log_fade or 3)
 	profile.chat:enableDisplayChans(false)
 
-	self.hotkeys_display = HotkeysIconsDisplay.new(nil, 216, self.h - 52, self.w - 216, 52, "/data/gfx/ui/talents-list.png", font_mono, size_mono, 48, 48)
-	self.hotkeys_display:enableShadow(0.6)
-	self.hotkeys_display:setColumns(3)
+	self.hotkeys_display_icons = HotkeysIconsDisplay.new(nil, 216, self.h - 52, self.w - 216, 52, "/data/gfx/ui/talents-list.png", font_mono, size_mono, 48, 48)
+	self.hotkeys_display_icons:enableShadow(0.6)
+	self.hotkeys_display_icons:setColumns(3)
+	self.hotkeys_display_text = HotkeysDisplay.new(nil, 216, self.h - 52, self.w - 216, 52, "/data/gfx/ui/talents-list.png", font_mono, size_mono)
+	self.hotkeys_display_text:enableShadow(0.6)
+	self.hotkeys_display_text:setColumns(3)
+	self.hotkeys_display = config.settings.tome.hotkey_icons and self.hotkeys_display_icons or self.hotkeys_display_text
 	self.npcs_display = ActorsSeenDisplay.new(nil, 216, self.h - font_mono_h * 4.2, self.w - 216, font_mono_h * 4.2, "/data/gfx/ui/talents-list.png", font_mono, size_mono)
 	self.npcs_display:setColumns(3)
 	self.tooltip = Tooltip.new(font_mono, size, {255,255,255}, {30,30,30,230})

game/modules/tome/data/talents/spells/spells.lua

@@ -135,6 +135,7 @@ function necroSetupSummon(self, m, x, y, level, no_control)
 	-- Try to use stored AI talents to preserve tweaking over multiple summons
 	m.ai_talents = self.stored_ai_talents and self.stored_ai_talents[m.name] or {}
 	m.inc_damage = table.clone(self.inc_damage, true)
+	m.no_breath = 1
 
 	if self:knowTalent(self.T_DARK_EMPATHY) then
 		local t = self:getTalentFromId(self.T_DARK_EMPATHY)

game/modules/tome/dialogs/GameOptions.lua

@@ -214,6 +214,18 @@ function _M:generateList()
 		}))
 	end,}
 
+	local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Uses the icons hotkeys toolbar or the textual one.#WHITE#"}
+	list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#Icons hotkey toolbar#WHITE##{normal}#", status=function(item)
+		return tostring(config.settings.tome.hotkey_icons and "enabled" or "disabled")
+	end, fct=function(item)
+		config.settings.tome.hotkey_icons = not config.settings.tome.hotkey_icons
+		game:saveSettings("tome.hotkey_icons", ("tome.hotkey_icons = %s\n"):format(tostring(config.settings.tome.hotkey_icons)))
+		game.hotkeys_display = config.settings.tome.hotkey_icons and game.hotkeys_display_icons or game.hotkeys_display_text
+		game.hotkeys_display.actor = game.player
+		game.player.changed = true
+		self.c_list:drawItem(item)
+	end,}
+
 
 	self.list = list
 end

game/modules/tome/load.lua

@@ -61,6 +61,7 @@ if config.settings.tome.gfx.tiles == "mushroom" then config.settings.tome.gfx.ti
 if type(config.settings.tome.weather_effects) == "nil" then config.settings.tome.weather_effects = true end
 if type(config.settings.tome.smooth_fov) == "nil" then config.settings.tome.smooth_fov = true end
 if type(config.settings.tome.daynight) == "nil" then config.settings.tome.daynight = true end
+if type(config.settings.tome.hotkey_icons) == "nil" then config.settings.tome.hotkey_icons = true end
 if type(config.settings.tome.chat_log) == "nil" then config.settings.tome.chat_log = true end
 if not config.settings.tome.fonts then config.settings.tome.fonts = {type="fantasy", size="normal"} end
 if not config.settings.tome.ui_theme then config.settings.tome.ui_theme = "stone" end