diff --git a/game/modules/tome/data/general/npcs/ant.lua b/game/modules/tome/data/general/npcs/ant.lua
index 651956d9e67053b30e5c2f6c0d4732bba8b5e08c..ae76ba46d2ebf596308a0cef4f9845d9feedd8dd 100644
--- a/game/modules/tome/data/general/npcs/ant.lua
+++ b/game/modules/tome/data/general/npcs/ant.lua
@@ -136,7 +136,7 @@ newEntity{ base = "BASE_NPC_ANT",
max_life = resolvers.rngavg(20,40),
combat = { damtype=DamageType.FIRE },
combat_armor = 5, combat_def = 5,
- on_melee_hit = {[DamageType.FIRE]=5},
+ melee_project = {[DamageType.FIRE]=5},
talent_cd_reduction = {[Talents.T_FLAME_FURY]=-6},
resolvers.talents{
[Talents.T_RITCH_FLAMESPITTER_BOLT]={base=1, every=10},
@@ -152,7 +152,7 @@ newEntity{ base = "BASE_NPC_ANT",
max_life = resolvers.rngavg(20,40),
combat = { damtype=DamageType.ICE },
combat_armor = 5, combat_def = 5,
- on_melee_hit = {[DamageType.ICE]=5},
+ melee_project = {[DamageType.ICE]=5},
talent_cd_reduction = {[Talents.T_WATER_BOLT]=-7},
resolvers.talents{
[Talents.T_WATER_BOLT]={base=2, every=10},
@@ -169,7 +169,7 @@ newEntity{ base = "BASE_NPC_ANT",
max_life = resolvers.rngavg(20,40),
combat = { damtype=DamageType.LIGHTNING },
combat_armor = 5, combat_def = 5,
- on_melee_hit = {[DamageType.LIGHTNING]=5},
+ melee_project = {[DamageType.LIGHTNING]=5},
talent_cd_reduction = {[Talents.T_CALL_LIGHTNING] = -7},
resolvers.talents{
[Talents.T_LIGHTNING_SPEED]={base=2, every=10},
@@ -185,7 +185,7 @@ newEntity{ base = "BASE_NPC_ANT",
max_life = resolvers.rngavg(20,40),
combat = { damtype=DamageType.ACID },
combat_armor = 5, combat_def = 5,
- on_melee_hit = {[DamageType.ACID]=5},
+ melee_project = {[DamageType.ACID]=5},
talent_cd_reduction = {[Talents.T_ACIDIC_SPRAY]=-7},
resolvers.talents{
[Talents.T_CRAWL_ACID]={base=2, every=10},
diff --git a/game/modules/tome/data/general/npcs/aquatic_critter.lua b/game/modules/tome/data/general/npcs/aquatic_critter.lua
index aa415651e6b4a295a668ef12170be486a764f0e4..f1103f43d5601cc5a49ab610fac9516b9fec7b3c 100644
--- a/game/modules/tome/data/general/npcs/aquatic_critter.lua
+++ b/game/modules/tome/data/general/npcs/aquatic_critter.lua
@@ -55,7 +55,6 @@ newEntity{ base = "BASE_NPC_AQUATIC_CRITTER",
rarity = 4,
autolevel = "warriormage",
combat = {damtype=DamageType.LIGHTNING},
- on_melee_hit = { [DamageType.LIGHTNING] = resolvers.mbonus(5, 5), },
resolvers.talents{
[Talents.T_CHAIN_LIGHTNING]={base=0, last=4, every=3, max=7},
[Talents.T_LIGHTNING]={base=0, last=4, every=3, max=7},
diff --git a/game/modules/tome/data/general/npcs/bone-giant.lua b/game/modules/tome/data/general/npcs/bone-giant.lua
index 080bfbd8683f7303c8cc22c9e8149d9a704a70b0..2432ccbc42c2f5acbd43e8a403981195520d3320 100644
--- a/game/modules/tome/data/general/npcs/bone-giant.lua
+++ b/game/modules/tome/data/general/npcs/bone-giant.lua
@@ -64,7 +64,6 @@ newEntity{ base = "BASE_NPC_BONE_GIANT",
rarity = 1,
max_life = resolvers.rngavg(100,120),
combat_armor = 20, combat_def = 0,
- on_melee_hit = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
melee_project = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
resolvers.talents{ [Talents.T_BONE_ARMOUR]={base=3, every=10, max=5}, [Talents.T_STUN]={base=3, every=10, max=5}, },
}
@@ -77,7 +76,6 @@ newEntity{ base = "BASE_NPC_BONE_GIANT",
rarity = 3,
max_life = resolvers.rngavg(100,120),
combat_armor = 40, combat_def = 20,
- on_melee_hit = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
melee_project = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
autolevel = "warriormage",
resists = {all = 50},
@@ -92,7 +90,6 @@ newEntity{ base = "BASE_NPC_BONE_GIANT",
rarity = 3,
max_life = resolvers.rngavg(100,120),
combat_armor = 20, combat_def = 0,
- on_melee_hit = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
melee_project = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
resolvers.talents{ [Talents.T_BONE_ARMOUR]={base=3, every=10, max=5}, [Talents.T_THROW_BONES]={base=4, every=10, max=7}, [Talents.T_STUN]={base=3, every=10, max=5}, },
}
diff --git a/game/modules/tome/data/general/npcs/elven-warrior.lua b/game/modules/tome/data/general/npcs/elven-warrior.lua
index a8af9303549cff85fbe48ca228ff13f6f4405c06..b02c736c8b83a5db2d175c672ef43111a50d253f 100644
--- a/game/modules/tome/data/general/npcs/elven-warrior.lua
+++ b/game/modules/tome/data/general/npcs/elven-warrior.lua
@@ -42,7 +42,7 @@ newEntity{
open_door = true,
resolvers.racial(),
- resolvers.talents{ [Talents.T_ARMOUR_TRAINING]=3, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_WEAPONS_MASTERY]={base=1, every=10, max=5} },
+ resolvers.talents{ [Talents.T_ARMOUR_TRAINING]=3, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_WEAPONS_MASTERY]={base=0, every=10, max=5} },
autolevel = "warrior",
ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=3, },
diff --git a/game/modules/tome/data/general/npcs/ghost.lua b/game/modules/tome/data/general/npcs/ghost.lua
index f36a1ffb93c2aa824092fe95c3a34ab3b5207679..8b18662e02bbaafc188d45df0e84f23e0389eeab 100644
--- a/game/modules/tome/data/general/npcs/ghost.lua
+++ b/game/modules/tome/data/general/npcs/ghost.lua
@@ -137,7 +137,6 @@ newEntity{ base = "BASE_NPC_GHOST",
ai = "tactical",
combat_armor = 0, combat_def = resolvers.mbonus(10, 50),
- on_melee_hit = {[DamageType.BLIGHT]=resolvers.mbonus(25, 25)},
melee_project = {[DamageType.BLIGHT]=resolvers.mbonus(25, 25)},
stealth = resolvers.mbonus(50, 20),
diff --git a/game/modules/tome/data/general/npcs/horror.lua b/game/modules/tome/data/general/npcs/horror.lua
index 2c683d8f6e36664674ddba18f78103fc8df09fde..ac67246c0932d340e14fb327e1dab35e9b49278e 100644
--- a/game/modules/tome/data/general/npcs/horror.lua
+++ b/game/modules/tome/data/general/npcs/horror.lua
@@ -533,7 +533,6 @@ newEntity{ base = "BASE_NPC_HORROR",
ai = "tactical", ai_state = { ai_move="move_complex", talent_in=2, ally_compassion=0 },
- on_melee_hit = {[DamageType.PHYSICALBLEED]=resolvers.mbonus(14, 2)},
combat = { dam=resolvers.levelup(resolvers.rngavg(16,22), 1, 1.5), atk=resolvers.levelup(18, 1, 1), apr=4, dammod={wil=0.25, cun=0.1}, damtype=engine.DamageType.PHYSICALBLEED, },
combat_physspeed = 4, --Crazy fast attack rate
@@ -1088,7 +1087,6 @@ newEntity{ base = "BASE_NPC_HORROR",
ai = "tactical", ai_state = { ai_move="move_complex", talent_in=2, ally_compassion=0 },
- on_melee_hit = {[DamageType.PHYSICALBLEED]=resolvers.mbonus(12, 5)},
melee_project = {[DamageType.PHYSICALBLEED]=resolvers.mbonus(32, 5)},
combat = { dam=resolvers.levelup(resolvers.rngavg(20,28), 1, 1.5), physspeed = 0.25,atk=resolvers.levelup(24, 1.2, 1.2), apr=4, dammod={wil=0.3, cun=0.15}, damtype=engine.DamageType.PHYSICALBLEED, },
--combat_physspeed = 4, --Crazy fast attack rate
diff --git a/game/modules/tome/data/general/npcs/lich.lua b/game/modules/tome/data/general/npcs/lich.lua
index 6383b8600cc4ba87b321db8cd1c29c63d9755ae8..44dd26ff9fc18ed5d2f78aacb49de6b04d01dea3 100644
--- a/game/modules/tome/data/general/npcs/lich.lua
+++ b/game/modules/tome/data/general/npcs/lich.lua
@@ -184,7 +184,6 @@ newEntity{ base = "BASE_NPC_LICH",
rarity = 30,
max_life = resolvers.rngavg(100,150),
combat_armor = 0, combat_def = 45,
- on_melee_hit = {[DamageType.BLIGHT]=resolvers.mbonus(25, 30)},
vim_regen = 1,
ignore_direct_crits = 100,
diff --git a/game/modules/tome/data/general/npcs/plant.lua b/game/modules/tome/data/general/npcs/plant.lua
index 40bde331c36f36f33335980f89762a85f5700df4..0b8b0fbe5679e74e8ab7e65896ad4bcbf04dcb98 100644
--- a/game/modules/tome/data/general/npcs/plant.lua
+++ b/game/modules/tome/data/general/npcs/plant.lua
@@ -81,7 +81,6 @@ newEntity{ base = "BASE_NPC_PLANT",
combat = { dam=5, atk=15, apr=3, damtype=DamageType.POISON},
can_multiply = 2,
- on_melee_hit = {[DamageType.POISON]=10},
inc_damage = {all=-30},
talent_cd_reduction = {[Talents.T_POISONOUS_SPORES]=-20},
resolvers.talents{
diff --git a/game/modules/tome/data/general/npcs/skeleton.lua b/game/modules/tome/data/general/npcs/skeleton.lua
index af9291dcf0af94541fc9336bff739e0d0a3e3c2c..1c375e1d62bfdf4b42cdf1c19b1060a4996fd571 100644
--- a/game/modules/tome/data/general/npcs/skeleton.lua
+++ b/game/modules/tome/data/general/npcs/skeleton.lua
@@ -107,7 +107,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
max_life = resolvers.rngavg(90,100),
combat_armor = 5, combat_def = 1,
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}, },
+ 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=0, every=10, max=5}, },
ai_state = { talent_in=2, },
}
@@ -118,7 +118,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
rarity = 3,
max_life = resolvers.rngavg(70,80),
combat_armor = 5, combat_def = 1,
- resolvers.talents{ [Talents.T_BOW_MASTERY]={base=1, every=10, max=5}, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_SHOOT]=1, },
+ resolvers.talents{ [Talents.T_BOW_MASTERY]={base=0, every=10, max=5}, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_SHOOT]=1, },
ai_state = { talent_in=1, },
autolevel = "archer",
diff --git a/game/modules/tome/data/general/npcs/snow-giant.lua b/game/modules/tome/data/general/npcs/snow-giant.lua
index 914103cdd2042eeea938d55c25b2073526d631da..bf20c06f92dc0a5e0413135ce58082df6a18758f 100644
--- a/game/modules/tome/data/general/npcs/snow-giant.lua
+++ b/game/modules/tome/data/general/npcs/snow-giant.lua
@@ -45,7 +45,6 @@ newEntity{
no_breath = 1,
confusion_immune = 1,
- poison_immune = 1,
ingredient_on_death = "SNOW_GIANT_KIDNEY",
}
@@ -57,7 +56,6 @@ newEntity{ base = "BASE_NPC_SNOW_GIANT",
rarity = 1,
max_life = resolvers.rngavg(100,120),
combat_armor = 0, combat_def = 0,
- on_melee_hit = {[DamageType.COLD]=resolvers.mbonus(15, 5)},
melee_project = {[DamageType.COLD]=resolvers.mbonus(15, 5)},
resolvers.talents{ [Talents.T_MIND_DISRUPTION]={base=2, every=10, max=5}, },
}
@@ -70,7 +68,6 @@ newEntity{ base = "BASE_NPC_SNOW_GIANT",
rarity = 3,
max_life = resolvers.rngavg(100,120),
combat_armor = 0, combat_def = 0,
- on_melee_hit = {[DamageType.COLD]=resolvers.mbonus(15, 5)},
melee_project = {[DamageType.COLD]=resolvers.mbonus(15, 5)},
autolevel = "warriormage",
resolvers.talents{ [Talents.T_LIGHTNING]={base=3, every=6, max=6}, [Talents.T_CHAIN_LIGHTNING]={base=3, every=6, max=6}, },
@@ -84,7 +81,6 @@ newEntity{ base = "BASE_NPC_SNOW_GIANT",
rarity = 3,
max_life = resolvers.rngavg(100,120),
combat_armor = 0, combat_def = 0,
- on_melee_hit = {[DamageType.COLD]=resolvers.mbonus(15, 5)},
melee_project = {[DamageType.COLD]=resolvers.mbonus(15, 5)},
resolvers.talents{ [Talents.T_THROW_BOULDER]={base=3, every=6, max=6}, },
}
@@ -98,7 +94,6 @@ newEntity{ base = "BASE_NPC_SNOW_GIANT",
rank = 3,
max_life = resolvers.rngavg(150,170),
combat_armor = 12, combat_def = 12,
- on_melee_hit = {[DamageType.COLD]=resolvers.mbonus(15, 10)},
melee_project = {[DamageType.COLD]=resolvers.mbonus(15, 10)},
resolvers.talents{ [Talents.T_KNOCKBACK]={base=3, every=6, max=6}, [Talents.T_STUN]={base=3, every=6, max=6}, },
make_escort = {
@@ -123,7 +118,6 @@ newEntity{ base = "BASE_NPC_SNOW_GIANT",
life_rating = 25,
max_life = resolvers.rngavg(150,170),
combat_armor = 32, combat_def = 30,
- on_melee_hit = {[DamageType.COLD]=resolvers.mbonus(25, 20)},
melee_project = {[DamageType.COLD]=resolvers.mbonus(25, 20)},
resolvers.talents{
[Talents.T_KNOCKBACK]={base=4, every=6, max=10},
diff --git a/game/modules/tome/data/general/npcs/yaech.lua b/game/modules/tome/data/general/npcs/yaech.lua
index bf8ad129e854f59f3ac9a19a62ef49a798d83dfd..521c9da43ec098b33a9c834b21526f3ea1e23ea1 100644
--- a/game/modules/tome/data/general/npcs/yaech.lua
+++ b/game/modules/tome/data/general/npcs/yaech.lua
@@ -56,7 +56,7 @@ newEntity{ base = "BASE_NPC_YAECH",
},
resolvers.talents{
[Talents.T_KINETIC_SHIELD]={base=1, every=15, max=3},
- [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+ [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=10, max=5},
},
}
@@ -70,7 +70,7 @@ newEntity{ base = "BASE_NPC_YAECH",
{type="weapon", subtype="trident", autoreq=true, special_rarity="trident_rarity"},
},
resolvers.talents{
- [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+ [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=10, max=5},
[Talents.T_MINDHOOK]={base=1, every=7, max=5},
[Talents.T_PERFECT_CONTROL]={base=2, every=7, max=5},
},
@@ -90,7 +90,7 @@ newEntity{ base = "BASE_NPC_YAECH",
[Talents.T_KINETIC_AURA]={base=1, every=7, max=5},
[Talents.T_CHARGED_AURA]={base=1, every=7, max=5},
[Talents.T_KINETIC_SHIELD]={base=2, every=7, max=5},
- [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+ [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=10, max=5},
},
}
diff --git a/game/modules/tome/data/zones/murgol-lair/npcs.lua b/game/modules/tome/data/zones/murgol-lair/npcs.lua
index 51971656215cda5744f2b8dd995de9533d156d78..341bce5baed3bd3c80f585f51755b37e708e261f 100644
--- a/game/modules/tome/data/zones/murgol-lair/npcs.lua
+++ b/game/modules/tome/data/zones/murgol-lair/npcs.lua
@@ -122,7 +122,7 @@ newEntity{ base = "BASE_NPC_NAGA", define_as = "NAGA_TIDEWARDEN",
{type="weapon", subtype="trident", autoreq=true, force_drop=true, special_rarity="trident_rarity"},
},
resolvers.talents{
- [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=8, max=6},
+ [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=8, max=6},
[Talents.T_SPIT_POISON]={base=1, every=10, max=5},
},
}
@@ -191,7 +191,7 @@ newEntity{ base="BASE_NPC_NAGA", define_as = "NASHVA",
[Talents.T_SPIT_POISON]={base=2, every=10, max=5},
[Talents.T_CHARGE_LEECH]={base=2, every=10, max=5},
[Talents.T_DISTORTION_BOLT]={base=2, every=10, max=5},
- [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=8, max=6},
+ [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=8, max=6},
},
resolvers.inscriptions(1, {"movement infusion"}),
diff --git a/game/modules/tome/data/zones/reknor-escape/npcs.lua b/game/modules/tome/data/zones/reknor-escape/npcs.lua
index ac8797cf5eaed982325cd664e28057106d52ee22..5142d5d7a945e6dc93ac4257917ebe590ccbaead 100644
--- a/game/modules/tome/data/zones/reknor-escape/npcs.lua
+++ b/game/modules/tome/data/zones/reknor-escape/npcs.lua
@@ -20,7 +20,15 @@
load("/data/general/npcs/rodent.lua", rarity(0))
load("/data/general/npcs/vermin.lua", rarity(2))
load("/data/general/npcs/molds.lua", rarity(1))
-load("/data/general/npcs/orc.lua", function(e) if e.level_range and e.level_range[1] == 10 then e.level_range[1] = 1 e.start_level = 1 end end) -- Make orcs lower level, not a problem we have norgan to help!
+load("/data/general/npcs/orc.lua", function(e)
+ if e.level_range and e.level_range[1] == 10 then
+ e.level_range[1] = 1
+ e.start_level = 1
+ e.on_added_to_level = function(self) -- Avoid the frontloading of the new weapon mastery formula but don't impact Orcs later
+ self.talents.T_WEAPONS_MASTERY = nil
+ self.talents.T_BOW_MASTERY = nil
+ end
+ end end) -- Make orcs lower level, not a problem we have norgan to help!
load("/data/general/npcs/snake.lua", rarity(2))
load("/data/general/npcs/all.lua", rarity(4, 35))
@@ -62,7 +70,6 @@ newEntity{ define_as = "BROTOQ",
[Talents.T_CARRIER]=1,
[Talents.T_ACID_BLOOD]=1,
[Talents.T_REND]=2,
- [Talents.T_WEAPONS_MASTERY]=1,
},
resolvers.inscriptions(1, {"wild infusion"}),