diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua index 602bc3ed484d90a925e8f1dabaa0876b38911ad3..6a56554791895d42cc5c41236de94d9acae9545c 100644 --- a/game/modules/tome/class/interface/Combat.lua +++ b/game/modules/tome/class/interface/Combat.lua @@ -283,7 +283,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult) end -- Temporal cast - if hitted and not target.dead and self:knowTalent(self.T_WEAPON_FOLDING) and self:isTalentActive(self.T_WEAPON_FOLDING) and weapon.talented and weapon.talented ~= "bow, sling" then + if hitted and not target.dead and self:knowTalent(self.T_WEAPON_FOLDING) and self:isTalentActive(self.T_WEAPON_FOLDING) and weapon.talented and weapon.talented ~= "bow" and weapon.talented ~= "sling" then local t = self:getTalentFromId(self.T_WEAPON_FOLDING) local dam = t.getDamage(self, t) DamageType:get(DamageType.TEMPORAL).projector(self, target.x, target.y, DamageType.TEMPORAL, dam) diff --git a/game/modules/tome/data/general/objects/egos/ammo.lua b/game/modules/tome/data/general/objects/egos/ammo.lua index 6e09306b9a8ccc25d22818fdf743738c0c643510..645c3ff58214531c8aef86cae7b6f301f1aad681 100644 --- a/game/modules/tome/data/general/objects/egos/ammo.lua +++ b/game/modules/tome/data/general/objects/egos/ammo.lua @@ -79,7 +79,6 @@ newEntity{ level_range = {35, 50}, greater_ego = 1, rarity = 25, - cost = 35, wielder = { ranged_project={ [DamageType.FIRE] = resolvers.mbonus_material(25, 4, function(e, v) return v * 0.1 * 0.7 * 0.3 end), @@ -106,7 +105,7 @@ newEntity{ name = " of annihilation", suffix=true, level_range = {1, 50}, greater_ego = 1, - cost = 35, + cost = 1, rarity = 15, combat = { physcrit = 100, @@ -122,7 +121,7 @@ newEntity{ name = " of unerring flight", suffix=true, level_range = {1, 50}, greater_ego = 1, - cost = 35, + cost = 1, rarity = 15, combat = { atk = 500, diff --git a/game/modules/tome/data/general/stores/basic.lua b/game/modules/tome/data/general/stores/basic.lua index 059e42769a4e1a257931aa8d0a8f49ca910b8c8c..0d56e4dfbf7928eddd7bb92efb1019e65787b10b 100644 --- a/game/modules/tome/data/general/stores/basic.lua +++ b/game/modules/tome/data/general/stores/basic.lua @@ -176,7 +176,7 @@ newEntity{ purse = 35, restock_every = 5, empty_before_restock = true, - sell_percent = 140, + sell_percent = 240, min_fill = 10, max_fill = 20, filters = function() diff --git a/game/modules/tome/data/timed_effects.lua b/game/modules/tome/data/timed_effects.lua index 9c2c5c8972b2d670896bceddc2152579beaffa3a..8835265a9ae903ec923bf6e7ff3ab0d0956fdef6 100644 --- a/game/modules/tome/data/timed_effects.lua +++ b/game/modules/tome/data/timed_effects.lua @@ -1395,6 +1395,8 @@ newEffect{ if eff.dur <= 1 then game:onTickEnd(function() game.logPlayer(self, "#LIGHT_RED#You lost sight of your golem for too long; direct control is broken!") + game.player:runStop("golem out of sight") + game.player:restStop("golem out of sight") game.party:setPlayer(self.summoner) end) end