From 0e5886986101ae142663ec18e5d54edd02f7221d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 12 Feb 2012 21:38:34 +0000
Subject: [PATCH] fix artifact shields; they can block too
git-svn-id: http://svn.net-core.org/repos/t-engine4@4844 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/general/objects/boss-artifacts.lua | 6 +++++-
.../tome/data/general/objects/world-artifacts-far-east.lua | 1 +
game/modules/tome/data/general/objects/world-artifacts.lua | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua
index d845d40b54..028bebab36 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts.lua
+++ b/game/modules/tome/data/general/objects/boss-artifacts.lua
@@ -380,6 +380,8 @@ newEntity{ base = "BASE_SHIELD",
damtype = DamageType.ARCANE,
},
wielder = {
+ learn_talent = { [Talents.T_BLOCK] = 5 },
+
resists={[DamageType.DARKNESS] = 25},
inc_damage={[DamageType.DARKNESS] = 15},
@@ -416,6 +418,7 @@ newEntity{ base = "BASE_SHIELD",
dammod = {str=0.4},
},
wielder = {
+ learn_talent = { [Talents.T_BLOCK] = 5 },
combat_armor = 10,
combat_def = 9,
fatigue = 14,
@@ -713,6 +716,7 @@ newEntity{ base = "BASE_SHIELD",
dammod = {str=1},
},
wielder = {
+ learn_talent = { [Talents.T_BLOCK] = 5 },
combat_armor = 4,
combat_def = 14,
combat_def_ranged = 14,
@@ -1239,7 +1243,7 @@ It has been kept somewhat intact with layers of salt and clay, but in spite of t
local grids = core.fov.circle_grids(actor.x, actor.y, 1, true)
local Map = require "engine.Map"
local is_trap = false
-
+
for x, yy in pairs(grids) do for y, _ in pairs(yy) do
local trap = game.level.map(x, y, Map.TRAP)
if trap then
diff --git a/game/modules/tome/data/general/objects/world-artifacts-far-east.lua b/game/modules/tome/data/general/objects/world-artifacts-far-east.lua
index 3660a164c2..7dcc54cc90 100644
--- a/game/modules/tome/data/general/objects/world-artifacts-far-east.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts-far-east.lua
@@ -97,6 +97,7 @@ newEntity{ base = "BASE_SHIELD",
damtype = DamageType.LIGHT,
},
wielder = {
+ learn_talent = { [Talents.T_BLOCK] = 5 },
lite = 2,
combat_armor = 9,
combat_def = 16,
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index 3237bf96ad..db90df60a5 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -539,7 +539,7 @@ newEntity{ base = "BASE_LONGBOW",
wielder = {
inc_damage={ [DamageType.PHYSICAL] = 12, },
lite = 1,
- inc_stats = { [Stats.STAT_DEX] = 5, [Stats.STAT_WIL] = 4, },
+ inc_stats = { [Stats.STAT_DEX] = 5, [Stats.STAT_WIL] = 4, },
},
}
@@ -722,6 +722,7 @@ newEntity{ base = "BASE_SHIELD",
damtype = DamageType.FIRE,
},
wielder = {
+ learn_talent = { [Talents.T_BLOCK] = 5 },
resists={[DamageType.FIRE] = 35},
on_melee_hit={[DamageType.FIRE] = 17},
combat_armor = 9,
@@ -751,6 +752,7 @@ newEntity{ base = "BASE_SHIELD",
dammod = {str=0.8,},
},
wielder = {
+ learn_talent = { [Talents.T_BLOCK] = 5 },
combat_armor = 18,
combat_def = 20,
combat_def_ranged = 10,
--
GitLab