Level 20 mindslayer tress brought back to level 10

Psi-archery removed


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

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

@@ -66,8 +66,7 @@ newBirthDescriptor{
 		["psionic/voracity"]={true, 0.3},
 		--Level 10 trees:
 		["psionic/finer-energy-manipulations"]={false, 0},
-		["psionic/psi-archery"]={false, 0.3},
-		--Level 20 trees:
+--		["psionic/psi-archery"]={false, 0.3},
 		["psionic/grip"]={false, 0},
 		["psionic/augmented-mobility"]={false, 0},
 		--Miscellaneous trees:
@@ -80,10 +79,8 @@ newBirthDescriptor{
 		[ActorTalents.T_KINETIC_AURA] = 1,
 		[ActorTalents.T_KINETIC_LEECH] = 1,
 		[ActorTalents.T_BEYOND_THE_FLESH] = 1,
-		[ActorTalents.T_TRAP_HANDLING] = 1,
 		[ActorTalents.T_TELEKINETIC_GRASP] = 1,
 		[ActorTalents.T_TELEKINETIC_SMASH] = 1,
-		[ActorTalents.T_SHOOT] = 1,
 	},
 	body = { PSIONIC_FOCUS = 1, QS_PSIONIC_FOCUS = 1,},
 	copy = {
@@ -92,11 +89,6 @@ newBirthDescriptor{
 			{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
 			{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance=-1000},
 		},
-		resolvers.inventory{ id=true,
-			{type="gem",},
-			{type="weapon", subtype="longbow", name="elm longbow", ego_chance=-1000},
-			{type="ammo", subtype="arrow", name="quiver of elm arrows", autoreq=true, ego_chance=-1000},
-		},
 		resolvers.generic(function(self)
 			-- Make and wield some alchemist gems
 			local gs = game.zone:makeEntity(game.level, "object", {type="weapon", subtype="greatsword", name="iron greatsword", ego_chance=-1000}, nil, true)
@@ -174,13 +166,13 @@ newBirthDescriptor{
 		["psionic/slumber"]={true, 0.3},
 		["psionic/solipsism"]={true, 0.3},
 		["psionic/thought-forms"]={true, 0.3},
-		
+
 		-- generic
 		["psionic/dreaming"]={true, 0.3},
 		["psionic/feedback"]={true, 0.3},
 		["psionic/mentalism"]={true, 0.3},
 		["cunning/survival"]={true, 0},
-		
+
 		-- locked trees
 		["psionic/discharge"]={false, 0.3},
 		["psionic/dream-forge"]={false, 0.3},
@@ -188,7 +180,7 @@ newBirthDescriptor{
 	},
 	talents = {
 		[ActorTalents.T_SLEEP] = 1,
-		
+
 		[ActorTalents.T_MIND_SEAR] = 1,
 		[ActorTalents.T_SOLIPSISM] = 1,
 		[ActorTalents.T_THOUGHT_FORMS] = 1,

game/modules/tome/data/talents/psionic/augmented-mobility.lua

@@ -20,7 +20,7 @@
 newTalent{
 	name = "Mindhook",
 	type = {"psionic/augmented-mobility", 1},
-	require = psi_wil_20_1,
+	require = psi_cun_high1,
 	cooldown = function(self, t)
 		return math.ceil(20 - self:getTalentLevel(t)*2)
 	end,
@@ -68,8 +68,8 @@ newTalent{
 	cooldown = 80,
 	psi = 30,
 	no_energy = true,
-	require = psi_wil_20_2,
-	getDuration = function(self, t) 
+	require = psi_cun_high2,
+	getDuration = function(self, t)
 		return 10 + self:combatMindpower(0.1)
 	end,
 	action = function(self, t)
@@ -90,7 +90,7 @@ newTalent{
 	--name = "Super"..self.race.." Leap",
 	name = "Telekinetic Leap",
 	type = {"psionic/augmented-mobility", 3},
-	require = psi_wil_20_3,
+	require = psi_cun_high3,
 	cooldown = 15,
 	psi = 10,
 	points = 5,
@@ -127,7 +127,7 @@ newTalent{
 newTalent{
 	name = "Shattering Charge",
 	type = {"psionic/augmented-mobility", 4},
-	require = psi_wil_20_4,
+	require = psi_cun_high4,
 	points = 5,
 	random_ego = "attack",
 	psi = 60,

game/modules/tome/data/talents/psionic/grip.lua

@@ -22,7 +22,7 @@
 newTalent{
 	name = "Deflect Projectiles",
 	type = {"psionic/grip", 1},
-	require = psi_wil_20_1,
+	require = psi_cun_high1,
 	points = 5,
 	mode = "sustained",
 	sustain_psi = 35,
@@ -51,7 +51,7 @@ newTalent{
 newTalent{
 	name = "Bind",
 	type = {"psionic/grip", 2},
-	require = psi_wil_20_2,
+	require = psi_cun_high2,
 	points = 5,
 	random_ego = "attack",
 	cooldown = function(self, t)
@@ -101,7 +101,7 @@ newTalent{
 newTalent{
 	name = "Implode",
 	type = {"psionic/grip", 3},
-	require = psi_wil_20_3,
+	require = psi_cun_high3,
 	points = 5,
 	random_ego = "attack",
 	cooldown = function(self, t)
@@ -153,7 +153,7 @@ newTalent{
 newTalent{
 	name = "Greater Telekinetic Grasp",
 	type = {"psionic/grip", 4},
-	require = psi_wil_20_4,
+	require = psi_cun_high4,
 	points = 5,
 	mode = "passive",
 	stat_sub = function(self, t)

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

@@ -22,14 +22,14 @@ newTalentType{ allow_random=true, type="psionic/absorption", name = "absorption"
 newTalentType{ allow_random=true, type="psionic/projection", name = "projection", description = "Project energy to damage foes." }
 newTalentType{ allow_random=true, type="psionic/psi-fighting", name = "psi-fighting", description = "Wield melee weapons with mentally-manipulated forces." }
 newTalentType{ allow_random=true, type="psionic/focus", name = "focus", description = "Use gems to focus your energies." }
-newTalentType{ allow_random=true, type="psionic/augmented-mobility", name = "augmented mobility", min_lev = 20, description = "Use energy to move yourself and others." }
+newTalentType{ allow_random=true, type="psionic/augmented-mobility", name = "augmented mobility", min_lev = 10, description = "Use energy to move yourself and others." }
 newTalentType{ allow_random=true, type="psionic/voracity", generic = true, name = "voracity", description = "Pull energy from your surroundings." }
 newTalentType{ allow_random=true, type="psionic/finer-energy-manipulations", min_lev = 10, generic = true, name = "finer energy manipulations", description = "Subtle applications of the psionic arts." }
 newTalentType{ allow_random=true, type="psionic/mental-discipline", generic = true, name = "mental discipline", description = "Increase mental capacity, endurance, and flexibility." }
 newTalentType{ type="psionic/other", name = "other", description = "Various psionic talents." }
 
 -- Advanced Talent Trees
-newTalentType{ allow_random=true, type="psionic/grip", name = "grip", min_lev = 20, description = "Augment your telekinetic grip." }
+newTalentType{ allow_random=true, type="psionic/grip", name = "grip", min_lev = 10, description = "Augment your telekinetic grip." }
 newTalentType{ allow_random=true, type="psionic/psi-archery", name = "psi-archery", min_lev = 10, description = "Use your telekinetic powers to wield bows with deadly effectiveness." }
 newTalentType{ allow_random=true, type="psionic/greater-psi-fighting", name = "greater psi-fighting", description = "Elevate psi-fighting prowess to epic levels." }
 newTalentType{ allow_random=true, type="psionic/brainstorm", name = "brainstorm", description = "Focus your telekinetic powers in ways undreamed of by most mindslayers." }
@@ -180,7 +180,7 @@ end
 
 function setupThoughtForm(self, m, x, y)
 	-- Set up some basic stuff
-	m.display = "p" 
+	m.display = "p"
 	m.color=colors.YELLOW
 	m.blood_color = colors.YELLOW
 	m.type = "thought-form"
@@ -194,11 +194,11 @@ function setupThoughtForm(self, m, x, y)
 	m.lite = 1
 	m.no_breath = 1
 	m.move_others = true
-	
+
 	-- Less tedium
 	m.life_regen = 1
 	m.stamina_regen = 1
-	
+
 	-- Make sure we don't gain anything from leveling
 	m.autolevel = "none"
 	m.unused_stats = 0
@@ -213,7 +213,7 @@ function setupThoughtForm(self, m, x, y)
 	-- 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.save_hotkeys = true
-	
+
 	-- Inheret some attributes
 	if self:getTalentLevel(self.T_TF_UNITY) >=5 then
 		m.inc_damage.all = (m.inc_damage.all) or 0 + (self.inc_damage.all or 0) + (self.inc_damage[engine.DamageType.MIND] or 0)