Fix character dump log messages

Living races start with Regeneration and Wild infusions; undeads with Shielding and Phase Door runes


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

game/engines/default/engine/LogDisplay.lua

@@ -102,7 +102,7 @@ function _M:getLines(number)
 	if from > #self.log then from = #self.log end
 	local lines = { }
 	for i = from, 1, -1 do
-		lines[#lines+1] = tostring(self.log[i][1])
+		lines[#lines+1] = tostring(self.log[i])
 	end
 	return lines
 end

game/modules/tome/data/birth/classes/chronomancer.lua

@@ -76,10 +76,6 @@ newBirthDescriptor{
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
 			{type="armor", subtype="cloth", name="linen robe", autoreq=true},
 		},
-		resolvers.inventory{ id=true,
-			{type="potion", subtype="potion", name="potion of lesser mana", ego_chance=-1000},
-			{type="potion", subtype="potion", name="potion of lesser mana", ego_chance=-1000},
-		},
 	},
 	copy_add = {
 		life_rating = -4,

game/modules/tome/data/birth/classes/tutorial.lua

@@ -64,7 +64,6 @@ newBirthDescriptor{
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="longsword", name="iron longsword", autoreq=true},
 			{type="armor", subtype="shield", name="iron shield", autoreq=true},
---			{type="armor", subtype="heavy", name="iron mail armour", autoreq=true}
 		},
 	},
 }

game/modules/tome/data/birth/descriptors.lua

@@ -70,8 +70,6 @@ newBirthDescriptor{
 		resolvers.equip{ id=true,
 			{type="lite", subtype="lite", name="brass lantern"},
 		},
-		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
-		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 }
 

game/modules/tome/data/birth/races/dwarf.lua

@@ -42,6 +42,8 @@ newBirthDescriptor{
 		starting_zone = "trollshaws",
 		starting_quest = "start-allied",
 		starting_intro = "dwarf",
+		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
+		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, },
 }

game/modules/tome/data/birth/races/elf.lua

@@ -47,6 +47,8 @@ newBirthDescriptor{
 		default_wilderness = {28, 13},
 		starting_zone = "trollshaws",
 		starting_quest = "start-allied",
+		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
+		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, },
 }

game/modules/tome/data/birth/races/halfling.lua

@@ -48,6 +48,8 @@ newBirthDescriptor{
 		starting_zone = "trollshaws",
 		starting_quest = "start-allied",
 		starting_intro = "halfling",
+		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
+		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, },
 }

game/modules/tome/data/birth/races/human.lua

@@ -47,6 +47,8 @@ newBirthDescriptor{
 	copy = {
 		faction = "allied-kingdoms",
 		type = "humanoid", subtype="human",
+		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
+		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, },
 }

game/modules/tome/data/birth/races/orc.lua

@@ -57,6 +57,8 @@ newBirthDescriptor{
 		starting_quest = "start-dunadan",
 		starting_intro = "orc",
 		life_rating=12,
+		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
+		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 	experience = 1.3,
 }

game/modules/tome/data/birth/races/troll.lua

@@ -51,6 +51,8 @@ newBirthDescriptor{
 		starting_quest = "start-dunadan",
 		starting_intro = "dwarf",
 		life_rating=10,
+		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
+		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 	experience = 1.1,
 }

game/modules/tome/data/birth/races/undead.lua

