Переглянути джерело

* Novice skill, Trick Dead, will no longer be granted to classes upon reset (save for Novice and Baby) (bugreport:2312)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13336 54d463be-8e91-2dee-dedb-b68131a5f0ec
sketchyphoenix 16 роки тому
батько
коміт
a09c05061a
2 змінених файлів з 10 додано та 0 видалено
  1. 2 0
      Changelog-Trunk.txt
  2. 8 0
      src/map/pc.c

+ 2 - 0
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

+ 8 - 0
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