diff --git a/game/modules/tome/data/general/npcs/losgoroth.lua b/game/modules/tome/data/general/npcs/losgoroth.lua index b070ccd7db6e1fde2226f249e5e3b749bc7c6940..b813d82d9f4b5e315b4a65e2fb806ca14b80d866 100644 --- a/game/modules/tome/data/general/npcs/losgoroth.lua +++ b/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 } diff --git a/game/modules/tome/data/zones/abashed-expanse/zone.lua b/game/modules/tome/data/zones/abashed-expanse/zone.lua index 034b6a7b3f92e267f35df180886f78a5443fe80d..af51d42348fbec2d0906f77d345f419a19a51c5e 100644 --- a/game/modules/tome/data/zones/abashed-expanse/zone.lua +++ b/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) diff --git a/src/core_lua.c b/src/core_lua.c index 6776df1d561db57da241187bd7624e53fca154b8..6107c7f751f6b2435b7f133dd42a2047a1cdd844 100644 --- a/src/core_lua.c +++ b/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},