浏览代码

* Fixed Monster Spiral Pierce not being reduced by Ghostring Card
- it is forced neutral as its a MISC skill for monsters and doesn't take weapon element

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13702 54d463be-8e91-2dee-dedb-b68131a5f0ec

Playtester 16 年之前
父节点
当前提交
96a0560b11
共有 2 个文件被更改,包括 13 次插入2 次删除
  1. 2 0
      Changelog-Trunk.txt
  2. 11 2
      src/map/battle.c

+ 2 - 0
Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2009/04/25
+	* Fixed Monster Spiral Pierce not being reduced by Ghostring Card (bugreport:3013) [Playtester]
+	- it is forced neutral as its a MISC skill for monsters and doesn't take weapon element
 	* First attempt to fix up the strip skills, please make sure these fixes work (bugreport:3011) [Playtester]
 	- the minimum rate of strip skills is now 5% for all levels
 	- duration of strip skills depends on the dex difference between target and caster and can be reduced to 0

+ 11 - 2
src/map/battle.c

@@ -1035,8 +1035,17 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
 	} else if (s_ele == -2) { //Use enchantment's element
 		s_ele = s_ele_ = status_get_attack_sc_element(src,sc);
 	}
-	if (skill_num == GS_GROUNDDRIFT)
-		s_ele = s_ele_ = wflag; //element comes in flag.
+
+	switch(skill_num)
+	{
+		case GS_GROUNDDRIFT:
+			s_ele = s_ele_ = wflag; //element comes in flag.
+			break;
+
+		case LK_SPIRALPIERCE:
+			if (!sd) nk &= ~NK_NO_ELEFIX; //forced neutral for monsters
+			break;
+	}
 
 	if(!skill_num)
   	{	//Skills ALWAYS use ONLY your right-hand weapon (tested on Aegis 10.2)