mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 22:19:07 +00:00
Code Issues Releases Wiki Activity

Script interface additions:

Browse source 
+ entity_isDeathScene()
+ getNearestEntity()
+ entity_getDistanceToPoint()
Add color transition time parameter to fade(), fade2(), fade3()
This commit is contained in:
fgenesis 2013-04-22 23:38:10 +02:00
parent cba3535487
commit 0490afe7a2
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Aquaria/Entity.h
View file

@ -436,6 +436,7 @@ public:
void setDieTimer(float v) { dieTimer = v; } void setDieTimer(float v) { dieTimer = v; }
float getHealthPerc(); float getHealthPerc();
void setDeathScene(bool v); void setDeathScene(bool v);
bool isDeathScene() const { return deathScene; }
void generateCollisionMask(int ovrCollideRadius=0); void generateCollisionMask(int ovrCollideRadius=0);
DamageData lastDamage; DamageData lastDamage;
bool checkSplash(const Vector &override=Vector(0,0,0)); bool checkSplash(const Vector &override=Vector(0,0,0));

41
Aquaria/ScriptInterface.cpp
View file

@ -4564,6 +4564,18 @@ luaFunc(entity_getDistanceToTarget)
luaReturnNum(dist); luaReturnNum(dist);
} }
luaFunc(entity_getDistanceToPoint)
{
Entity *e = entity(L);
float dist = 0;
if (e)
{
Vector p(lua_tonumber(L, 2), lua_tonumber(L, 3));
dist = (p - e->position).getLength2D();
}
luaReturnNum(dist);
}
luaFunc(entity_watchEntity) luaFunc(entity_watchEntity)
{ {
Entity *e = entity(L); Entity *e = entity(L);
@ -5204,6 +5216,12 @@ luaFunc(entity_setDeathScene)
luaReturnNil(); luaReturnNil();
} }
luaFunc(entity_isDeathScene)
{
Entity *e = entity(L);
luaReturnBool(e ? e->isDeathScene() : false);
}
luaFunc(entity_setCurrentTarget) luaFunc(entity_setCurrentTarget)
{ {
Entity *e = entity(L); Entity *e = entity(L);
@ -6546,6 +6564,20 @@ luaFunc(entity_getNearestEntity)
luaReturnPtr(closest); luaReturnPtr(closest);
} }
luaFunc(getNearestEntity)
{
Vector p(lua_tonumber(L, 1), lua_tonumber(L, 2));
int radius = lua_tointeger(L, 3);
Entity *ignore = lua_isuserdata(L, 4) ? entity(L, 4) : NULL;
EntityType et = lua_isnumber(L, 5) ? (EntityType)lua_tointeger(L, 5) : ET_NOTYPE;
DamageType dt = lua_isnumber(L, 6) ? (DamageType)lua_tointeger(L, 6) : DT_NONE;
int lrStart = lua_isnumber(L, 7) ? lua_tointeger(L, 7) : -1;
int lrEnd = lua_isnumber(L, 8) ? lua_tointeger(L, 8) : -1;
Entity *target = dsq->game->getNearestEntity(p, radius, ignore, ET_ENEMY, dt, lrStart, lrEnd);
luaReturnPtr(target);
}
luaFunc(findWall) luaFunc(findWall)
{ {
int x = lua_tonumber(L, 1); int x = lua_tonumber(L, 1);
@ -7049,21 +7081,21 @@ luaFunc(getMouseWorldPos)
luaFunc(fade) luaFunc(fade)
{ {
dsq->overlay->color = Vector(lua_tonumber(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5)); dsq->overlay->color.interpolateTo(Vector(lua_tonumber(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5)), lua_tonumber(L, 6));
dsq->overlay->alpha.interpolateTo(lua_tonumber(L, 1), lua_tonumber(L, 2)); dsq->overlay->alpha.interpolateTo(lua_tonumber(L, 1), lua_tonumber(L, 2));
luaReturnNil(); luaReturnNil();
} }
luaFunc(fade2) luaFunc(fade2)
{ {
dsq->overlay2->color = Vector(lua_tonumber(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5)); dsq->overlay2->color.interpolateTo(Vector(lua_tonumber(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5)), lua_tonumber(L, 6));
dsq->overlay2->alpha.interpolateTo(lua_tonumber(L, 1), lua_tonumber(L, 2)); dsq->overlay2->alpha.interpolateTo(lua_tonumber(L, 1), lua_tonumber(L, 2));
luaReturnNil(); luaReturnNil();
} }
luaFunc(fade3) luaFunc(fade3)
{ {
dsq->overlay3->color = Vector(lua_tonumber(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5)); dsq->overlay3->color.interpolateTo(Vector(lua_tonumber(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5)), lua_tonumber(L, 6));
dsq->overlay3->alpha.interpolateTo(lua_tonumber(L, 1), lua_tonumber(L, 2)); dsq->overlay3->alpha.interpolateTo(lua_tonumber(L, 1), lua_tonumber(L, 2));
luaReturnNil(); luaReturnNil();
} }
@ -7557,6 +7589,7 @@ static const struct {
luaRegister(entity_setBoneLock), luaRegister(entity_setBoneLock),
luaRegister(entity_setIngredient), luaRegister(entity_setIngredient),
luaRegister(entity_setDeathScene), luaRegister(entity_setDeathScene),
luaRegister(entity_isDeathScene),
luaRegister(entity_setBeautyFlip), luaRegister(entity_setBeautyFlip),
luaRegister(entity_setInvincible), luaRegister(entity_setInvincible),
@ -7708,6 +7741,7 @@ static const struct {
luaRegister(entity_getVectorToEntity), luaRegister(entity_getVectorToEntity),
luaRegister(entity_getDistanceToTarget), luaRegister(entity_getDistanceToTarget),
luaRegister(entity_getDistanceToPoint),
luaRegister(entity_move), luaRegister(entity_move),
luaRegister(entity_getID), luaRegister(entity_getID),
@ -8302,6 +8336,7 @@ static const struct {
luaRegister(entity_getNearestEntity), luaRegister(entity_getNearestEntity),
luaRegister(entity_getNearestBoneToPosition), luaRegister(entity_getNearestBoneToPosition),
luaRegister(getNearestEntity),
luaRegister(entity_getNearestNode), luaRegister(entity_getNearestNode),
luaRegister(entity_setPoison), luaRegister(entity_setPoison),