Commit a5d616647b86213c459e59c30e002f00241ae152

Authored by DarkGod
2 parents 09e0f806 41df6cb0

Merge branch 'misc_idk' into 'master'

Miscs for next version

1. fix wintry ego on shield not crit (it does mindcrit, but then use the base damage instead)
2. fix Shattering Charge double crits (luckily only spire dragon knows this obslete talent, which is extremely rare except Gorbat Pride).

See merge request !747
... ... @@ -352,7 +352,7 @@ newEntity{
352 352 local damage = who:mindCrit(dam)
353 353 local check = math.max(who:combatSpellpower(), who:combatMindpower(), who:combatAttack())
354 354 local tg = {type="ball", range=0, radius=4, selffire=false, friendlyfire=false}
355   - local grids = who:project(tg, who.x, who.y, DamageType.COLDNEVERMOVE, {dur=3, dam=dam, apply_power = check})
  355 + local grids = who:project(tg, who.x, who.y, DamageType.COLDNEVERMOVE, {dur=3, dam=damage, apply_power = check})
356 356 game.level.map:particleEmitter(who.x, who.y, tg.radius, "circle", {oversize=1.1, a=255, limit_life=16, grow=true, speed=0, img="ice_nova", radius=tg.radius})
357 357 game:playSoundNear(self, "talents/ice")
358 358 end,
... ...
... ... @@ -2585,7 +2585,7 @@ newTalent{
2585 2585 local x, y = self:getTarget(tg)
2586 2586 if not x or not y then return nil end
2587 2587 if core.fov.distance(self.x, self.y, x, y) > tg.range then return nil end
2588   - local dam = self:mindCrit(t.getDam(self, t))
  2588 + local dam = t.getDam(self, t)
2589 2589
2590 2590 for i = 1, self:getTalentRange(t) do
2591 2591 self:project(tg, x, y, DamageType.DIG, 1)
... ...