Chat class constructor can be passed a table as a third parameter to provide...

Chat class constructor can be passed a table as a third parameter to provide data to the chat script
escort quest nearly done


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

game/engine/Chat.lua

@@ -23,16 +23,17 @@ require "engine.dialogs.Chat"
 --- Handle chats between the player and NPCs
 module(..., package.seeall, class.make)
 
-function _M:init(name, npc, player)
+function _M:init(name, npc, player, data)
 	self.chats = {}
 	self.npc = npc
 	self.player = player
+	data = setmetatable(data or {}, {__index=_G})
 
 	local f, err = loadfile("/data/chats/"..name..".lua")
 	if not f and err then error(err) end
 	setfenv(f, setmetatable({
 		newChat = function(c) self:addChat(c) end,
-	}, {__index=_G}))
+	}, {__index=data}))
 	self.default_id = f()
 end
 

game/modules/tome/data/chats/escort-quest.lua

@@ -17,11 +17,163 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
+local Talents = require("engine.interface.ActorTalents")
+local Stats = require("engine.interface.ActorStats")
+
+local reward_types = {
+	warrior = {
+		types = {
+			["technique/combat-training"] = 0.7,
+		},
+		talents = {
+			[Talents.T_WEAPON_COMBAT] = 1,
+			[Talents.T_SWORD_MASTERY] = 1,
+			[Talents.T_AXE_MASTERY] = 1,
+			[Talents.T_MACE_MASTERY] = 1,
+			[Talents.T_EXOTIC_WEAPONS_MASTERY] = 1,
+		},
+		stats = {
+			[Stats.STAT_STR] = 1,
+			[Stats.STAT_CON] = 1,
+		},
+	},
+	divination = {
+		types = {
+			["spell/divination"] = 0.7,
+		},
+		talents = {
+			[Talents.T_SENSE] = 1,
+			[Talents.T_IDENTIFY] = 1,
+			[Talents.T_VISION] = 1,
+		},
+		stats = {
+			[Stats.STAT_MAG] = 1,
+			[Stats.STAT_WIL] = 1,
+		},
+	},
+	alchemy = {
+		types = {
+			["spell/staff-combat"] = 0.7,
+			["spell/stone-alchemy"] = 0.7,
+		},
+		talents = {
+			[Talents.T_CHANNEL_STAFF] = 1,
+			[Talents.T_STAFF_MASTERY] = 1,
+			[Talents.T_STONE_TOUCH] = 1,
+			[Talents.T_IMBUE_ITEM] = 1,
+		},
+		stats = {
+			[Stats.STAT_MAG] = 1,
+			[Stats.STAT_DEX] = 1,
+		},
+	},
+	survival = {
+		types = {
+			["cunning/survival"] = 0.7,
+		},
+		talents = {
+			[Talents.T_HEIGHTENED_SENSES] = 1,
+			[Talents.T_TRAP_DETECTION] = 1,
+			[Talents.T_TRAP_DISARM] = 1,
+		},
+		stats = {
+			[Stats.STAT_DEX] = 1,
+			[Stats.STAT_CUN] = 1,
+		},
+	},
+	sun_paladin = {
+		types = {
+			["divine/chants"] = 0.7,
+		},
+		talents = {
+			[Talents.T_CHANT_OF_FORTITUDE] = 1,
+			[Talents.T_CHANT_OF_FORTRESS] = 1,
+		},
+		stats = {
+			[Stats.STAT_STR] = 1,
+			[Stats.STAT_MAG] = 1,
+		},
+	},
+	anorithil = {
+		types = {
+			["divine/hymns"] = 0.7,
+		},
+		talents = {
+			[Talents.T_HYMN_OF_DETECTION] = 1,
+			[Talents.T_HYMN_OF_PERSEVERANCE] = 1,
+		},
+		stats = {
+			[Stats.STAT_CUN] = 1,
+			[Stats.STAT_MAG] = 1,
+		},
+	},
+	exotic = {
+		talents = {
+			[Talents.T_DISARM] = 1,
+			[Talents.T_WATER_JET] = 1,
+			[Talents.T_SPIT_POISON] = 1,
+			[Talents.T_MIND_SEAR] = 1,
+		},
+		stats = {
+			[Stats.STAT_STR] = 1,
+			[Stats.STAT_DEX] = 1,
+			[Stats.STAT_MAG] = 1,
+			[Stats.STAT_WIL] = 1,
+			[Stats.STAT_CUN] = 1,
+			[Stats.STAT_CON] = 1,
+		},
+	},
+}
+local reward = reward_types[npc.reward_type]
+
+local function generate_rewards()
+	local answers = {}
+	if reward.stats then
+		for i = 1, #npc.stats_def do if reward.stats[i] then
+			local doit = function(npc, player) player.inc_stats[i] = (player.inc_stats[i] or 0) + reward.stats[i]; player.changed = true end
+			answers[#answers+1] = {("[Improve %s by +%d]"):format(npc.stats_def[i].name, reward.stats[i]), jump="done", action=doit}
+		end end
+	end
+	if reward.talents then
+		for tid, level in pairs(reward.talents) do
+			local t = npc:getTalentFromId(tid)
+			level = math.min(t.points - npc:getTalentLevelRaw(tid), level)
+			if level > 0 then
+				local doit = function(npc, player)
+					player:learnTalent(tid, true, level)
+					if t.hide then player.__show_special_talents[tid] = true end
+				end
+				answers[#answers+1] = {("[%s talent %s (+%d level(s))]"):format(npc:knowTalent(tid) and "Improve" or "Learn", t.name, level), jump="done", action=doit}
+			end
+		end
+	end
+	if reward.types then
+		for tt, mastery in pairs(reward.types) do if not npc:knowTalentType(tt) then
+			local tt_def = npc:getTalentTypeFrom(tt)
+			local doit = function(npc, player)
+				player:learnTalentType(tt, false)
+				player:setTalentTypeMastery(tt, mastery)
+			end
+			local cat = tt_def.type:gsub("/.*", "")
+			answers[#answers+1] = {("[Allow training of talent category %s (at mastery %0.2f)]"):format(cat:capitalize().." / "..tt_def.name:capitalize(), mastery), jump="done", action=doit}
+		end end
+	end
+	return answers
+end
+
 newChat{ id="welcome",
-	text = [[Todo!]],
+	text = [[Thank you my friend, I do not think I would have survived without you.
+Please let me reward you:]],
+	answers = generate_rewards(),
+}
+
+newChat{ id="done",
+	text = [[There you go, farewell!]],
 	answers = {
-		{"[leave]"},
-	}
+		{"Thank you."},
+	},
 }
 
+print(plop)
+
 return "welcome"

game/modules/tome/data/quests/escort-duty.lua

@@ -26,29 +26,25 @@ local Astar = require("engine.Astar")
 -- Quest data
 --------------------------------------------------------------------------------
 local name_rules = {
-	phonemesVocals = "a, e, i, o, u, y",
-	phonemesConsonants = "b, c, ch, ck, cz, d, dh, f, g, gh, h, j, k, kh, l, m, n, p, ph, q, r, rh, s, sh, t, th, ts, tz, v, w, x, z, zh",
-	syllablesStart = "Aer, Al, Am, An, Ar, Arm, Arth, B, Bal, Bar, Be, Bel, Ber, Bok, Bor, Bran, Breg, Bren, Brod, Cam, Chal, Cham, Ch, Cuth, Dag, Daim, Dair, Del, Dr, Dur, Duv, Ear, Elen, Er, Erel, Erem, Fal, Ful, Gal, G, Get, Gil, Gor, Grin, Gun, H, Hal, Han, Har, Hath, Hett, Hur, Iss, Khel, K, Kor, Lel, Lor, M, Mal, Man, Mard, N, Ol, Radh, Rag, Relg, Rh, Run, Sam, Tarr, T, Tor, Tul, Tur, Ul, Ulf, Unr, Ur, Urth, Yar, Z, Zan, Zer",
-	syllablesMiddle = "de, do, dra, du, duna, ga, go, hara, kaltho, la, latha, le, ma, nari, ra, re, rego, ro, rodda, romi, rui, sa, to, ya, zila",
-	syllablesEnd = "bar, bers, blek, chak, chik, dan, dar, das, dig, dil, din, dir, dor, dur, fang, fast, gar, gas, gen, gorn, grim, gund, had, hek, hell, hir, hor, kan, kath, khad, kor, lach, lar, ldil, ldir, leg, len, lin, mas, mnir, ndil, ndur, neg, nik, ntir, rab, rach, rain, rak, ran, rand, rath, rek, rig, rim, rin, rion, sin, sta, stir, sus, tar, thad, thel, tir, von, vor, yon, zor",
-	rules = "$s$v$35m$10m$e",
+	male = {
+		phonemesVocals = "a, e, i, o, u, y",
+		phonemesConsonants = "b, c, ch, ck, cz, d, dh, f, g, gh, h, j, k, kh, l, m, n, p, ph, q, r, rh, s, sh, t, th, ts, tz, v, w, x, z, zh",
+		syllablesStart = "Aer, Al, Am, An, Ar, Arm, Arth, B, Bal, Bar, Be, Bel, Ber, Bok, Bor, Bran, Breg, Bren, Brod, Cam, Chal, Cham, Ch, Cuth, Dag, Daim, Dair, Del, Dr, Dur, Duv, Ear, Elen, Er, Erel, Erem, Fal, Ful, Gal, G, Get, Gil, Gor, Grin, Gun, H, Hal, Han, Har, Hath, Hett, Hur, Iss, Khel, K, Kor, Lel, Lor, M, Mal, Man, Mard, N, Ol, Radh, Rag, Relg, Rh, Run, Sam, Tarr, T, Tor, Tul, Tur, Ul, Ulf, Unr, Ur, Urth, Yar, Z, Zan, Zer",
+		syllablesMiddle = "de, do, dra, du, duna, ga, go, hara, kaltho, la, latha, le, ma, nari, ra, re, rego, ro, rodda, romi, rui, sa, to, ya, zila",
+		syllablesEnd = "bar, bers, blek, chak, chik, dan, dar, das, dig, dil, din, dir, dor, dur, fang, fast, gar, gas, gen, gorn, grim, gund, had, hek, hell, hir, hor, kan, kath, khad, kor, lach, lar, ldil, ldir, leg, len, lin, mas, mnir, ndil, ndur, neg, nik, ntir, rab, rach, rain, rak, ran, rand, rath, rek, rig, rim, rin, rion, sin, sta, stir, sus, tar, thad, thel, tir, von, vor, yon, zor",
+		rules = "$s$v$35m$10m$e",
+	},
+	female = {
+		phonemesVocals = "a, e, i, o, u, y",
+		syllablesStart = "Ad, Aer, Ar, Bel, Bet, Beth, Ce'N, Cyr, Eilin, El, Em, Emel, G, Gl, Glor, Is, Isl, Iv, Lay, Lis, May, Ner, Pol, Por, Sal, Sil, Vel, Vor, X, Xan, Xer, Yv, Zub",
+		syllablesMiddle = "bre, da, dhe, ga, lda, le, lra, mi, ra, ri, ria, re, se, ya",
+		syllablesEnd = "ba, beth, da, kira, laith, lle, ma, mina, mira, na, nn, nne, nor, ra, rin, ssra, ta, th, tha, thra, tira, tta, vea, vena, we, wen, wyn",
+		rules = "$s$v$35m$10m$e",
+	},
 }
 
 local possible_types = {
-	{ name="lost warrior",
-		types = {
-			["technique/combat-training"] = 0.7,
-			["technique/combat-techniques-active"] = 0.7,
-			["technique/combat-techniques-passive"] = 0.7,
-		},
-		talents = {
-			[Talents.T_RUSH] = 1,
-		},
-		stats = {
-			[Stats.STAT_STR] = 2,
-			[Stats.STAT_DEX] = 1,
-			[Stats.STAT_CON] = 2,
-		},
+	{ name="lost warrior", random="male",
 		actor = {
 			type = "humanoid", subtype = "human",
 			display = "@", color=colors.UMBER,
@@ -66,9 +62,61 @@ local possible_types = {
 			exp_worth = 0,
 
 			max_life = 50, life_regen = 0,
-			life_rating = 5,
+			life_rating = 7,
 			combat_armor = 3, combat_def = 3,
 			inc_damage = {all=-50},
+
+			reward_type = "warrior",
+		},
+	},
+	{ name="injured seer", random="female",
+		actor = {
+			name = "%s, the injured seer",
+			type = "humanoid", subtype = "elf", female=true,
+			display = "@", color=colors.LIGHT_BLUE,
+			desc = [[She looks tired and wounded.]],
+			autolevel = "caster",
+			ai = "summoned", ai_real = "escort_quest", ai_state = { talent_in=4, },
+			stats = { str=8, dex=7, mag=18, con=12 },
+
+			body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+			resolvers.equip{ {type="weapon", subtype="staff", autoreq=true} },
+			resolvers.talents{ [Talents.T_MANATHRUST]=1, },
+			lite = 4,
+			rank = 2,
+			exp_worth = 0,
+
+			max_life = 50, life_regen = 0,
+			life_rating = 6,
+			combat_armor = 3, combat_def = 3,
+			inc_damage = {all=-50},
+
+			reward_type = "divination",
+		},
+	},
+	{ name="repented thief", random="male",
+		actor = {
+			name = "%s, the repented thief",
+			type = "humanoid", subtype = "hobbit",
+			display = "@", color=colors.BLUE,
+			desc = [[She looks tired and wounded.]],
+			autolevel = "rogue",
+			ai = "summoned", ai_real = "escort_quest", ai_state = { talent_in=4, },
+			stats = { str=8, dex=7, mag=18, con=12 },
+
+			body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+			resolvers.equip{ {type="weapon", subtype="staff", autoreq=true} },
+			resolvers.talents{ [Talents.T_DIRTY_FIGHTING]=1, },
+			lite = 4,
+			rank = 2,
+			exp_worth = 0,
+
+			max_life = 50, life_regen = 0,
+			life_rating = 6,
+			combat_armor = 3, combat_def = 3,
+			inc_damage = {all=-50},
+
+			reward_type = "survival",
 		},
 	},
 }
@@ -120,9 +168,10 @@ end
 on_grant = function(self, who)
 	self.on_grant = nil
 
-	local ng = NameGenerator.new(name_rules)
-
 	self.kind = rng.table(possible_types)
+
+	local ng = NameGenerator.new(name_rules[self.kind.random])
+
 	self.kind.actor.level_range = {game.level.level, game.level.level}
 	self.kind.actor.name = self.kind.actor.name:format(ng:generate())
 	self.kind.actor.faction = who.faction
@@ -143,7 +192,8 @@ on_grant = function(self, who)
 	self.kind.actor = nil
 
 	-- Spawn the portal, far enough from the escort
-	local gx, gy = getPortalSpot(npc, 150, (game.level.map.w + game.level.map.h) / 2 / 2)
+--	local gx, gy = getPortalSpot(npc, 150, (game.level.map.w + game.level.map.h) / 2 / 2)
+	local gx, gy = x+1, y
 	if not gx then return end
 	local g = mod.class.Grid.new{
 		show_tooltip=true,
@@ -153,9 +203,10 @@ on_grant = function(self, who)
 		on_move = function(self, x, y, who)
 			if not who.escort_quest then return end
 			game.player:setQuestStatus(who.quest_id, engine.Quest.DONE)
-			npc:disappear()
+			who:disappear()
+			who:removed()
 			local Chat = require "engine.Chat"
-			Chat.new("escort-quest", who, game.player):invoke()
+			Chat.new("escort-quest", who, game.player, {npc=who}):invoke()
 		end,
 	}
 	g:resolve() g:resolve(nil, true)

game/modules/tome/data/talents/misc/npcs.lua

@@ -25,6 +25,9 @@ newTalentType{ type="wild-gift/other", name = "other", hide = true, description
 newTalentType{ type="other/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
 newTalentType{ type="undead/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
 
+local oldTalent = newTalent
+local newTalent = function(t) if type(t.hide) == "nil" then t.hide = true end return oldTalent(t) end
+
 -- Multiply!!!
 newTalent{
 	name = "Multiply",