@@ -43,10 +43,6 @@ newBirthDescriptor{
 		},
 	},
 	copy = {
-		resolvers.inventory{ id=true,
-			{type="potion", subtype="potion", name="potion of cure disease", ego_chance=-1000},
-			{type="potion", subtype="potion", name="potion of cure disease", ego_chance=-1000},
-		},
 		-- Force undead faction to undead
 		resolvers.genericlast(function(e) e.faction = "undead" end),
 		default_wilderness = {39, 38},
@@ -54,6 +50,8 @@ newBirthDescriptor{
 		starting_level = 8, starting_level_force_down = true,
 		starting_quest = "start-undead",
 		undead = 1,
+		resolvers.inscription("RUNE:_SHIELDING", {cooldown=14, dur=5, power=100}),
+		resolvers.inscription("RUNE:_PHASE_DOOR", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, },
 }

game/modules/tome/data/general/npcs/sandworm.lua

@@ -37,7 +37,7 @@ newEntity{
 	size_category = 2,
 	blind_immune = 1,
 
-	drops = resolvers.drops{chance=20, nb=1, {type="potion"}, {type="scroll"} },
+	drops = resolvers.drops{chance=5, nb=1, {type="scroll"} },
 
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=3, },

game/modules/tome/data/general/objects/objects.lua

@@ -28,7 +28,7 @@ loadIfNot("/data/general/objects/gem.lua")
 loadIfNot("/data/general/objects/lites.lua")
 
 -- Usable stuff
---loadIfNot("/data/general/objects/potions.lua")
+loadIfNot("/data/general/objects/potions.lua")
 loadIfNot("/data/general/objects/scrolls.lua")
 loadIfNot("/data/general/objects/wands.lua")
 

game/modules/tome/data/general/objects/potions.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+newEntity{
+	define_as = "BASE_POTION",
+	slot = "INBELT", use_no_wear=true,
+	type = "potion", subtype="potion",
+	unided_name = "potion", id_by_type = true,
+	display = "!", color=colors.WHITE, image="object/potion-0x0.png",
+	use_sound = "actions/quaff",
+	encumber = 0.2,
+	stacking = true,
+	acid_destroy = {{10,1}, {20,2}, {40,5}, {60,10}, {120,20}},
+	desc = [[Magical potions can have wildly different effects, from healing to killing you, beware! Most of them function better with a high Magic score]],
+	egos = "/data/general/objects/egos/potions.lua", egos_chance = resolvers.mbonus(10, 5),
+}

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -280,28 +280,6 @@ This star is the culmination of their craft. Light radiates from its ever shifti
 	},
 }
 
