From da2e74e3ab868552a82462db1ef79edab4f09c0a Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 6 Jun 2012 08:28:57 +0000
Subject: [PATCH] All creatures that use arcane powers will now never spawn
with antimagic equipment
git-svn-id: http://svn.net-core.org/repos/t-engine4@5203 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../tome/data/general/npcs/construct.lua | 6 +-
.../tome/data/general/npcs/elven-caster.lua | 16 ++---
game/modules/tome/data/general/npcs/ghoul.lua | 6 +-
game/modules/tome/data/general/npcs/lich.lua | 14 ++--
.../tome/data/general/npcs/major-demon.lua | 12 ++--
.../tome/data/general/npcs/minotaur.lua | 2 +-
.../tome/data/general/npcs/orc-rak-shor.lua | 12 ++--
.../tome/data/general/npcs/orc-vor.lua | 16 ++---
.../tome/data/general/npcs/skeleton.lua | 12 ++--
.../tome/data/general/npcs/sunwall-town.lua | 10 +--
.../tome/data/general/npcs/ziguranth.lua | 16 ++---
.../data/zones/ancient-elven-ruins/npcs.lua | 12 ++--
.../tome/data/zones/arena-unlock/npcs.lua | 6 +-
game/modules/tome/data/zones/arena/npcs.lua | 70 +++++++++----------
.../tome/data/zones/blighted-ruins/npcs.lua | 2 +-
.../tome/data/zones/charred-scar/npcs.lua | 20 +++---
.../tome/data/zones/deep-bellow/npcs.lua | 6 +-
.../tome/data/zones/dreadfell/npcs.lua | 56 +++++++--------
game/modules/tome/data/zones/eruan/npcs.lua | 6 +-
.../tome/data/zones/golem-graveyard/npcs.lua | 4 +-
.../tome/data/zones/halfling-ruins/npcs.lua | 6 +-
.../tome/data/zones/high-peak/npcs.lua | 10 +--
.../data/zones/last-hope-graveyard/npcs.lua | 4 +-
.../tome/data/zones/mark-spellblaze/npcs.lua | 4 +-
.../tome/data/zones/rak-shor-pride/npcs.lua | 2 +-
.../tome/data/zones/reknor-escape/npcs.lua | 4 +-
.../tome/data/zones/rhaloren-camp/npcs.lua | 2 +-
.../tome/data/zones/ring-of-blood/npcs.lua | 2 +-
.../tome/data/zones/ruins-kor-pul/npcs.lua | 6 +-
.../tome/data/zones/shadow-crypt/npcs.lua | 2 +-
.../tome/data/zones/shertul-fortress/npcs.lua | 4 +-
.../tome/data/zones/tannen-tower/npcs.lua | 10 +--
.../tome/data/zones/tempest-peak/npcs.lua | 4 +-
.../data/zones/temple-of-creation/npcs.lua | 6 +-
.../tome/data/zones/temporal-rift/npcs.lua | 8 +--
.../tome/data/zones/town-angolwen/npcs.lua | 28 ++++----
.../data/zones/town-gates-of-morning/npcs.lua | 6 +-
.../data/zones/town-iron-council/npcs.lua | 6 +-
.../tome/data/zones/town-zigur/npcs.lua | 8 +--
.../modules/tome/data/zones/tutorial/npcs.lua | 2 +-
.../data/zones/unremarkable-cave/npcs.lua | 8 +--
.../tome/data/zones/vor-pride/npcs.lua | 4 +-
42 files changed, 220 insertions(+), 220 deletions(-)
diff --git a/game/modules/tome/data/general/npcs/construct.lua b/game/modules/tome/data/general/npcs/construct.lua
index ba4889f1bb..60220388b9 100644
--- a/game/modules/tome/data/general/npcs/construct.lua
+++ b/game/modules/tome/data/general/npcs/construct.lua
@@ -61,7 +61,7 @@ newEntity{ base = "BASE_NPC_CONSTRUCT",
rarity = 1,
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="greatmaul", autoreq=true},
+ {type="weapon", subtype="greatmaul", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.inscriptions(1, "rune"),
resolvers.talents{
@@ -78,7 +78,7 @@ newEntity{ base = "BASE_NPC_CONSTRUCT",
rarity = 1,
max_life = resolvers.rngavg(90,100),
resolvers.equip{
- {type="weapon", subtype="greatmaul", autoreq=true},
+ {type="weapon", subtype="greatmaul", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.inscriptions(2, "rune"),
resolvers.talents{
@@ -97,7 +97,7 @@ newEntity{ base = "BASE_NPC_CONSTRUCT",
rank = 3,
max_life = resolvers.rngavg(90,100),
resolvers.equip{
- {type="weapon", subtype="greatmaul", autoreq=true},
+ {type="weapon", subtype="greatmaul", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.inscriptions(2, "rune"),
resolvers.talents{
diff --git a/game/modules/tome/data/general/npcs/elven-caster.lua b/game/modules/tome/data/general/npcs/elven-caster.lua
index 6f6568c5e6..c88944dee7 100644
--- a/game/modules/tome/data/general/npcs/elven-caster.lua
+++ b/game/modules/tome/data/general/npcs/elven-caster.lua
@@ -58,7 +58,7 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER",
rarity = 2,
max_life = resolvers.rngavg(70, 80), life_rating = 10,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 0,
resolvers.talents{
@@ -75,7 +75,7 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER",
max_life = resolvers.rngavg(70, 80), life_rating = 10,
mana_regen = 30, max_mana = 200,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 0,
resolvers.talents{
@@ -94,8 +94,8 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER",
ai = "tactical",
max_life = resolvers.rngavg(100, 110), life_rating = 13,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 0,
resolvers.talents{
@@ -118,8 +118,8 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER",
ai = "tactical",
max_life = resolvers.rngavg(100, 110),
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 0,
resolvers.talents{
@@ -143,8 +143,8 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER",
ai_tactic = resolvers.tactic"ranged",
max_life = resolvers.rngavg(100, 110), life_rating = 12,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 0,
resolvers.talents{
diff --git a/game/modules/tome/data/general/npcs/ghoul.lua b/game/modules/tome/data/general/npcs/ghoul.lua
index d934bb00df..3ef2d68e2c 100644
--- a/game/modules/tome/data/general/npcs/ghoul.lua
+++ b/game/modules/tome/data/general/npcs/ghoul.lua
@@ -123,7 +123,7 @@ newEntity{ base = "BASE_NPC_GHOUL", define_as = "RISEN_CORPSE",
exp_worth = 1,
combat_armor = 5, combat_def = 3,
resolvers.equip{
- {type="weapon", subtype="longsword", autoreq=true},
+ {type="weapon", subtype="longsword", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_STUN]={base=3, every=9, max=7},
@@ -158,11 +158,11 @@ newEntity{ base = "BASE_NPC_GHOUL", define_as = "ROTTING_TITAN",
stats = { str=40, dex=20, mag=24, con=25 },
resists = {all = 25, [DamageType.PHYSICAL]=15, [DamageType.ARCANE]=-50, [DamageType.FIRE]=-20},
-
+
resolvers.equip{ {type="weapon", subtype="greatmaul", defined="ROTTING_MAUL", random_art_replace={chance=30}, autoreq=true, force_drop=true}, },
combat = { dam=resolvers.levelup(80, 1, 2), atk=resolvers.levelup(70, 1, 1), apr=20, dammod={str=1.3}, damtype=engine.DamageType.PHYSICAL, },
-
+
combat_atk=40,
combat_spellpower=25,
diff --git a/game/modules/tome/data/general/npcs/lich.lua b/game/modules/tome/data/general/npcs/lich.lua
index 69ce913276..e4db794edc 100644
--- a/game/modules/tome/data/general/npcs/lich.lua
+++ b/game/modules/tome/data/general/npcs/lich.lua
@@ -30,13 +30,13 @@ newEntity{
body = { INVEN = 10, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1},
equipment = resolvers.equip{
- {type="armor", subtype="cloth", ego_chance=75, autoreq=true},
- {type="armor", subtype="head", ego_chance=75, autoreq=true},
- {type="armor", subtype="feet", ego_chance=75, autoreq=true},
- {type="armor", subtype="cloak", ego_chance=75, autoreq=true},
- {type="jewelry", subtype="amulet", ego_chance=100, autoreq=true},
- {type="jewelry", subtype="ring", ego_chance=100, autoreq=true},
- {type="jewelry", subtype="ring", ego_chance=100, autoreq=true},
+ {type="armor", subtype="cloth", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="head", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="feet", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloak", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="jewelry", subtype="amulet", ego_chance=100, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="jewelry", subtype="ring", ego_chance=100, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="jewelry", subtype="ring", ego_chance=100, forbid_power_source={antimagic=true}, autoreq=true},
},
autolevel = "caster",
diff --git a/game/modules/tome/data/general/npcs/major-demon.lua b/game/modules/tome/data/general/npcs/major-demon.lua
index b3d409e7aa..8fd5f16239 100644
--- a/game/modules/tome/data/general/npcs/major-demon.lua
+++ b/game/modules/tome/data/general/npcs/major-demon.lua
@@ -109,7 +109,7 @@ Oh, and it is twice as big, too.]],
ai = "tactical",
ai_tactic = resolvers.tactic"melee",
- resolvers.equip{ {type="weapon", subtype="battleaxe", autoreq=true}, },
+ resolvers.equip{ {type="weapon", subtype="battleaxe", forbid_power_source={antimagic=true}, autoreq=true}, },
resists={[DamageType.PHYSICAL] = resolvers.mbonus(15, 10), [DamageType.FIRE] = resolvers.mbonus(15, 10)},
@@ -140,7 +140,7 @@ newEntity{ base = "BASE_NPC_MAJOR_DEMON",
ai = "tactical",
- resolvers.equip{ {type="weapon", subtype="staff", autoreq=true}, },
+ resolvers.equip{ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true}, },
silence_immune = 1,
blind_immune = 1,
@@ -175,8 +175,8 @@ It moves swiftly toward you, casting terrible spells and swinging its weapons at
ai = "tactical",
- resolvers.equip{ {type="weapon", subtype="longsword", autoreq=true}, },
- resolvers.equip{ {type="weapon", subtype="waraxe", autoreq=true}, },
+ resolvers.equip{ {type="weapon", subtype="longsword", forbid_power_source={antimagic=true}, autoreq=true}, },
+ resolvers.equip{ {type="weapon", subtype="waraxe", forbid_power_source={antimagic=true}, autoreq=true}, },
resists={all = resolvers.mbonus(25, 20)},
@@ -250,8 +250,8 @@ newEntity{ base = "BASE_NPC_MAJOR_DEMON",
ai = "tactical",
- resolvers.equip{ {type="weapon", subtype="mace", autoreq=true}, },
- resolvers.equip{ {type="weapon", subtype="mace", autoreq=true}, },
+ resolvers.equip{ {type="weapon", subtype="mace", forbid_power_source={antimagic=true}, autoreq=true}, },
+ resolvers.equip{ {type="weapon", subtype="mace", forbid_power_source={antimagic=true}, autoreq=true}, },
resists={[DamageType.PHYSICAL] = resolvers.mbonus(15, 10), [DamageType.FIRE] = 100},
on_melee_hit = {[DamageType.FIRE]=resolvers.mbonus(25, 25)},
diff --git a/game/modules/tome/data/general/npcs/minotaur.lua b/game/modules/tome/data/general/npcs/minotaur.lua
index 324d5cc325..64f65a54db 100644
--- a/game/modules/tome/data/general/npcs/minotaur.lua
+++ b/game/modules/tome/data/general/npcs/minotaur.lua
@@ -75,7 +75,7 @@ newEntity{ base = "BASE_NPC_MINOTAUR",
level_range = {20, nil}, exp_worth = 1,
rarity = 4,
combat_armor = 15, combat_def = 7,
- resolvers.equip{ {type="weapon", subtype="maul", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="maul", forbid_power_source={antimagic=true}, autoreq=true} },
autolevel = "caster",
resists = { [DamageType.FIRE] = 100 },
diff --git a/game/modules/tome/data/general/npcs/orc-rak-shor.lua b/game/modules/tome/data/general/npcs/orc-rak-shor.lua
index 34946b1b2a..8efa12528c 100644
--- a/game/modules/tome/data/general/npcs/orc-rak-shor.lua
+++ b/game/modules/tome/data/general/npcs/orc-rak-shor.lua
@@ -55,8 +55,8 @@ newEntity{ base = "BASE_NPC_ORC_RAK_SHOR",
rarity = 1,
max_life = resolvers.rngavg(70,80), life_rating = 7,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 5,
@@ -87,8 +87,8 @@ newEntity{ base = "BASE_NPC_ORC_RAK_SHOR",
rarity = 2,
max_life = resolvers.rngavg(110,120), life_rating = 12,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 5,
@@ -111,8 +111,8 @@ newEntity{ base = "BASE_NPC_ORC_RAK_SHOR",
rank = 3,
max_life = resolvers.rngavg(160,180), life_rating = 15,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 5,
diff --git a/game/modules/tome/data/general/npcs/orc-vor.lua b/game/modules/tome/data/general/npcs/orc-vor.lua
index 8b0d034cfb..1b017b78c8 100644
--- a/game/modules/tome/data/general/npcs/orc-vor.lua
+++ b/game/modules/tome/data/general/npcs/orc-vor.lua
@@ -57,8 +57,8 @@ newEntity{ base = "BASE_NPC_ORC_VOR",
rarity = 1,
max_life = resolvers.rngavg(100,110), life_rating = 7,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 5,
@@ -78,8 +78,8 @@ newEntity{ base = "BASE_NPC_ORC_VOR",
rarity = 4,
max_life = resolvers.rngavg(100,110), life_rating = 10,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 5,
ai = "tactical",
@@ -106,8 +106,8 @@ newEntity{ base = "BASE_NPC_ORC_VOR",
rarity = 1,
max_life = resolvers.rngavg(100,110), life_rating = 10,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 5,
@@ -127,8 +127,8 @@ newEntity{ base = "BASE_NPC_ORC_VOR",
rarity = 4,
max_life = resolvers.rngavg(100,110), life_rating = 10,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 5,
rank = 3,
diff --git a/game/modules/tome/data/general/npcs/skeleton.lua b/game/modules/tome/data/general/npcs/skeleton.lua
index 36446a7053..4c1f24415c 100644
--- a/game/modules/tome/data/general/npcs/skeleton.lua
+++ b/game/modules/tome/data/general/npcs/skeleton.lua
@@ -59,7 +59,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
name = "degenerated skeleton warrior", color=colors.WHITE, image="npc/degenerated_skeleton_warrior.png",
level_range = {1, 18}, exp_worth = 1,
rarity = 1,
- resolvers.equip{ {type="weapon", subtype="greatsword", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true} },
max_life = resolvers.rngavg(40,50),
combat_armor = 5, combat_def = 1,
}
@@ -70,7 +70,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
rarity = 1,
max_life = resolvers.rngavg(90,100),
combat_armor = 5, combat_def = 1,
- resolvers.equip{ {type="weapon", subtype="greatsword", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true} },
resolvers.talents{ [Talents.T_STUNNING_BLOW]={base=1, every=7, max=5}, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_WEAPONS_MASTERY]={base=1, every=10, max=5}, },
ai_state = { talent_in=1, },
}
@@ -85,7 +85,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
stats = { str=10, dex=12, cun=14, mag=14, con=10 },
resolvers.talents{ [Talents.T_FLAME]={base=1, every=7, max=5}, [Talents.T_MANATHRUST]={base=2, every=7, max=5} },
- resolvers.equip{ {type="weapon", subtype="staff", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true} },
autolevel = "caster",
ai = "dumb_talented_simple", ai_state = { talent_in=3, },
@@ -102,7 +102,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
ai_state = { talent_in=1, },
autolevel = "archer",
- resolvers.equip{ {type="weapon", subtype="longbow", autoreq=true}, {type="ammo", subtype="arrow", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="longbow", forbid_power_source={antimagic=true}, autoreq=true}, {type="ammo", subtype="arrow", forbid_power_source={antimagic=true}, autoreq=true} },
}
newEntity{ base = "BASE_NPC_SKELETON",
@@ -119,7 +119,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
ai_tactic = resolvers.tactic"ranged",
autolevel = "archer",
- resolvers.equip{ {type="weapon", subtype="longbow", autoreq=true}, {type="ammo", subtype="arrow", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="longbow", forbid_power_source={antimagic=true}, autoreq=true}, {type="ammo", subtype="arrow", forbid_power_source={antimagic=true}, autoreq=true} },
}
newEntity{ base = "BASE_NPC_SKELETON",
@@ -143,6 +143,6 @@ newEntity{ base = "BASE_NPC_SKELETON",
[Talents.T_OVERPOWER]={base=1, every=7, max=5},
[Talents.T_DISARM]={base=3, every=7, max=7},
},
- resolvers.equip{ {type="weapon", subtype="longsword", autoreq=true}, {type="armor", subtype="shield", autoreq=true}, {type="armor", subtype="heavy", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="longsword", forbid_power_source={antimagic=true}, autoreq=true}, {type="armor", subtype="shield", forbid_power_source={antimagic=true}, autoreq=true}, {type="armor", subtype="heavy", forbid_power_source={antimagic=true}, autoreq=true} },
ai_state = { talent_in=1, },
}
diff --git a/game/modules/tome/data/general/npcs/sunwall-town.lua b/game/modules/tome/data/general/npcs/sunwall-town.lua
index 411ff20207..31280760e7 100644
--- a/game/modules/tome/data/general/npcs/sunwall-town.lua
+++ b/game/modules/tome/data/general/npcs/sunwall-town.lua
@@ -78,9 +78,9 @@ newEntity{ base = "BASE_NPC_SUNWALL_TOWN",
ai = "tactical",
ai_tactic = resolvers.tactic"melee",
resolvers.equip{
- {type="weapon", subtype="mace", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
+ {type="weapon", subtype="mace", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_ARMOUR_TRAINING]=4,
@@ -100,8 +100,8 @@ newEntity{ base = "BASE_NPC_SUNWALL_TOWN",
ai_tactic = resolvers.tactic"ranged",
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="stagg", autoreq=true},
- {type="armor", subtype="robe", autoreq=true},
+ {type="weapon", subtype="stagg", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="robe", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_CHANT_OF_LIGHT]=2,
diff --git a/game/modules/tome/data/general/npcs/ziguranth.lua b/game/modules/tome/data/general/npcs/ziguranth.lua
index c7bc98f45a..db1882e113 100644
--- a/game/modules/tome/data/general/npcs/ziguranth.lua
+++ b/game/modules/tome/data/general/npcs/ziguranth.lua
@@ -60,9 +60,9 @@ newEntity{ base = "BASE_NPC_ZIGURANTH",
rarity = 1,
max_life = resolvers.rngavg(100,110),
resolvers.equip{
- {type="weapon", subtype="waraxe", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- {type="armor", subtype="heavy", autoreq=true},
+ {type="weapon", subtype="waraxe", forbid_power_source={arcane=true}, autoreq=true},
+ {type="armor", subtype="shield", forbid_power_source={arcane=true}, autoreq=true},
+ {type="armor", subtype="heavy", forbid_power_source={arcane=true}, autoreq=true},
},
combat_armor = 10, combat_def = 6,
resolvers.talents{
@@ -83,9 +83,9 @@ newEntity{ base = "BASE_NPC_ZIGURANTH",
rarity = 2,
max_life = resolvers.rngavg(100,110),
resolvers.equip{
- {type="weapon", subtype="waraxe", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- {type="armor", subtype="heavy", autoreq=true},
+ {type="weapon", subtype="waraxe", forbid_power_source={arcane=true}, autoreq=true},
+ {type="armor", subtype="shield", forbid_power_source={arcane=true}, autoreq=true},
+ {type="armor", subtype="heavy", forbid_power_source={arcane=true}, autoreq=true},
},
combat_armor = 10, combat_def = 6, life_rating = 11,
equilibrium_regen = -20,
@@ -114,8 +114,8 @@ newEntity{ base = "BASE_NPC_ZIGURANTH",
rank = 3,
max_life = resolvers.rngavg(100,110),
resolvers.equip{
- {type="weapon", subtype="battleaxe", autoreq=true},
- {type="armor", subtype="heavy", autoreq=true},
+ {type="weapon", subtype="battleaxe", forbid_power_source={arcane=true}, autoreq=true},
+ {type="armor", subtype="heavy", forbid_power_source={arcane=true}, autoreq=true},
},
combat_armor = 10, combat_def = 6, life_rating = 14,
equilibrium_regen = -20,
diff --git a/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua b/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua
index 0fdd31f6df..150f98e9fc 100644
--- a/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua
+++ b/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua
@@ -49,8 +49,8 @@ newEntity{ define_as = "GREATER_MUMMY_LORD",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, },
equipment = resolvers.equip{
{type="weapon", subtype="longsword", defined="LONGSWORD_WINTERTIDE", random_art_replace={chance=75}, autoreq=true},
- {type="armor", subtype="shield", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="mummy", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="armor", subtype="shield", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="mummy", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=4, {tome_drops="boss"} },
@@ -93,8 +93,8 @@ newEntity{ base = "BASE_NPC_MUMMY",
infravision = 10,
resolvers.equip{
- {type="weapon", subtype="greatsword", autoreq=true},
- {type="armor", subtype="mummy", autoreq=true},
+ {type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="mummy", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_STUNNING_BLOW]={base=2, every=7, max=6},
@@ -117,7 +117,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
infravision = 10,
resolvers.equip{
- {type="armor", subtype="mummy", force_drop=true, autoreq=true},
+ {type="armor", subtype="mummy", force_drop=true, forbid_power_source={antimagic=true}, autoreq=true},
},
autolevel = "caster",
resolvers.talents{
@@ -140,7 +140,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
infravision = 10,
resolvers.equip{
- {type="armor", subtype="mummy", autoreq=true},
+ {type="armor", subtype="mummy", forbid_power_source={antimagic=true}, autoreq=true},
},
autolevel = "ghoul",
resolvers.talents{
diff --git a/game/modules/tome/data/zones/arena-unlock/npcs.lua b/game/modules/tome/data/zones/arena-unlock/npcs.lua
index 1217617f0f..08ede49706 100644
--- a/game/modules/tome/data/zones/arena-unlock/npcs.lua
+++ b/game/modules/tome/data/zones/arena-unlock/npcs.lua
@@ -144,9 +144,9 @@ newEntity{ name = "arcane blade",
rarity = false,
max_life = resolvers.rngavg(100,130),
resolvers.equip{
- {type="weapon", subtype="greatsword", autoreq=true},
- {type="armor", subtype="heavy", autoreq=true},
- {type="armor", subtype="feet", autoreq=true},
+ {type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="heavy", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="feet", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_ARCANE_COMBAT]=2,
diff --git a/game/modules/tome/data/zones/arena/npcs.lua b/game/modules/tome/data/zones/arena/npcs.lua
index 53b665d618..c1e66bbe46 100644
--- a/game/modules/tome/data/zones/arena/npcs.lua
+++ b/game/modules/tome/data/zones/arena/npcs.lua
@@ -152,8 +152,8 @@ newEntity{ name = "master alchemist",
max_life = 120,
resolvers.inscriptions(3, {}),
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=1, {type="charm", subtype="wand", ego_chance=100}},
autolevel = "dexmage",
@@ -284,9 +284,9 @@ newEntity{ name = "reaver",
max_life = 150,
resolvers.inscriptions(3, {}),
resolvers.equip{
- {type="weapon", subtype="longsword", autoreq=true},
- {type="weapon", subtype="longsword", autoreq=true},
- {type="armor", subtype="heavy", autoreq=true},
+ {type="weapon", subtype="longsword", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="weapon", subtype="longsword", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="heavy", forbid_power_source={antimagic=true}, autoreq=true},
},
autolevel = "warriormage",
combat_def = 4,
@@ -364,7 +364,7 @@ newEntity{ name = "Ryal",
desc = "A gargantuan bone giant resembling a wingless wyrm. He is fully sentient and surprisingly fast.",
rank = 4, unique = true,
resolvers.equip{
- {type="weapon", subtype="trident", autoreq=true, special_rarity="trident_rarity"},
+ {type="weapon", subtype="trident", autoreq=true, forbid_power_source={antimagic=true}, special_rarity="trident_rarity"},
},
ai = "tactical", ai_state = { ai_move = "move_astar", talent_in = 1 },
ai_tactic = resolvers.tactic("melee"),
@@ -418,10 +418,10 @@ newEntity{ name = "Fryjia Loren",
body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1 },
resolvers.equip{
- {type="weapon", subtype="dagger", autoreq=true},
- {type="weapon", subtype="dagger", autoreq=true},
- {type="armor", subtype="light", autoreq=true},
- {type="armor", subtype="light", autoreq=true}
+ {type="weapon", subtype="dagger", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="weapon", subtype="dagger", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="light", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="light", forbid_power_source={antimagic=true}, autoreq=true}
},
talent_cd_reduction={
[Talents.T_ICE_SHARDS] = 3,
@@ -476,8 +476,8 @@ newEntity{ name = "Riala Shalarak",
body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1 },
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true}
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true}
},
resolvers.talents{
[Talents.T_FIREFLASH] = 2,
@@ -566,9 +566,9 @@ newEntity{ name = "Rej Arkatis",
body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1 },
resolvers.equip{
- {type="weapon", subtype="dagger", autoreq=true, force_drop=true, tome_drops="boss"},
- {type="weapon", subtype="dagger", autoreq=true, force_drop=true, tome_drops="boss"},
- {type="armor", subtype="cloak", autoreq=true, force_drop=true, tome_drops="boss"},
+ {type="weapon", subtype="dagger", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
+ {type="weapon", subtype="dagger", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
+ {type="armor", subtype="cloak", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
},
autolevel = "rogue",
combat_def = 2,
@@ -653,8 +653,8 @@ newEntity{ name = "alchemist",
rarity = 1,
max_life = 60,
equipment = resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=40, {type="charm", subtype="wand", ego_chance=100}},
autolevel = "dexmage", ai_tactic = resolvers.tactic("ranged"),
@@ -687,8 +687,8 @@ newEntity{ name = "blood mage",
rarity = 1,
max_life = 40,
equipment = resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=40, {type="charm", subtype="wand", ego_chance=100}},
autolevel = "caster", ai_tactic = resolvers.tactic("ranged"),
@@ -712,8 +712,8 @@ newEntity{ name = "hexer",
rarity = 1,
max_life = 10,
equipment = resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=40, {type="charm", subtype="wand", ego_chance=100}},
autolevel = "caster", ai_tactic = resolvers.tactic("ranged"),
@@ -801,10 +801,10 @@ newEntity{ name = "shadowblade",
rarity = 1,
max_life = 100,
resolvers.equip{
- {type="weapon", subtype="dagger", autoreq=true},
- {type="weapon", subtype="dagger", autoreq=true},
- {type="armor", subtype="cloak", autoreq=true},
- {name="rough leather gloves", autoreq=true},
+ {type="weapon", subtype="dagger", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="weapon", subtype="dagger", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloak", forbid_power_source={antimagic=true}, autoreq=true},
+ {name="rough leather gloves", forbid_power_source={antimagic=true}, autoreq=true},
},
autolevel = "rogue", ai_tactic = resolvers.tactic("melee"),
combat_def = 2,
@@ -995,8 +995,8 @@ newEntity{ name = "martyr",
rarity = 10,
max_life = 200,
resolvers.equip{
- {type="weapon", subtype="longsword", ego_chance=10, autoreq=true},
- {type="armor", subtype="shield", ego_chance=30, autoreq=true},
+ {type="weapon", subtype="longsword", ego_chance=10, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", ego_chance=30, forbid_power_source={antimagic=true}, autoreq=true},
},
resists = { [DamageType.LIGHT] = 90 },
autolevel = "caster",
@@ -1025,8 +1025,8 @@ newEntity{ name = "anorithil",
rarity = 10,
max_life = 120,
resolvers.equip{
- {type="weapon", subtype="staff", ego_chance=30, autoreq=true},
- {type="armor", subtype="cloth", ego_chance=30, autoreq=true},
+ {type="weapon", subtype="staff", ego_chance=30, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", ego_chance=30, forbid_power_source={antimagic=true}, autoreq=true},
},
autolevel = "caster", ai_tactic = resolvers.tactic("ranged"),
resolvers.drops{chance=50, nb=1, {type="weapon", subtype="staff", force_drop=true, tome_drops="boss"}},
@@ -1054,9 +1054,9 @@ newEntity{ name = "sun paladin",
rarity = 10,
max_life = 150,
resolvers.equip{
- {type="weapon", subtype="longsword", ego_chance=30, autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
- {type="armor", subtype="shield", ego_chance=30, autoreq=true},
+ {type="weapon", subtype="longsword", ego_chance=30, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", ego_chance=30, forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=50, nb=1, {type="weapon", subtype="staff", force_drop=true, tome_drops="boss"}},
combat_def = 4,
@@ -1089,9 +1089,9 @@ newEntity{ name = "star crusader",
stun_immune = 0.2,
confusion_immune = 0.4,
resolvers.equip{
- {type="weapon", subtype="longsword", ego_chance=30, autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
- {type="armor", subtype="shield", ego_chance=50, autoreq=true},
+ {type="weapon", subtype="longsword", ego_chance=30, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", ego_chance=50, forbid_power_source={antimagic=true}, autoreq=true},
},
resists = { [DamageType.LIGHT] = 95 ,[DamageType.DARKNESS] = 95 },
resolvers.drops{ chance=50, nb=1, {type="weapon", subtype="staff", force_drop=true, tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/blighted-ruins/npcs.lua b/game/modules/tome/data/zones/blighted-ruins/npcs.lua
index 1e969a7463..deb9c04f0c 100644
--- a/game/modules/tome/data/zones/blighted-ruins/npcs.lua
+++ b/game/modules/tome/data/zones/blighted-ruins/npcs.lua
@@ -52,7 +52,7 @@ newEntity{
max_life = resolvers.rngavg(70,80), life_rating = 7,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
{type="armor", subtype="cloak", defined="CLOAK_DECEPTION", autoreq=true},
},
diff --git a/game/modules/tome/data/zones/charred-scar/npcs.lua b/game/modules/tome/data/zones/charred-scar/npcs.lua
index eca6271f40..bf7eb560cd 100644
--- a/game/modules/tome/data/zones/charred-scar/npcs.lua
+++ b/game/modules/tome/data/zones/charred-scar/npcs.lua
@@ -55,9 +55,9 @@ newEntity{ base = "BASE_NPC_SUNWALL_DEFENDER", define_as = "SUN_PALADIN_DEFENDER
life_regen = 5,
max_life = resolvers.rngavg(140,170),
resolvers.equip{
- {type="weapon", subtype="mace", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
+ {type="weapon", subtype="mace", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_ARMOUR_TRAINING]=5,
@@ -85,9 +85,9 @@ newEntity{ base = "BASE_NPC_SUNWALL_DEFENDER", define_as = "SUN_PALADIN_DEFENDER
life_regen = 5,
max_life = resolvers.rngavg(240,270),
resolvers.equip{
- {type="weapon", subtype="mace", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
+ {type="weapon", subtype="mace", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_ARMOUR_TRAINING]=5,
@@ -177,8 +177,8 @@ newEntity{
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=10, {tome_drops="boss"} },
@@ -235,8 +235,8 @@ newEntity{
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=10, {tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/deep-bellow/npcs.lua b/game/modules/tome/data/zones/deep-bellow/npcs.lua
index 46cec58c7c..45f08f2afc 100644
--- a/game/modules/tome/data/zones/deep-bellow/npcs.lua
+++ b/game/modules/tome/data/zones/deep-bellow/npcs.lua
@@ -147,9 +147,9 @@ newEntity{ base="BASE_NPC_CORRUPTED_HORROR", define_as = "ABOMINATION",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, FEET=1 },
resolvers.equip{
- {type="weapon", subtype="battleaxe", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="boots", defined="WARPED_BOOTS", random_art_replace={chance=75}, autoreq=true},
- {type="armor", subtype="massive", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="battleaxe", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="boots", defined="WARPED_BOOTS", random_art_replace={chance=75}, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {defined="ADV_LTR_8"} },
diff --git a/game/modules/tome/data/zones/dreadfell/npcs.lua b/game/modules/tome/data/zones/dreadfell/npcs.lua
index 708de27948..27aa73e696 100644
--- a/game/modules/tome/data/zones/dreadfell/npcs.lua
+++ b/game/modules/tome/data/zones/dreadfell/npcs.lua
@@ -211,12 +211,12 @@ What proud hero of renown was this before he was condemned to such a terrible fa
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, HANDS=1, FEET=1, },
equipment = resolvers.equip{
- {type="weapon", subtype="mace", ego_chance=100, autoreq=true, force_drop=true,},
- {type="armor", subtype="shield", ego_chance=100, autoreq=true, force_drop=true,},
+ {type="weapon", subtype="mace", ego_chance=100, autoreq=true, forbid_power_source={antimagic=true}, force_drop=true,},
+ {type="armor", subtype="shield", ego_chance=100, autoreq=true, forbid_power_source={antimagic=true}, force_drop=true,},
{type="armor", subtype="massive", defined="BORFAST_CAGE", random_art_replace={chance=75}, autoreq=true, tome_drops="boss"},
- {type="armor", subtype="head", ego_chance=75, autoreq=true},
- {type="armor", subtype="hands", ego_chance=75, autoreq=true},
- {type="armor", subtype="feet", ego_chance=75, autoreq=true},
+ {type="armor", subtype="head", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="hands", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="feet", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=1, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {defined="BORFAST_LETTER"} },
@@ -235,19 +235,19 @@ What proud hero of renown was this before he was condemned to such a terrible fa
[Talents.T_RUSH]={base=1, every=5, max=6},
[Talents.T_SPELL_SHIELD]={base=3, every=5, max=6},
[Talents.T_PERFECT_STRIKE]={base=3, every=5, max=6},
-
+
[Talents.T_SHIELD_WALL]=6,
[Talents.T_SHIELD_EXPERTISE]=6,
-
+
[Talents.T_THICK_SKIN]={base=3, every=5, max=5},
[Talents.T_ARMOUR_TRAINING]={base=4, every=5, max=10},
[Talents.T_WEAPONS_MASTERY]={base=2, every=10, max=5},
[Talents.T_WEAPON_COMBAT]={base=2, every=10, max=5},
-
+
[Talents.T_VITALITY]={base=4, every=5, max=6},
[Talents.T_UNFLINCHING_RESOLVE]=6,
[Talents.T_DAUNTING_PRESENCE]={base=3, every=5, max=5},
-
+
[Talents.T_GHOULISH_LEAP]={base=1, every=5, max=5},
[Talents.T_RETCH]=5,
[Talents.T_GNAW]=1,
@@ -267,7 +267,7 @@ newEntity{ define_as = "ALETTA",
type = "undead", subtype = "ghost", unique = true,
name = "Aletta Soultorn", female=1,
display = "G", color=colors.VIOLET,
- desc = [[What once must have been an enchantingly beautiful Higher woman now looks to be a ghost of utter despair. Her thin, elegant form ripples gently in the air, whilst her tattered robes seem oddly still. The ghost's face looks jittery and pained whilst her wild, glowing eyes move rapidly back and forth in their sockets.
+ desc = [[What once must have been an enchantingly beautiful Higher woman now looks to be a ghost of utter despair. Her thin, elegant form ripples gently in the air, whilst her tattered robes seem oddly still. The ghost's face looks jittery and pained whilst her wild, glowing eyes move rapidly back and forth in their sockets.
Now and then she seems to see something and her jaw pulls back, her whole face splitting apart as she shrieks an unholy cry of pain and torment.]],
killer_message = "and offered to her dark Master",
level_range = {20, nil}, exp_worth = 2,
@@ -278,7 +278,7 @@ Now and then she seems to see something and her jaw pulls back, her whole face s
size_category = 3,
infravision = 10,
stats = { str=14, dex=18, mag=20, wil=20, cun=20, con=12 },
-
+
instakill_immune = 1,
no_breath = 1,
stone_immune = 1,
@@ -292,23 +292,23 @@ Now and then she seems to see something and her jaw pulls back, her whole face s
cut_immune = 1,
see_invisible = 80,
undead = 1,
-
+
combat_armor = 0, combat_def = 10,
stealth = 20,
combat = { dam=5, atk=5, apr=100, dammod={str=0.5, mag=0.5} },
-
+
can_pass = {pass_wall=70},
dont_pass_target = true,
resists = {all = 35, [DamageType.LIGHT] = -70, [DamageType.DARKNESS] = 65},
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, NECK=1, FINGER = 2, BODY=1, HEAD=1, },
equipment = resolvers.equip{
- {type="armor", subtype="cloth", ego_chance=75, autoreq=true,},
+ {type="armor", subtype="cloth", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true,},
{type="armor", subtype="head", defined="ALETTA_DIADEM", random_art_replace={chance=75}, autoreq=true, tome_drops="boss"},
- {type="jewelry", subtype="amulet", ego_chance=100, autoreq=true, force_drop=true},
- {type="jewelry", subtype="ring", ego_chance=100, autoreq=true, force_drop=true},
- {type="jewelry", subtype="ring", ego_chance=75, autoreq=true},
+ {type="jewelry", subtype="amulet", ego_chance=100, autoreq=true, forbid_power_source={antimagic=true}, force_drop=true},
+ {type="jewelry", subtype="ring", ego_chance=100, autoreq=true, forbid_power_source={antimagic=true}, force_drop=true},
+ {type="jewelry", subtype="ring", ego_chance=75, forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=1, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {defined="ALETTA_LETTER"} },
@@ -322,7 +322,7 @@ Now and then she seems to see something and her jaw pulls back, her whole face s
[Talents.T_GLOOM]={base=3, every=7, max=5},
[Talents.T_WEAKNESS]={base=3, every=7, max=5},
[Talents.T_SANCTUARY]=5,
-
+
[Talents.T_INSTILL_FEAR]=5,
[Talents.T_HEIGHTEN_FEAR]=5,
[Talents.T_TYRANT]=5,
@@ -357,12 +357,12 @@ There is a cunning air to his hollow skull, and his empty sockets reveal nothing
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, QUIVER=1 },
equipment = resolvers.equip{
{type="weapon", subtype="sling", defined="HARESKIN_SLING", random_art_replace={chance=0}, autoreq=true, tome_drops="boss"},
- {type="weapon", subtype="dagger", ego_chance=100, autoreq=true, force_drop=true},
- {type="ammo", subtype="shot", ego_chance=100, autoreq=true, force_drop=true},
+ {type="weapon", subtype="dagger", ego_chance=100, autoreq=true, forbid_power_source={antimagic=true}, force_drop=true},
+ {type="ammo", subtype="shot", ego_chance=100, autoreq=true, forbid_power_source={antimagic=true}, force_drop=true},
},
resolvers.drops{chance=100, nb=1, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {defined="FILIO_LETTER"} },
-
+
open_door = 1,
instakill_immune = 1,
cut_immune = 1,
@@ -374,23 +374,23 @@ There is a cunning air to his hollow skull, and his empty sockets reveal nothing
resolvers.talents{
[Talents.T_SHOOT]=1,
[Talents.T_INERTIAL_SHOT]=3,
-
+
[Talents.T_STEALTH]={base=5, every=6, max=7},
[Talents.T_SHADOWSTRIKE]={base=1, every=6, max=7},
[Talents.T_HIDE_IN_PLAIN_SIGHT]={base=1, every=6, max=7},
-
+
[Talents.T_DISENGAGE]={base=3, every=6, max=7},
[Talents.T_EVASION]={base=5, every=6, max=7},
[Talents.T_PIERCING_SIGHT]={base=3, every=6, max=7},
-
+
[Talents.T_DUAL_STRIKE]={base=2, every=6, max=7},
[Talents.T_DUAL_WEAPON_DEFENSE]={base=5, every=6, max=7},
[Talents.T_LETHALITY]={base=1, every=6, max=5},
[Talents.T_WILLFUL_COMBAT]={base=5, every=6, max=6},
-
+
[Talents.T_KNIFE_MASTERY]={base=2, every=10, max=5},
[Talents.T_WEAPON_COMBAT]={base=2, every=10, max=5},
-
+
[Talents.T_BONE_ARMOUR]={base=3, every=5, max=5},
[Talents.T_RESILIENT_BONES]={base=3, every=5, max=5},
[Talents.T_SKELETON_REASSEMBLE]={base=3, every=5, max=5},
@@ -401,11 +401,11 @@ There is a cunning air to his hollow skull, and his empty sockets reveal nothing
ai = "tactical", ai_state = { talent_in=1, ai_move="move_astar", },
ai_tactic = resolvers.tactic"survivor",
resolvers.inscriptions(1, {"invisibility rune",}),
-
+
on_move = function(self, x, y, self, force)
if not force and rng.percent(10) then
local traps = { self.T_BEAR_TRAP, self.T_CATAPULT_TRAP }
self:forceUseTalent(rng.table(traps), {ignore_energy=true, ignore_resources=true, ignore_cd=true, force_target=self})
end
- end,
+ end,
}
diff --git a/game/modules/tome/data/zones/eruan/npcs.lua b/game/modules/tome/data/zones/eruan/npcs.lua
index de7ae74126..36ac2ec3d3 100644
--- a/game/modules/tome/data/zones/eruan/npcs.lua
+++ b/game/modules/tome/data/zones/eruan/npcs.lua
@@ -51,9 +51,9 @@ newEntity{ define_as = "SUN_PALADIN_GUREN",
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
resolvers.equip{
- {type="weapon", subtype="mace", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
+ {type="weapon", subtype="mace", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_ARMOUR_TRAINING]=5,
diff --git a/game/modules/tome/data/zones/golem-graveyard/npcs.lua b/game/modules/tome/data/zones/golem-graveyard/npcs.lua
index 77f435fb39..1626f6e423 100644
--- a/game/modules/tome/data/zones/golem-graveyard/npcs.lua
+++ b/game/modules/tome/data/zones/golem-graveyard/npcs.lua
@@ -40,8 +40,8 @@ newEntity{ define_as = "ATAMATHON", base = "BASE_NPC_CONSTRUCT",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, GEM=4 },
resolvers.equip{
- {type="weapon", subtype="greatmaul", tome_drops="boss", tome_mod="uvault", autoreq=true },
- {type="armour", subtype="massive", tome_drops="boss", tome_mod="uvault", autoreq=true },
+ {type="weapon", subtype="greatmaul", tome_drops="boss", tome_mod="uvault", forbid_power_source={antimagic=true}, autoreq=true },
+ {type="armour", subtype="massive", tome_drops="boss", tome_mod="uvault", forbid_power_source={antimagic=true}, autoreq=true },
},
combat_armor = 50,
resolvers.drops{chance=100, nb=7, {type="gem"} },
diff --git a/game/modules/tome/data/zones/halfling-ruins/npcs.lua b/game/modules/tome/data/zones/halfling-ruins/npcs.lua
index 9292f0d785..d8007436a3 100644
--- a/game/modules/tome/data/zones/halfling-ruins/npcs.lua
+++ b/game/modules/tome/data/zones/halfling-ruins/npcs.lua
@@ -43,9 +43,9 @@ newEntity{ define_as="SUBJECT_Z",
see_invisible = 20,
resolvers.equip{
- {type="weapon", subtype="dagger", autoreq=true, force_drop=true, tome_drops="boss"},
- {type="weapon", subtype="dagger", autoreq=true, force_drop=true, tome_drops="boss"},
- {type="armor", subtype="light", autoreq=true, force_drop=true, tome_drops="boss"},
+ {type="weapon", subtype="dagger", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
+ {type="weapon", subtype="dagger", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
+ {type="armor", subtype="light", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
{defined="NIGHT_SONG", random_art_replace={chance=65}, autoreq=true},
},
diff --git a/game/modules/tome/data/zones/high-peak/npcs.lua b/game/modules/tome/data/zones/high-peak/npcs.lua
index 3f2dc4eba2..09fd3690aa 100644
--- a/game/modules/tome/data/zones/high-peak/npcs.lua
+++ b/game/modules/tome/data/zones/high-peak/npcs.lua
@@ -312,11 +312,11 @@ newEntity{ define_as = "HIGH_SUN_PALADIN_AERYN",
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
resolvers.equip{
- {type="weapon", subtype="mace", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="shield", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="massive", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="feet", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="head", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="mace", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="feet", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="head", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
positive_regen = 25,
diff --git a/game/modules/tome/data/zones/last-hope-graveyard/npcs.lua b/game/modules/tome/data/zones/last-hope-graveyard/npcs.lua
index 2a87c24cb3..cdf93236a6 100644
--- a/game/modules/tome/data/zones/last-hope-graveyard/npcs.lua
+++ b/game/modules/tome/data/zones/last-hope-graveyard/npcs.lua
@@ -44,8 +44,8 @@ newEntity{ define_as = "CELIA",
level_range = {20, nil},
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {unique=true} },
diff --git a/game/modules/tome/data/zones/mark-spellblaze/npcs.lua b/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
index 9da71fe9c3..34a56453f2 100644
--- a/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
+++ b/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
@@ -36,8 +36,8 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER", define_as = "GRAND_CORRUPTOR",
max_vim = 800,
max_life = resolvers.rngavg(300, 310), life_rating = 18,
resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=1, {unique=true} },
resolvers.drops{chance=100, nb=1, {defined="DRAFT_LETTER"} },
diff --git a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
index 7e5d754d09..3b0b6fa995 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
@@ -55,7 +55,7 @@ newEntity{ base="BASE_NPC_ORC_RAK_SHOR", define_as = "RAK_SHOR",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
{type="armor", subtype="cloth", defined="BLACK_ROBE", random_art_replace={chance=75}, autoreq=true},
},
resolvers.drops{chance=20, nb=1, {defined="JEWELER_TOME"} },
diff --git a/game/modules/tome/data/zones/reknor-escape/npcs.lua b/game/modules/tome/data/zones/reknor-escape/npcs.lua
index e0266f8a1e..149901587d 100644
--- a/game/modules/tome/data/zones/reknor-escape/npcs.lua
+++ b/game/modules/tome/data/zones/reknor-escape/npcs.lua
@@ -48,8 +48,8 @@ newEntity{ define_as = "BROTOQ",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{
{type="weapon", subtype="waraxe", defined="FAKE_SKULLCLEAVER", never_drop=true},
- {type="weapon", subtype="longsword", autoreq=true},
- {type="armor", subtype="light", autoreq=true},
+ {type="weapon", subtype="longsword", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="light", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=1, {type="weapon", subtype="waraxe", defined="SKULLCLEAVER", random_art_replace={chance=75}} },
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/rhaloren-camp/npcs.lua b/game/modules/tome/data/zones/rhaloren-camp/npcs.lua
index 4e4ffbea95..64b0168419 100644
--- a/game/modules/tome/data/zones/rhaloren-camp/npcs.lua
+++ b/game/modules/tome/data/zones/rhaloren-camp/npcs.lua
@@ -44,7 +44,7 @@ newEntity{ define_as = "INQUISITOR",
move_others=true,
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
- equipment = resolvers.equip{ {type="weapon", subtype="greatsword", auto_req=true}, {type="armor", subtype="light", autoreq=true}, },
+ equipment = resolvers.equip{ {type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, auto_req=true}, {type="armor", subtype="light", forbid_power_source={antimagic=true}, autoreq=true}, },
resolvers.drops{chance=100, nb=1, {defined="ROD_OF_ANNULMENT", random_art_replace={chance=75}} },
resolvers.drops{chance=100, nb=1, {defined="NOTE5"} },
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/ring-of-blood/npcs.lua b/game/modules/tome/data/zones/ring-of-blood/npcs.lua
index f13d69201c..9807b711b2 100644
--- a/game/modules/tome/data/zones/ring-of-blood/npcs.lua
+++ b/game/modules/tome/data/zones/ring-of-blood/npcs.lua
@@ -176,7 +176,7 @@ newEntity{ base = "BASE_NPC_SLAVER",
rarity = 1,
max_life = resolvers.rngavg(80,90), life_rating = 11,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 0, combat_def = 6,
resolvers.talents{
diff --git a/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua b/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
index 3e4f99b8ed..d81f10b8ac 100644
--- a/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
+++ b/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
@@ -51,7 +51,7 @@ newEntity{ define_as = "SHADE",
move_others=true,
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
- equipment = resolvers.equip{ {type="weapon", subtype="staff", defined="STAFF_KOR", random_art_replace={chance=75}, autoreq=true}, {type="armor", subtype="light", autoreq=true}, },
+ equipment = resolvers.equip{ {type="weapon", subtype="staff", defined="STAFF_KOR", random_art_replace={chance=75}, autoreq=true}, {type="armor", subtype="light", forbid_power_source={antimagic=true}, autoreq=true}, },
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
resolvers.talents{
@@ -104,8 +104,8 @@ newEntity{ define_as = "KOR_FURY",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, NECK=1 },
resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="light", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="light", forbid_power_source={antimagic=true}, autoreq=true},
{type="jewelry", subtype="amulet", defined="VOX", random_art_replace={chance=75}, autoreq=true},
},
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/shadow-crypt/npcs.lua b/game/modules/tome/data/zones/shadow-crypt/npcs.lua
index ba8307e51e..de4b1b6bd9 100644
--- a/game/modules/tome/data/zones/shadow-crypt/npcs.lua
+++ b/game/modules/tome/data/zones/shadow-crypt/npcs.lua
@@ -50,7 +50,7 @@ newEntity{ base="BASE_NPC_ORC_RAK_SHOR", define_as = "CULTIST_RAK_SHOR",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=20, nb=1, {defined="JEWELER_TOME"} },
resolvers.drops{chance=100, nb=1, {defined="LIFE_DRINKER", random_art_replace={chance=75}} },
diff --git a/game/modules/tome/data/zones/shertul-fortress/npcs.lua b/game/modules/tome/data/zones/shertul-fortress/npcs.lua
index 2eb53695d8..116100e323 100644
--- a/game/modules/tome/data/zones/shertul-fortress/npcs.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/npcs.lua
@@ -45,8 +45,8 @@ newEntity{ base = "BASE_NPC_HORROR", define_as="WEIRDLING_BEAST",
negative_regen = 15,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true, force_drop=true, tome_drops="boss"},
- {type="armor", subtype="light", autoreq=true, force_drop=true, tome_drops="boss"}
+ {type="weapon", subtype="staff", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
+ {type="armor", subtype="light", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"}
},
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/tannen-tower/npcs.lua b/game/modules/tome/data/zones/tannen-tower/npcs.lua
index 4a12d9f0ad..17e85e45db 100644
--- a/game/modules/tome/data/zones/tannen-tower/npcs.lua
+++ b/game/modules/tome/data/zones/tannen-tower/npcs.lua
@@ -50,8 +50,8 @@ newEntity{ define_as = "TANNEN",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1, },
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=4, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {defined="ORB_MANY_WAYS2"} },
@@ -131,9 +131,9 @@ It is so huge that it blocks sight beyond it.]],
resolvers.drops{chance=100, nb=1, {defined="RESONATING_DIAMOND_WEST2"} },
resolvers.equip{
- {type="weapon", subtype="greatsword", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="massive", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="head", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="greatsword", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="head", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
autolevel = "warrior",
diff --git a/game/modules/tome/data/zones/tempest-peak/npcs.lua b/game/modules/tome/data/zones/tempest-peak/npcs.lua
index f630b7002c..c4e10a205f 100644
--- a/game/modules/tome/data/zones/tempest-peak/npcs.lua
+++ b/game/modules/tome/data/zones/tempest-peak/npcs.lua
@@ -48,8 +48,8 @@ newEntity{ define_as = "URKIS",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {unique=true} },
diff --git a/game/modules/tome/data/zones/temple-of-creation/npcs.lua b/game/modules/tome/data/zones/temple-of-creation/npcs.lua
index 7e4157cc1f..1220aa7296 100644
--- a/game/modules/tome/data/zones/temple-of-creation/npcs.lua
+++ b/game/modules/tome/data/zones/temple-of-creation/npcs.lua
@@ -54,9 +54,9 @@ newEntity{ define_as = "SLASUL",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, LITE=1 },
resolvers.equip{
- {type="weapon", subtype="mace", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="shield", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="heavy", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="mace", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="heavy", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
{type="jewelry", subtype="lite", defined="ELDRITCH_PEARL", autoreq=true},
},
resolvers.drops{chance=100, nb=1, {defined="SLASUL_NOTE"} },
diff --git a/game/modules/tome/data/zones/temporal-rift/npcs.lua b/game/modules/tome/data/zones/temporal-rift/npcs.lua
index cdfb2a8c11..e4c47e0ca9 100644
--- a/game/modules/tome/data/zones/temporal-rift/npcs.lua
+++ b/game/modules/tome/data/zones/temporal-rift/npcs.lua
@@ -153,8 +153,8 @@ newEntity{ base="BASE_NPC_HORROR_TEMPORAL", define_as = "CHRONOLITH_TWIN",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=2, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {unique=true} },
@@ -202,8 +202,8 @@ newEntity{ base="BASE_NPC_HORROR_TEMPORAL", define_as = "CHRONOLITH_CLONE",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=2, {tome_drops="boss"} },
resolvers.drops{chance=100, nb=1, {unique=true} },
diff --git a/game/modules/tome/data/zones/town-angolwen/npcs.lua b/game/modules/tome/data/zones/town-angolwen/npcs.lua
index c57bf6b15a..609952d4e9 100644
--- a/game/modules/tome/data/zones/town-angolwen/npcs.lua
+++ b/game/modules/tome/data/zones/town-angolwen/npcs.lua
@@ -55,8 +55,8 @@ newEntity{ define_as = "SUPREME_ARCHMAGE_LINANIIL",
resists = {[DamageType.FIRE]=100, [DamageType.LIGHTNING]=100},
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true, tome_drops="boss"},
- {type="armor", subtype="cloth", autoreq=true, tome_drops="boss"},
+ {type="weapon", subtype="staff", autoreq=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
+ {type="armor", subtype="cloth", autoreq=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
},
talent_cd_reduction = {all=23},
@@ -117,8 +117,8 @@ newEntity{ define_as = "TARELION",
resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true, tome_drops="store"},
- {type="armor", subtype="cloth", autoreq=true, tome_drops="store"},
+ {type="weapon", subtype="staff", autoreq=true, forbid_power_source={antimagic=true}, tome_drops="store"},
+ {type="armor", subtype="cloth", autoreq=true, forbid_power_source={antimagic=true}, tome_drops="store"},
},
resolvers.talents{
@@ -175,8 +175,8 @@ newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
rarity = 3,
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 2, combat_def = 0,
resolvers.talents{ [Talents.T_MANATHRUST]=2, [Talents.T_FREEZE]=1, },
@@ -190,8 +190,8 @@ newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
rarity = 3,
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 2, combat_def = 0,
resolvers.talents{ [Talents.T_FLAME]=3, [Talents.T_WILDFIRE]=3, [Talents.T_BURNING_WAKE]=3, [Talents.T_BLASTWAVE]=3, },
@@ -205,8 +205,8 @@ newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
rarity = 3,
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 2, combat_def = 0,
resolvers.talents{ [Talents.T_ICE_SHARDS]=3, [Talents.T_UTTERCOLD]=3, [Talents.T_FREEZE]=3, [Talents.T_FROZEN_GROUND]=3, },
@@ -220,8 +220,8 @@ newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
rarity = 3,
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 2, combat_def = 0,
resolvers.talents{ [Talents.T_EARTHEN_MISSILES]=3, [Talents.T_CRYSTALLINE_FOCUS]=3, [Talents.T_BODY_OF_STONE]=3, [Talents.T_STRIKE]=3, },
@@ -235,8 +235,8 @@ newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
rarity = 3,
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
combat_armor = 2, combat_def = 0,
resolvers.talents{ [Talents.T_LIGHTNING]=3, [Talents.T_TEMPEST]=3, [Talents.T_HURRICANE]=3, [Talents.T_SHOCK]=3, },
diff --git a/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua b/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua
index af350cce06..3ae82c861c 100644
--- a/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua
+++ b/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua
@@ -53,9 +53,9 @@ newEntity{ define_as = "HIGH_SUN_PALADIN_AERYN",
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
resolvers.equip{
- {type="weapon", subtype="mace", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
+ {type="weapon", subtype="mace", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="shield", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.talents{
[Talents.T_ARMOUR_TRAINING]=5,
diff --git a/game/modules/tome/data/zones/town-iron-council/npcs.lua b/game/modules/tome/data/zones/town-iron-council/npcs.lua
index a4594ca286..ff722adf61 100644
--- a/game/modules/tome/data/zones/town-iron-council/npcs.lua
+++ b/game/modules/tome/data/zones/town-iron-council/npcs.lua
@@ -22,7 +22,7 @@ load("/data/general/npcs/gwelgoroth.lua", function(e) if e.rarity then e.derth_r
local Talents = require("engine.interface.ActorTalents")
newEntity{
- define_as = "BASE_NPC_ELVALA_TOWN",
+ define_as = "BASE_NPC_IRON_COUNCIL_TOWN",
type = "humanoid", subtype = "dwarf",
display = "p", color=colors.WHITE,
faction = "iron-throne",
@@ -50,7 +50,7 @@ newEntity{
emote_random = resolvers.emote_random{allow_backup_guardian=true},
}
-newEntity{ base = "BASE_NPC_ELVALA_TOWN",
+newEntity{ base = "BASE_NPC_IRON_COUNCIL_TOWN",
name = "dwarven guard", color=colors.LIGHT_UMBER,
desc = [[A stocky dwarf, he looks angry.]],
level_range = {1, nil}, exp_worth = 1,
@@ -63,7 +63,7 @@ newEntity{ base = "BASE_NPC_ELVALA_TOWN",
resolvers.talents{ [Talents.T_RUSH]=1, [Talents.T_PERFECT_STRIKE]=1, },
}
-newEntity{ base = "BASE_NPC_ELVALA_TOWN",
+newEntity{ base = "BASE_NPC_IRON_COUNCIL_TOWN",
name = "dwarven earthwarden", color=colors.RED,
desc = [[A stocky dwarf, he looks angry.]],
level_range = {1, nil}, exp_worth = 1,
diff --git a/game/modules/tome/data/zones/town-zigur/npcs.lua b/game/modules/tome/data/zones/town-zigur/npcs.lua
index ad79c89e9c..59df4916df 100644
--- a/game/modules/tome/data/zones/town-zigur/npcs.lua
+++ b/game/modules/tome/data/zones/town-zigur/npcs.lua
@@ -33,8 +33,8 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER", define_as = "GRAND_CORRUPTOR",
max_vim = 800,
max_life = resolvers.rngavg(300, 310), life_rating = 18,
resolvers.equip{
- {type="weapon", subtype="staff", autoreq=true},
- {type="armor", subtype="cloth", autoreq=true},
+ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", forbid_power_source={antimagic=true}, autoreq=true},
},
ai = "tactical", ai_state = { talent_in=1, ai_move="move_astar", },
@@ -78,8 +78,8 @@ newEntity{ base = "BASE_NPC_ZIGURANTH", define_as = "PROTECTOR_MYSSIL",
stamina_regen = 40,
max_life = resolvers.rngavg(300, 310), life_rating = 21,
resolvers.equip{
- {type="weapon", subtype="greatsword", autoreq=true},
- {type="armor", subtype="massive", autoreq=true},
+ {type="weapon", subtype="greatsword", forbid_power_source={arcane=true}, autoreq=true},
+ {type="armor", subtype="massive", forbid_power_source={arcane=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=1, {unique=true} },
resolvers.drops{chance=100, nb=4, {tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/tutorial/npcs.lua b/game/modules/tome/data/zones/tutorial/npcs.lua
index 7deb39738c..1a5f126271 100644
--- a/game/modules/tome/data/zones/tutorial/npcs.lua
+++ b/game/modules/tome/data/zones/tutorial/npcs.lua
@@ -30,7 +30,7 @@ newEntity{ base = "BASE_NPC_SKELETON", define_as = "TUTORIAL_NPC_MAGE", image="n
stats = { str=10, dex=12, cun=14, mag=14, con=10 },
resolvers.talents{ [Talents.T_MANATHRUST]=3 },
- resolvers.equip{ {type="weapon", subtype="staff", autoreq=true} },
+ resolvers.equip{ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true} },
autolevel = "caster",
ai = "dumb_talented_simple", ai_state = { talent_in=1, },
diff --git a/game/modules/tome/data/zones/unremarkable-cave/npcs.lua b/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
index 76772af8f0..0614e3e7e7 100644
--- a/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
+++ b/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
@@ -48,8 +48,8 @@ newEntity{ define_as = "FILLAREL",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
@@ -108,8 +108,8 @@ newEntity{ define_as = "CORRUPTOR",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="heavy", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="heavy", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
},
resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
diff --git a/game/modules/tome/data/zones/vor-pride/npcs.lua b/game/modules/tome/data/zones/vor-pride/npcs.lua
index 82def8a9bc..5781706da8 100644
--- a/game/modules/tome/data/zones/vor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/vor-pride/npcs.lua
@@ -50,8 +50,8 @@ newEntity{ base="BASE_NPC_ORC_VOR", define_as = "VOR",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1 },
resolvers.equip{
- {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
- {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+ {type="weapon", subtype="staff", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+ {type="armor", subtype="cloth", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
{type="armor", subtype="head", defined="CROWN_ELEMENTS", random_art_replace={chance=75}, autoreq=true},
},
resolvers.drops{chance=100, nb=1, {defined="ORB_ELEMENTS"} },
--
GitLab