diff options
| author | Haru <haru@dotalux.com> | 2020-07-25 23:57:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-25 23:57:47 +0200 |
| commit | 060133ec08ed597cfcf105b5180ee77e8b89ea7a (patch) | |
| tree | 7ca55a571c1b9a804bcb81abb6b8e5eb5f90ef28 | |
| parent | 4982cbb17730c9dbfab0b7bfebd51826dca8a464 (diff) | |
| parent | c2a08e1c57d2e02813c2c07556417a1a4b67befd (diff) | |
| download | hercules-060133ec08ed597cfcf105b5180ee77e8b89ea7a.tar.gz hercules-060133ec08ed597cfcf105b5180ee77e8b89ea7a.tar.bz2 hercules-060133ec08ed597cfcf105b5180ee77e8b89ea7a.tar.xz hercules-060133ec08ed597cfcf105b5180ee77e8b89ea7a.zip | |
Merge pull request #2792 from Kenpachi2k13/moscovia_quests
Fix Moscovia quests getting stuck in infinite loop
| -rw-r--r-- | npc/quests/quests_moscovia.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 3f44a9b0a..e0678cec9 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -1134,7 +1134,7 @@ mosk_ship,101,111,4 script rudder#ship HIDDEN_NPC,{ mes "Hey! Listen to what I am saying."; mes "How come you go there without my"; mes "permission..."; - next; + close; } mes "[Mr. Ibanoff]"; mes "What? How did you get on"; @@ -1171,7 +1171,10 @@ S_Rud1: mes "ever encountered! Be careful! We"; mes "must repulse these monsters!"; ++$@mos1_edq; - donpcevent "Baehideun3#ship::OnEnable"; + if (mos_whale_edq >= 241) + donpcevent "Baehideun4#ship::OnEnable"; + else + donpcevent "Baehideun3#ship::OnEnable"; } mos_whale_edq = (getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):mos_whale_edq + 1; close; |