From d099e510b1e9bac26a432101add7eb6d2ebcb661 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 15 Feb 2011 12:23:43 +0000
Subject: [PATCH] Price of ego ammo is now more correctly aligned with other
egos
git-svn-id: http://svn.net-core.org/repos/t-engine4@2731 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/interface/Combat.lua | 2 +-
game/modules/tome/data/general/objects/egos/ammo.lua | 5 ++---
game/modules/tome/data/general/stores/basic.lua | 2 +-
game/modules/tome/data/timed_effects.lua | 2 ++
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 602bc3ed48..6a56554791 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 6e09306b9a..645c3ff582 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 059e42769a..0d56e4dfbf 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 9c2c5c8972..8835265a9a 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
--
GitLab