- Item use interval is set to a default of 100ms now.

- Updated Full Buster so that the can't act delay carries on to the weapon attack delay and can't use item intervals.
- Added script command getbattleflag to retrieve the current value of a battle_config switch.


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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 20b761b2d..08cd19569 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -408,6 +408,7 @@ int buildin_npcshopitem(struct script_state *st); // [Lance]
 int buildin_equip(struct script_state *st);

 int buildin_autoequip(struct script_state *st);

 int buildin_setbattleflag(struct script_state *st);

+int buildin_getbattleflag(struct script_state *st);

 // [zBuffer] List of player cont commands --->

 int buildin_rid2name(struct script_state *st);

 int buildin_pcwalkxy(struct script_state *st);

@@ -737,6 +738,7 @@ struct {
 	{buildin_equip,"equip","i"},

 	{buildin_autoequip,"autoequip","ii"},

 	{buildin_setbattleflag,"setbattleflag","ss"},

+	{buildin_getbattleflag,"getbattleflag","s"},

 	{buildin_setitemscript,"setitemscript","is"}, //Set NEW item bonus script. Lupus

 	{buildin_disguise,"disguise","i"}, //disguise player. Lupus

 	{buildin_undisguise,"undisguise","i"}, //undisguise player. Lupus

@@ -9553,11 +9555,18 @@ int buildin_setbattleflag(struct script_state *st){
 	if (battle_set_value(flag, value) == 0)

 		ShowWarning("buildin_setbattleflag: unknown battle_config flag '%s'",flag);

 	else

-        ShowInfo("buildin_setbattleflag: battle_config flag '%s' is now set to '%s'.",flag,value);

+		ShowInfo("buildin_setbattleflag: battle_config flag '%s' is now set to '%s'.",flag,value);

 

 	return 0;

 }

 

+int buildin_getbattleflag(struct script_state *st){

+	char *flag;

+	flag = conv_str(st,& (st->stack->stack_data[st->start+2]));

+	push_val(st->stack,C_INT,battle_get_value(flag));

+	return 0;

+}

+

 //=======================================================

 // strlen [Valaris]

 //-------------------------------------------------------