* Corrected Extremity Fist

* Added weapon skills rely on attack speed as cast delays
* Fixed mob_ghostring_fix not working

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

4 files changed, 24 insertions, 10 deletions

diff --git a/Changelog.txt b/Changelog.txt
index d3a4ae2b5..478ff0d98 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,11 @@
 Date	Added
 12/16
+        * Corrected Extremity Fist to not require Explosion Spirits when being used
+          right after using Combo Finish or Dilemma [celest]
+        * Added instant cast weapon skills rely on attack speed as cast delays, not
+          on dex [celest]
+        * Fixed mob_ghostring_fix not working [celest]
+        * Changed default value for mob_ghostring_fix to 'yes' [celest]
 	* Added #itemlist, removed @charitemlist [MC Cameri]
 	* Changed @job and #job so that when it's used it unequips all the items, to prevent sprite errors [MC Cameri]
 	* Fixed a misuse of mysql_config (thanks Daegalus for
diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index 6b0381074..f0ae5e9b1 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -560,7 +560,7 @@ pc_attack_attr_none: no
 mob_attack_attr_none: no
 
 // mob attacks againsts players wearing ghostring armor do full damage
-mob_ghostring_fix: no
+mob_ghostring_fix: yes
 
 // Does the Golden Thief Bug card only work during pvp?
 // no or 0 - gtb works all the time
diff --git a/src/map/battle.c b/src/map/battle.c
index 34c9d5ebb..494b7a323 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2717,11 +2717,11 @@ static struct Damage battle_calc_mob_weapon_attack(
 	if(damage < 0) damage = 0;
 
 	// 属 性の適用
-        if (!((battle_config.mob_ghostring_fix == 1) && 
-              (battle_get_element(target) == 8) && 
-              (target->type==BL_PC))) // [MouseJstr]
-	if(skill_num != 0 || s_ele != 0 || !battle_config.mob_attack_attr_none)
-	damage=battle_attr_fix(damage, s_ele, battle_get_element(target) );
+	if (!((battle_config.mob_ghostring_fix == 1) && 
+		(battle_get_elem_type(target) == 8) && 
+		(target->type==BL_PC))) // [MouseJstr]
+		if(skill_num != 0 || s_ele != 0 || !battle_config.mob_attack_attr_none)
+			damage=battle_attr_fix(damage, s_ele, battle_get_element(target) );
 
 	//if(sc_data && sc_data[SC_AURABLADE].timer!=-1)	/* オーラブレード 必中 */
 	//	damage += sc_data[SC_AURABLADE].val1 * 10;
@@ -5394,9 +5394,9 @@ void battle_set_defaults() {
 	battle_config.pc_cloak_check_type = 0;
 	battle_config.monster_cloak_check_type = 0;
 	battle_config.gvg_short_damage_rate = 100;
-	battle_config.gvg_long_damage_rate = 100;
-	battle_config.gvg_magic_damage_rate = 100;
-	battle_config.gvg_misc_damage_rate = 100;
+	battle_config.gvg_long_damage_rate = 60;
+	battle_config.gvg_magic_damage_rate = 50;
+	battle_config.gvg_misc_damage_rate = 60;
 	battle_config.gvg_eliminate_time = 7000;
 	battle_config.mob_changetarget_byskill = 0;
 	battle_config.pc_attack_direction_change = 1;
diff --git a/src/map/skill.c b/src/map/skill.c
index 740caf777..2cba675c2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1,4 +1,4 @@
-// $Id: skill.c,v 1.8 2004/12/15 8:56:46 PM Celestia $
+// $Id: skill.c,v 1.8 2004/12/16 6:46:08 PM Celestia $
 /* スキル?係 */
 
 #include <stdio.h>
@@ -7259,6 +7259,9 @@ int skill_check_condition(struct map_session_data *sd,int type)
 		}
 		break;
 	case ST_EXPLOSIONSPIRITS:
+		if (skill == MO_EXTREMITYFIST && ((sd->sc_data[SC_COMBO].timer != -1 && (sd->sc_data[SC_COMBO].val1 == MO_COMBOFINISH || sd->sc_data[SC_COMBO].val1 == CH_CHAINCRUSH)) || sd->sc_data[SC_BLADESTOP].timer!=-1)) {
+			break;
+		}
 		if(sd->sc_data[SC_EXPLOSIONSPIRITS].timer == -1) {
 			clif_skill_fail(sd,skill,0,0);
 			return 0;
@@ -7730,6 +7733,11 @@ int skill_use_id( struct map_session_data *sd, int target_id,
 			skill_status_change_end(&sd->bl, SC_MEMORIZE, -1);
 	}
 
+	// instant cast attack skills depend on aspd as delay [celest]
+	if (casttime == 0 && delay == 0 && skill_db[skill_num].skill_type == BF_WEAPON) {
+		delay = battle_get_adelay (&sd->bl) * battle_config.delay_rate / 100;
+	}
+
 	if(battle_config.pc_skill_log)
 		printf("PC %d skill use target_id=%d skill=%d lv=%d cast=%d\n",sd->bl.id,target_id,skill_num,skill_lv,casttime);