Staff Mastery is trainable in Angolwen

Mindstar Mastery is trainable in Zigur


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

game/modules/tome/data/chats/angolwen-staves-store.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 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
+
+newChat{ id="welcome",
+	text = [[Welcome @playername@ to my shop.]],
+	answers = {
+		{"Let me see your wares.", action=function(npc, player)
+			npc.store:loadup(game.level, game.zone)
+			npc.store:interact(player)
+		end},
+		{"I am looking for staff training.", jump="training"},
+		{"Sorry, I have to go!"},
+	}
+}
+
+newChat{ id="training",
+	text = [[I can briefly go over the basics (talent category Spell/Staff-combat, locked) for a fee of 100 gold pieces.  Alternatively, I can provide a more in-depth study for 750.]],
+	answers = {
+		{"Just give me the basics.", action=function(npc, player)
+			game.logPlayer(player, "The staff carver spends some time with you, teaching you the basics of staff combat.")
+			player:incMoney(-100)
+			player:learnTalentType("spell/staff-combat", false)
+			player.changed = true
+		end, cond=function(npc, player)
+			if player.money < 100 then return end
+			--if player:knowTalentType("spell/staff-combat") then return end
+			if player:knowTalentType("spell/staff-combat") or player:knowTalentType("spell/staff-combat") == false then return end
+			return true
+		end},
+		{"Please teach me all there is to know.", action=function(npc, player)
+			game.logPlayer(player, "The staff carver spends a great deal of time going over the finer details of staff combat with you.")
+			player:incMoney(-750)
+			player:learnTalentType("spell/staff-combat", true)
+			player.changed = true
+		end, cond=function(npc, player)
+			if player.money < 750 then return end
+			if player:knowTalentType("spell/staff-combat") then return end
+			return true
+		end},
+		{"No thanks."},
+	}
+}
+
+return "welcome"

game/modules/tome/data/chats/zigur-mindstar-store.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 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
+
+newChat{ id="welcome",
+	text = [[Welcome @playername@ to my shop.]],
+	answers = {
+		{"Let me see your wares.", action=function(npc, player)
+			npc.store:loadup(game.level, game.zone)
+			npc.store:interact(player)
+		end},
+		{"I am looking for mindstar training.", jump="training"},
+		{"Sorry, I have to go!"},
+	}
+}
+
+newChat{ id="training",
+	text = [[I can briefly go over the basics (talent category Wild-gift/Mindstar-mastery, locked) for a fee of 100 gold pieces.  Alternatively, I can provide a more in-depth study for 750.]],
+	answers = {
+		{"Just give me the basics.", action=function(npc, player)
+			game.logPlayer(player, "The shopkeeper spends some time with you, teaching you the basics of channeling energy through mindstars.")
+			player:incMoney(-100)
+			player:learnTalentType("wild-gift/mindstar-mastery", false)
+			player.changed = true
+		end, cond=function(npc, player)
+			if player.money < 100 then return end
+			--if player:knowTalentType("wild-gift/mindstar-mastery") then return end
+			if player:knowTalentType("wild-gift/mindstar-mastery") or player:knowTalentType("wild-gift/mindstar-mastery") == false then return end
+			return true
+		end},
+		{"Please teach me all there is to know.", action=function(npc, player)
+			game.logPlayer(player, "The shopkeeper spends a great deal of time going over the finer details of channeling energy through mindstars with you.")
+			player:incMoney(-750)
+			player:learnTalentType("wild-gift/mindstar-mastery", true)
+			player.changed = true
+		end, cond=function(npc, player)
+			if player.money < 750 then return end
+			if player:knowTalentType("wild-gift/mindstar-mastery") then return end
+			return true
+		end},
+		{"No thanks."},
+	}
+}
+
+return "welcome"

game/modules/tome/data/zones/infinite-dungeon/objects.lua

@@ -47,7 +47,17 @@ newEntity{
 			game.logPlayer(who, "#VIOLET#You seem to now know how to properly use a bow or a sling.")
 			done = done + 1
 		end
-
+		if not ( who:knowTalentType("spell/staff-combat") or who:knowTalentType("spell/staff-combat") == false ) then 
+			who:learnTalentType("spell/staff-combat", false)
+			game.logPlayer(who, "#VIOLET#Images of yourself beating people with a stick spring into your mind. (Staff Combat category can be bought)")
+			done = done + 1
+		end
+		if not ( who:knowTalentType("wild-gift/mindstar-mastery") or who:knowTalentType("wild-gift/mindstar-mastery") == false ) then 
+			who:learnTalentType("wild-gift/mindstar-mastery", false)
+			game.logPlayer(who, "#VIOLET#You suddenly understand how to channel your mental force through mindstars. (Mindstar Mastery category can be bought)")
+			done = done + 1
+		end
+		
 		if done == 0 then
 			game.logPlayer(who, "#VIOLET#It seems you already knew all the elixir could teach you.")
 		end

game/modules/tome/data/zones/town-angolwen/traps.lua

@@ -42,4 +42,5 @@ newEntity{ base = "BASE_STORE", define_as = "STAVES",
 	name="Tools of the Art",
 	display='6', color=colors.UMBER,
 	resolvers.store("ANGOLWEN_STAFF_WAND", "angolwen", "store/shop_door.png", "store/shop_sign_staves_wands.png"),
+	resolvers.chatfeature("angolwen-staves-store", "angolwen"),
 }

game/modules/tome/data/zones/town-zigur/traps.lua

@@ -59,6 +59,7 @@ newEntity{ base = "BASE_STORE", define_as = "MINDSTAR_WEAPON_STORE",
 	name="Purification Tools",
 	display='3', color=colors.UMBER,
 	resolvers.store("MINDSTAR", "zigur", "store/shop_door.png", "store/shop_sign_jewelry.png"),
+	resolvers.chatfeature("zigur-mindstar-store", "zigur"),
 }
 
 newEntity{ base = "BASE_STORE", define_as = "LIBRARY",