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

Bug Fixes

Browse Source 
* Reverted a change made to Raising Dragon for HP/SP Regen.
* Fixed Rage Burst not consuming Rage Counters on use. (bugreport:7975)
This commit is contained in:
aleos89 2014-03-07 14:19:09 -05:00
parent 5aa2f17fc1
commit 2cd1e8c393
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/skill.c
View File

@ -14818,6 +14818,9 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
case SR_RAMPAGEBLASTER: case SR_RAMPAGEBLASTER:
req.spiritball = sd->spiritball?sd->spiritball:15; req.spiritball = sd->spiritball?sd->spiritball:15;
break; break;
case LG_RAGEBURST:
req.spiritball = sd->spiritball?sd->spiritball:1;
break;
case SR_GATEOFHELL: case SR_GATEOFHELL:
if( sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE ) if( sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE )
req.sp -= req.sp * 10 / 100; req.sp -= req.sp * 10 / 100;

3
src/map/status.c
View File

@ -3886,6 +3886,7 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str
|| sc->data[SC_TRICKDEAD] || sc->data[SC_TRICKDEAD]
|| sc->data[SC_BLEEDING] || sc->data[SC_BLEEDING]
|| sc->data[SC_MAGICMUSHROOM] || sc->data[SC_MAGICMUSHROOM]
|| sc->data[SC_RAISINGDRAGON]
|| sc->data[SC_SATURDAYNIGHTFEVER] || sc->data[SC_SATURDAYNIGHTFEVER]
) // No regen ) // No regen
regen->flag = 0; regen->flag = 0;
@ -3896,7 +3897,7 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str
sc->data[SC_MAXIMIZEPOWER] || sc->data[SC_MAXIMIZEPOWER] ||
#endif #endif
( (bl->type == BL_PC && ((TBL_PC*)bl)->class_&MAPID_UPPERMASK) == MAPID_MONK && ( (bl->type == BL_PC && ((TBL_PC*)bl)->class_&MAPID_UPPERMASK) == MAPID_MONK &&
(sc->data[SC_EXTREMITYFIST] || ((sc->data[SC_EXPLOSIONSPIRITS] || sc->data[SC_RAISINGDRAGON]) && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK))) (sc->data[SC_EXTREMITYFIST] || (sc->data[SC_EXPLOSIONSPIRITS] && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK)))
) )
) // No natural SP regen ) // No natural SP regen
regen->flag &=~RGN_SP; regen->flag &=~RGN_SP;