update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@702 54d463be-8e91-2dee-dedb-b68131a5f0ec

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]

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;

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ƒXƒLƒ‹‚È‚ç�A
@@ -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
 			}
 		}
 	}