[reddozen's fix]

- Updated Full Buster's damage, status effects, and skill levels
- Bullseye now only uses 1 coin
- changed Adjustment's required SP
- changed Incerase Accuracy's effect bonuses
- changed Magical Bullet's SP cost
- changed Piercing Shot's damage and SP
- changed Desperado's range, hit count, aftercast delay, and SP
- fixed Absorb Spirit Sphere being able to remove coins
- changed Acid Demonstration's damage to the new Japanese formula

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

1 files changed, 24 insertions, 28 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 44ac95464..ef835eba4 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1254,6 +1254,9 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 	case GS_PIERCINGSHOT:

 		sc_start(bl,SC_BLEEDING,(skilllv*3),skilllv,skill_get_time2(skillid,skilllv));

 		break;

+	case GS_FULLBUSTER:

+		sc_start(bl,SC_BLIND,(2*skilllv),skilllv,skill_get_time2(skillid,1));

+		break;

 	case NJ_HYOUSYOURAKU:

 		sc_start(bl,SC_FREEZE,(10+10*skilllv),skilllv,skill_get_time2(skillid,skilllv));

 		break;

@@ -3952,29 +3955,29 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 

 	case MO_ABSORBSPIRITS:	// ?’D

 		i = 0;

-		if (dstsd && dstsd->spiritball > 0 &&

-			((sd && sd == dstsd) || map_flag_vs(src->m)))

+		if (dstsd && dstsd->spiritball > 0)

 		{

-			i = dstsd->spiritball * 7;

-			pc_delspiritball(dstsd,dstsd->spiritball,0);

-		} else if (dstmd && //??Û‚ªƒ‚ƒ“ƒXƒ^?‚Ì?ê?‡

-			//20%‚ÌŠm—¦‚Å??Û‚ÌLv*2‚ÌSP‚ð‰ñ•œ‚·‚é?B?¬Œ÷‚µ‚½‚Æ‚«‚̓^?ƒQƒbƒg(ƒÐ?„D?)ƒÐ????!!

-			!(status_get_mode(bl)&MD_BOSS) && rand() % 100 < 20)

-		{

-			i = 2 * dstmd->db->lv;

-			mob_target(dstmd,src,0);

-		}

-		if (sd){

-			if (i > 0x7FFF)

-				i = 0x7FFF;

-			if (sd->status.sp + i > sd->status.max_sp)

-				i = sd->status.max_sp - sd->status.sp;

-			if (i) {

-				sd->status.sp += i;

-				clif_heal(sd->fd,SP_SP,i);

+			if (((sd && sd == dstsd) || map_flag_vs(src->m)) && ((dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER))

+			{	// split the if for readability, and included gunslingers in the check so that their coins cannot be removed [Reddozen]

+				i = dstsd->spiritball * 7;

+				pc_delspiritball(dstsd,dstsd->spiritball,0);

+			} else if (dstmd && !(status_get_mode(bl)&MD_BOSS) && rand() % 100 < 20)

+			{	// check if target is a monster and not a Boss, for the 20% chance to absorb 2 SP per monster's level [Reddozen]

+				i = 2 * dstmd->db->lv;

+				mob_target(dstmd,src,0);

+			}

+			if (sd){

+				if (i > 0x7FFF)

+					i = 0x7FFF;

+				if (sd->status.sp + i > sd->status.max_sp)

+					i = sd->status.max_sp - sd->status.sp;

+				if (i) {

+					sd->status.sp += i;

+					clif_heal(sd->fd,SP_SP,i);

+				}

 			}

 		}

-		clif_skill_nodamage(src,bl,skillid,skilllv,0);

+			clif_skill_nodamage(src,bl,skillid,skilllv,0);

 		break;

 

 	case AC_MAKINGARROW:			/* –î?ì?¬ */

@@ -8139,6 +8142,7 @@ int skill_check_condition(struct map_session_data *sd,int type)
 	case GS_TRIPLEACTION:

 	case GS_MAGICALBULLET:

 	case GS_CRACKER:

+	case GS_BULLSEYE:

 		spiritball = 1;

 		if (skill != GS_MAGICALBULLET)

 			arrow_flag = 1;

@@ -8148,14 +8152,6 @@ int skill_check_condition(struct map_session_data *sd,int type)
 		}

 		break;

 

-	case GS_BULLSEYE:

-		spiritball = 5;

-		if(sd->equip_index[10] < 0) {

-			clif_arrow_fail(sd,0);

-			return 0;

-		}

-		break;

-

 	case GS_MADNESSCANCEL:

 		spiritball = 4;

 		if(sd->spiritball >= 4 && sd->sc.data[SC_ADJUSTMENT].timer!=-1)