From 2be02293f223f71824357f4d3f03b5ba9cd7441f Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Tue, 11 Feb 2014 23:29:49 +0100
Subject: [PATCH] please pure, please, make changelogs
---
.../tome/data/general/objects/egos/shield.lua | 3 ++-
.../data/general/objects/egos/wizard-hat.lua | 4 ++--
.../data/general/objects/world-artifacts.lua | 7 +++----
.../tome/data/talents/psionic/discharge.lua | 2 +-
.../tome/data/zones/rak-shor-pride/npcs.lua | 18 ++++++++++--------
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/game/modules/tome/data/general/objects/egos/shield.lua b/game/modules/tome/data/general/objects/egos/shield.lua
index e807e56cb9..e80bd19981 100644
--- a/game/modules/tome/data/general/objects/egos/shield.lua
+++ b/game/modules/tome/data/general/objects/egos/shield.lua
@@ -589,7 +589,7 @@ newEntity{
greater_ego = 1,
rarity = 25,
cost = 40,
- resolvers.charmt(Talents.T_STONE_WALL, {2,3,4,5}, 40),
+-- resolvers.charmt(Talents.T_STONE_WALL, {2,3,4,5}, 40),
special_combat = {
melee_project={
[DamageType.PHYSICAL] = resolvers.mbonus_material(10, 10)
@@ -598,6 +598,7 @@ newEntity{
wielder = {
combat_armor = resolvers.mbonus_material(10, 5),
combat_armor_hardiness = resolvers.mbonus_material(5, 5),
+ resists={[DamageType.PHYSICAL] = resolvers.mbonus_material(10, 10)},
},
}
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 bfee406376..43582cc424 100644
--- a/game/modules/tome/data/general/objects/egos/wizard-hat.lua
+++ b/game/modules/tome/data/general/objects/egos/wizard-hat.lua
@@ -198,7 +198,7 @@ newEntity{
keywords = {Brotherhood=true},
level_range = {30, 50},
greater_ego = 1,
- rarity = 35,
+ rarity = 25,
cost = 40,
resolvers.charmt(Talents.T_ARCANE_EYE, 5, 10),
wielder = {
@@ -220,7 +220,7 @@ newEntity{
greater_ego = 1,
rarity = 35,
cost = 20,
- resolvers.charmt(Talents.T_STONE_WALL, {1,2,3}, 80),
+ resolvers.charmt(Talents.T_STONE_WALL, 1, 80),
wielder = {
inc_stats = {
[Stats.STAT_CON] = resolvers.mbonus_material(5, 1),
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index e4fba5c8f1..022f26d93e 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -2977,7 +2977,7 @@ newEntity{ base = "BASE_LONGSWORD",
damage_convert = {[DamageType.MIND]=20,},
special_on_hit = {desc="torments the target with many mental effects", fct=function(combat, who, target)
if not who:checkHit(who:combatMindpower(), target:combatMentalResist()*0.9) then return end
- target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=18})
+ target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=0, save=20})
if not rng.percent(40) then return end
local eff = rng.table{"stun", "malign", "agony", "confusion", "silence",}
if not target:canBe(eff) then return end
@@ -3019,8 +3019,7 @@ newEntity{ base = "BASE_LONGSWORD",
local target = game.level.map(px, py, engine.Map.ACTOR)
if not target then return end
if not rng.percent(20) then return end
- if not who:checkHit(who:combatMindpower(), target:combatMentalResist()) then return end
- target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=5})
+ target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=0, save=5})
who:logCombat(target, "Anmalice focuses its mind-piercing eye on #Target#!")
end)
end,
@@ -3032,7 +3031,7 @@ newEntity{ base = "BASE_LONGSWORD",
game.logPlayer(who, "#CRIMSON#The tentacles release your arm, sated.")
else
game.logPlayer(who, "#CRIMSON#As you tear the tentacles from your arm, horrible images enter your mind!")
- who:setEffect(who.EFF_WEAKENED_MIND, 15, {power=25})
+ who:setEffect(who.EFF_WEAKENED_MIND, 15, {power=0, save=25})
who:setEffect(who.EFF_AGONY, 5, { src=who, damage=15, mindpower=40, range=10, minPercent=10, duration=5})
end
self.wielder.combat_mentalresist = -30
diff --git a/game/modules/tome/data/talents/psionic/discharge.lua b/game/modules/tome/data/talents/psionic/discharge.lua
index 7b184a1fba..7548e0be70 100644
--- a/game/modules/tome/data/talents/psionic/discharge.lua
+++ b/game/modules/tome/data/talents/psionic/discharge.lua
@@ -216,6 +216,6 @@ newTalent{
local crit_bonus = t.getCritBonus(self, t)
return ([[Focus your mind on a single target, diverting all offensive Discharge talent effects to it for %d turns. While this effect is active, all Discharge talents gain %d%% critical power.
If the target is killed, the effect will end early.
- The damage bonus will scale with your Mindpower.]]):format(duration, damDesc(self, DamageType.MIND, crit_bonus))
+ The damage bonus will scale with your Mindpower.]]):format(duration, crit_bonus)
end,
}
\ No newline at end of file
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 96475482bc..c90cc85e9e 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
@@ -110,7 +110,7 @@ newEntity{ base = "BASE_NPC_GHOUL", define_as = "ROTTING_TITAN",
resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_ghoul_rotting_titan.png", display_h=2, display_y=-1}}},
desc = [[This gigantic mass of flesh and stone moves slowly, the ground rumbling with each step it takes. Its body seems to constantly pulsate and reform. Massive stones at the end of each limb form massive blunt weapons.]],
level_range = {45, nil}, exp_worth = 2,
- rarity = 28,
+ rarity = 25,
max_life = resolvers.rngavg(150,200), life_rating = 40,
combat_armor = 40, combat_def = 10,
ai_state = { talent_in=2 },
@@ -125,8 +125,10 @@ newEntity{ base = "BASE_NPC_GHOUL", define_as = "ROTTING_TITAN",
ai = "tactical",
ai_tactic = resolvers.tactic"melee",
autolevel="warriormage",
-
- can_pass = {pass_wall=70}, --So AI knows to try and pass walls.
+
+ on_added_to_level = function(self)
+ self.can_pass = {pass_wall=70} --Added after birth so it doesn't spawn inside a wall.
+ end,
stats = { str=40, dex=20, mag=24, con=25 },
resists = {all = 25, [DamageType.PHYSICAL]=15, [DamageType.ARCANE]=-50, [DamageType.FIRE]=-20},
@@ -182,7 +184,7 @@ newEntity{ base = "BASE_NPC_GHOST", define_as = "GLACIAL_LEGION",
resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_ghost_glacial_legion.png", display_h=2, display_y=-1}}},
desc = [[A massive, shifting, ethereal form floats in the air around an orb of frozen blood. Vapor pools on the floor beneath it.]],
level_range = {45, nil}, exp_worth = 2,
- rarity = 28,
+ rarity = 25,
size_category=5,
rank = 3.5,
max_life = resolvers.rngavg(90,100), life_rating = 18,
@@ -246,7 +248,7 @@ newEntity{ base = "BASE_NPC_BONE_GIANT", define_as = "HEAVY_SENTINEL",
desc = [[A towering creature, made from the bones of countless bodies. An aura of flame bellows from within its chest.]],
resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_giant_heavy_sentinel.png", display_h=2, display_y=-1}}},
level_range = {45, nil}, exp_worth = 2,
- rarity = 28,
+ rarity = 25,
rank = 3.5,
ai = "tactical",
size=5,
@@ -292,7 +294,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE", unique=true, define_as="ARCH_ZEPHYR",
resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_vampire_arch_zephyr.png", display_h=2, display_y=-1}}},
desc=[[The robes of this ancient vampire billow with intense winds. Bolts of lightning arc along its body. In its hand it holds a bow, electricity streaking across it.]],
level_range = {45, nil}, exp_worth = 1,
- rarity = 28,
+ rarity = 25,
autolevel="warriormage",
stats = { str=24, dex=40, mag=24, con=20 },
max_life = resolvers.rngavg(100,120), life_rating=25,
@@ -345,7 +347,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
desc=[[Intense Arcane energy whirls in the air around this ethereal form. ]],
level_range = {45, nil}, exp_worth = 2,
life_rating=16,
- rarity = 28,
+ rarity = 25,
rank = 3.5,
max_life = resolvers.rngavg(200,300),
max_mana = resolvers.rngavg(800,1200),
@@ -368,7 +370,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
[Talents.T_ARCANE_VORTEX]={base=4, every=4, max=7},
[Talents.T_SPELLCRAFT]=5,
[Talents.T_AETHER_BEAM]={base=6, every=7, max=9},
- [Talents.T_AETHER_BREACH]={base=3, every=6, max=6},
+ [Talents.T_AETHER_BREACH]={base=4, every=6, max=8},
[Talents.T_HEAL]={base=3, every=6, max=6},
[Talents.T_SHIELDING]={base=3, every=6, max=6},
[Talents.T_ARCANE_SHIELD]={base=3, every=5, max=5},
--
GitLab