diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index b1aabf944749c5af1fb4c5019f9943e53d81f77c..610160524d783d946f216f47b917c859195963a2 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -3509,8 +3509,8 @@ function _M:updateModdableTile()
self:triggerHook{"Actor:updateModdableTile:front", base=base, add=add}
- if self.moddable_tile_ornament and self.moddable_tile_ornament[self.female and "female" or "male"] then add[#add+1] = {image = base..self.moddable_tile_ornament[self.female and "female" or "male"]..".png", auto_tall=1} end
- if self.moddable_tile_ornament2 and self.moddable_tile_ornament2[self.female and "female" or "male"] then add[#add+1] = {image = base..self.moddable_tile_ornament2[self.female and "female" or "male"]..".png", auto_tall=1} end
+ if self.moddable_tile_ornament and self.moddable_tile_ornament[self.female and "female" or "male"] then add[#add+1] = {image = base..self.moddable_tile_ornament[self.female and "female" or "male"]..".png", auto_tall=1, shader=self.moddable_tile_ornament_shader} end
+ if self.moddable_tile_ornament2 and self.moddable_tile_ornament2[self.female and "female" or "male"] then add[#add+1] = {image = base..self.moddable_tile_ornament2[self.female and "female" or "male"]..".png", auto_tall=1, shader=self.moddable_tile_ornament_shader2} end
if self.x and game.level then game.level.map:updateMap(self.x, self.y) end
end
diff --git a/game/modules/tome/data/birth/races/giant.lua b/game/modules/tome/data/birth/races/giant.lua
index 87e2a8dee39417a367eac9d47ce9353718c5ceda..dc2ae0057f18ae9b9c70fa0f56a71d1b613e16f2 100644
--- a/game/modules/tome/data/birth/races/giant.lua
+++ b/game/modules/tome/data/birth/races/giant.lua
@@ -39,19 +39,6 @@ newBirthDescriptor{
copy = {
type = "giant", subtype="giant",
},
-
- cosmetic_unlock = {
- cosmetic_bikini = {
- {name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
- if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
- else actor:registerOnBirthForceWear("FUN_BIKINI") end
- end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
- {name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
- if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
- else actor:registerOnBirthForceWear("FUN_MANKINI") end
- end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
- },
- },
}
---------------------------------------------------------
@@ -100,4 +87,20 @@ to start, look where halflings once tinkered with portals...]],
},
experience = 1.3,
random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+
+ cosmetic_unlock = {
+ cosmetic_race_human_redhead = {
+ {name="Redhead [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.moddable_tile_base = "base_redhead_01.png" end end},
+ },
+ cosmetic_bikini = {
+ {name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+ if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+ else actor:registerOnBirthForceWear("FUN_BIKINI") end
+ end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+ {name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+ if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+ else actor:registerOnBirthForceWear("FUN_MANKINI") end
+ end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+ },
+ },
}
diff --git a/game/modules/tome/data/gfx/shaders/runes_glow.frag b/game/modules/tome/data/gfx/shaders/runes_glow.frag
new file mode 100644
index 0000000000000000000000000000000000000000..f9c69594ce589ff76d36c7cda6e2b0194103ad2e
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/runes_glow.frag
@@ -0,0 +1,102 @@
+uniform sampler2D tex;
+uniform float tick;
+
+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 ) ) );
+
+}
+
+void main(void)
+{
+ float t = tick / 5000.0;
+ vec4 c = texture2D(tex, gl_TexCoord[0].xy);
+ float n = snoise(vec3(0.0, 0.0, t));
+ c.rgb *= (n + 1.0) * 0.5;
+ c.a *= n + 2.0;
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/runes_glow.lua b/game/modules/tome/data/gfx/shaders/runes_glow.lua
new file mode 100644
index 0000000000000000000000000000000000000000..6299dd478ff4c1e7bb309274581a2a372a12af22
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/runes_glow.lua
@@ -0,0 +1,26 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2015 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 = "runes_glow",
+ vert = nil,
+ args = {
+ },
+ clone = false,
+}
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_readhead_01.png b/game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_redhead_01.png
similarity index 100%
rename from game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_readhead_01.png
rename to game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_redhead_01.png
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_readhead_02.png b/game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_redhead_02.png
similarity index 100%
rename from game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_readhead_02.png
rename to game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_redhead_02.png
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_readhead_03.png b/game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_redhead_03.png
similarity index 100%
rename from game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_readhead_03.png
rename to game/modules/tome/data/gfx/shockbolt/player/ogre_female/base_redhead_03.png
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_readhead_01.png b/game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_redhead_01.png
similarity index 100%
rename from game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_readhead_01.png
rename to game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_redhead_01.png
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_readhead_02.png b/game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_redhead_02.png
similarity index 100%
rename from game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_readhead_02.png
rename to game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_redhead_02.png
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_readhead_03.png b/game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_redhead_03.png
similarity index 100%
rename from game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_readhead_03.png
rename to game/modules/tome/data/gfx/shockbolt/player/ogre_male/base_redhead_03.png
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index ca2d8acc471e8f77038a25252fd11616bce2afe9..f2764560d27e0204c66fde7f8deac4fc2d64b095 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -3192,6 +3192,15 @@ newEffect{
self:effectTemporaryValue(eff, "stun_immune", 0.2)
self:effectTemporaryValue(eff, "pin_immune", 0.2)
self:effectTemporaryValue(eff, "inc_damage", {all=0.1})
+
+ self.moddable_tile_ornament, eff.old_mod = {female="runes_red_glow_01", male="runes_red_glow_01"}, self.moddable_tile_ornament
+ self.moddable_tile_ornament_shader, eff.old_mod_shader = "runes_glow", self.moddable_tile_ornament_shader
+ self:updateModdableTile()
+ end,
+ deactivate = function(self, eff)
+ self.moddable_tile_ornament = eff.old_mod
+ self.moddable_tile_ornament_shader = eff.old_mod_shader
+ self:updateModdableTile()
end,
}