summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-02 20:33:41 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-02 20:33:41 +0000
commit8d7d2705e3c12c7c6cff03755bd031a35b993ba9 (patch)
tree5b9248e2f9ec6c483eaa0f9abd6eb6a144896be3
parent055a8778bc0b8cd87709af7517c5955bcc8f898c (diff)
downloadhercules-8d7d2705e3c12c7c6cff03755bd031a35b993ba9.tar.gz
hercules-8d7d2705e3c12c7c6cff03755bd031a35b993ba9.tar.bz2
hercules-8d7d2705e3c12c7c6cff03755bd031a35b993ba9.tar.xz
hercules-8d7d2705e3c12c7c6cff03755bd031a35b993ba9.zip
* Spirit of Bard and Dancer now only works for mastered skills (bugreport:3037)
- also fixed an outdated comment in the source code git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13714 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/pc.c4
-rw-r--r--src/map/skill.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a477d48ea..0d6b9722f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ 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.
+2009/05/02
+ * Spirit of Bard and Dancer now only works for mastered skills (bugreport:3037) [Playtester]
+ - also fixed an outdated comment in the source code
2009/04/27
* Fixed break equipment debuff working on bosses (bugreport:3023) [Playtester]
2009/04/25
diff --git a/src/map/pc.c b/src/map/pc.c
index 9ee886984..1c4330c01 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1106,12 +1106,16 @@ int pc_calc_skilltree(struct map_session_data *sd)
{ //Enable Bard/Dancer spirit linked skills.
if( sd->status.sex )
{ //Link dancer skills to bard.
+ if( sd->status.skill[i-8].lv < 10 )
+ continue;
sd->status.skill[i].id = i;
sd->status.skill[i].lv = sd->status.skill[i-8].lv; // Set the level to the same as the linking skill
sd->status.skill[i].flag = 1; // Tag it as a non-savable, non-uppable, bonus skill
}
else
{ //Link bard skills to dancer.
+ if( sd->status.skill[i].lv < 10 )
+ continue;
sd->status.skill[i-8].id = i - 8;
sd->status.skill[i-8].lv = sd->status.skill[i].lv; // Set the level to the same as the linking skill
sd->status.skill[i-8].flag = 1; // Tag it as a non-savable, non-uppable, bonus skill
diff --git a/src/map/skill.c b/src/map/skill.c
index acf4bc1ef..f05688426 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7216,7 +7216,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
int count = 0;
const int x = bl->x, y = bl->y;
- //If target isn't knocked back it should hit every 20ms [Playtester]
+ //If target isn't knocked back it should hit every "interval" ms [Playtester]
do
{
if( bl->type == BL_PC )