Commit 203d5accbdf7c2bb8656ff55be07e88b2609d446

Authored by dg
1 parent f91eadf0

Little buff to Kryl-Feijan


git-svn-id: http://svn.net-core.org/repos/t-engine4@5103 51575b47-30f0-44d4-a5cc-537603b46e54
@@ -254,7 +254,7 @@ function _M:makeMapObject(tiles, idx) @@ -254,7 +254,7 @@ function _M:makeMapObject(tiles, idx)
254 self:defineDisplayCallback() 254 self:defineDisplayCallback()
255 255
256 -- Setup tint 256 -- Setup tint
257 - self._mo:tint(self.tint_r, self.tint_g, self.tint_b) 257 + self._mo:tint(self.tint_r or 1, self.tint_g or 1, self.tint_b or 1)
258 258
259 -- Texture 0 is always the normal image/ascii tile 259 -- Texture 0 is always the normal image/ascii tile
260 local tex, texx, texy, pos_x, pos_y = tiles:get(self.display, self.color_r, self.color_g, self.color_b, self.color_br, self.color_bg, self.color_bb, self.image, self._noalpha and 255, self.ascii_outline, true) 260 local tex, texx, texy, pos_x, pos_y = tiles:get(self.display, self.color_r, self.color_g, self.color_b, self.color_br, self.color_bg, self.color_bb, self.image, self._noalpha and 255, self.ascii_outline, true)
@@ -95,7 +95,7 @@ newTalent{ @@ -95,7 +95,7 @@ newTalent{
95 deactivate = function(self, t, p) 95 deactivate = function(self, t, p)
96 self:removeTemporaryValue("overkill", p.ov) 96 self:removeTemporaryValue("overkill", p.ov)
97 return true 97 return true
98 - end, 98 + end,
99 info = function(self, t) 99 info = function(self, t)
100 return ([[When you kill a creature, the remainer of the damage done will not be lost. Instead %d%% of it will splash in a radius 2, doing blight damage. 100 return ([[When you kill a creature, the remainer of the damage done will not be lost. Instead %d%% of it will splash in a radius 2, doing blight damage.
101 The damage will increase with Magic stat.]]):format(40 + self:combatTalentSpellDamage(t, 10, 90)) 101 The damage will increase with Magic stat.]]):format(40 + self:combatTalentSpellDamage(t, 10, 90))
@@ -124,7 +124,7 @@ newTalent{ @@ -124,7 +124,7 @@ newTalent{
124 self:removeTemporaryValue("reduce_spell_cooldown_on_hit", p.l) 124 self:removeTemporaryValue("reduce_spell_cooldown_on_hit", p.l)
125 self:removeTemporaryValue("reduce_spell_cooldown_on_hit_chance", p.c) 125 self:removeTemporaryValue("reduce_spell_cooldown_on_hit_chance", p.c)
126 return true 126 return true
127 - end, 127 + end,
128 info = function(self, t) 128 info = function(self, t)
129 local l, c = t.getPower(self, t) 129 local l, c = t.getPower(self, t)
130 return ([[When you are dealt a blow that reduces your life by at least %d%% you have %d%% chances to reduce the remaining cooldown of all your spells by 1. 130 return ([[When you are dealt a blow that reduces your life by at least %d%% you have %d%% chances to reduce the remaining cooldown of all your spells by 1.
@@ -175,6 +175,8 @@ newTalent{ @@ -175,6 +175,8 @@ newTalent{
175 end, 175 end,
176 points = 5, 176 points = 5,
177 hard_cap = 5, 177 hard_cap = 5,
  178 + range = 1,
  179 + tactical = { ATTACK = 2, DEFEND = 2 },
178 on_pre_use = function(self, t, silent) if not self:hasShield() then if not silent then game.logPlayer(self, "You require a weapon and a shield to use this talent.") end return false end return true end, 180 on_pre_use = function(self, t, silent) if not self:hasShield() then if not silent then game.logPlayer(self, "You require a weapon and a shield to use this talent.") end return false end return true end,
179 getProperties = function(self, t) 181 getProperties = function(self, t)
180 local shield = self:hasShield() 182 local shield = self:hasShield()
@@ -254,6 +256,6 @@ newTalent{ @@ -254,6 +256,6 @@ newTalent{
254 br_text = " All blocked damage heals the wielder." 256 br_text = " All blocked damage heals the wielder."
255 end 257 end
256 local bt, bt_string = t.getBlockedTypes(self, t) 258 local bt, bt_string = t.getBlockedTypes(self, t)
257 - return ([[Raise your shield into blocking position for one turn, reducing the damage of all %s attacks by %d. If you block all of an attack's damage, the attacker will be vulnerable to a deadly counterstrike for one turn.%s%s%s]]):format(bt_string, t.getBlockValue(self, t), sp_text, ref_text, br_text) 259 + return ([[Raise your shield into blocking position for one turn, reducing the damage of all %s attacks by %d. If you block all of an attack's damage, the attacker will be vulnerable to a deadly counterstrike (a normal attack will instead deal 200%% damage) for one turn.%s%s%s]]):format(bt_string, t.getBlockValue(self, t), sp_text, ref_text, br_text)
258 end, 260 end,
259 } 261 }
@@ -69,6 +69,9 @@ newEntity{ base="BASE_NPC_MAJOR_DEMON", define_as = "KRYL_FEIJAN", @@ -69,6 +69,9 @@ newEntity{ base="BASE_NPC_MAJOR_DEMON", define_as = "KRYL_FEIJAN",
69 [Talents.T_DARKNESS]={base=3, every=5, max=6}, 69 [Talents.T_DARKNESS]={base=3, every=5, max=6},
70 [Talents.T_EVASION]={base=5, every=5, max=8}, 70 [Talents.T_EVASION]={base=5, every=5, max=8},
71 [Talents.T_VIRULENT_DISEASE]={base=3, every=5, max=6}, 71 [Talents.T_VIRULENT_DISEASE]={base=3, every=5, max=6},
  72 + [Talents.T_PACIFICATION_HEX]={base=5, every=5, max=8},
  73 + [Talents.T_BURNING_HEX]={base=5, every=5, max=8},
  74 + [Talents.T_BLOOD_LOCK]={base=5, every=5, max=8},
72 }, 75 },
73 resolvers.sustains_at_birth(), 76 resolvers.sustains_at_birth(),
74 } 77 }