shadowblades

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

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"},

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,
 	},
 }

game/modules/tome/data/talents/techniques/magical-combat.lua

+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,
+}

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")