* Fixed attack not counted as connect when dodged and got damage from skill bonus like Weaponry Research.

* Corrected the description for vit_penalty_type.

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

3 files changed, 7 insertions, 3 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3ee052e70..ce1579a15 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+09/06/29
+	* Fixed attack not counted as connect when dodged and got damage from skill bonus like Weaponry Research. [Inkfish]
 09/06/28
 	* Implemented script command "autobonus". [Inkfish]
 	- "autobonus" is similar to "bonusautoscript", however it has a timer of its own.
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
index 37cabc199..b5544fe41 100644
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -88,10 +88,10 @@ agi_penalty_count: 3
 // Amount of FLEE penalized per each attacking monster more than agi_penalty_count
 agi_penalty_num: 10
 
-// Type of penalty that is applied to VIT defense when more than vit_penalty_count monsters are targetting player
+// Type of penalty that is applied to both equipment and vit DEF when more than vit_penalty_count monsters are targetting player
 // 0 = no penalty is applied
-// 1 = vit_penalty_num is reduced from FLEE as a %
-// 2 = vit_penalty_num is reduced from FLEE as an exact amount
+// 1 = vit_penalty_num is reduced from DEF as a %
+// 2 = vit_penalty_num is reduced from DEF as an exact amount
 vit_penalty_type: 1
 
 // When vit penalty is enabled, to whom it should apply to? (Note 3)
diff --git a/src/map/battle.c b/src/map/battle.c
index 505d37373..3e0a9556e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2790,6 +2790,8 @@ struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct bl
 			d.dmg_lv = ATK_MISS;
 		d.dmotion = 0;
 	}
+	else // Some skills like Weaponry Research will cause damage even if attack is dodged
+		d.dmg_lv = ATK_DEF;
 	return d;
 }