From 8801f61a7216f11d2c6848573ef68a1489489903 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 16 Dec 2012 15:39:40 +0000
Subject: [PATCH] nerf!!!! NERFF !!!
git-svn-id: http://svn.net-core.org/repos/t-engine4@6102 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/damage_types.lua | 8 ++++----
game/modules/tome/data/timed_effects/magical.lua | 1 +
game/modules/tome/data/zones/noxious-caldera/zone.lua | 4 ++--
game/modules/tome/data/zones/unhallowed-morass/npcs.lua | 3 +++
game/modules/tome/data/zones/unhallowed-morass/zone.lua | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index e955217004..1e052c1dcb 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -1581,9 +1581,9 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target and not target:attr("undead") then
target:setEffect(target.EFF_EMPOWERED_HEALING, 1, {power=(dam/100)})
- target:attr("allow_on_heal", 1)
+ if dam >= 100 then target:attr("allow_on_heal", 1) end
target:heal(dam, src)
- target:attr("allow_on_heal", -1)
+ if dam >= 100 then target:attr("allow_on_heal", -1) end
elseif target then
DamageType:get(DamageType.LIGHT).projector(src, x, y, DamageType.LIGHT, dam)
end
@@ -1595,9 +1595,9 @@ newDamageType{
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and not target:attr("undead") then
- target:attr("allow_on_heal", 1)
+ if dam >= 100 then target:attr("allow_on_heal", 1) end
target:heal(dam, src)
- target:attr("allow_on_heal", -1)
+ if dam >= 100 then target:attr("allow_on_heal", -1) end
elseif target then
DamageType:get(DamageType.NATURE).projector(src, x, y, DamageType.NATURE, dam)
end
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index d673f66f7e..3c56453d61 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -2185,6 +2185,7 @@ newEffect{
desc = "Keepers of Reality Rally Call",
long_desc = function(self, eff) return "The keepers of reality have called upon all to defend Point Zero. Life increased by 5000, damage by 300%." end,
type = "magical",
+ decrease = 0, no_remove = true,
subtype = { temporal=true },
status = "beneficial",
cancel_on_level_change = true,
diff --git a/game/modules/tome/data/zones/noxious-caldera/zone.lua b/game/modules/tome/data/zones/noxious-caldera/zone.lua
index ebca0178f9..fb257b390a 100644
--- a/game/modules/tome/data/zones/noxious-caldera/zone.lua
+++ b/game/modules/tome/data/zones/noxious-caldera/zone.lua
@@ -150,10 +150,10 @@ return {
end
end,
- run_dream = function(dangerous)
+ run_dream = function(dangerous, dream)
if game.player.runStop then game.player:runStop("dream") end
local x, y, lev = game.player.x, game.player.y, game.level.level
- local dream = rng.range(1, 2)
+ local dream = dream or rng.range(1, 2)
game:changeLevel(dream, "dreams", {direct_switch=true})
game.level.data.real_death = dangerous
game.level.data.caldera_x = x
diff --git a/game/modules/tome/data/zones/unhallowed-morass/npcs.lua b/game/modules/tome/data/zones/unhallowed-morass/npcs.lua
index 0d167c6f36..e4f686940f 100644
--- a/game/modules/tome/data/zones/unhallowed-morass/npcs.lua
+++ b/game/modules/tome/data/zones/unhallowed-morass/npcs.lua
@@ -118,6 +118,9 @@ newEntity{ base = "BASE_NPC_SPIDER", define_as = "WEAVER_QUEEN",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
+
+ inc_damage = {all=-20},
+ healing_factor = 0.5,
talent_cd_reduction = {[Talents.T_RETHREAD]=-10},
resolvers.talents{
diff --git a/game/modules/tome/data/zones/unhallowed-morass/zone.lua b/game/modules/tome/data/zones/unhallowed-morass/zone.lua
index 4386f3fdf9..477caa20b7 100644
--- a/game/modules/tome/data/zones/unhallowed-morass/zone.lua
+++ b/game/modules/tome/data/zones/unhallowed-morass/zone.lua
@@ -25,7 +25,7 @@ return {
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 50, height = 50,
- all_remembered = true,
+-- all_remembered = true,
all_lited = true,
tier1 = true,
persistent = "zone",
--
GitLab