diff options
| author | Sirius <zopokx@gmail.com> | 2013-05-26 02:53:06 -0700 |
|---|---|---|
| committer | Sirius <zopokx@gmail.com> | 2013-05-26 02:53:06 -0700 |
| commit | 73169ee3002dc038f8556c74df250f6fbc029f1f (patch) | |
| tree | 5db73037f519e29cde6f9757bbff2431f0bcecf7 /npc/other | |
| parent | 7f1ebe25ba78b33cb1dc9169fdaedf4335423739 (diff) | |
| download | hercules-73169ee3002dc038f8556c74df250f6fbc029f1f.tar.gz hercules-73169ee3002dc038f8556c74df250f6fbc029f1f.tar.bz2 hercules-73169ee3002dc038f8556c74df250f6fbc029f1f.tar.xz hercules-73169ee3002dc038f8556c74df250f6fbc029f1f.zip | |
* Poring War: Added missing barrier resets [Euphy's rAthena fix based on my report]
* Added support for Baby Novices in the Novice's Quest Skills
* Hotfix for the Blacksmith Rank bugreport: http://hercules.ws/board/tracker/issue-7288-max-refine-blacksmith-rank/
* Added duplicates from pre-re Mage Quest required in Sage Quest Skill.
Diffstat (limited to 'npc/other')
| -rw-r--r-- | npc/other/poring_war.txt | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index f81b54f89..6e701b398 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -1,17 +1,20 @@ -//===== Hercules Script ====================================== +//===== rAthena Script ======================================= //= Poring War //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1b +//= 1.2 +//===== Compatible With: ===================================== +//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Poring War //===== Additional Comments: ================================= //= 1.0 First version. [Kisuka][5511] //= 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 +932,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: |