- 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, 7 insertions, 1 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 521753a25..c1c451471 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -934,12 +934,18 @@ static void battle_calc_base_damage(struct block_list *src, struct block_list *t
  * Consumes ammo for the given skill.

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

  */

-static void battle_consume_ammo(TBL_PC*sd, int skill, int lv)

+void battle_consume_ammo(TBL_PC*sd, int skill, int lv)

 {

 	int qty=1;

 	if (!battle_config.arrow_decrement)

 		return;

 	

+	if (skill == AC_SHOWER) {

+		//Can't consume arrows this way as it triggers per target, gotta wait for the direct invocation with lv -1

+		if (lv > 0)

+			return;

+		lv *= -1;

+	}

 	if (skill)

 	{

 		qty = skill_get_ammo_qty(skill, lv);