Many character dump improvments by shani

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

game/engine/LogDisplay.lua

@@ -68,6 +68,18 @@ function _M:empty()
 	self.changed = true
 end
 
+--- Get Last Lines From Log
+-- @param number number of lines to retrieve
+function _M:getLines(number)
+	local from = number
+	if from > #self.log then from = #self.log end
+	local lines = { }
+	for i = from, 1, -1 do
+		lines[#lines+1] = self.log[i]
+	end
+	return lines
+end
+
 function _M:display()
 	-- If nothing changed, return the same surface as before
 	if not self.changed then return self.surface end

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

@@ -17,45 +17,6 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-newTalent{
-	name = "Create Alchemist Gems",
-	type = {"spell/alchemy-base", 1},
-	require = spells_req1,
-	points = 1,
-	range = function(self, t)
-		return math.ceil(5 + self:getDex(12))
-	end,
-	mana = 30,
-	make_gem = function(self, t, base_define)
-		local nb = rng.range(40, 80)
-		local gem = game.zone:makeEntityByName(game.level, "object", "ALCHEMIST_" .. base_define)
-
-		local s = {}
-		while nb > 0 do
-			s[#s+1] = gem:clone()
-			nb = nb - 1
-		end
-		for i = 1, #s do gem:stack(s[i]) end
-
-		return gem
-	end,
-	action = function(self, t)
-		self:showEquipInven("Use which gem?", function(o) return o.type == "gem" end, function(o, inven, item)
-			local gem = t.make_gem(self, t, o.define_as)
-			self:addObject(self.INVEN_INVEN, gem)
-			self:removeObject(inven, item)
-			game.logPlayer(self, "You create: %s", gem:getName{do_color=true, do_count=true})
-			return true
-		end)
-		game:playSoundNear(self, "talents/arcane")
-		return true
-	end,
-	info = function(self, t)
-		return ([[Carve %d to %d alchemist gems out of natural gems.
-		Alchemists gems are used for lots of other spells.]]):format(40, 80)
-	end,
-}
-
 newTalent{
 	name = "Throw Bomb",
 	type = {"spell/alchemy", 1},

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

@@ -32,12 +32,12 @@ newTalentType{ type="spell/phantasm", name = "phantasm", description = "Control
 newTalentType{ type="spell/enhancement", name = "enhancement", description = "Magical enhancement of your body." }
 
 -- Alchemist spells
-newTalentType{ type="spell/alchemy-base", name = "alchemy", hide = true, description = "Manipulate gems to turn them into explosive magical bombs." }
 newTalentType{ type="spell/alchemy", name = "alchemy", description = "Manipulate gems to turn them into explosive magical bombs." }
 newTalentType{ type="spell/infusion", name = "infusion", description = "Infusion your gem bombs with the powers of the elements." }
 newTalentType{ type="spell/golemancy-base", name = "golemancy", hide = true, description = "Learn to craft and upgrade your golem." }
 newTalentType{ type="spell/golemancy", name = "golemancy", description = "Learn to craft and upgrade your golem." }
 newTalentType{ type="spell/advanced-golemancy", name = "advanced-golemancy", description = "Advanced golem operations." }
+newTalentType{ type="spell/gemology-base", name = "gemology", hide = true, description = "Manipulate gems, imbue their powers into other objects." }
 newTalentType{ type="spell/gemology", name = "gemology", generic = true, description = "Manipulate gems, imbue their powers into other objects." }
 newTalentType{ type="spell/herbalism", name = "herbalism", generic = true, description = "Herbs lore." }
 newTalentType{ type="spell/staff-combat", name = "staff combat", generic = true, description = "Harness the power of magical staves." }

game/modules/tome/data/talents/spells/staff-combat.lua

@@ -96,7 +96,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Adopt a defensive posture, reducing your staff attack power by %d and increasing your defense by %d.]]):
-		format(self:combatTalentSpellDamage(t, 20, 230) / 2, self:combatTalentSpellDamage(t, 20, 230))
+		format(self:combatTalentSpellDamage(t, 10, 20) / 2, self:combatTalentSpellDamage(t, 10, 20))
 	end,
 }
 

game/modules/tome/dialogs/CharacterSheet.lua

@@ -266,9 +266,9 @@ function _M:dump()
 	nl(makelabel("Spellpower", game.player:combatSpellpower() ..""))
 	nnl(("%-32s"):format(makelabel("Armor", game.player:combatArmor() .. "")))
 	nl(makelabel("Spell Crit", game.player:combatSpellCrit() .."%"))
-	nnl(("%-32s"):format(makelabel("Class", game.player:combatDefense() .. "")))
+	nnl(("%-32s"):format(makelabel("Defense", game.player:combatDefense() .. "")))
 	nl(makelabel("Spell Speed", game.player:combatSpellSpeed() ..""))
-	nnl(("%-32s"):format(makelabel("Class", game.player:combatDefenseRanged() .. "")))
+	nnl(("%-32s"):format(makelabel("Ranged Defense", game.player:combatDefenseRanged() .. "")))
 	nl()
 
 	nl()
@@ -406,6 +406,12 @@ function _M:dump()
 		end
 	end
 
+	nl()
+	nl("  [Last Messages]")
+	nl()
+
+	nl(table.concat(game.logdisplay:getLines(40), "\r"):gsub("#.-#", "   "))
+
 	fff:close()
 
 	Dialog:simplePopup("Character dump complete", "File: "..fs.getRealPath(file))