From 4f6447b58e49e8b1eef7d29d4dbb9ca12e0f7abe Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Thu, 29 Aug 2013 03:58:50 +0200
Subject: [PATCH] Script interface extensions:

- shot_setTargetPoint()
- shot_getTargetPoint()
- entity_getTargetPriority()
- fix oversight in entity_doEntityAvoidance()
- entity_getTargetRange()
- getJoystickAxisLeft()
- getJoystickAxisRight()
---
 Aquaria/ScriptInterface.cpp | 46 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp
index 634a44c..a17519e 100644
--- a/Aquaria/ScriptInterface.cpp
+++ b/Aquaria/ScriptInterface.cpp
@@ -2177,6 +2177,20 @@ luaFunc(shot_setTrailPrt)
 	luaReturnNil();
 }
 
+luaFunc(shot_setTargetPoint)
+{
+	Shot *shot = getShot(L);
+	if (shot)
+		shot->setTargetPoint(lua_tointeger(L, 2));
+	luaReturnNil();
+}
+
+luaFunc(shot_getTargetPoint)
+{
+	Shot *shot = getShot(L);
+	luaReturnInt(shot ? shot->targetPt : 0);
+}
+
 luaFunc(entity_setVel)
 {
 	Entity *e = entity(L);
@@ -2502,6 +2516,12 @@ luaFunc(entity_setTargetPriority)
 	luaReturnNil();
 }
 
+luaFunc(entity_getTargetPriority)
+{
+	Entity *e = entity(L);
+	luaReturnInt(e ? e->targetPriority : 0);
+}
+
 luaFunc(isQuitFlag)
 {
 	luaReturnBool(dsq->isQuitFlag());
@@ -5675,7 +5695,7 @@ luaFunc(entity_doCollisionAvoidance)
 	Entity *e = entity(L);
 	bool ret = false;
 
-	int useVel2 = lua_tonumber(L, 6);
+	bool useVel2 = getBool(L, 6);
 	bool onlyVP = getBool(L, 7);
 	int ignoreObs = lua_tointeger(L, 8);
 
@@ -5876,6 +5896,12 @@ luaFunc(entity_setTargetRange)
 	luaReturnNil();
 }
 
+luaFunc(entity_getTargetRange)
+{
+	Entity *e = entity(L);
+	luaReturnInt(e ? e->getTargetRange() : 0);
+}
+
 luaFunc(entity_clearTargetPoints)
 {
 	Entity *e = entity(L);
@@ -7565,6 +7591,18 @@ luaFunc(getInputMode)
 	luaReturnInt(dsq->inputMode);
 }
 
+luaFunc(getJoystickAxisLeft)
+{
+	Vector v = core->joystick.position;
+	luaReturnVec2(v.x, v.y);
+}
+
+luaFunc(getJoystickAxisRight)
+{
+	Vector v = core->joystick.rightStick;
+	luaReturnVec2(v.x, v.y);
+}
+
 luaFunc(quit)
 {
 #ifdef AQUARIA_DEMO
@@ -8486,6 +8524,7 @@ static const struct {
 	luaRegister(entity_getNumTargetPoints),
 
 	luaRegister(entity_setTargetRange),
+	luaRegister(entity_getTargetRange),
 
 	luaRegister(bone_addSegment),
 
@@ -8528,6 +8567,8 @@ static const struct {
 	luaRegister(disableInput),
 
 	luaRegister(getInputMode),
+	luaRegister(getJoystickAxisLeft),
+	luaRegister(getJoystickAxisRight),
 
 	luaRegister(setMousePos),
 	luaRegister(getMousePos),
@@ -8615,6 +8656,7 @@ static const struct {
 	luaRegister(entity_stopTimer),
 	luaRegister(entity_stopPull),
 	luaRegister(entity_setTargetPriority),
+	luaRegister(entity_getTargetPriority),
 
 	luaRegister(entity_setEntityType),
 	luaRegister(entity_getEntityType),
@@ -8981,6 +9023,8 @@ static const struct {
 	luaRegister(shot_setCheckDamageTarget),
 	luaRegister(shot_isCheckDamageTarget),
 	luaRegister(shot_setTrailPrt),
+	luaRegister(shot_setTargetPoint),
+	luaRegister(shot_getTargetPoint),
 	luaRegister(entity_pathBurst),
 	luaRegister(entity_handleShotCollisions),
 	luaRegister(entity_handleShotCollisionsSkeletal),