diff options
author | Wushin <pasekei@gmail.com> | 2015-06-19 21:54:16 -0500 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2015-06-19 21:54:16 -0500 |
commit | f008d4510f391aa802c31bc06b7cac2628a8b3fb (patch) | |
tree | b8f43ed53a221fdc36355849613c57ff26777f6c /src/map/pc.cpp | |
parent | 8b4faba9b55ea4a0f3c8f6e5cbcd5fcff3509247 (diff) | |
parent | 2d8dd9049a22034d6727f082d428f8c10c8c8606 (diff) | |
download | tmwa-f008d4510f391aa802c31bc06b7cac2628a8b3fb.tar.gz tmwa-f008d4510f391aa802c31bc06b7cac2628a8b3fb.tar.bz2 tmwa-f008d4510f391aa802c31bc06b7cac2628a8b3fb.tar.xz tmwa-f008d4510f391aa802c31bc06b7cac2628a8b3fb.zip |
Merge pull request #103 from mekolat/pvp
Pvp enhancements
Diffstat (limited to 'src/map/pc.cpp')
-rw-r--r-- | src/map/pc.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp index d2b2f44..ca636b4 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -944,7 +944,7 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first) b_mdef = sd->mdef; b_mdef2 = sd->mdef2; b_base_atk = sd->base_atk; - if (!pc_isdead(sd) && sd->state.pvpchannel == 1) + if (sd->state.pvpchannel == 1) b_pvpchannel = sd->state.pvpchannel; sd->max_weight = max_weight_base_0 + sd->status.attrs[ATTR::STR] * 300; @@ -3313,6 +3313,11 @@ int pc_damage(dumb_ptr<block_list> src, dumb_ptr<map_session_data> sd, }; npc_event_doall_l(stringish<ScriptLabel>("OnPCKilledEvent"_s), sd->bl_id, arg); npc_event_doall_l(stringish<ScriptLabel>("OnPCKillEvent"_s), src->bl_id, arg); + + sd->state.pvp_rank = 0; + src->is_player()->state.pvp_rank++; + clif_pvpstatus(sd); + clif_pvpstatus(src->is_player()); } npc_event_doall_l(stringish<ScriptLabel>("OnPCDieEvent"_s), sd->bl_id, nullptr); |