diff options
| author | Gepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-07-03 11:29:29 +0000 |
|---|---|---|
| committer | Gepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-07-03 11:29:29 +0000 |
| commit | ae4f376004739b0178be6ab3f5d9fecbb7a53ca1 (patch) | |
| tree | fc65762acfccdef5835388be63edfc63af83610f /npc/battleground | |
| parent | d2964687c691b302d0d74bde1ba842baa67108ca (diff) | |
| download | hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.gz hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.bz2 hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.xz hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.zip | |
Fixed KvM announcements showing during WoE:SE (bugreport:4335).
Added missing Lighthalzen NPC (bugreport:4319).
Fixed checkweights in Manuk & Splendide shops.
Fixed some condition checks in Moscovia quests.
Fixed some typos in Sealed Shrine and Manuk quests dialogues.
Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/battleground')
| -rw-r--r-- | npc/battleground/bg_kvm01.txt | 2 | ||||
| -rw-r--r-- | npc/battleground/bg_kvm02.txt | 2 | ||||
| -rw-r--r-- | npc/battleground/bg_kvm03.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/npc/battleground/bg_kvm01.txt b/npc/battleground/bg_kvm01.txt index efc5c12fb..f8b767277 100644 --- a/npc/battleground/bg_kvm01.txt +++ b/npc/battleground/bg_kvm01.txt @@ -100,7 +100,7 @@ OnReadyCheck: if( .@Guillaume < 5 || .@Croix < 5 ) { - if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && $@KvM_Flood < gettimetick(2) ) + if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && !agitcheck2() && $@KvM_Flood < gettimetick(2) ) { announce "Battleground -- Kreiger Von Midgard [80-99] G: " + .@Guillaume + "/5, C: " + .@Croix + "/5",0,0x696969; set $@KvM_Flood, gettimetick(2) + 15; diff --git a/npc/battleground/bg_kvm02.txt b/npc/battleground/bg_kvm02.txt index 521192f07..4116f7f58 100644 --- a/npc/battleground/bg_kvm02.txt +++ b/npc/battleground/bg_kvm02.txt @@ -100,7 +100,7 @@ OnReadyCheck: if( .@Guillaume < 5 || .@Croix < 5 ) { - if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && $@KvM_Flood < gettimetick(2) ) + if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && !agitcheck2() && $@KvM_Flood < gettimetick(2) ) { announce "Battleground -- Kreiger Von Midgard [60-79] G: " + .@Guillaume + "/5, C: " + .@Croix + "/5",0,0x808080; set $@KvM_Flood, gettimetick(2) + 15; diff --git a/npc/battleground/bg_kvm03.txt b/npc/battleground/bg_kvm03.txt index 7765cebff..315f4bf9d 100644 --- a/npc/battleground/bg_kvm03.txt +++ b/npc/battleground/bg_kvm03.txt @@ -100,7 +100,7 @@ OnReadyCheck: if( .@Guillaume < 5 || .@Croix < 5 ) { - if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && $@KvM_Flood < gettimetick(2) ) + if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && !agitcheck2() && $@KvM_Flood < gettimetick(2) ) { announce "Battleground -- Kreiger Von Midgard [1-59] G: " + .@Guillaume + "/5, C: " + .@Croix + "/5",0,0xC0C0C0; set $@KvM_Flood, gettimetick(2) + 15; |