From 1074584b3836832044c70ae6cf68eb6c31eab895 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 14 Aug 2011 11:45:36 +0000
Subject: [PATCH] Arcane Blades can access Stone spells when unlocked. Earthen
Missiles can be cast by Arcane Combat
git-svn-id: http://svn.net-core.org/repos/t-engine4@4143 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/interface/ActorTalents.lua | 2 +-
game/modules/tome/data/birth/classes/warrior.lua | 5 ++++-
game/modules/tome/data/general/npcs/xorn.lua | 4 ++--
game/modules/tome/data/talents/techniques/magical-combat.lua | 3 ++-
game/modules/tome/data/texts/unlock-mage_geomancer.lua | 2 +-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/game/engines/default/engine/interface/ActorTalents.lua b/game/engines/default/engine/interface/ActorTalents.lua
index 3417a07877..9cc9101b75 100644
--- a/game/engines/default/engine/interface/ActorTalents.lua
+++ b/game/engines/default/engine/interface/ActorTalents.lua
@@ -128,7 +128,7 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target)
local old_level
local old_target
if force_level then old_level = who.talents[id]; who.talents[id] = force_level end
- if force_target then old_target = rawget(who, "getTarget"); who.getTarget = function(a) a.getTarget = nil; return force_target.x, force_target.y, not force_target.__no_self and force_target end end
+ if force_target then old_target = rawget(who, "getTarget"); who.getTarget = function(a) return force_target.x, force_target.y, not force_target.__no_self and force_target end end
local ret = ab.action(who, ab)
if force_target then who.getTarget = old_target end
if force_level then who.talents[id] = old_level end
diff --git a/game/modules/tome/data/birth/classes/warrior.lua b/game/modules/tome/data/birth/classes/warrior.lua
index ff4deb9918..29c8a9d909 100644
--- a/game/modules/tome/data/birth/classes/warrior.lua
+++ b/game/modules/tome/data/birth/classes/warrior.lua
@@ -156,6 +156,9 @@ newBirthDescriptor{
["cunning/survival"]={true, -0.1},
["cunning/dirty"]={false, -0.1},
},
+ unlockable_talents_types = {
+ ["spell/stone"]={false, 0.1, "mage_geomancer"},
+ },
talents = {
[ActorTalents.T_FLAME] = 1,
[ActorTalents.T_ARCANE_COMBAT] = 1,
@@ -164,7 +167,7 @@ newBirthDescriptor{
},
copy = {
max_life = 100,
- talent_cd_reduction={[ActorTalents.T_FLAME]=-3, [ActorTalents.T_LIGHTNING]=-3, },
+ talent_cd_reduction={[ActorTalents.T_FLAME]=-3, [ActorTalents.T_LIGHTNING]=-3, [ActorTalents.T_EARTHEN_MISSILES]=-3, },
resolvers.equip{ id=true,
{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000, ego_chance=-1000},
diff --git a/game/modules/tome/data/general/npcs/xorn.lua b/game/modules/tome/data/general/npcs/xorn.lua
index 3fca84198c..4388632473 100644
--- a/game/modules/tome/data/general/npcs/xorn.lua
+++ b/game/modules/tome/data/general/npcs/xorn.lua
@@ -200,10 +200,10 @@ newEntity{ base = "BASE_NPC_XORN", define_as = "FULL_HARKOR_ZUN",
game:setAllowedBuild("mage_geomancer", true)
world:gainAchievement("GEOMANCER", game.player)
local p = game.party:findMember{main=true}
- if p.descriptor.subclass == "Archmage" then
+ if p.descriptor.subclass == "Archmage" or p.descriptor.subclass == "Arcane Blade" then
if p:knowTalentType("spell/stone") == nil then
p:learnTalentType("spell/stone", false)
- p:setTalentTypeMastery("spell/stone", 1.3)
+ p:setTalentTypeMastery("spell/stone", p.descriptor.subclass == "Archmage" and 1.3 or 1.1)
end
end
end
diff --git a/game/modules/tome/data/talents/techniques/magical-combat.lua b/game/modules/tome/data/talents/techniques/magical-combat.lua
index 96a8a3f489..d5d14c720f 100644
--- a/game/modules/tome/data/talents/techniques/magical-combat.lua
+++ b/game/modules/tome/data/talents/techniques/magical-combat.lua
@@ -34,6 +34,7 @@ newTalent{
local mana = self:getMana() - 1
if self:knowTalent(self.T_FLAME) and mana > self:getTalentFromId(self.T_FLAME).mana * fatigue then spells[#spells+1] = self.T_FLAME end
if self:knowTalent(self.T_LIGHTNING) and mana > self:getTalentFromId(self.T_LIGHTNING).mana * fatigue then spells[#spells+1] = self.T_LIGHTNING end
+ if self:knowTalent(self.T_EARTHEN_MISSILES) and mana > self:getTalentFromId(self.T_EARTHEN_MISSILES).mana * fatigue then spells[#spells+1] = self.T_EARTHEN_MISSILES end
local tid = rng.table(spells)
if tid then
-- Extending beam target, assumes a maximum range of 10
@@ -73,7 +74,7 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Allows one to use a melee weapon to focus spells, granting %d%% chance per melee attack to deliver a Flame, or Lightning spell as a free action on the target.
+ return ([[Allows one to use a melee weapon to focus spells, granting %d%% chance per melee attack to deliver a Flame, Lightning or Earthen Missiles spell as a free action on the target.
Delivering the spell this way will not trigger a spell cooldown, but only works if the spell is not cooling-down.
The chance increases with dexterity.]]):
format(20 + self:getTalentLevel(t) * (1 + self:getDex(9, true)))
diff --git a/game/modules/tome/data/texts/unlock-mage_geomancer.lua b/game/modules/tome/data/texts/unlock-mage_geomancer.lua
index b28060977f..afacf184ce 100644
--- a/game/modules/tome/data/texts/unlock-mage_geomancer.lua
+++ b/game/modules/tome/data/texts/unlock-mage_geomancer.lua
@@ -22,7 +22,7 @@ return "New Talent Category: #LIGHT_GREEN#Stone",
While most mages are content using the Earth school, a few of them took their research deeper and created Stone magic.
At its core lies the Crystalline Focus, which can create attacks so sharp they can cut through physical immunity.
-You have mastered stone magic and can now create new Archmage characters that can learn the #LIGHT_GREEN#Stone talents#WHITE#.
+You have mastered stone magic and can now create new Archmage and Arcane Blade characters that can learn the #LIGHT_GREEN#Stone talents#WHITE#.
Talents:
- #YELLOW#Earthen Missiles: #WHITE#Fires multiple missiles of stone indepentenly to targets
--
GitLab