losgoroths can all walk in the void

git-svn-id: http://svn.net-core.org/repos/t-engine4@3478 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/general/npcs/losgoroth.lua

@@ -36,6 +36,7 @@ newEntity{
 	rank = 2,
 	size_category = 3,
 	levitation = 1,
+	can_pass = {pass_void=70},
 
 	autolevel = "dexmage",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=2, },
@@ -58,7 +59,6 @@ newEntity{ base = "BASE_NPC_LOSGOROTH",
 
 	resolvers.talents{
 		[Talents.T_VOID_BLAST]={base=1, every=7, max=7},
-		[Talents.T_PHASE_DOOR]=2,
 	},
 }
 
@@ -71,6 +71,5 @@ newEntity{ base = "BASE_NPC_LOSGOROTH",
 	movement_speed = 0.7,
 	combat_armor = 0, combat_def = 20,
 	on_melee_hit = { [DamageType.ARCANE] = resolvers.mbonus(20, 10), },
-	can_pass = {pass_void=70},
 	combat = { atk=10000, apr=10000, damtype=DamageType.MANAWORM }, -- They can not miss
 }

game/modules/tome/data/zones/abashed-expanse/zone.lua

@@ -234,6 +234,7 @@ return {
 		core.display.glRotate(120, 0, 1, 0)
 		core.display.glRotate(300, 1, 0, 0)
 		core.display.glRotate(game.zone.world_sphere_rot, 0, 0, 1)
+		core.display.glColor(1, 1, 1, 1)
 
 		local tex = Map.tiles:get('', 0, 0, 0, 0, 0, 0, "shockbolt/terrain/eyal-world.png")
 		tex:bind(0)
@@ -244,8 +245,8 @@ return {
 		core.display.glRotate(game.zone.cloud_sphere_rot, 0, 0, 1)
 		level.world_sphere.q:sphere(304)
 
-		game.zone.world_sphere_rot = game.zone.world_sphere_rot + 0.01
-		game.zone.cloud_sphere_rot = game.zone.cloud_sphere_rot + rng.float(0.01, 0.02)
+		game.zone.world_sphere_rot = game.zone.world_sphere_rot + 0.01 * nb_keyframes
+		game.zone.cloud_sphere_rot = game.zone.cloud_sphere_rot + rng.float(0.01, 0.02) * nb_keyframes
 
 		core.display.glMatrix(false)
 		core.display.glDepthTest(false)

src/core_lua.c

@@ -1315,6 +1315,12 @@ static int gl_depth_test(lua_State *L)
 	return 0;
 }
 
+static int gl_color(lua_State *L)
+{
+	tglColor4f(luaL_checknumber(L, 1), luaL_checknumber(L, 2), luaL_checknumber(L, 3), luaL_checknumber(L, 4));
+	return 0;
+}
+
 static int sdl_texture_bind(lua_State *L)
 {
 	GLuint *t = (GLuint*)auxiliar_checkclass(L, "gl{texture}", 1);
@@ -1856,6 +1862,7 @@ static const struct luaL_reg displaylib[] =
 	{"glTranslate", gl_translate},
 	{"glScale", gl_scale},
 	{"glRotate", gl_rotate},
+	{"glColor", gl_color},
 	{"glMatrix", gl_matrix},
 	{"glDepthTest", gl_depth_test},
 	{NULL, NULL},