- getnameditem will now also work on stackable items

- Corrected battle_calc_weapon_attack so that all skills ignore your left-hand weapon, and that the Katar's double-attack damage bonus for the offhand damage applies ONLY on normal attacks.
- Fixed Resurrect Homunculus's % to 20*lv%


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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 132cf7eff..9ab0bbb95 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3045,7 +3045,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
 			case 2: sid=MG_LIGHTNINGBOLT; break;
 			case 3: sid=WZ_EARTHSPIKE; break;
 			}
-			skill_attack(BF_MAGIC,src,src,bl,sid,skilllv,tick,flag);
+			skill_attack(BF_MAGIC,src,src,bl,sid,skilllv,tick,flag|0xF000);
 		}
 		break;
 	case WZ_WATERBALL:			/* ウォーターボール */
@@ -6247,14 +6247,16 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
 	case AM_RESURRECTHOMUN:	//[orn]
 		if (sd)
 		{
+	/*	According to Tharis, the correct % SHOULD be 20*lv%
 			int p;
 			// If skilllv = 1, range = 1~4%, lv 2 : 5~25%, lv 3 : 25~45%, ...
 			if (skilllv == 1)
 				p = 1 + rand() % 4;
 			else
 				p = 5 + 20 * (skilllv - 2) + rand() % 21;
+	*/
 			if (map_flag_gvg(src->m) || //No reviving in WoE grounds!
-				!merc_revive_homunculus(sd, p, x, y))
+				!merc_revive_homunculus(sd, 20*skilllv, x, y))
 			{
 				clif_skill_fail(sd,skillid,0,0);
 				break;