summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-28 01:55:48 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-28 01:55:48 +0000
commit9ca0347c41430b8cdc19bce6a01c2e10b30ce85e (patch)
tree21c85377240254c8222c3a1ef12539075c1f3714
parent8c784e637b9dd44dfde54a0c770f46a9a5d86cf0 (diff)
downloadhercules-9ca0347c41430b8cdc19bce6a01c2e10b30ce85e.tar.gz
hercules-9ca0347c41430b8cdc19bce6a01c2e10b30ce85e.tar.bz2
hercules-9ca0347c41430b8cdc19bce6a01c2e10b30ce85e.tar.xz
hercules-9ca0347c41430b8cdc19bce6a01c2e10b30ce85e.zip
* Fixed skillratio of Archbishop skills is 100% higher than it's supposed be.(it's initialized to be 100% not 0)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14944 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Renewal.txt2
-rw-r--r--src/map/battle.c12
2 files changed, 10 insertions, 4 deletions
diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt
index 943cc2748..d037e4693 100644
--- a/Changelog-Renewal.txt
+++ b/Changelog-Renewal.txt
@@ -1,6 +1,8 @@
Date Added
2011/08/27
+ * Fixed skillratio of Archbishop skills is 100% higher than it's supposed be.(it's initialized to be 100% not 0) [Inkfish]
+2011/08/27
* Reverted unnecessary signature change of clif_skill_fail from r14941. [Gepard]
2011/08/26
* Rev. 14941 Renewal changes in renewal branch? Am I dreaming? [L0ne_W0lf]
diff --git a/src/map/battle.c b/src/map/battle.c
index ccda6bc44..dfbda4ded 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1731,7 +1731,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
skillratio += ((skill_lv-1)%5+1)*100;
break;
case AB_DUPLELIGHT_MELEE:
- skillratio += 100 + 10 * skill_lv;
+ skillratio += 10 * skill_lv;
break;
}
@@ -2530,13 +2530,17 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
skillratio += 100 +100*skill_lv +100*(skill_lv/2);
break;
case AB_JUDEX:
- skillratio += ((skill_lv < 5)?280 + 20 * skill_lv:400) * (status_get_lv(src) / 100); // Possible RE-Formula
+ skillratio += ((skill_lv < 5)?180 + 20 * skill_lv:300); // Possible RE-Formula
+ if( status_get_lv(src) >= 100 )
+ skillratio = skillratio * status_get_lv(src) / 100;
break;
case AB_ADORAMUS:
- skillratio += (500 + 100 * skill_lv) * (status_get_lv(src) / 100); //Possible RE-Formula
+ skillratio += 400 + 100 * skill_lv; //Possible RE-Formula
+ if( status_get_lv(src) >= 100 )
+ skillratio = skillratio * status_get_lv(src) / 100;
break;
case AB_DUPLELIGHT_MAGIC:
- skillratio += 200 + 20 * skill_lv;
+ skillratio += 100 + 20 * skill_lv;
break;
}