diff options
author | Wushin <pasekei@gmail.com> | 2014-11-01 22:20:41 -0500 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2014-11-01 22:20:41 -0500 |
commit | e0107f44ce41a6e130030cef2f79748cdf67b250 (patch) | |
tree | 6468d496b3385097b5475fb740f226d379880062 /world/map/npc/009-6 | |
parent | 82ce751849a79c29d76a2b2ee5f5ec2a820ae700 (diff) | |
parent | b2aaa61286c1e3a107df7fcd8d63086b360aa0f6 (diff) | |
download | serverdata-e0107f44ce41a6e130030cef2f79748cdf67b250.tar.gz serverdata-e0107f44ce41a6e130030cef2f79748cdf67b250.tar.bz2 serverdata-e0107f44ce41a6e130030cef2f79748cdf67b250.tar.xz serverdata-e0107f44ce41a6e130030cef2f79748cdf67b250.zip |
Merge pull request #169 from mekolat/duels
Fight Club
Diffstat (limited to 'world/map/npc/009-6')
-rw-r--r-- | world/map/npc/009-6/brodomir.txt | 8 | ||||
-rw-r--r-- | world/map/npc/009-6/mapflags.txt | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt index 5bd032e4..e981e603 100644 --- a/world/map/npc/009-6/brodomir.txt +++ b/world/map/npc/009-6/brodomir.txt @@ -171,6 +171,7 @@ L_Warp: mapwarp "009-6.gat", "009-5.gat", 0, 0; mapannounce "009-5.gat", "PvP On!", 0; pvpon "009-5.gat"; + areatimer "009-5.gat", 20, 20, 80, 80, 0, "#GoBack2#Duels::OnResave"; end; L_Warpfail: @@ -225,12 +226,19 @@ L_SkipItem: set $@BRODOMIR_PLAYERS, 0; end; +L_Dead_Duels: + set DUELS, DUELS &~ $@DuelPvpBit; + warp "009-7.gat", 39, 37; + end; + L_Dead: + if(DUELS & $@DuelPvpBit) goto L_Dead_Duels; warp "009-3.gat", 155,83; end; L_End: mapwarp "009-5.gat", "009-6.gat", 36, 42; + areatimer "009-6.gat", 17, 23, 47, 50, 0, "#GoBack2#Duels::OnResave"; goto L_Cleanup; L_Alreadystarted: diff --git a/world/map/npc/009-6/mapflags.txt b/world/map/npc/009-6/mapflags.txt index 6e3cffc7..5d9fed65 100644 --- a/world/map/npc/009-6/mapflags.txt +++ b/world/map/npc/009-6/mapflags.txt @@ -1,2 +1 @@ 009-6.gat|mapflag|nosave|009-3,162,82 -009-6.gat|mapflag|resave|009-3,162,82 |