Lua: Move "Conveyance" spell functions to C

3 files changed, 235 insertions, 0 deletions

diff --git a/src/externs.h b/src/externs.h
index 4fa71a2f..6a3bdb07 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1421,6 +1421,26 @@ char  *air_thunderstorm_info();
 bool_ *air_sterilize();
 char  *air_sterilize_info();
 
+extern s32b BLINK;
+extern s32b DISARM;
+extern s32b TELEPORT;
+extern s32b TELEAWAY;
+extern s32b RECALL;
+extern s32b PROBABILITY_TRAVEL;
+
+bool_ *convey_blink();
+char  *convey_blink_info();
+bool_ *convey_disarm();
+char  *convey_disarm_info();
+bool_ *convey_teleport();
+char  *convey_teleport_info();
+bool_ *convey_teleport_away();
+char  *convey_teleport_away_info();
+bool_ *convey_recall();
+char  *convey_recall_info();
+bool_ *convey_probability_travel();
+char  *convey_probability_travel_info();
+
 /* randart.c */
 extern int get_activation_power(void);
 extern void build_prob(cptr learn);
diff --git a/src/spells.pkg b/src/spells.pkg
index de5d55bc..f1a83a23 100644
--- a/src/spells.pkg
+++ b/src/spells.pkg
@@ -2444,3 +2444,26 @@ bool_ *air_thunderstorm();
 char  *air_thunderstorm_info();
 bool_ *air_sterilize();
 char  *air_sterilize_info();
+
+/*
+ * Conveyance
+ */
+extern s32b BLINK;
+extern s32b DISARM;
+extern s32b TELEPORT;
+extern s32b TELEAWAY;
+extern s32b RECALL;
+extern s32b PROBABILITY_TRAVEL;
+
+bool_ *convey_blink();
+char  *convey_blink_info();
+bool_ *convey_disarm();
+char  *convey_disarm_info();
+bool_ *convey_teleport();
+char  *convey_teleport_info();
+bool_ *convey_teleport_away();
+char  *convey_teleport_away_info();
+bool_ *convey_recall();
+char  *convey_recall_info();
+bool_ *convey_probability_travel();
+char  *convey_probability_travel_info();
diff --git a/src/spells3.c b/src/spells3.c
index 0b5d5443..dd75aac0 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -7,6 +7,13 @@ s32b POISONBLOOD;
 s32b THUNDERSTORM;
 s32b STERILIZE;
 
+s32b BLINK;
+s32b DISARM;
+s32b TELEPORT;
+s32b TELEAWAY;
+s32b RECALL;
+s32b PROBABILITY_TRAVEL;
+
 /* FIXME: Hackish workaround while we're still tied to Lua. This lets
  us return Lua's "nil" and a non-nil value (which is all the s_aux.lua
  cares about). */
@@ -162,3 +169,188 @@ char *air_sterilize_info()
 		(20 + get_level_s(STERILIZE, 70)));
 	return buf;
 }
+
+bool_ *convey_blink()
+{
+	if (get_level_s(BLINK, 50) >= 30)
+	{
+		int oy = p_ptr->py;
+		int ox = p_ptr->px;
+
+		teleport_player(10 + get_level_s(BLINK, 8));
+		create_between_gate(0, oy, ox);
+		return CAST;
+	}
+	else
+	{
+		teleport_player(10 + get_level_s(BLINK, 8));
+		return CAST;
+	}
+}
+
+char *convey_blink_info()
+{
+	static char buf[128];
+	sprintf(buf,
+		"distance %d",
+		(10 + get_level_s(BLINK, 8)));
+	return buf;
+}
+
+bool_ *convey_disarm()
+{
+	destroy_doors_touch();
+	if (get_level_s(DISARM, 50) >= 10)
+	{
+		destroy_traps_touch();
+	}
+
+	return CAST;
+}
+
+char *convey_disarm_info()
+{
+	return "";
+}
+
+bool_ *convey_teleport()
+{
+	p_ptr->energy -= (25 - get_level_s(TELEPORT, 50));
+	teleport_player(100 + get_level_s(TELEPORT, 100));
+	return CAST;
+}
+
+char *convey_teleport_info()
+{
+	static char buf[128];
+	sprintf(buf,
+		"distance %d",
+		(100 + get_level_s(TELEPORT, 100)));
+	return buf;
+}
+
+bool_ *convey_teleport_away()
+{
+	if (get_level_s(TELEAWAY, 50) >= 20)
+	{
+		project_hack(GF_AWAY_ALL, 100);
+		return CAST;
+	}
+	else if (get_level_s(TELEAWAY, 50) >= 10)
+	{
+		int dir;
+		if (!get_aim_dir(&dir))
+		{
+			return NO_CAST;
+		}
+
+		fire_ball(GF_AWAY_ALL, dir, 100, 3 + get_level_s(TELEAWAY, 4));
+		return CAST;
+	}
+	else
+	{
+		int dir;
+		if (!get_aim_dir(&dir))
+		{
+			return NO_CAST;
+		}
+		teleport_monster(dir);
+		return CAST;
+	}
+}
+
+char *convey_teleport_away_info()
+{
+	return "";
+}
+
+static int recall_get_d()
+{
+	int d = 21 - get_level_s(RECALL, 15);
+	if (d < 0)
+	{
+		d = 0;
+	}
+	return d;
+}
+
+static int recall_get_f()
+{
+	int f = 15 - get_level_s(RECALL, 10);
+	if (f < 1)
+	{
+		f = 1;
+	}
+	return f;
+}
+
+bool_ *convey_recall()
+{
+	int x,y;
+	cave_type *c_ptr;
+
+	if (!tgt_pt(&x, &y))
+	{
+		return NO_CAST;
+	}
+
+	c_ptr = &cave[y][x];
+
+	if ((y == p_ptr->py) &&
+	    (x == p_ptr->px))
+	{
+		int d = recall_get_d();
+		int f = recall_get_f();
+		recall_player(d, f);
+		return CAST;
+	}
+	else if (c_ptr->m_idx > 0)
+	{
+		swap_position(y, x);
+		return CAST;
+	}
+	else if (c_ptr->o_idx > 0)
+	{
+		set_target(y, x);
+		if (get_level_s(RECALL, 50) >= 15)
+		{
+			fetch(5, 10 + get_level_s(RECALL, 150), FALSE);
+		}
+		else
+		{
+			fetch(5, 10 + get_level_s(RECALL, 150), TRUE);
+		}
+		return CAST;
+	}
+	else
+	{
+		return NO_CAST;
+	}
+}
+
+char *convey_recall_info()
+{
+	static char buf[128];
+	int d = recall_get_d();
+	int f = recall_get_f();
+
+	sprintf(buf,
+		"dur %d+d%d weight %dlb",
+		f, d, (1 + get_level_s(RECALL, 15)));
+	return buf;
+}
+
+bool_ *convey_probability_travel()
+{
+	set_prob_travel(randint(20) + get_level_s(PROBABILITY_TRAVEL, 60));
+	return CAST;
+}
+
+char *convey_probability_travel_info()
+{
+	static char buf[128];
+	sprintf(buf,
+		"dur %d+d20",
+		get_level_s(PROBABILITY_TRAVEL, 60));
+	return buf;
+}