diff options
| author | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-10-29 13:22:47 +0000 |
|---|---|---|
| committer | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-10-29 13:22:47 +0000 |
| commit | 98e1d89b94e5ca1a1e24db886dbf3190b8bc7d46 (patch) | |
| tree | 2a8f9294c5450f02c8843076a5a00846877e8197 | |
| parent | 6c96f6b31543b7a431afd2482c592b9fa3070688 (diff) | |
| download | hercules-98e1d89b94e5ca1a1e24db886dbf3190b8bc7d46.tar.gz hercules-98e1d89b94e5ca1a1e24db886dbf3190b8bc7d46.tar.bz2 hercules-98e1d89b94e5ca1a1e24db886dbf3190b8bc7d46.tar.xz hercules-98e1d89b94e5ca1a1e24db886dbf3190b8bc7d46.zip | |
* Novice skill, Trick Dead, will no longer be granted to classes upon reset (save for Novice and Baby) (bugreport:2312)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13336 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 35d572a4f..c185a25c9 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. +2008/10/29 + * Novice skill, Trick Dead, will no longer be granted to classes upon reset (save for Novice and Baby) (bugreport:2312) [SketchyPhoenix] 2008/10/28 * Made script command "unequip" call status_calc_pc. Thanks to Orcao. (bugreport:2368). [Paradox924X] 2008/10/27 diff --git a/src/map/pc.c b/src/map/pc.c index 7774680f7..ba29547ca 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4861,6 +4861,14 @@ int pc_resetskill(struct map_session_data* sd, int flag) if( inf2&(INF2_WEDDING_SKILL|INF2_SPIRIT_SKILL) ) //Avoid reseting wedding/linker skills. continue; + + // Don't reset trick dead if not a novice/baby + if( i == NV_TRICKDEAD && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE && (sd->class_&MAPID_UPPERMASK) != MAPID_BABY ) + { + sd->status.skill[i].lv = 0; + sd->status.skill[i].flag = 0; + } + continue; if( inf2&INF2_QUEST_SKILL && !battle_config.quest_skill_learn ) { //Only handle quest skills in a special way when you can't learn them manually |