Skip to content
Snippets Groups Projects
Commit 09cd7aa8 authored by dg's avatar dg
Browse files

for dekar, with love

git-svn-id: http://svn.net-core.org/repos/t-engine4@6013 51575b47-30f0-44d4-a5cc-537603b46e54
parent 94b995d7
No related branches found
No related tags found
No related merge requests found
...@@ -104,7 +104,6 @@ end ...@@ -104,7 +104,6 @@ end
-- @return true if an achievement was gained -- @return true if an achievement was gained
function _M:gainAchievement(id, src, ...) function _M:gainAchievement(id, src, ...)
local a = self.achiev_defs[id] local a = self.achiev_defs[id]
print("=============== ach", id, a)
if not a then error("Unknown achievement "..id) return end if not a then error("Unknown achievement "..id) return end
if self.achieved[id] and src.achievements and src.achievements[id] then return end if self.achieved[id] and src.achievements and src.achievements[id] then return end
......
...@@ -3734,7 +3734,7 @@ function _M:postUseTalent(ab, ret) ...@@ -3734,7 +3734,7 @@ function _M:postUseTalent(ab, ret)
if ab.id ~= self.T_STEALTH and ab.id ~= self.T_HIDE_IN_PLAIN_SIGHT and not ab.no_break_stealth then self:breakStealth() end if ab.id ~= self.T_STEALTH and ab.id ~= self.T_HIDE_IN_PLAIN_SIGHT and not ab.no_break_stealth then self:breakStealth() end
if ab.id ~= self.T_LIGHTNING_SPEED then self:breakLightningSpeed() end if ab.id ~= self.T_LIGHTNING_SPEED then self:breakLightningSpeed() end
if ab.id ~= self.T_GATHER_THE_THREADS and ab.id ~= self.T_SPACETIME_TUNING and ab.is_spell then self:breakChronoSpells() end if ab.id ~= self.T_GATHER_THE_THREADS and ab.id ~= self.T_SPACETIME_TUNING and ab.is_spell then self:breakChronoSpells() end
if ab.id ~= self.T_RELOAD then self:breakReloading() end if not ab.no_reload_break then self:breakReloading() end
self:breakStepUp() self:breakStepUp()
if not (ab.no_energy or ab.no_break_channel) and not (ab.mode == "sustained" and self:isTalentActive(ab.id)) then self:breakPsionicChannel(ab.id) end if not (ab.no_energy or ab.no_break_channel) and not (ab.mode == "sustained" and self:isTalentActive(ab.id)) then self:breakPsionicChannel(ab.id) end
......
...@@ -58,6 +58,7 @@ newTalent{ ...@@ -58,6 +58,7 @@ newTalent{
innate = true, innate = true,
points = 1, points = 1,
tactical = { AMMO = 2 }, tactical = { AMMO = 2 },
no_reload_break = true,
on_pre_use = function(self, t, silent) if not self:hasAmmo() then if not silent then game.logPlayer(self, "You must have a quiver or pouch equipped.") end return false end return true end, on_pre_use = function(self, t, silent) if not self:hasAmmo() then if not silent then game.logPlayer(self, "You must have a quiver or pouch equipped.") end return false end return true end,
shots_per_turn = function(self, t) shots_per_turn = function(self, t)
local v = math.max(self:getTalentLevelRaw(self.T_BOW_MASTERY), self:getTalentLevelRaw(self.T_SLING_MASTERY)) local v = math.max(self:getTalentLevelRaw(self.T_BOW_MASTERY), self:getTalentLevelRaw(self.T_SLING_MASTERY))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment