nothing can stop the tree-man !

game/engines/default/modules/boot/data/gfx/shaders/awesomeaura.frag

@@ -5,6 +5,8 @@ uniform float alpha;
 uniform float tick;
 uniform float time_factor;
 uniform float flameScale;
+uniform vec2 quadSize;
+uniform vec2 texSize;
 
 vec4 permute( vec4 x ) {
 
@@ -160,9 +162,12 @@ void main(void)
 	
 	vec2 planarPos;
 	vec4 displacement = texture2D(tex, gl_TexCoord[0].xy);
-	planarPos.x = displacement.b;	
-	planarPos.y = displacement.a * 3.0 * (1.0 + 10.0 * pow((planarPos.x) * (1.0 - planarPos.x) * 4.0, 1.0)) / max(flameScale, 1e-3);
-	
+	vec2 quadCoords = gl_TexCoord[0].xy / quadSize.xy;
+	float mult = pow(quadCoords.x * (1.0 - quadCoords.x) * 4.0, 0.5);//
+	mult *= pow(min(0.5, abs(1.0 - gl_TexCoord[0].y / quadSize.y)) * 2.0, 2.0);
+
+	planarPos.x = gl_TexCoord[0].x * texSize.x * 0.004;
+	planarPos.y = displacement.a * 0.05 * sqrt(texSize.x * texSize.x + texSize.y * texSize.y) / (1e-2 + mult);// * 3.0 * (1.0 + 10.0 * pow((planarPos.x) * (1.0 - planarPos.x) * 4.0, 1.0)) / max(flameScale, 1e-3);
 	vec4 resultColor = vec4(0.0, 0.0, 0.0, 0.0);
 		
 	resultColor = GetFireAuraColor(tick / time_factor, planarPos, 6.0, 15.0 * max(flameScale, 1e-3), 1.0, 1.0, 1.0, 0.75);//texture2D(tex, gl_TexCoord[0].xy) * texture2D(flames, gl_TexCoord[0].xy) + 0.2;

game/engines/default/modules/boot/data/gfx/shaders/crystalineaura.frag

@@ -13,25 +13,29 @@ uniform float time_factor;
 
 uniform vec3 color;
 
+uniform vec2 quadSize;
+uniform vec2 texSize;
+
 void main(void)
 {
 	vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
 	float innerRadius = 0.25;
 	float outerRadius = 0.5;
 	
-	vec2 planarPos;
 	vec4 displacement = texture2D(displMapTex, gl_TexCoord[0].xy);
+	vec2 quadCoords = gl_TexCoord[0].xy / quadSize.xy;
+	float mult = pow(quadCoords.x * (1.0 - quadCoords.x) * 4.0, 0.5);//
+	mult *= pow(min(0.5, abs(1.0 - gl_TexCoord[0].y / quadSize.y)) * 2.0, 2.0);
+
 
 	vec2 point = gl_TexCoord[0].xy;
 	float eps = 0.05;
-	vec2 basisY = vec2(
-		 texture2D(displMapTex, point + vec2(eps, 0.0)).a - texture2D(displMapTex, point + vec2(-eps, 0.0)).a,
-		-texture2D(displMapTex, point + vec2(0.0, eps)).a + texture2D(displMapTex, point + vec2(0.0, -eps)).a);
-	basisY /= length(basisY) + 0.001;
-	vec2 basisX = vec2(basisY.y, -basisY.x);
-
-	planarPos.x = displacement.b * 6.0 / spikeWidth + spikeOffset;
-	planarPos.y = displacement.a * 20.0 / (spikeLength * clamp((tick - tick_start) / time_factor * growthSpeed, 0.0, 1.0) + 0.001);
+	vec2 basisY = vec2(0.0, 1.0);
+	vec2 basisX = vec2(1.0, 0.0);
+
+	vec2 planarPos;
+	planarPos.x = gl_TexCoord[0].x * texSize.x * 0.02 / spikeWidth + spikeOffset;
+	planarPos.y = displacement.a * 0.05 * sqrt(texSize.x * texSize.x + texSize.y * texSize.y) / (1e-2 + mult) / (spikeLength * clamp((tick - tick_start) / time_factor * growthSpeed, 0.0, 1.0) + 0.001);
 
 	vec4 normalMap = texture2D(normalMapTex, vec2(planarPos.x, clamp(1.0 - planarPos.y, 0.01, 0.99)));
 	vec3 localNormal = normalMap.rgb;

game/engines/default/modules/boot/dialogs/Credits.lua

@@ -226,6 +226,8 @@ function _M:displayCredit(txt, x, y)
 		if txt.title then
 			aura_texture[txt.title]:bind(1)
 			aura[txt.title].shad:use(true)
+			if aura[txt.title].shad.uniQuadSize then aura[txt.title].shad:uniQuadSize(txt.w/txt._tex_w, txt.h/txt._tex_h) end
+			if aura[txt.title].shad.uniTexSize then aura[txt.title].shad:uniTexSize(txt._tex_w, txt._tex_h) end
 			txt._texf:toScreenPrecise(x, y, txt.w, txt.h, 0, txt.w/txt._tex_w, 0, txt.h/txt._tex_h)
 			aura[txt.title].shad:use(false)
 

game/modules/tome/data/general/grids/elven_forest.lua

@@ -23,6 +23,7 @@ local snowy_grass_editer = { method="borders_def", def="snowy_grass"}
 
 local treesdef = {
 	{"elventree", {tall=-1, "shadow", "trunk", "foliage_summer"}},
+	{"elventree_03", {tall=-1, "shadow", "trunk", "foliage_summer"}},
 	{"fat_elventree", {tall=-1, "shadow", "trunk", {"foliage_summer_%02d",1,2}}},
 	{"oak", {tall=-1, "shadow", {"trunk_%02d",1,2}, {"foliage_summer_%02d",1,4}}},
 }