-newEntity{
-	unique = true,
-	type = "potion", subtype="potion",
-	name = "Ever-Refilling Potion of Healing",
-	unided_name = "strange potion",
-	level_range = {35, 40},
-	display = '!', color=colors.VIOLET, image="object/potion-0x3-violet.png",
-	encumber = 0.4,
-	rarity = 150,
-	desc = [[Bottle containing healing magic. But the more you drink from it, the more it refills!]],
-	cost = 80,
-
-	max_power = 100, power_regen = 1,
-	use_power = { name = "heal", power = 80,
-		use = function(self, who)
-			who:heal(150 + who:getMag())
-			game.logSeen(who, "%s quaffs an %s!", who.name:capitalize(), self:getName())
-			return nil, true
-		end
-	},
-}
-
 newEntity{
 	unique = true,
 	type = "potion", subtype="potion",

game/modules/tome/data/general/stores/basic.lua

@@ -29,8 +29,7 @@ newEntity{
 		min_fill = 40,
 		max_fill = 60,
 		filters = {
-			{type="potion", id=true},
-			{type="scroll", id=true},
+--			{type="scroll", id=true},
 		},
 --		fixed = {
 --		},

game/modules/tome/data/maps/tutorial/tutorial1.lua

@@ -29,7 +29,7 @@ defineTile("T", "GRASS", nil, "TUTORIAL_NPC_TROLL", nil)
 defineTile("L", "GRASS", nil, "TUTORIAL_NPC_LONE_WOLF", nil)
 defineTile("1", "GRASS", nil, nil, "TUTORIAL_MELEE")
 defineTile("|", "GRASS", {random_filter={name="elm arrow"}}, nil, nil)
-defineTile("2", "GRASS", {random_filter={name="potion of lesser healing"}}, nil, "TUTORIAL_OBJECTS")
+defineTile("2", "GRASS", {random_filter={name="regeneration infusion"}}, nil, "TUTORIAL_OBJECTS")
 defineTile("3", "GRASS", nil, nil, "TUTORIAL_TALENTS")
 defineTile("4", "GRASS", nil, nil, "TUTORIAL_LEVELUP")
 defineTile("~", "DEEP_WATER", nil, nil, nil)
@@ -40,9 +40,9 @@ defineTile("8", "GRASS", nil, nil, "TUTORIAL_RANGED")
 defineTile("9", "GRASS", nil, nil, "TUTORIAL_QUESTS")
 defineTile("j", "GRASS", nil, {random_filter={type="immovable", subtype="jelly", max_ood=2}}, nil)
 defineTile(" ", "DEEP_WATER", nil, {random_filter={type="immovable", subtype="jelly", max_ood=2}}, nil)
-defineTile("!", "GRASS", {random_filter={name="potion of lesser healing"}}, nil, nil)
+defineTile("!", "GRASS", {random_filter={name="healing infusion"}}, nil, nil)
 defineTile('"', "DEEP_WATER", nil, {random_filter={type="immovable", subtype="jelly", max_ood=2}}, nil)
-defineTile("#", "DEEP_WATER", {random_filter={name="potion of lesser healing"}}, nil, nil)
+defineTile("#", "DEEP_WATER", {random_filter={name="shielding rune"}}, nil, nil)
 
 return [[
 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&~&&&&&&&&&&&&&&&&&
@@ -53,11 +53,11 @@ return [[
 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&~~~,,,&&&&&&&&
 &&&&&&&&&,,,,,&&&&&&&&&&&&&&&&&&~~&&~~~&&,,,&&&&&&
 &&&&&&&&,T,,,,,,,,,,,,&&&&&&&&&&~~~~~~~&&&&,&&&&&&
-&&&&&&&&!T,,,,,,,,,,,,,&&&&&&&&&~~~~~~&&&&&,&&&&&&
-&&&&&&&&!T,,T,,,,,,,,,,&&&&&&&&&~~~&~~&&&&&,&&&&&&
+&&&&&&&&,T,,,,,,,,,,,,,&&&&&&&&&~~~~~~&&&&&,&&&&&&
+&&&&&&&&,T,,T,,,,,,,,,,&&&&&&&&&~~~&~~&&&&&,&&&&&&
 &&&&&&&,,,,,T,,,,,,,,,,,&&&&&&&&&~~~~&&&s&,,&&&&&&
-&&&&&&&,!T,,T,,,,,,,,,,,,,,&&&&&,~&~~&&&,,,,&&&&&&
-&&&&&&&&!T,,,,,,,,,,,,,,,&,&&&,,,~~~~&&,,,,,!&&&&&
+&&&&&&&,,T,,T,,,,,,,,,,,,,,&&&&&,~&~~&&&,,,,&&&&&&
+&&&&&&&&,T,,,,,,,,,,,,,,,&,&&&,,,~~~~&&,,,,,!&&&&&
 &&&&&&&&,T,,,,,,,,,,,,,,&&,|)8,&&&~~&&&&,,,,,&&&&&
 &&&&&&&&,,,,,,,,,,,,,,,&&&&&&&&&&&&&&&&&,,,,,&&&&&
 &&&&&&&&&,,,,,,,,,,,,,&&&&&&&&&&,,,,,,,,7,,,&&&&&&
@@ -68,7 +68,7 @@ return [[
 &&&&&&&&&&&&&&&9&&&&&&&&&&&&&,&&&&&&&&&&&&&&&&&&&&
 &&&&&&&&&&&&&&,,&&&&&&&&&&&&,,&&&&&&&&&&&&&&&&&&&&
 &&&&&&&&&&&&&,,&&&&&&&&&&&&&,&&&&&&&&,,,,,,,&&&&&&
-&&&&&&&&&&&&&,&&&&&&&&&&&&&&!&&&&&&&,,j,,,,,,&&&&&
+&&&&&&&&&&&&&,&&&&&&&&&&&&&&,&&&&&&&,,j,,,,,,&&&&&
 &&&&&&&&&&&&&,&&&&&&&&&&&&&&,&&&&&&,,,2,,,,,,1,,,,
 &&&&&&&&&,,,,,,&&&&&&&&&&&&&,&&&,,,,,,j,,,,,&&&&&&
 &&&&&&&&,,,,,,,,&&&&&&&&&&&&,&&&,&&&,,,,,,,,&&&&&&

game/modules/tome/data/maps/vaults/forest-snake-pit.lua

@@ -27,7 +27,7 @@ defineTile('#', "WALL")
 defineTile('X', "TREE")
 defineTile('x', "DOOR_VAULT")
 
-defineTile('s', "FLOOR", {random_filter={type="potion", ego_chance=25}}, {random_filter={name="rattlesnake"}})
+defineTile('s', "FLOOR", {random_filter={type="scroll", ego_chance=25}}, {random_filter={name="rattlesnake"}})
 
 return {
 [[,,,,,,,,,]],

game/modules/tome/data/maps/vaults/thief-hideout-dark.lua

@@ -31,7 +31,7 @@ defineTile('!', "DOOR_VAULT")
 defineTile('p', "FLOOR", nil, {random_filter={name="rogue", add_levels=3}})
 defineTile('P', "FLOOR", nil, {random_filter={name="bandit", add_levels=5}})
 
-defineTile('&', "FLOOR", {random_filter={type="potion"}})
+defineTile('&', "FLOOR", {random_filter={type="scroll"}})
 defineTile('$', "FLOOR", "MONEY_SMALL")
 defineTile('*', "FLOOR", {random_filter={type="gem"}})