diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-21 17:11:37 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-21 17:11:37 +0000 |
| commit | 58e576b3e274619d79fd8b68be778e3db4023537 (patch) | |
| tree | a93b29609a01b0b7ad7401c7840166513bbe2031 | |
| parent | 6e8711b3aa6dde7bd0f863b3cb9fed24cad860f4 (diff) | |
| download | hercules-58e576b3e274619d79fd8b68be778e3db4023537.tar.gz hercules-58e576b3e274619d79fd8b68be778e3db4023537.tar.bz2 hercules-58e576b3e274619d79fd8b68be778e3db4023537.tar.xz hercules-58e576b3e274619d79fd8b68be778e3db4023537.zip | |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@702 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 8 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt index cfbfcd4c3..b5f1a0b11 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,7 @@ Date Added 12/21 + * guild skills vanished due to incorrect placement of a + check for quest skills in the calc_skilltree code [MouseJstr] * Fixed skill LK_HEADCRUSH, LK_JOINTBEAT to work on both on and off peco's for lord knights (fixed typo in skill_tree.txt) [MouseJstr] diff --git a/src/map/battle.c b/src/map/battle.c index 22ad51609..2ff50cfff 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4468,6 +4468,7 @@ struct Damage battle_calc_misc_attack( #ifdef TWILIGHT if( sd==NULL || (skill = pc_checkskill(sd,HT_BLITZBEAT)) <= 0) skill=0; + damage=(100+50*skill_lv+(dex/10+int_/2+skill*3+40)*2) * 2; #else if( sd==NULL || (skill = pc_checkskill(sd,HT_STEELCROW)) <= 0) skill=0; diff --git a/src/map/pc.c b/src/map/pc.c index c10eef425..5f55bfc51 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -997,6 +997,8 @@ int pc_calc_skilltree(struct map_session_data *sd) c = pc_calc_skilltree_normalize_job(c, sd); for(i=0;i<MAX_SKILL;i++){ + if(skill_get_inf2(i)) + continue; if (sd->status.skill[i].flag != 13) sd->status.skill[i].id=0; if (sd->status.skill[i].flag && sd->status.skill[i].flag != 13){ // cardスキルなら、 @@ -1024,8 +1026,6 @@ int pc_calc_skilltree(struct map_session_data *sd) flag=0; for(i=0;(id=skill_tree[s][c][i].id)>0;i++){ int j,f=1; - if(skill_get_inf2(id)) - continue; if(!battle_config.skillfree) { for(j=0;j<5;j++) { if( skill_tree[s][c][i].need[j].id && @@ -1084,7 +1084,7 @@ int pc_calc_skilltree_normalize_job(int c, struct map_session_data *sd) { case 17: c = 6; break; -#if 0 +// #if 0 case 4008: case 4014: case 4015: @@ -1139,7 +1139,7 @@ int pc_calc_skilltree_normalize_job(int c, struct map_session_data *sd) { case 4043: c = 4029; break; -#endif +// #endif } } } |