Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:7182 where GN_MIX_COOKING is limited in creating 1 food item.

Browse Source 
Fixed bugreport:7172 missing elemental resistance bonus of NC_RESEARCHFE.
Recoded RA_FEARBREEZE.(bugreport:7188).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17101 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
rud0lp20 2013-01-16 14:45:42 +00:00
parent 5b456c67a1
commit f7de20c88b
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/map/battle.c
View File

@ -1857,19 +1857,35 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
wd.div_ = skill_get_num(GS_CHAINACTION,skill_lv);
wd.type = 0x08;
}
else if(sc && sc->data[SC_FEARBREEZE] && sd->weapontype1==W_BOW && (i = sd->equip_index[EQI_AMMO]) >= 0 && sd->inventory_data[i] && sd->status.inventory[i].amount > 1){
short rate[] = { 4, 4, 7, 9, 10 };
if(sc->data[SC_FEARBREEZE]->val1 > 0 && sc->data[SC_FEARBREEZE]->val1 < 6 && rand()%100 < rate[sc->data[SC_FEARBREEZE]->val1-1]) {
else if(sc && sc->data[SC_FEARBREEZE] && sd->weapontype1==W_BOW
&& (i = sd->equip_index[EQI_AMMO]) >= 0 && sd->inventory_data[i] && sd->status.inventory[i].amount > 1){
int chance = rand()%100;
wd.type = 0x08;
wd.div_ = 2;
if(sc->data[SC_FEARBREEZE]->val1 > 2){
int chance = rand()%100;
wd.div_ += (chance >= 40) + (chance >= 70) + (chance >= 90);
wd.div_ = min(wd.div_,sc->data[SC_FEARBREEZE]->val1);
switch(sc->data[SC_FEARBREEZE]->val1){
case 5:
if( chance < 3){// 3 % chance to attack 5 times.
wd.div_ = 5;
break;
}
case 4:
if( chance < 7){// 6 % chance to attack 4 times.
wd.div_ = 4;
break;
}
case 3:
if( chance < 10){// 9 % chance to attack 3 times.
wd.div_ = 3;
break;
}
case 2:
case 1:
if( chance < 13){// 12 % chance to attack 2 times.
wd.div_ = 2;
break;
}
}
wd.div_ = min(wd.div_,sd->status.inventory[i].amount);
sc->data[SC_FEARBREEZE]->val4 = wd.div_-1;
}
}
}

2
src/map/clif.c
View File

@ -11057,7 +11057,7 @@ void clif_parse_Cooking(int fd,struct map_session_data *sd) {
return;
}
if( skill_can_produce_mix(sd,nameid,sd->menuskill_val, amount) )
skill_produce_mix(sd,0,nameid,0,0,0,amount);
skill_produce_mix(sd,(type>1?sd->menuskill_id:0),nameid,0,0,0,amount);
clif_menuskill_clear(sd);
}

4
src/map/status.c
View File

@ -2995,6 +2995,10 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
sd->subele[ELE_NEUTRAL] += skill;
sd->subele[ELE_FIRE] += skill*4;
}
if((skill=pc_checkskill(sd,NC_RESEARCHFE))>0) {
sd->subele[ELE_EARTH] += skill*10;
sd->subele[ELE_FIRE] += skill*10;
}
if((skill=pc_checkskill(sd,SA_DRAGONOLOGY))>0 ){
skill = skill*4;
sd->right_weapon.addrace[RC_DRAGON]+=skill;