Commit 2be02293f223f71824357f4d3f03b5ba9cd7441f

Authored by DarkGod
1 parent e52e4a4b

please pure, please, make changelogs

... ... @@ -589,7 +589,7 @@ newEntity{
589 589 greater_ego = 1,
590 590 rarity = 25,
591 591 cost = 40,
592   - resolvers.charmt(Talents.T_STONE_WALL, {2,3,4,5}, 40),
  592 +-- resolvers.charmt(Talents.T_STONE_WALL, {2,3,4,5}, 40),
593 593 special_combat = {
594 594 melee_project={
595 595 [DamageType.PHYSICAL] = resolvers.mbonus_material(10, 10)
... ... @@ -598,6 +598,7 @@ newEntity{
598 598 wielder = {
599 599 combat_armor = resolvers.mbonus_material(10, 5),
600 600 combat_armor_hardiness = resolvers.mbonus_material(5, 5),
  601 + resists={[DamageType.PHYSICAL] = resolvers.mbonus_material(10, 10)},
601 602 },
602 603 }
603 604
... ...
... ... @@ -198,7 +198,7 @@ newEntity{
198 198 keywords = {Brotherhood=true},
199 199 level_range = {30, 50},
200 200 greater_ego = 1,
201   - rarity = 35,
  201 + rarity = 25,
202 202 cost = 40,
203 203 resolvers.charmt(Talents.T_ARCANE_EYE, 5, 10),
204 204 wielder = {
... ... @@ -220,7 +220,7 @@ newEntity{
220 220 greater_ego = 1,
221 221 rarity = 35,
222 222 cost = 20,
223   - resolvers.charmt(Talents.T_STONE_WALL, {1,2,3}, 80),
  223 + resolvers.charmt(Talents.T_STONE_WALL, 1, 80),
224 224 wielder = {
225 225 inc_stats = {
226 226 [Stats.STAT_CON] = resolvers.mbonus_material(5, 1),
... ...
... ... @@ -2977,7 +2977,7 @@ newEntity{ base = "BASE_LONGSWORD",
2977 2977 damage_convert = {[DamageType.MIND]=20,},
2978 2978 special_on_hit = {desc="torments the target with many mental effects", fct=function(combat, who, target)
2979 2979 if not who:checkHit(who:combatMindpower(), target:combatMentalResist()*0.9) then return end
2980   - target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=18})
  2980 + target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=0, save=20})
2981 2981 if not rng.percent(40) then return end
2982 2982 local eff = rng.table{"stun", "malign", "agony", "confusion", "silence",}
2983 2983 if not target:canBe(eff) then return end
... ... @@ -3019,8 +3019,7 @@ newEntity{ base = "BASE_LONGSWORD",
3019 3019 local target = game.level.map(px, py, engine.Map.ACTOR)
3020 3020 if not target then return end
3021 3021 if not rng.percent(20) then return end
3022   - if not who:checkHit(who:combatMindpower(), target:combatMentalResist()) then return end
3023   - target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=5})
  3022 + target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=0, save=5})
3024 3023 who:logCombat(target, "Anmalice focuses its mind-piercing eye on #Target#!")
3025 3024 end)
3026 3025 end,
... ... @@ -3032,7 +3031,7 @@ newEntity{ base = "BASE_LONGSWORD",
3032 3031 game.logPlayer(who, "#CRIMSON#The tentacles release your arm, sated.")
3033 3032 else
3034 3033 game.logPlayer(who, "#CRIMSON#As you tear the tentacles from your arm, horrible images enter your mind!")
3035   - who:setEffect(who.EFF_WEAKENED_MIND, 15, {power=25})
  3034 + who:setEffect(who.EFF_WEAKENED_MIND, 15, {power=0, save=25})
3036 3035 who:setEffect(who.EFF_AGONY, 5, { src=who, damage=15, mindpower=40, range=10, minPercent=10, duration=5})
3037 3036 end
3038 3037 self.wielder.combat_mentalresist = -30
... ...
... ... @@ -216,6 +216,6 @@ newTalent{
216 216 local crit_bonus = t.getCritBonus(self, t)
217 217 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.
218 218 If the target is killed, the effect will end early.
219   - The damage bonus will scale with your Mindpower.]]):format(duration, damDesc(self, DamageType.MIND, crit_bonus))
  219 + The damage bonus will scale with your Mindpower.]]):format(duration, crit_bonus)
