From 0c46e1bffeb6dbe88d07de3087fe70dfe4219856 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 24 Sep 2012 19:08:05 +0000
Subject: [PATCH] Worm that Walks no longer has a casting speed bonus Dreaming
Horrors no longer know the talents Slumber and Restless Night Fixed a bug
that caused Night Terrors to create an infinite loop when spawned by Hammer
Toss
git-svn-id: http://svn.net-core.org/repos/t-engine4@5712 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../modules/tome/data/general/npcs/horror.lua | 9 +++---
.../tome/data/general/objects/egos/armor.lua | 30 ++++++++---------
.../tome/data/general/objects/egos/belt.lua | 22 ++++++-------
.../tome/data/general/objects/egos/boots.lua | 12 +++----
.../tome/data/general/objects/egos/cloak.lua | 20 ++++++------
.../data/general/objects/egos/heavy-armor.lua | 2 +-
.../tome/data/general/objects/egos/helm.lua | 18 +++++------
.../general/objects/egos/massive-armor.lua | 2 +-
.../tome/data/general/objects/egos/rings.lua | 16 +++++-----
.../tome/data/general/objects/egos/robe.lua | 32 +++++++++----------
.../tome/data/general/objects/egos/shield.lua | 10 +++---
.../data/general/objects/egos/wizard-hat.lua | 20 ++++++------
.../tome/data/talents/psionic/nightmare.lua | 2 +-
13 files changed, 97 insertions(+), 98 deletions(-)
diff --git a/game/modules/tome/data/general/npcs/horror.lua b/game/modules/tome/data/general/npcs/horror.lua
index 41c094c013..5661697f73 100644
--- a/game/modules/tome/data/general/npcs/horror.lua
+++ b/game/modules/tome/data/general/npcs/horror.lua
@@ -63,7 +63,6 @@ Each swing drips pestulant fluid before it, and each droplet writhes and wriggle
blind_immune = 1,
disease_immune = 1,
- combat_spellspeed = 1.3,
combat_spellpower = resolvers.levelup(10, 1, 1),
@@ -693,9 +692,9 @@ With each slow breath it takes reality distorts around it. Blue twirls into red
[Talents.T_LUCID_DREAMER]={base=4, every=12, max=8},
[Talents.T_DREAM_WALK]={base=4, every=12, max=8},
- [Talents.T_SLUMBER]={base=4, every=6, max=8},
+ -- [Talents.T_SLUMBER]={base=4, every=6, max=8},
[Talents.T_SLEEP]={base=4, every=6, max=8},
- [Talents.T_RESTLESS_NIGHT]={base=4, every=6, max=8},
+ -- [Talents.T_RESTLESS_NIGHT]={base=4, every=6, max=8},
[Talents.T_DREAMSCAPE]=10,
-- Summon Dream Seeds while awake
@@ -746,8 +745,8 @@ With each slow breath it takes reality distorts around it. Blue twirls into red
end
-- Script the AI to encourage opening with dream scape
elseif self.ai_target.actor and self.ai_target.actor.game_ender and not game.zone.is_dream_scape then
- if not self:isTalentCoolingDown(self.T_SLUMBER) then
- self:forceUseTalent(self.T_SLUMBER, {})
+ if not self:isTalentCoolingDown(self.T_SLEEP) then
+ self:forceUseTalent(self.T_SLEEP, {})
elseif not self:isTalentCoolingDown(self.T_DREAMSCAPE) and self.ai_target.actor:attr("sleep") then
self:forceUseTalent(self.T_DREAMSCAPE, {})
end
diff --git a/game/modules/tome/data/general/objects/egos/armor.lua b/game/modules/tome/data/general/objects/egos/armor.lua
index fbf4b273d3..0371e0532b 100644
--- a/game/modules/tome/data/general/objects/egos/armor.lua
+++ b/game/modules/tome/data/general/objects/egos/armor.lua
@@ -30,7 +30,7 @@ newEntity{
rarity = 5,
cost = 6,
wielder = {
- resists={[DamageType.FIRE] = resolvers.mbonus_material(30, 10)},
+ resists={[DamageType.FIRE] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -41,7 +41,7 @@ newEntity{
rarity = 5,
cost = 6,
wielder = {
- resists={[DamageType.COLD] = resolvers.mbonus_material(30, 10)},
+ resists={[DamageType.COLD] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -52,7 +52,7 @@ newEntity{
rarity = 5,
cost = 6,
wielder = {
- resists={[DamageType.ACID] = resolvers.mbonus_material(30, 10)},
+ resists={[DamageType.ACID] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -63,7 +63,7 @@ newEntity{
rarity = 5,
cost = 6,
wielder = {
- resists={[DamageType.LIGHTNING] = resolvers.mbonus_material(30, 10)},
+ resists={[DamageType.LIGHTNING] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -74,7 +74,7 @@ newEntity{
rarity = 10,
cost = 6,
wielder = {
- resists={[DamageType.TEMPORAL] = resolvers.mbonus_material(30, 10)},
+ resists={[DamageType.TEMPORAL] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -86,8 +86,8 @@ newEntity{
cost = 7,
wielder = {
resists={
- [DamageType.LIGHT] = resolvers.mbonus_material(20, 10),
- [DamageType.DARKNESS] = resolvers.mbonus_material(20, 10),
+ [DamageType.LIGHT] = resolvers.mbonus_material(10, 10),
+ [DamageType.DARKNESS] = resolvers.mbonus_material(10, 10),
},
},
}
@@ -100,7 +100,7 @@ newEntity{
cost = 7,
wielder = {
resists={
- [DamageType.NATURE] = resolvers.mbonus_material(20, 10),
+ [DamageType.NATURE] = resolvers.mbonus_material(10, 10),
[DamageType.BLIGHT] = resolvers.mbonus_material(10, 10),
},
},
@@ -114,7 +114,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_physresist = resolvers.mbonus_material(10, 5),
+ combat_physresist = resolvers.mbonus_material(15, 10),
},
}
newEntity{
@@ -125,7 +125,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_spellresist = resolvers.mbonus_material(10, 5),
+ combat_spellresist = resolvers.mbonus_material(15, 10),
},
}
newEntity{
@@ -136,7 +136,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_mentalresist = resolvers.mbonus_material(10, 5),
+ combat_mentalresist = resolvers.mbonus_material(15, 10),
},
}
@@ -209,7 +209,7 @@ newEntity{
power_source = {psionic=true},
name = "enlightening ", prefix=true, instant_resolve=true,
keywords = {enlight=true},
- level_range = {10, 50},
+ level_range = {20, 50},
greater_ego = 1,
rarity = 15,
cost = 30,
@@ -218,7 +218,7 @@ newEntity{
[Stats.STAT_WIL] = resolvers.mbonus_material(5, 1),
[Stats.STAT_CUN] = resolvers.mbonus_material(5, 1),
},
- combat_mentalresist = resolvers.mbonus_material(10, 5),
+ combat_mentalresist = resolvers.mbonus_material(15, 10),
},
}
newEntity{
@@ -233,7 +233,7 @@ newEntity{
inc_stats = {
[Stats.STAT_CUN] = resolvers.mbonus_material(5, 1),
},
- combat_mentalresist = resolvers.mbonus_material(10, 5),
+ combat_mentalresist = resolvers.mbonus_material(15, 10),
combat_armor = resolvers.mbonus_material(7, 3),
combat_def = resolvers.mbonus_material(10, 5),
},
@@ -258,7 +258,7 @@ newEntity{
power_source = {nature=true},
name = " of the deep", suffix=true, instant_resolve=true,
keywords = {deep=true},
- level_range = {10, 50},
+ level_range = {20, 50},
greater_ego = 1,
rarity = 90,
cost = 20,
diff --git a/game/modules/tome/data/general/objects/egos/belt.lua b/game/modules/tome/data/general/objects/egos/belt.lua
index 4d09c13d04..c400f9a5bb 100644
--- a/game/modules/tome/data/general/objects/egos/belt.lua
+++ b/game/modules/tome/data/general/objects/egos/belt.lua
@@ -135,7 +135,7 @@ newEntity{
rarity = 6,
cost = 5,
wielder = {
- combat_mentalresist = resolvers.mbonus_material(10, 2),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
},
}
@@ -147,7 +147,7 @@ newEntity{
rarity = 6,
cost = 5,
wielder = {
- combat_spellresist = resolvers.mbonus_material(10, 2),
+ combat_spellresist = resolvers.mbonus_material(10, 5),
},
}
@@ -159,7 +159,7 @@ newEntity{
rarity = 6,
cost = 5,
wielder = {
- combat_physresist = resolvers.mbonus_material(10, 2),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -174,7 +174,7 @@ newEntity{
wielder = {
combat_armor = resolvers.mbonus_material(10, 5),
combat_def = resolvers.mbonus_material(10, 5),
- combat_physresist = resolvers.mbonus_material(10, 2),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -229,7 +229,7 @@ newEntity{
},
size_category = 1,
combat_dam = resolvers.mbonus_material(5, 5),
- combat_physresist = resolvers.mbonus_material(7, 3),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -318,9 +318,9 @@ newEntity{
[Stats.STAT_WIL] = resolvers.mbonus_material(3, 1),
[Stats.STAT_CUN] = resolvers.mbonus_material(3, 1),
},
- combat_mentalresist = resolvers.mbonus_material(3, 3),
- combat_physresist = resolvers.mbonus_material(3, 3),
- combat_spellresist = resolvers.mbonus_material(3, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
+ combat_physresist = resolvers.mbonus_material(10, 5),
+ combat_spellresist = resolvers.mbonus_material(10, 5),
},
}
@@ -387,7 +387,7 @@ newEntity{
inc_stats = {
[Stats.STAT_CON] = resolvers.mbonus_material(5, 1),
},
- combat_mentalresist = resolvers.mbonus_material(7, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
combat_mindpower = resolvers.mbonus_material(7, 3),
},
}
@@ -450,7 +450,7 @@ newEntity{
inc_stats = {
[Stats.STAT_WIL] = resolvers.mbonus_material(5, 1),
},
- combat_mentalresist = resolvers.mbonus_material(3, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
max_life = resolvers.mbonus_material(70, 40),
},
}
@@ -467,7 +467,7 @@ newEntity{
inc_stats = {
[Stats.STAT_CON] = resolvers.mbonus_material(6, 4),
},
- combat_physresist = resolvers.mbonus_material(7, 3),
+ combat_physresist = resolvers.mbonus_material(10, 5),
max_stamina = resolvers.mbonus_material(30, 10),
},
}
\ No newline at end of file
diff --git a/game/modules/tome/data/general/objects/egos/boots.lua b/game/modules/tome/data/general/objects/egos/boots.lua
index 1900f5ced7..d1a5134ca5 100644
--- a/game/modules/tome/data/general/objects/egos/boots.lua
+++ b/game/modules/tome/data/general/objects/egos/boots.lua
@@ -29,7 +29,7 @@ newEntity{
rarity = 12,
cost = 12,
wielder = {
- combat_physresist = resolvers.mbonus_material(10, 2),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -267,8 +267,8 @@ newEntity{
inc_stats = {
[Stats.STAT_CON] = resolvers.mbonus_material(5, 1),
},
- combat_mentalresist = resolvers.mbonus_material(3, 3),
- combat_physresist = resolvers.mbonus_material(3, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -409,9 +409,9 @@ newEntity{
rarity = 15,
cost = 30,
wielder = {
- combat_spellresist = resolvers.mbonus_material(3, 3),
- combat_mentalresist = resolvers.mbonus_material(3, 3),
- combat_physresist = resolvers.mbonus_material(3, 3),
+ combat_spellresist = resolvers.mbonus_material(10, 5),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
diff --git a/game/modules/tome/data/general/objects/egos/cloak.lua b/game/modules/tome/data/general/objects/egos/cloak.lua
index ce2ec9bd4a..e03d6a9f47 100644
--- a/game/modules/tome/data/general/objects/egos/cloak.lua
+++ b/game/modules/tome/data/general/objects/egos/cloak.lua
@@ -125,7 +125,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_physresist = resolvers.mbonus_material(10, 2),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -137,7 +137,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_spellresist = resolvers.mbonus_material(10, 2),
+ combat_spellresist = resolvers.mbonus_material(10, 5),
},
}
@@ -149,7 +149,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_mentalresist = resolvers.mbonus_material(10, 2),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
},
}
@@ -162,8 +162,8 @@ newEntity{
rarity = 16,
cost = 50,
wielder = {
- combat_physresist = resolvers.mbonus_material(5, 5),
- combat_mentalresist = resolvers.mbonus_material(5, 5),
+ combat_physresist = resolvers.mbonus_material(10, 5),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
},
}
@@ -187,7 +187,7 @@ newEntity{
rarity = 5,
cost = 6,
wielder = {
- combat_def = resolvers.mbonus_material(10, 2),
+ combat_def = resolvers.mbonus_material(10, 5),
},
}
@@ -215,7 +215,7 @@ newEntity{
inc_stats = {
[Stats.STAT_WIL] = resolvers.mbonus_material(2, 2),
},
- combat_mentalresist = resolvers.mbonus_material(10, 2),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
},
}
@@ -270,7 +270,7 @@ newEntity{
[Stats.STAT_CON] = resolvers.mbonus_material(5, 1),
},
combat_spellresist = resolvers.mbonus_material(20, 10, function(e, v) return 0, -v end),
- stamina_regen = resolvers.mbonus_material(12, 3, function(e, v) v=v/10 return 0, -v end),
+ stamina_regen = resolvers.mbonus_material(12, 3, function(e, v) v=v/10 return 0, v end),
mana_regen = resolvers.mbonus_material(50, 10, function(e, v) v=v/100 return 0, -v end),
talents_types_mastery = {
["technique/combat-training"] = resolvers.mbonus_material(2, 2, function(e, v) v=v/10 return 0, v end),
@@ -325,7 +325,7 @@ newEntity{
[Stats.STAT_MAG] = resolvers.mbonus_material(5, 1),
[Stats.STAT_WIL] = resolvers.mbonus_material(5, 1),
},
- combat_spellresist = resolvers.mbonus_material(4, 1),
+ combat_spellresist = resolvers.mbonus_material(10, 5),
max_mana = resolvers.mbonus_material(40, 40),
},
}
@@ -343,7 +343,7 @@ newEntity{
[Stats.STAT_STR] = resolvers.mbonus_material(5, 1),
[Stats.STAT_CON] = resolvers.mbonus_material(5, 1),
},
- combat_physresist = resolvers.mbonus_material(4, 1),
+ combat_physresist = resolvers.mbonus_material(10, 5),
max_life = resolvers.mbonus_material(70, 40),
},
}
diff --git a/game/modules/tome/data/general/objects/egos/heavy-armor.lua b/game/modules/tome/data/general/objects/egos/heavy-armor.lua
index 8e9993f6bf..949282dfb9 100644
--- a/game/modules/tome/data/general/objects/egos/heavy-armor.lua
+++ b/game/modules/tome/data/general/objects/egos/heavy-armor.lua
@@ -31,7 +31,7 @@ newEntity{
rarity = 8,
cost = 7,
wielder = {
- combat_armor = resolvers.mbonus_material(12, 3),
+ combat_armor = resolvers.mbonus_material(15, 5),
},
}
diff --git a/game/modules/tome/data/general/objects/egos/helm.lua b/game/modules/tome/data/general/objects/egos/helm.lua
index ba851b3b4d..637ddf180e 100644
--- a/game/modules/tome/data/general/objects/egos/helm.lua
+++ b/game/modules/tome/data/general/objects/egos/helm.lua
@@ -71,7 +71,7 @@ newEntity{
cost = 10,
wielder = {
inc_stats = { [Stats.STAT_WIL] = resolvers.mbonus_material(2, 1) },
- combat_mentalresist = resolvers.mbonus_material(3, 3),
+ combat_mentalresist = resolvers.mbonus_material(5, 5),
},
}
newEntity{
@@ -180,7 +180,7 @@ newEntity{
rarity = 6,
cost = 5,
wielder = {
- combat_physresist = resolvers.mbonus_material(7, 3),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -260,7 +260,7 @@ newEntity{
cost = 50,
wielder = {
combat_dam = resolvers.mbonus_material(6, 6),
- combat_physresist = resolvers.mbonus_material(3, 3),
+ combat_physresist = resolvers.mbonus_material(10, 5),
inc_stats = {
[Stats.STAT_WIL] = resolvers.mbonus_material(4, 3),
},
@@ -278,7 +278,7 @@ newEntity{
wielder = {
combat_armor = resolvers.mbonus_material(5, 4),
combat_def = resolvers.mbonus_material(4, 4),
- combat_physresist = resolvers.mbonus_material(7, 3),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -334,7 +334,7 @@ newEntity{
resists={
[DamageType.MIND] = resolvers.mbonus_material(15, 5),
},
- combat_mentalresist = resolvers.mbonus_material(7, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
},
}
@@ -351,7 +351,7 @@ newEntity{
[Stats.STAT_STR] = resolvers.mbonus_material(5, 1),
[Stats.STAT_WIL] = resolvers.mbonus_material(5, 1),
},
- combat_mentalresist = resolvers.mbonus_material(7, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
lite = resolvers.mbonus_material(1, 1),
},
}
@@ -446,7 +446,7 @@ newEntity{
[DamageType.BLIGHT] = resolvers.mbonus_material(10, 5),
[DamageType.DARKNESS] = resolvers.mbonus_material(10, 5),
},
- combat_mentalresist = resolvers.mbonus_material(7, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
},
}
@@ -463,7 +463,7 @@ newEntity{
inc_stats = {
[Stats.STAT_STR] = resolvers.mbonus_material(5, 1),
},
- combat_mentalresist = resolvers.mbonus_material(7, 3),
- combat_physresist = resolvers.mbonus_material(7, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
diff --git a/game/modules/tome/data/general/objects/egos/massive-armor.lua b/game/modules/tome/data/general/objects/egos/massive-armor.lua
index a91f8b59af..500e599ea6 100644
--- a/game/modules/tome/data/general/objects/egos/massive-armor.lua
+++ b/game/modules/tome/data/general/objects/egos/massive-armor.lua
@@ -58,7 +58,7 @@ newEntity{
rarity = 8,
cost = 7,
wielder = {
- combat_armor = resolvers.mbonus_material(12, 3),
+ combat_armor = resolvers.mbonus_material(15, 5),
},
}
diff --git a/game/modules/tome/data/general/objects/egos/rings.lua b/game/modules/tome/data/general/objects/egos/rings.lua
index 541843aeeb..e79acc34f7 100644
--- a/game/modules/tome/data/general/objects/egos/rings.lua
+++ b/game/modules/tome/data/general/objects/egos/rings.lua
@@ -321,7 +321,7 @@ newEntity{
wielder = {
inc_stats = { [Stats.STAT_STR] = resolvers.mbonus_material(8, 2) },
},
- resolvers.genericlast(function(e) e.wielder.combat_armor = (e.wielder.combat_armor or 0) + e.wielder.inc_stats[engine.interface.ActorStats.STAT_STR] end),
+ resolvers.genericlast(function(e) e.wielder.combat_armor = (e.wielder.combat_armor or 0) + (e.wielder.inc_stats[engine.interface.ActorStats.STAT_STR]*2) end),
}
newEntity{
power_source = {technique=true},
@@ -333,7 +333,7 @@ newEntity{
wielder = {
inc_stats = { [Stats.STAT_CUN] = resolvers.mbonus_material(8, 2) },
},
- resolvers.genericlast(function(e) e.wielder.combat_def = (e.wielder.combat_def or 0) + e.wielder.inc_stats[engine.interface.ActorStats.STAT_CUN] end),
+ resolvers.genericlast(function(e) e.wielder.combat_def = (e.wielder.combat_def or 0) + (e.wielder.inc_stats[engine.interface.ActorStats.STAT_CUN]*2) end),
}
newEntity{
power_source = {technique=true},
@@ -345,7 +345,7 @@ newEntity{
wielder = {
inc_stats = { [Stats.STAT_DEX] = resolvers.mbonus_material(8, 2) },
},
- resolvers.genericlast(function(e) e.wielder.combat_atk = (e.wielder.combat_atk or 0) + e.wielder.inc_stats[engine.interface.ActorStats.STAT_DEX] end),
+ resolvers.genericlast(function(e) e.wielder.combat_atk = (e.wielder.combat_atk or 0) + (e.wielder.inc_stats[engine.interface.ActorStats.STAT_DEX]*2) end),
}
newEntity{
power_source = {nature=true},
@@ -357,7 +357,7 @@ newEntity{
wielder = {
inc_stats = { [Stats.STAT_CON] = resolvers.mbonus_material(8, 2) },
},
- resolvers.genericlast(function(e) e.wielder.combat_physresist = (e.wielder.combat_physresist or 0) + e.wielder.inc_stats[engine.interface.ActorStats.STAT_CON] end),
+ resolvers.genericlast(function(e) e.wielder.combat_physresist = (e.wielder.combat_physresist or 0) + (e.wielder.inc_stats[engine.interface.ActorStats.STAT_CON]*2) end),
}
newEntity{
@@ -370,7 +370,7 @@ newEntity{
wielder = {
inc_stats = { [Stats.STAT_MAG] = resolvers.mbonus_material(8, 2) },
},
- resolvers.genericlast(function(e) e.wielder.combat_spellresist = (e.wielder.combat_spellresist or 0) + e.wielder.inc_stats[engine.interface.ActorStats.STAT_MAG] end),
+ resolvers.genericlast(function(e) e.wielder.combat_spellresist = (e.wielder.combat_spellresist or 0) + (e.wielder.inc_stats[engine.interface.ActorStats.STAT_MAG]*2) end),
}
newEntity{
@@ -383,7 +383,7 @@ newEntity{
wielder = {
inc_stats = { [Stats.STAT_WIL] = resolvers.mbonus_material(8, 2) },
},
- resolvers.genericlast(function(e) e.wielder.combat_mentalresist = (e.wielder.combat_mentalresist or 0) + e.wielder.inc_stats[engine.interface.ActorStats.STAT_WIL] end),
+ resolvers.genericlast(function(e) e.wielder.combat_mentalresist = (e.wielder.combat_mentalresist or 0) + (e.wielder.inc_stats[engine.interface.ActorStats.STAT_WIL]*2) end),
}
newEntity{
power_source = {technique=true},
@@ -503,7 +503,7 @@ newEntity{
inc_stats = {
[Stats.STAT_CON] = resolvers.mbonus_material(5, 1),
},
- combat_spellresist = resolvers.mbonus_material(7, 3),
+ combat_spellresist = resolvers.mbonus_material(10, 5),
max_stamina = resolvers.mbonus_material(30, 10),
},
}
@@ -522,7 +522,7 @@ newEntity{
},
poison_immune = resolvers.mbonus_material(15, 10, function(e, v) v=v/100 return 0, v end),
disease_immune = resolvers.mbonus_material(15, 10, function(e, v) v=v/100 return 0, v end),
- combat_physresist = resolvers.mbonus_material(7, 3),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
diff --git a/game/modules/tome/data/general/objects/egos/robe.lua b/game/modules/tome/data/general/objects/egos/robe.lua
index 25a048372c..5d12263c65 100644
--- a/game/modules/tome/data/general/objects/egos/robe.lua
+++ b/game/modules/tome/data/general/objects/egos/robe.lua
@@ -36,7 +36,7 @@ newEntity{
inc_damage = { [DamageType.FIRE] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.FIRE] = (e.wielder.resists[engine.DamageType.FIRE] or 0) + (e.wielder.inc_damage[engine.DamageType.FIRE]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.FIRE] = (e.wielder.resists[engine.DamageType.FIRE] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.FIRE]*1.5) end),
}
newEntity{
@@ -50,7 +50,7 @@ newEntity{
inc_damage = { [DamageType.COLD] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.COLD] = (e.wielder.resists[engine.DamageType.COLD] or 0) + (e.wielder.inc_damage[engine.DamageType.COLD]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.COLD] = (e.wielder.resists[engine.DamageType.COLD] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.COLD]*1.5) end),
}
newEntity{
@@ -64,7 +64,7 @@ newEntity{
inc_damage = { [DamageType.NATURE] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.NATURE] = (e.wielder.resists[engine.DamageType.NATURE] or 0) + (e.wielder.inc_damage[engine.DamageType.NATURE]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.NATURE] = (e.wielder.resists[engine.DamageType.NATURE] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.NATURE]*1.5) end),
}
newEntity{
@@ -78,7 +78,7 @@ newEntity{
inc_damage = { [DamageType.LIGHTNING] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHTNING] = (e.wielder.resists[engine.DamageType.LIGHTNING] or 0) + (e.wielder.inc_damage[engine.DamageType.LIGHTNING]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHTNING] = (e.wielder.resists[engine.DamageType.LIGHTNING] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.LIGHTNING]*1.5) end),
}
newEntity{
@@ -92,7 +92,7 @@ newEntity{
inc_damage = { [DamageType.LIGHT] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHT] = (e.wielder.resists[engine.DamageType.LIGHT] or 0) + (e.wielder.inc_damage[engine.DamageType.LIGHT]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHT] = (e.wielder.resists[engine.DamageType.LIGHT] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.LIGHT]*1.5) end),
}
newEntity{
@@ -106,7 +106,7 @@ newEntity{
inc_damage = { [DamageType.DARKNESS] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.DARKNESS] = (e.wielder.resists[engine.DamageType.DARKNESS] or 0) + (e.wielder.inc_damage[engine.DamageType.DARKNESS]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.DARKNESS] = (e.wielder.resists[engine.DamageType.DARKNESS] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.DARKNESS]*1.5) end),
}
newEntity{
@@ -120,7 +120,7 @@ newEntity{
inc_damage = { [DamageType.ACID] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.ACID] = (e.wielder.resists[engine.DamageType.ACID] or 0) + (e.wielder.inc_damage[engine.DamageType.ACID]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.ACID] = (e.wielder.resists[engine.DamageType.ACID] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.ACID]*1.5) end),
}
-- rare resists
@@ -202,7 +202,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_physresist = resolvers.mbonus_material(20, 10),
+ combat_physresist = resolvers.mbonus_material(15, 15),
},
}
newEntity{
@@ -213,7 +213,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_spellresist = resolvers.mbonus_material(20, 10),
+ combat_spellresist = resolvers.mbonus_material(15, 15),
},
}
newEntity{
@@ -224,7 +224,7 @@ newEntity{
rarity = 7,
cost = 6,
wielder = {
- combat_mentalresist = resolvers.mbonus_material(20, 10),
+ combat_mentalresist = resolvers.mbonus_material(15, 15),
},
}
newEntity{
@@ -236,9 +236,9 @@ newEntity{
rarity = 30,
cost = 60,
wielder = {
- combat_physresist = resolvers.mbonus_material(10, 5),
- combat_spellresist = resolvers.mbonus_material(10, 5),
- combat_mentalresist = resolvers.mbonus_material(20, 10),
+ combat_physresist = resolvers.mbonus_material(10, 10),
+ combat_spellresist = resolvers.mbonus_material(10, 10),
+ combat_mentalresist = resolvers.mbonus_material(20, 20),
},
}
newEntity{
@@ -250,9 +250,9 @@ newEntity{
rarity = 30,
cost = 60,
wielder = {
- combat_physresist = resolvers.mbonus_material(10, 5),
- combat_mentalresist = resolvers.mbonus_material(10, 5),
- combat_spellresist = resolvers.mbonus_material(20, 10),
+ combat_physresist = resolvers.mbonus_material(10, 10),
+ combat_mentalresist = resolvers.mbonus_material(10, 10),
+ combat_spellresist = resolvers.mbonus_material(20, 20),
},
}
diff --git a/game/modules/tome/data/general/objects/egos/shield.lua b/game/modules/tome/data/general/objects/egos/shield.lua
index ffa0727a30..7de53ebd52 100644
--- a/game/modules/tome/data/general/objects/egos/shield.lua
+++ b/game/modules/tome/data/general/objects/egos/shield.lua
@@ -34,7 +34,7 @@ newEntity{
rarity = 5,
cost = 4,
wielder = {
- resists={[DamageType.FIRE] = resolvers.mbonus_material(20, 20)},
+ resists={[DamageType.FIRE] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -45,7 +45,7 @@ newEntity{
rarity = 5,
cost = 4,
wielder = {
- resists={[DamageType.COLD] = resolvers.mbonus_material(20, 20)},
+ resists={[DamageType.COLD] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -56,7 +56,7 @@ newEntity{
rarity = 5,
cost = 4,
wielder = {
- resists={[DamageType.ACID] = resolvers.mbonus_material(20, 20)},
+ resists={[DamageType.ACID] = resolvers.mbonus_material(15, 15)},
},
}
newEntity{
@@ -67,7 +67,7 @@ newEntity{
rarity = 5,
cost = 4,
wielder = {
- resists={[DamageType.LIGHTNING] = resolvers.mbonus_material(20, 20)},
+ resists={[DamageType.LIGHTNING] = resolvers.mbonus_material(15, 15)},
},
}
-- rare resists
@@ -101,7 +101,7 @@ newEntity{
rarity = 12,
cost = 4,
wielder = {
- resists={[DamageType.MIND] = resolvers.mbonus_material(10, 10)},
+ resists={[DamageType.PHYSICAL] = resolvers.mbonus_material(10, 10)},
},
}
newEntity{
diff --git a/game/modules/tome/data/general/objects/egos/wizard-hat.lua b/game/modules/tome/data/general/objects/egos/wizard-hat.lua
index 29a01cf1dd..695743bc8e 100644
--- a/game/modules/tome/data/general/objects/egos/wizard-hat.lua
+++ b/game/modules/tome/data/general/objects/egos/wizard-hat.lua
@@ -276,7 +276,7 @@ newEntity{
rarity = 6,
cost = 5,
wielder = {
- combat_physresist = resolvers.mbonus_material(7, 3),
+ combat_physresist = resolvers.mbonus_material(10, 5),
},
}
@@ -288,7 +288,7 @@ newEntity{
rarity = 6,
cost = 5,
wielder = {
- combat_mentalresist = resolvers.mbonus_material(7, 3),
+ combat_mentalresist = resolvers.mbonus_material(10, 5),
},
}
@@ -300,7 +300,7 @@ newEntity{
rarity = 6,
cost = 5,
wielder = {
- combat_spellresist = resolvers.mbonus_material(7, 3),
+ combat_spellresist = resolvers.mbonus_material(10, 5),
},
}
@@ -334,7 +334,7 @@ newEntity{
inc_damage = { [DamageType.FIRE] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.FIRE] = (e.wielder.resists[engine.DamageType.FIRE] or 0) + (e.wielder.inc_damage[engine.DamageType.FIRE]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.FIRE] = (e.wielder.resists[engine.DamageType.FIRE] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.FIRE]*1.5) end),
}
newEntity{
@@ -348,7 +348,7 @@ newEntity{
inc_damage = { [DamageType.COLD] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.COLD] = (e.wielder.resists[engine.DamageType.COLD] or 0) + (e.wielder.inc_damage[engine.DamageType.COLD]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.COLD] = (e.wielder.resists[engine.DamageType.COLD] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.COLD]*1.5) end),
}
newEntity{
@@ -362,7 +362,7 @@ newEntity{
inc_damage = { [DamageType.NATURE] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.NATURE] = (e.wielder.resists[engine.DamageType.NATURE] or 0) + (e.wielder.inc_damage[engine.DamageType.NATURE]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.NATURE] = (e.wielder.resists[engine.DamageType.NATURE] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.NATURE]*1.5) end),
}
newEntity{
@@ -376,7 +376,7 @@ newEntity{
inc_damage = { [DamageType.LIGHTNING] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHTNING] = (e.wielder.resists[engine.DamageType.LIGHTNING] or 0) + (e.wielder.inc_damage[engine.DamageType.LIGHTNING]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHTNING] = (e.wielder.resists[engine.DamageType.LIGHTNING] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.LIGHTNING]*1.5) end),
}
newEntity{
@@ -390,7 +390,7 @@ newEntity{
inc_damage = { [DamageType.LIGHT] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHT] = (e.wielder.resists[engine.DamageType.LIGHT] or 0) + (e.wielder.inc_damage[engine.DamageType.LIGHT]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHT] = (e.wielder.resists[engine.DamageType.LIGHT] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.LIGHT]*1.5) end),
}
newEntity{
@@ -404,7 +404,7 @@ newEntity{
inc_damage = { [DamageType.DARKNESS] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.DARKNESS] = (e.wielder.resists[engine.DamageType.DARKNESS] or 0) + (e.wielder.inc_damage[engine.DamageType.DARKNESS]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.DARKNESS] = (e.wielder.resists[engine.DamageType.DARKNESS] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.DARKNESS]*1.5) end),
}
newEntity{
@@ -418,7 +418,7 @@ newEntity{
inc_damage = { [DamageType.ACID] = resolvers.mbonus_material(10, 10) },
resists = {},
},
- resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.ACID] = (e.wielder.resists[engine.DamageType.ACID] or 0) + (e.wielder.inc_damage[engine.DamageType.ACID]*2) end),
+ resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.ACID] = (e.wielder.resists[engine.DamageType.ACID] or 0) + math.floor(e.wielder.inc_damage[engine.DamageType.ACID]*1.5) end),
}
-- rare resists
diff --git a/game/modules/tome/data/talents/psionic/nightmare.lua b/game/modules/tome/data/talents/psionic/nightmare.lua
index c5b2bd4dc3..88bc0b7b78 100644
--- a/game/modules/tome/data/talents/psionic/nightmare.lua
+++ b/game/modules/tome/data/talents/psionic/nightmare.lua
@@ -317,7 +317,7 @@ newTalent{
m:resolve() m:resolve(nil, true)
m:forceLevelup(self.level)
- game.zone:addEntity(game.level, m, "actor", x, y)
+ game:onTickEnd(function()game.zone:addEntity(game.level, m, "actor", x, y) end)
game.level.map:particleEmitter(x, y, 1, "generic_teleport", {rm=60, rM=130, gm=20, gM=110, bm=90, bM=130, am=70, aM=180})
if game.party:hasMember(self) then
--
GitLab