diff --git a/game/modules/tome/data/gfx/particles_images/ice_nova.png b/game/modules/tome/data/gfx/particles_images/ice_nova.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8197028aa03894cd550f85c8356ab3c64329105
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/ice_nova.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/water_drops.png b/game/modules/tome/data/gfx/particles_images/water_drops.png
new file mode 100644
index 0000000000000000000000000000000000000000..e101a324bf7eb827414cb2cd75de965efcf5223b
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/water_drops.png differ
diff --git a/game/modules/tome/data/gfx/shaders/volumetric_aura.frag b/game/modules/tome/data/gfx/shaders/volumetric_aura.frag
new file mode 100644
index 0000000000000000000000000000000000000000..42d5af1d8e35ae07f80cf9b22d7b343ceca992ee
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/volumetric_aura.frag
@@ -0,0 +1,141 @@
+uniform sampler2D tex;
+float antialiasingRadius = 0.99; //1.0 is no antialiasing, 0.0 - fully smoothed(looks worse)
+uniform float tick;
+
+float snoise( vec3 v );
+
+vec4 Uberblend(vec4 col0, vec4 col1)
+{
+// return vec4((1.0 - col0.a) * (col1.rgb) + col0.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+// return vec4((1.0 - col1.a) * (col0.rgb) + col1.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+ return vec4(
+ (1.0 - col0.a) * (1.0 - col1.a) * (col0.rgb * col0.a + col1.rgb * col1.a) / (col0.a + col1.a + 1e-1) +
+ (1.0 - col0.a) * (0.0 + col1.a) * (col1.rgb) +
+ (0.0 + col0.a) * (1.0 - col1.a) * (col0.rgb * (1.0 - col1.a) + col1.rgb * col1.a) +
+ (0.0 + col0.a) * (0.0 + col1.a) * (col1.rgb),
+ min(1.0, col0.a + col1.a));
+}
+
+#define samplesCount 80
+void main(void)
+{
+ vec2 radius = vec2(0.5, 0.5) - gl_TexCoord[0].xy;
+ float outerScale = 0.95 + sin(tick / 1000.0f) * 0.05;
+ float innerScale = 0.5;
+ float shininess = 10.0;
+
+ vec4 resultColor = vec4(0.0, 0.0, 0.0, 0.0);
+ float density = 50.1;
+
+ float absorb = 1.0;
+ vec3 emittedColor = vec3(0.0, 0.0, 0.0);
+ for(int i = 0; i < samplesCount; i++)
+ {
+ float scale = outerScale - float(i) / float(samplesCount) * (outerScale - innerScale);
+
+ vec2 texPos = clamp(vec2(0.5, 0.5) + radius / scale, 0.0, 1.0);
+
+ vec4 sampleColor = texture2D(tex, texPos);
+ float sampleLen = 1.0 / float(samplesCount);
+
+ float layerMult = float(i) / float(samplesCount);
+ float shininessMult = absorb / density * (1.0 - exp(-density * sampleLen));
+
+ emittedColor += sampleColor.rgb * (1.0 - pow(1.0 - sampleColor.a, 1.0)) * shininess * sampleLen * layerMult;//shininessMult;
+ absorb *= exp(-sampleLen * density * sampleColor.a * layerMult);
+ }
+ float shininessOpacity = 0.0;
+ gl_FragColor = vec4(emittedColor.rgb, 1.0 - absorb + (emittedColor.r + emittedColor.g + emittedColor.b) * shininessOpacity);
+}
+
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
diff --git a/game/modules/tome/data/gfx/shaders/volumetric_aura.lua b/game/modules/tome/data/gfx/shaders/volumetric_aura.lua
new file mode 100644
index 0000000000000000000000000000000000000000..f9d0b5ab1abea5eb9e50f82c7909746a7a4cbd4a
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/volumetric_aura.lua
@@ -0,0 +1,28 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return {
+ require_kind = "adv",
+ frag = "volumetric_aura",
+ vert = nil,
+ args = {
+ tex = { texture = 0 },
+ },
+ clone = false,
+}
diff --git a/game/modules/tome/data/talents/spells/ice.lua b/game/modules/tome/data/talents/spells/ice.lua
index a95355f2303e26f7822c094069492ecba353b033..4eab6e0b0a750ba8ba489daf45ca2488614a36c7 100644
--- a/game/modules/tome/data/talents/spells/ice.lua
+++ b/game/modules/tome/data/talents/spells/ice.lua
@@ -84,7 +84,8 @@ newTalent{
action = function(self, t)
local tg = self:getTalentTarget(t)
local grids = self:project(tg, self.x, self.y, DamageType.COLDNEVERMOVE, {shatter_reduce=2, dur=4, dam=self:spellCrit(t.getDamage(self, t))})
- game.level.map:particleEmitter(self.x, self.y, tg.radius, "ball_ice", {radius=tg.radius})
+-- game.level.map:particleEmitter(self.x, self.y, tg.radius, "ball_ice", {radius=tg.radius})
+ game.level.map:particleEmitter(self.x, self.y, tg.radius, "circle", {oversize=1.1, a=255, limit_life=16, grow=true, speed=0, img="ice_nova", radius=tg.radius})
game:playSoundNear(self, "talents/ice")
return true
end,
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index d04be1938d40cfe9e43697634f40dbed1c815c91..f66728717c5716b8d76d4aa6c0d1f8d48e03be3e 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -2798,11 +2798,17 @@ newEffect{
status = "detrimental",
on_gain = function(self, err) return nil, "+Wet" end,
on_lose = function(self, err) return nil, "-Wet" end,
+ on_merge = function(self, old_eff, new_eff)
+ old_eff.dur = new_eff.dur
+ return old_eff
+ end,
activate = function(self, eff)
if self:attr("stun_immune") then
self:effectTemporaryValue(eff, "stun_immune", -self:attr("stun_immune") / 2)
end
+ eff.particle = self:addParticles(Particles.new("circle", 1, {shader=true, oversize=0.7, a=155, appear=8, speed=0, img="water_drops", radius=0}))
end,
deactivate = function(self, eff)
+ self:removeParticles(eff.particle)
end,
}