diff --git a/game/modules/tome/data/birth/mage.lua b/game/modules/tome/data/birth/mage.lua
index 6bef26ace776176e7beb4370a8482441103b86a9..8c690240e7781b085b1096e87b1edbc236d83bfd 100644
--- a/game/modules/tome/data/birth/mage.lua
+++ b/game/modules/tome/data/birth/mage.lua
@@ -84,13 +84,14 @@ newBirthDescriptor{
["spell/conveyance"]={false, 0.2},
["technique/shield-offense"]={true, 0},
["technique/shield-defense"]={true, 0},
- ["technique/combat-training-active"]={false, 0},
- ["technique/combat-training-passive"]={false, 0},
+ ["technique/combat-techniques-active"]={false, 0},
+ ["technique/combat-techniques-passive"]={false, 0},
["technique/weapon-training"]={true, 0},
+ ["technique/magical-combat"]={true, 0},
["cunning/survival"]={true, -0.1},
},
talents = {
- [ActorTalents.T_MANATHRUST] = 1,
+ [ActorTalents.T_ARCANE_COMBAT] = 1,
[ActorTalents.T_FLAME] = 1,
[ActorTalents.T_WEAPON_COMBAT] = 1,
[ActorTalents.T_STAMINA_POOL]=1,
@@ -102,8 +103,8 @@ newBirthDescriptor{
stamina_rating = 8,
resolvers.equip{ id=true,
{type="weapon", subtype="staff", name="elm staff"},
- {type="armor", subtype="shield", name="iron shield"}
- {type="armor", subtype="cloth", name="robe"}
+ {type="armor", subtype="shield", name="iron shield"},
+ {type="armor", subtype="cloth", name="robe"},
},
resolvers.inventory{ id=true,
{type="potion", subtype="potion", name="potion of lesser mana"},
diff --git a/game/modules/tome/data/birth/rogue.lua b/game/modules/tome/data/birth/rogue.lua
index ae669a1ccd46182d2d3f39e20247269ee1bb33d9..c251a1be9aac85b6acc97492ce3818e66cbc3c31 100644
--- a/game/modules/tome/data/birth/rogue.lua
+++ b/game/modules/tome/data/birth/rogue.lua
@@ -11,7 +11,7 @@ newBirthDescriptor{
{
__ALL__ = "never",
Rogue = "allow",
- Shadowdancer = "allow",
+ Shadowblade = "allow",
},
},
talents = { [ActorTalents.T_STAMINA_POOL]=1, },
@@ -38,17 +38,18 @@ newBirthDescriptor{
talents_types = {
["technique/dualweapon-attack"]={true, 0.3},
["technique/dualweapon-training"]={true, 0.3},
- ["technique/combat-training"]={true, 0.2},
- ["technique/weapon-training"]={true, 0.2},
+ ["technique/combat-training-active"]={true, 0.3},
+ ["technique/combat-training-passive"]={false, 0.3},
+ ["technique/weapon-training"]={true, 0.3},
["cunning/stealth"]={true, 0.3},
- ["cunning/traps"]={true, 0.3},
- ["cunning/dirty"]={true, 0.3},
+ ["cunning/traps"]={false, 0.3},
+ ["cunning/dirty"]={false, 0.3},
["cunning/survival"]={true, 0.3},
},
talents = {
[ActorTalents.T_STEALTH] = 1,
[ActorTalents.T_WEAPON_COMBAT] = 1,
- [ActorTalents.T_KNIFE_MASTERY] = 1,
+ [ActorTalents.T_LETHALITY] = 1,
[ActorTalents.T_TRAP_DETECTION] = 1,
},
}
@@ -59,23 +60,27 @@ newBirthDescriptor{
desc = {
"Shadowblades are a blend of rogues and mages, able to kill with their daggers under a veil of stealth while casting spells",
"to enhance their performance and survival.",
- "Their most important stats are: Dexterity and Cunning",
+ "Their most important stats are: Dexterity, Cunning and Magic",
},
- stats = { dex=2, str=1, cun=3, },
+ stats = { dex=2, mag=2, cun=2, },
talents_types = {
- ["technique/dualweapon-attack"]={true, 0.3},
- ["technique/dualweapon-training"]={true, 0.3},
- ["technique/combat-training"]={true, 0.2},
+ ["spell/phantasm"]={true, 0},
+ ["spell/temporal"]={false, 0},
+ ["spell/divination"]={false, 0},
+ ["spell/conveyance"]={true, 0},
+ ["technique/dualweapon-attack"]={true, 0.2},
+ ["technique/dualweapon-training"]={true, 0.2},
+ ["technique/combat-training-active"]={true, 0.2},
+ ["technique/combat-training-passive"]={false, 0.2},
["technique/weapon-training"]={true, 0.2},
["cunning/stealth"]={true, 0.3},
- ["cunning/traps"]={true, 0.3},
- ["cunning/dirty"]={true, 0.3},
- ["cunning/survival"]={true, 0.3},
+ ["cunning/survival"]={true, 0.1},
},
talents = {
[ActorTalents.T_STEALTH] = 1,
[ActorTalents.T_WEAPON_COMBAT] = 1,
[ActorTalents.T_KNIFE_MASTERY] = 1,
- [ActorTalents.T_TRAP_DETECTION] = 1,
+ [ActorTalents.T_PHASE_DOOR] = 1,
+ [ActorTalents.T_MANA_POOL] = 1,
},
}
diff --git a/game/modules/tome/data/talents/techniques/magical-combat.lua b/game/modules/tome/data/talents/techniques/magical-combat.lua
new file mode 100644
index 0000000000000000000000000000000000000000..26274715bbd4573968135f55547c9aa34f82837b
--- /dev/null
+++ b/game/modules/tome/data/talents/techniques/magical-combat.lua
@@ -0,0 +1,11 @@
+newTalent{
+ name = "Arcane Combat",
+ type = {"technique/magical-combat", 1},
+ mode = "passive",
+ points = 1,
+ require = { stat = { mag=14, dex=12 }, },
+ info = function(self, t)
+ return ([[The user has learned how to blend the sword and the word, and is able to substitute her Magic stat to her Strength stat for the purpose of meeting techniques requirements.]]):
+ format()
+ end,
+}
diff --git a/game/modules/tome/data/talents/techniques/techniques.lua b/game/modules/tome/data/talents/techniques/techniques.lua
index e15e7578c6ce2a5174851483b8344e45737f3b24..a2f148429afe3ea20a9bd29c396ab40cc48b1431 100644
--- a/game/modules/tome/data/talents/techniques/techniques.lua
+++ b/game/modules/tome/data/talents/techniques/techniques.lua
@@ -8,28 +8,30 @@ newTalentType{ type="technique/dualweapon-attack", name = "dual wielding", descr
newTalentType{ type="technique/combat-techniques-active", name = "combat-techniques", description = "Generic combat oriented techniques." }
newTalentType{ type="technique/combat-techniques-passive", name = "combat-techniques", description = "Generic combat oriented techniques." }
newTalentType{ type="technique/combat-training", name = "combat-training", description = "Teaches to use various armors and improves health." }
+newTalentType{ type="technique/magical-combat", name = "magical-combat", description = "Blend magic and melee." }
-- Generic requires for techs based on talent level
-techs_req1 = {
- stat = { str=function(level) return 12 + (level-1) * 2 end },
+-- Uses STR unless the wielder knows Arcane Combat
+techs_req1 = function(self, t) local stat = self:getMag() >= self:getStr() and self:knowTalent(self.T_ARCANE_COMBAT) and "mag" or "str"; return {
+ stat = { [stat]=function(level) return 12 + (level-1) * 2 end },
level = function(level) return 0 + (level-1) end,
-}
-techs_req2 = {
- stat = { str=function(level) return 20 + (level-1) * 2 end },
+} end
+techs_req2 = function(self, t) local stat = self:getMag() >= self:getStr() and self:knowTalent(self.T_ARCANE_COMBAT) and "mag" or "str"; return {
+ stat = { [stat]=function(level) return 20 + (level-1) * 2 end },
level = function(level) return 4 + (level-1) end,
-}
-techs_req3 = {
- stat = { str=function(level) return 28 + (level-1) * 2 end },
+} end
+techs_req3 = function(self, t) local stat = self:getMag() >= self:getStr() and self:knowTalent(self.T_ARCANE_COMBAT) and "mag" or "str"; return {
+ stat = { [stat]=function(level) return 28 + (level-1) * 2 end },
level = function(level) return 8 + (level-1) end,
-}
-techs_req4 = {
- stat = { str=function(level) return 36 + (level-1) * 2 end },
+} end
+techs_req4 = function(self, t) local stat = self:getMag() >= self:getStr() and self:knowTalent(self.T_ARCANE_COMBAT) and "mag" or "str"; return {
+ stat = { [stat]=function(level) return 36 + (level-1) * 2 end },
level = function(level) return 12 + (level-1) end,
-}
-techs_req5 = {
- stat = { str=function(level) return 44 + (level-1) * 2 end },
+} end
+techs_req5 = function(self, t) local stat = self:getMag() >= self:getStr() and self:knowTalent(self.T_ARCANE_COMBAT) and "mag" or "str"; return {
+ stat = { [stat]=function(level) return 44 + (level-1) * 2 end },
level = function(level) return 16 + (level-1) end,
-}
+} end
-- Generic requires for techs_dex based on talent level
techs_dex_req1 = {
@@ -60,19 +62,19 @@ techs_strdex_req1 = function(self, t) local stat = self:getStr() >= self:getDex(
} end
techs_strdex_req2 = function(self, t) local stat = self:getStr() >= self:getDex() and "str" or "dex"; return {
stat = { [stat]=function(level) return 20 + (level-1) * 2 end },
- level = function(level) return 0 + (level-1) end,
+ level = function(level) return 4 + (level-1) end,
} end
techs_strdex_req3 = function(self, t) local stat = self:getStr() >= self:getDex() and "str" or "dex"; return {
stat = { [stat]=function(level) return 28 + (level-1) * 2 end },
- level = function(level) return 0 + (level-1) end,
+ level = function(level) return 8 + (level-1) end,
} end
techs_strdex_req4 = function(self, t) local stat = self:getStr() >= self:getDex() and "str" or "dex"; return {
stat = { [stat]=function(level) return 36 + (level-1) * 2 end },
- level = function(level) return 0 + (level-1) end,
+ level = function(level) return 12 + (level-1) end,
} end
techs_strdex_req5 = function(self, t) local stat = self:getStr() >= self:getDex() and "str" or "dex"; return {
stat = { [stat]=function(level) return 44 + (level-1) * 2 end },
- level = function(level) return 0 + (level-1) end,
+ level = function(level) return 16 + (level-1) end,
} end
load("/data/talents/techniques/2hweapon.lua")
@@ -80,3 +82,4 @@ load("/data/talents/techniques/dualweapon.lua")
load("/data/talents/techniques/weaponshield.lua")
load("/data/talents/techniques/combat-techniques.lua")
load("/data/talents/techniques/combat-training.lua")
+load("/data/talents/techniques/magical-combat.lua")
diff --git a/ideas/classes.ods b/ideas/classes.ods
index 700758db4e2c3205ecf7b9e0cab92a64e25a1b80..8ffe9fa68ea5ae1809bca5f70dab558987674d5b 100644
Binary files a/ideas/classes.ods and b/ideas/classes.ods differ