#include "lua_api/l_object.h"
#include "lua_api/l_internal.h"
#include "common/c_converter.h"
+#include "common/c_content.h"
#include "server.h"
-#include "particles.h"
+#include "client/particles.h"
// add_particle({pos=, velocity=, acceleration=, expirationtime=,
-// size=, collisiondetection=, collision_removal=, vertical=,
-// texture=, player=})
+// size=, collisiondetection=, collision_removal=, object_collision=,
+// vertical=, texture=, player=})
// pos/velocity/acceleration = {x=num, y=num, z=num}
// expirationtime = num (seconds)
// size = num
// collisiondetection = bool
// collision_removal = bool
+// object_collision = bool
// vertical = bool
// texture = e.g."default_wood.png"
+// animation = TileAnimation definition
+// glow = num
int ModApiParticles::l_add_particle(lua_State *L)
{
MAP_LOCK_REQUIRED;
// Get parameters
v3f pos, vel, acc;
- pos = vel = acc = v3f(0, 0, 0);
-
float expirationtime, size;
expirationtime = size = 1;
-
- bool collisiondetection, vertical, collision_removal;
- collisiondetection = vertical = collision_removal = false;
-
- std::string texture = "";
- std::string playername = "";
+ bool collisiondetection, vertical, collision_removal, object_collision;
+ collisiondetection = vertical = collision_removal = object_collision = false;
+ struct TileAnimationParams animation;
+ animation.type = TAT_NONE;
+ std::string texture;
+ std::string playername;
+ u8 glow = 0;
if (lua_gettop(L) > 1) // deprecated
{
acc = check_v3f(L, 3);
expirationtime = luaL_checknumber(L, 4);
size = luaL_checknumber(L, 5);
- collisiondetection = lua_toboolean(L, 6);
+ collisiondetection = readParam<bool>(L, 6);
texture = luaL_checkstring(L, 7);
if (lua_gettop(L) == 8) // only spawn for a single player
playername = luaL_checkstring(L, 8);
"collisiondetection", collisiondetection);
collision_removal = getboolfield_default(L, 1,
"collision_removal", collision_removal);
+ object_collision = getboolfield_default(L, 1,
+ "object_collision", object_collision);
vertical = getboolfield_default(L, 1, "vertical", vertical);
+
+ lua_getfield(L, 1, "animation");
+ animation = read_animation_definition(L, -1);
+ lua_pop(L, 1);
+
texture = getstringfield_default(L, 1, "texture", "");
playername = getstringfield_default(L, 1, "playername", "");
+
+ glow = getintfield_default(L, 1, "glow", 0);
}
getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, size,
- collisiondetection, collision_removal, vertical, texture);
+ collisiondetection, collision_removal, object_collision, vertical,
+ texture, animation, glow);
return 1;
}
// minsize=, maxsize=,
// collisiondetection=,
// collision_removal=,
+// object_collision=,
// vertical=,
// texture=,
// player=})
// minsize/maxsize = num
// collisiondetection = bool
// collision_removal = bool
+// object_collision = bool
// vertical = bool
// texture = e.g."default_wood.png"
+// animation = TileAnimation definition
+// glow = num
int ModApiParticles::l_add_particlespawner(lua_State *L)
{
MAP_LOCK_REQUIRED;
// Get parameters
u16 amount = 1;
v3f minpos, maxpos, minvel, maxvel, minacc, maxacc;
- minpos= maxpos= minvel= maxvel= minacc= maxacc= v3f(0, 0, 0);
float time, minexptime, maxexptime, minsize, maxsize;
- time= minexptime= maxexptime= minsize= maxsize= 1;
- bool collisiondetection, vertical, collision_removal;
- collisiondetection = vertical = collision_removal = false;
+ time = minexptime = maxexptime = minsize = maxsize = 1;
+ bool collisiondetection, vertical, collision_removal, object_collision;
+ collisiondetection = vertical = collision_removal = object_collision = false;
+ struct TileAnimationParams animation;
+ animation.type = TAT_NONE;
ServerActiveObject *attached = NULL;
- std::string texture = "";
- std::string playername = "";
+ std::string texture;
+ std::string playername;
+ u8 glow = 0;
if (lua_gettop(L) > 1) //deprecated
{
maxexptime = luaL_checknumber(L, 10);
minsize = luaL_checknumber(L, 11);
maxsize = luaL_checknumber(L, 12);
- collisiondetection = lua_toboolean(L, 13);
+ collisiondetection = readParam<bool>(L, 13);
texture = luaL_checkstring(L, 14);
if (lua_gettop(L) == 15) // only spawn for a single player
playername = luaL_checkstring(L, 15);
"collisiondetection", collisiondetection);
collision_removal = getboolfield_default(L, 1,
"collision_removal", collision_removal);
+ object_collision = getboolfield_default(L, 1,
+ "object_collision", object_collision);
+
+ lua_getfield(L, 1, "animation");
+ animation = read_animation_definition(L, -1);
+ lua_pop(L, 1);
lua_getfield(L, 1, "attached");
if (!lua_isnil(L, -1)) {
vertical = getboolfield_default(L, 1, "vertical", vertical);
texture = getstringfield_default(L, 1, "texture", "");
playername = getstringfield_default(L, 1, "playername", "");
+ glow = getintfield_default(L, 1, "glow", 0);
}
u32 id = getServer(L)->addParticleSpawner(amount, time,
minsize, maxsize,
collisiondetection,
collision_removal,
+ object_collision,
attached,
vertical,
- texture, playername);
+ texture, playername,
+ animation, glow);
lua_pushnumber(L, id);
return 1;
// Get parameters
u32 id = luaL_checknumber(L, 1);
- std::string playername = "";
+ std::string playername;
if (lua_gettop(L) == 2) {
playername = luaL_checkstring(L, 2);
}