diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-27 11:41:16 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-27 11:41:16 +0000 |
| commit | 895c508c597988741d8ddafdbd4e75ec916081cc (patch) | |
| tree | bb9c090027ef6ba46aa22e784628f4d141291341 /src/map/clif.c | |
| parent | 909fd614f24aedc23f474c757ee8d6f74e3a86ab (diff) | |
| download | hercules-895c508c597988741d8ddafdbd4e75ec916081cc.tar.gz hercules-895c508c597988741d8ddafdbd4e75ec916081cc.tar.bz2 hercules-895c508c597988741d8ddafdbd4e75ec916081cc.tar.xz hercules-895c508c597988741d8ddafdbd4e75ec916081cc.zip | |
Fixed bugreport:6516 where duplicate entry in produce_db.txt is been ignored when both required skills are present in a character (ex. AM_PHARMACY w/ GN_CHANGEMATERIAL)
Updated all Genetic's item creation skills to its official behavior and added all missing items used for GN_CHANGEMATERIAL.(bugreport:6539)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16712 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 508f4991e..267c315cb 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5247,12 +5247,17 @@ void clif_skill_produce_mix_list(struct map_session_data *sd, int skillid , int if(sd->menuskill_id == skillid) return; //Avoid resending the menu twice or more times... + if( skillid == GC_CREATENEWPOISON ) + skillid = GC_RESEARCHNEWPOISON; + fd=sd->fd; WFIFOHEAD(fd, MAX_SKILL_PRODUCE_DB * 8 + 8); WFIFOW(fd, 0)=0x18d; for(i=0,c=0;i<MAX_SKILL_PRODUCE_DB;i++){ - if( skill_can_produce_mix(sd,skill_produce_db[i].nameid,trigger, 1) ){ + if( skill_can_produce_mix(sd,skill_produce_db[i].nameid, trigger, 1) && + ( ( skillid > 0 && skill_produce_db[i].req_skill == skillid ) || skillid < 0 ) + ){ if((view = itemdb_viewid(skill_produce_db[i].nameid)) > 0) WFIFOW(fd,c*8+ 4)= view; else @@ -10980,7 +10985,7 @@ void clif_parse_ProduceMix(int fd,struct map_session_data *sd) case -1: case AM_PHARMACY: case RK_RUNEMASTERY: - case GC_CREATENEWPOISON: + case GC_RESEARCHNEWPOISON: break; default: return; |