diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-11 16:04:24 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-11 16:04:24 +0000 |
| commit | ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c (patch) | |
| tree | f773155526ba89186626de09faf7f2dcbe2bb1c9 /src/map/pc.c | |
| parent | 1ce32a605550e2e3418d2ba23948ecc832d7c76c (diff) | |
| download | hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.tar.gz hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.tar.bz2 hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.tar.xz hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.zip | |
- Spirit of Sin and Enchant Deadly Poison now stack.
- Fixed skill damage card bonuses not working on magic skills.
- Moved the setting of sd->npc_id = 0 in npc_dequeue to the beginning, since this function is called when a script is cancelled (TODO: but when this happens, shouldn't the previously ongoing script also be free'd?)
- Made homunc's speed be recalculated when you respawn it from rest state.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9453 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index c5128bd79..e6ae6c8af 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2136,19 +2136,19 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) ATF_SHORT|ATF_TARGET); break; case SP_SKILL_ATK: + if(sd->state.lr_flag == 2) + break; for (i = 0; i < MAX_PC_BONUS && sd->skillatk[i].id != 0 && sd->skillatk[i].id != type2; i++); if (i == MAX_PC_BONUS) { //Better mention this so the array length can be updated. [Skotlex] ShowDebug("run_script: bonus2 bSkillAtk reached it's limit (%d skills per character), bonus skill %d (+%d%%) lost.\n", MAX_PC_BONUS, type2, val); break; } - if(sd->state.lr_flag != 2) { - if (sd->skillatk[i].id == type2) - sd->skillatk[i].val += val; - else { - sd->skillatk[i].id = type2; - sd->skillatk[i].val = val; - } + if (sd->skillatk[i].id == type2) + sd->skillatk[i].val += val; + else { + sd->skillatk[i].id = type2; + sd->skillatk[i].val = val; } break; case SP_ADD_SKILL_BLOW: |