diff options
| author | Matias <matiassw@gmail.com> | 2013-06-25 16:59:44 -0400 |
|---|---|---|
| committer | Matias <matiassw@gmail.com> | 2013-06-25 16:59:44 -0400 |
| commit | b40371d3a0772031d12f2782c10976413c6f34b9 (patch) | |
| tree | 7aeed5544a9df524a834cc739d3f596b66d6a006 /npc/other/poring_war.txt | |
| parent | 25914bae30eced388cf8640eead19fbb11a65ade (diff) | |
| parent | 5785dbae3f513da20611e3147dadef2b9c911443 (diff) | |
| download | hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.gz hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.bz2 hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.xz hercules-b40371d3a0772031d12f2782c10976413c6f34b9.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/other/poring_war.txt')
| -rw-r--r-- | npc/other/poring_war.txt | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index f81b54f89..95a17d241 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1b +//= 1.2 //===== Description: ========================================= //= [Aegis Conversion] //= Poring War @@ -12,6 +12,7 @@ //= 1.1 Fixed some typos/bugs. [CalciumKid] //= 1.1a Fixed Waiting rooms witht he default MAX_LEVEL [Slim] //= 1.1b Fixed incorrect label calls. [Euphy] +//= 1.2 Added missing barrier resets, credits to Zopokx. [Euphy] //============================================================ // Poring War Recruiter @@ -929,23 +930,23 @@ OnStop: end; OnAngelingWin: - removemapflag "poring_w02",mf_partylock; - removemapflag "poring_w02",mf_pvp; - removemapflag "poring_w02",mf_pvp_noguild; - removemapflag "poring_w02",mf_pvp_nocalcrank; - mapannounce "poring_w02","Mr. Doppel: Angeling Team of party " + getpartyname($@wop_team_a) + " won the battle!",0,0xf08080; - donpcevent "Deviruchi#wop_endmaster::OnEnable"; - stopnpctimer; - end; - + set .@i,1; OnDevilingWin: removemapflag "poring_w02",mf_partylock; removemapflag "poring_w02",mf_pvp; removemapflag "poring_w02",mf_pvp_noguild; removemapflag "poring_w02",mf_pvp_nocalcrank; - mapannounce "poring_w02","Mr. Doppel: Deviling Team of party " + getpartyname($@wop_team_d) + " won the battle!",0,0xf08080; + if (.@i) + mapannounce "poring_w02","Mr. Doppel: Angeling Team of party " + getpartyname($@wop_team_a) + " won the battle!",0,0xf08080; + else + mapannounce "poring_w02","Mr. Doppel: Deviling Team of party " + getpartyname($@wop_team_d) + " won the battle!",0,0xf08080; donpcevent "Deviruchi#wop_endmaster::OnEnable"; stopnpctimer; + // Reset Barriers + donpcevent "#aroom_ingate_wop::OnDisable"; + donpcevent "#aroom_outgate_wop::OnDisable"; + donpcevent "#droom_ingate_wop::OnDisable"; + donpcevent "#droom_outgate_wop::OnDisable"; end; OnTimer5000: |