diff --git a/game/modules/tome/data/birth/classes/mage.lua b/game/modules/tome/data/birth/classes/mage.lua
index 786ff5dc959f46597dc6a3b99060dc770e09221c..0a22ca867529cefb62df3fddc395c4621a4a7a03 100644
--- a/game/modules/tome/data/birth/classes/mage.lua
+++ b/game/modules/tome/data/birth/classes/mage.lua
@@ -137,7 +137,10 @@ newBirthDescriptor{
end
end,
function(actor)
- if core.shader.active(4) then actor:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=-0.2, radius=1.1}, {type="sparks", hide_center=0, time_factor=40000, color1={0, 0, 1, 1}, color2={0, 1, 1, 1}, zoom=0.5, xy={0, 0}}))
+ if core.shader.active(4) then
+ local p1 = actor:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=0, radius=1.1, img="coldgeneric"}, {type="circular_flames", ellipsoidalFactor={1,2}, time_factor=22000, noup=2.0}))
+ p1.toback = true
+ actor:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=0, radius=1.1, img="coldgeneric"}, {type="circular_flames", ellipsoidalFactor={1,2}, time_factor=22000, noup=1.0}))
else actor:addParticles(Particles.new("uttercold", 1))
end
end,
diff --git a/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua b/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua
index a95900ba2505d65d001debf53a716881a8ff844c..efa58dccb1c95b7c471e5110f079a86956a57838 100644
--- a/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua
+++ b/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua
@@ -46,4 +46,4 @@ end, },
function(self)
self.ps:emit(1)
end,
-1, "particles_images/square", true
+1, "particles_images/"..(img or "square"), true
diff --git a/game/modules/tome/data/gfx/particles/shader_wings.lua b/game/modules/tome/data/gfx/particles/shader_wings.lua
index bf804789c419f833c82b5687b18420cca43db819..cfc8ebbf023935910d35b4d487f0470a7069e1cf 100644
--- a/game/modules/tome/data/gfx/particles/shader_wings.lua
+++ b/game/modules/tome/data/gfx/particles/shader_wings.lua
@@ -33,8 +33,8 @@ return { generator = function()
life = life or 10,
size = 64 * (size_factor or 1), sizev = 0, sizea = 0,
- x = 0, xv = 0, xa = 0,
- y = -25, yv = 0, ya = 0,
+ x = x or 0, xv = 0, xa = 0,
+ y = y or -25, yv = 0, ya = 0,
dir = 0, dirv = dirv, dira = 0,
vel = 0, velv = 0, vela = 0,
diff --git a/game/modules/tome/data/gfx/particles_images/arcanegeneric.png b/game/modules/tome/data/gfx/particles_images/arcanegeneric.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1adab9a419ce66453e450beb807c2371a84ef07
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/arcanegeneric.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/coldgeneric.png b/game/modules/tome/data/gfx/particles_images/coldgeneric.png
new file mode 100644
index 0000000000000000000000000000000000000000..331b605b7625b0577ed873f45a50feda99bfde75
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/coldgeneric.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/flamesgeneric.png b/game/modules/tome/data/gfx/particles_images/flamesgeneric.png
new file mode 100644
index 0000000000000000000000000000000000000000..81ff285cd73ed0e6c405d1a327f7bfc5be9b8fcf
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/flamesgeneric.png differ
diff --git a/game/modules/tome/data/gfx/shaders/circular_flames.frag b/game/modules/tome/data/gfx/shaders/circular_flames.frag
new file mode 100644
index 0000000000000000000000000000000000000000..26b3491566e1190112f00b7a6e343aac24874f0e
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/circular_flames.frag
@@ -0,0 +1,187 @@
+uniform sampler2D tex;
+uniform float tick;
+uniform vec3 color;
+uniform float time_factor;
+uniform float noup = 0.0;
+
+uniform vec2 ellipsoidalFactor = vec2(1.0, 1.0); //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
+
+
+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 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
+{
+ float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.1);
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
+ vec2 displacedPoint = pos + vec2(0, delta * ampMult);
+ displacedPoint.y = min(0.99, displacedPoint.y);
+ displacedPoint.y = max(0.01, displacedPoint.y);
+
+ return texture2D(tex, displacedPoint);
+}
+
+vec4 GetFireRingColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
+{
+ float pi = 3.141592;
+ float ang = atan(pos.y, pos.x) + pi;
+
+ vec2 planarPos = vec2(ang / (2.0 * pi), 1.0 - (length(pos) - radius1) / (radius2 - radius1));
+ planarPos.y = pow(abs(planarPos.y), power);
+
+ float delta =
+ GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
+ GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
+
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+ float verticalPos = planarPos.y + delta * ampMult;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ return texture2D(tex, vec2(paletteCoord, verticalPos));
+}
+
+void main(void)
+{
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+
+ radius *= ellipsoidalFactor;
+
+ float radiusLen = length(radius);
+
+
+ float ringRadius = 0.3;
+ float ringWidth = 0.2;
+
+ vec4 c;
+ if(radiusLen > ringRadius - ringWidth && radiusLen < ringRadius)
+ {
+ c = GetFireRingColor(tick / time_factor + 0.0 , radius, 6, 15.0, 1, 2, ringRadius, ringRadius - ringWidth, 0.0, 0.5);
+ }else
+ if(radiusLen < ringRadius + ringWidth && radiusLen >= ringRadius)
+ {
+ c = GetFireRingColor(tick / time_factor + 10.0 , radius, 6, 15.0, 1, 2, ringRadius, ringRadius + ringWidth, 0.0, 0.5);
+ }else
+ {
+ c = vec4(0.0, 0.0, 0.0, 0.0);
+ }
+ c.a *= gl_Color.a;
+ if (noup == 1.0) { if (gl_TexCoord[0].y < 0.5) c.a = 0.0; }
+ else if (noup == 2.0) { if (gl_TexCoord[0].y >= 0.5) c.a = 0.0; }
+
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/circular_flames.lua b/game/modules/tome/data/gfx/shaders/circular_flames.lua
new file mode 100644
index 0000000000000000000000000000000000000000..7e6f5b5a027462b177be9e8efa413844bd8d0b75
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/circular_flames.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 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 {
+ frag = "circular_flames",
+ vert = nil,
+ args = {
+ tex = { texture = 0 },
+ time_factor = time_factor or 4000,
+ ellipsoidalFactor = ellipsoidalFactor or {1,1}, --1 is perfect circle, >1 is ellipsoidal
+ noup = noup or 0,
+ },
+ clone = false,
+}
diff --git a/game/modules/tome/data/talents/spells/ice.lua b/game/modules/tome/data/talents/spells/ice.lua
index be62ab0c2f5ac480c54acc9d3b0cb39dfa6a22fb..a03f0982aae7260403da40929b7a4939c3be85be 100644
--- a/game/modules/tome/data/talents/spells/ice.lua
+++ b/game/modules/tome/data/talents/spells/ice.lua
@@ -159,22 +159,24 @@ newTalent{
activate = function(self, t)
game:playSoundNear(self, "talents/ice")
- local particle
- if core.shader.active(4) then
- particle = self:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=-0.2, radius=1.1}, {type="sparks", hide_center=0, time_factor=40000, color1={0, 0, 1, 1}, color2={0, 1, 1, 1}, zoom=0.5, xy={self.x, self.y}}))
- else
- particle = self:addParticles(Particles.new("uttercold", 1))
- end
-
- return {
+ local ret = {
dam = self:addTemporaryValue("inc_damage", {[DamageType.COLD] = t.getColdDamageIncrease(self, t)}),
resist = self:addTemporaryValue("resists_pen", {[DamageType.COLD] = t.getResistPenalty(self, t)}),
pierce = self:addTemporaryValue("iceblock_pierce", t.getPierce(self, t)),
- particle = particle,
}
+ local particle
+ if core.shader.active(4) then
+ ret.particle1 = self:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=0, radius=1.1, img="coldgeneric"}, {type="circular_flames", ellipsoidalFactor={1,2}, time_factor=22000, noup=2.0}))
+ ret.particle1.toback = true
+ ret.particle2 = self:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=0, radius=1.1, img="coldgeneric"}, {type="circular_flames", ellipsoidalFactor={1,2}, time_factor=22000, noup=1.0}))
+ else
+ ret.particle1 = self:addParticles(Particles.new("uttercold", 1))
+ end
+ return ret
end,
deactivate = function(self, t, p)
- self:removeParticles(p.particle)
+ if p.particle1 then self:removeParticles(p.particle1) end
+ if p.particle2 then self:removeParticles(p.particle2) end
self:removeTemporaryValue("inc_damage", p.dam)
self:removeTemporaryValue("resists_pen", p.resist)
self:removeTemporaryValue("iceblock_pierce", p.pierce)
diff --git a/game/modules/tome/data/talents/spells/wildfire.lua b/game/modules/tome/data/talents/spells/wildfire.lua
index a3d00bc64e80607e230d22f85d97f2eb13ff9ed5..42a6e791d13a62f5fd51ab0e6a0c44cb1410d336 100644
--- a/game/modules/tome/data/talents/spells/wildfire.lua
+++ b/game/modules/tome/data/talents/spells/wildfire.lua
@@ -124,7 +124,7 @@ newTalent{
local particle
if core.shader.active(4) then
- particle = self:addParticles(Particles.new("shader_wings", 1, {infinite=1}))
+ particle = self:addParticles(Particles.new("shader_wings", 1, {infinite=1, x=self.wings_x, y=self.wings_y}))
else
particle = self:addParticles(Particles.new("wildfire", 1))
end
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index 8fa2b894cc86ec64cdfb450a2f67c3e7632a485b..0e4a205d81554d3b48dfff7be41a6d19aea77075 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -89,7 +89,13 @@ newEffect{
eff.sid = self:addTemporaryValue("time_prison", 1)
eff.tid = self:addTemporaryValue("no_timeflow", 1)
eff.imid = self:addTemporaryValue("status_effect_immune", 1)
- eff.particle = self:addParticles(Particles.new("time_prison", 1))
+ if core.shader.active(4) then
+ eff.particle1 = self:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=0, radius=1.1, img="arcanegeneric"}, {type="circular_flames", ellipsoidalFactor={1,2}, time_factor=3000, noup=2.0}))
+ eff.particle1.toback = true
+ eff.particle2 = self:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=0, radius=1.1, img="arcanegeneric"}, {type="circular_flames", ellipsoidalFactor={1,2}, time_factor=3000, noup=1.0}))
+ else
+ eff.particle1 = self:addParticles(Particles.new("time_prison", 1))
+ end
self.energy.value = 0
end,
deactivate = function(self, eff)
@@ -97,7 +103,8 @@ newEffect{
self:removeTemporaryValue("time_prison", eff.sid)
self:removeTemporaryValue("no_timeflow", eff.tid)
self:removeTemporaryValue("status_effect_immune", eff.imid)
- self:removeParticles(eff.particle)
+ if eff.particle1 then self:removeParticles(eff.particle1) end
+ if eff.particle2 then self:removeParticles(eff.particle2) end
end,
}
diff --git a/game/modules/tome/data/zones/town-angolwen/npcs.lua b/game/modules/tome/data/zones/town-angolwen/npcs.lua
index 7ef16064bfdb98f252e48379e37dd272f795ab8d..e156b501c43a2e005cf308a2a6f20754110c4f74 100644
--- a/game/modules/tome/data/zones/town-angolwen/npcs.lua
+++ b/game/modules/tome/data/zones/town-angolwen/npcs.lua
@@ -94,6 +94,7 @@ newEntity{ define_as = "SUPREME_ARCHMAGE_LINANIIL",
[Talents.T_KEEN_SENSES]=5,
[Talents.T_PREMONITION]=5,
},
+ wings_x = 2, wings_y = -33,
resolvers.sustains_at_birth(),
can_talk = "angolwen-leader",