220 220 end,
221 221 }
\ No newline at end of file
... ...
... ... @@ -110,7 +110,7 @@ newEntity{ base = "BASE_NPC_GHOUL", define_as = "ROTTING_TITAN",
110 110 resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_ghoul_rotting_titan.png", display_h=2, display_y=-1}}},
111 111 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.]],
112 112 level_range = {45, nil}, exp_worth = 2,
113   - rarity = 28,
  113 + rarity = 25,
114 114 max_life = resolvers.rngavg(150,200), life_rating = 40,
115 115 combat_armor = 40, combat_def = 10,
116 116 ai_state = { talent_in=2 },
... ... @@ -125,8 +125,10 @@ newEntity{ base = "BASE_NPC_GHOUL", define_as = "ROTTING_TITAN",
125 125 ai = "tactical",
126 126 ai_tactic = resolvers.tactic"melee",
127 127 autolevel="warriormage",
128   -
129   - can_pass = {pass_wall=70}, --So AI knows to try and pass walls.
  128 +
  129 + on_added_to_level = function(self)
  130 + self.can_pass = {pass_wall=70} --Added after birth so it doesn't spawn inside a wall.
  131 + end,
130 132
131 133 stats = { str=40, dex=20, mag=24, con=25 },
132 134 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",
182 184 resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_ghost_glacial_legion.png", display_h=2, display_y=-1}}},
183 185 desc = [[A massive, shifting, ethereal form floats in the air around an orb of frozen blood. Vapor pools on the floor beneath it.]],
184 186 level_range = {45, nil}, exp_worth = 2,
185   - rarity = 28,
  187 + rarity = 25,
186 188 size_category=5,
187 189 rank = 3.5,
188 190 max_life = resolvers.rngavg(90,100), life_rating = 18,
... ... @@ -246,7 +248,7 @@ newEntity{ base = "BASE_NPC_BONE_GIANT", define_as = "HEAVY_SENTINEL",
246 248 desc = [[A towering creature, made from the bones of countless bodies. An aura of flame bellows from within its chest.]],
247 249 resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_giant_heavy_sentinel.png", display_h=2, display_y=-1}}},
248 250 level_range = {45, nil}, exp_worth = 2,
249   - rarity = 28,
  251 + rarity = 25,
250 252 rank = 3.5,
251 253 ai = "tactical",
252 254 size=5,
... ... @@ -292,7 +294,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE", unique=true, define_as="ARCH_ZEPHYR",
292 294 resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_vampire_arch_zephyr.png", display_h=2, display_y=-1}}},
293 295 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.]],
294 296 level_range = {45, nil}, exp_worth = 1,
295   - rarity = 28,
  297 + rarity = 25,
296 298 autolevel="warriormage",
297 299 stats = { str=24, dex=40, mag=24, con=20 },
298 300 max_life = resolvers.rngavg(100,120), life_rating=25,
... ... @@ -345,7 +347,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
345 347 desc=[[Intense Arcane energy whirls in the air around this ethereal form. ]],
346 348 level_range = {45, nil}, exp_worth = 2,
347 349 life_rating=16,
348   - rarity = 28,
  350 + rarity = 25,
349 351 rank = 3.5,
350 352 max_life = resolvers.rngavg(200,300),
351 353 max_mana = resolvers.rngavg(800,1200),
... ... @@ -368,7 +370,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
368 370 [Talents.T_ARCANE_VORTEX]={base=4, every=4, max=7},
369 371 [Talents.T_SPELLCRAFT]=5,
370 372 [Talents.T_AETHER_BEAM]={base=6, every=7, max=9},
371   - [Talents.T_AETHER_BREACH]={base=3, every=6, max=6},
  373 + [Talents.T_AETHER_BREACH]={base=4, every=6, max=8},
372 374 [Talents.T_HEAL]={base=3, every=6, max=6},
373 375 [Talents.T_SHIELDING]={base=3, every=6, max=6},
374 376 [Talents.T_ARCANE_SHIELD]={base=3, every=5, max=5},
... ...