Skip to content
Snippets Groups Projects
Commit f35ed208 authored by dg's avatar dg
Browse files

Removed particle error debug lines

Illuminate now has a visual effect


git-svn-id: http://svn.net-core.org/repos/t-engine4@6195 51575b47-30f0-44d4-a5cc-537603b46e54
parent 0129a58a
No related branches found
No related tags found
No related merge requests found
......@@ -1271,6 +1271,33 @@ function _M:setupCommands()
print("===============")
end end,
[{"_g","ctrl"}] = function() if config.settings.cheat then
local elf = mod.class.NPC.new{
name = "red helper elf", type="humanoid", subtype="elf",
image = "player/elf_female/base_shadow_01.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15,
add_mos = {
{image="player/elf_female/cloak_behind_02.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/base_redhead_01.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/lower_body_06.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/upper_body_09.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/braid_redhead_02.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
},
}
game.zone:addEntity(game.level, elf, "actor", game.player.x, game.player.y+1)
local elf = mod.class.NPC.new{
name = "green helper elf", type="humanoid", subtype="elf",
image = "player/elf_female/base_shadow_01.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15,
add_mos = {
{image="player/elf_female/cloak_behind_06.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/base_thalore_01.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/lower_body_04.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/upper_body_06.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
{image="player/elf_female/braid_01.png", display_w = 0.7, display_h = 0.7, display_x = 0.15, display_y = 0.15},
},
}
game.zone:addEntity(game.level, elf, "actor", game.player.x+1, game.player.y+1)
do return end
self:registerDialog(require("mod.dialogs.DownloadCharball").new())
do return end
local f, err = loadfile("/data/general/events/glimmerstone.lua")
......
......@@ -45,6 +45,7 @@ newTalent{
action = function(self, t)
local tg = {type="ball", range=self:getTalentRange(t), selffire=true, radius=self:getTalentRadius(t), talent=t}
self:project(tg, self.x, self.y, DamageType.LITE, 1)
game.level.map:particleEmitter(self.x, self.y, tg.radius, "sunburst", {radius=tg.radius, grids=grids, tx=self.x, ty=self.y, max_alpha=80})
if self:getTalentLevel(t) >= 3 then
tg.selffire= false
self:project(tg, self.x, self.y, DamageType.BLIND, t.getBlindPower(self, t))
......
......@@ -426,12 +426,14 @@ static int particles_emit(lua_State *L)
lua_getglobal(L, "__fcts");
lua_pushnumber(L, l->generator_ref);
lua_rawget(L, -2);
if (lua_isnil(L, -1)) { printf("Particle emitter error %x (%d) is nil\n", (int)l, l->generator_ref); }
if (lua_isnil(L, -1)) {
// printf("Particle emitter error %x (%d) is nil\n", (int)l, l->generator_ref);
}
else {
lua_pushnumber(L, i);
if (lua_pcall(L, 1, 1, 0))
{
printf("Particle emitter error %x (%d): %s\n", (int)l, l->generator_ref, lua_tostring(L, -1));
// printf("Particle emitter error %x (%d): %s\n", (int)l, l->generator_ref, lua_tostring(L, -1));
lua_pop(L, 1);
}
}
......@@ -558,7 +560,7 @@ void thread_particle_run(particle_thread *pt, plist *l)
lua_rawget(L, -3);
if (!lua_isfunction(L, -2) || !lua_istable(L, -1)) {
printf("L(%x) Particle updater error %x (%d, %d) is nil: %s / %s\n", (int)L, (int)l, l->updator_ref, l->emit_ref, lua_tostring(L, -1), lua_tostring(L, -2));
// printf("L(%x) Particle updater error %x (%d, %d) is nil: %s / %s\n", (int)L, (int)l, l->updator_ref, l->emit_ref, lua_tostring(L, -1), lua_tostring(L, -2));
lua_pop(L, 2);
}
else {
......@@ -571,7 +573,7 @@ void thread_particle_run(particle_thread *pt, plist *l)
if (run) {
if (lua_pcall(L, 1, 0, 0))
{
printf("L(%x) Particle updater error %x (%d, %d): %s\n", (int)L, (int)l, l->updator_ref, l->emit_ref, lua_tostring(L, -1));
// printf("L(%x) Particle updater error %x (%d, %d): %s\n", (int)L, (int)l, l->updator_ref, l->emit_ref, lua_tostring(L, -1));
// ps->i_want_to_die = TRUE;
lua_pop(L, 1);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment