- If someone is expulsed from a guild while the guild storage is open, it will be auto-closed now.

- Modified battle_consume_ammo to prevent consuming multiple arrows on AC_SHOWER.
- Readded script command skillpointcount. (who removed it? <.<)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6406 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 14 insertions, 0 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 5880c0b81..f9a87e1be 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -271,6 +271,7 @@ int buildin_birthpet(struct script_state *st);
 int buildin_resetlvl(struct script_state *st);

 int buildin_resetstatus(struct script_state *st);

 int buildin_resetskill(struct script_state *st);

+int buildin_skillpointcount(struct script_state *st);

 int buildin_changebase(struct script_state *st);

 int buildin_changesex(struct script_state *st);

 int buildin_waitingroom(struct script_state *st);

@@ -594,6 +595,7 @@ struct {
 	{buildin_resetlvl,"resetlvl","i"},

 	{buildin_resetstatus,"resetstatus",""},

 	{buildin_resetskill,"resetskill",""},

+	{buildin_skillpointcount,"skillpointcount",""},

 	{buildin_changebase,"changebase","i"},

 	{buildin_changesex,"changesex",""},

 	{buildin_waitingroom,"waitingroom","si*"},

@@ -6322,6 +6324,18 @@ int buildin_resetskill(struct script_state *st)
 }

 

 /*==========================================

+ * Counts total amount of skill points.

+ *------------------------------------------

+ */

+int buildin_skillpointcount(struct script_state *st)

+{

+	struct map_session_data *sd;

+	sd=script_rid2sd(st);

+	push_val(st->stack,C_INT,sd->status.skill_point + pc_resetskill(sd,2));

+	return 0;

+}

+

+/*==========================================

  *

  *------------------------------------------

  */