diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-01-15 19:58:02 +0000 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-01-15 19:58:02 +0000 |
| commit | 3c791e9ee312b057091834ba274dec63e271071f (patch) | |
| tree | fe6b1b3a2a47dae504f2a8dbf6e56c575e43c4eb /npc | |
| parent | 54b77f785404c4955cb49d74176eda10b6726520 (diff) | |
| parent | a0b0c554d4cdec963ae74615a291dac075d33229 (diff) | |
| download | serverdata-3c791e9ee312b057091834ba274dec63e271071f.tar.gz serverdata-3c791e9ee312b057091834ba274dec63e271071f.tar.bz2 serverdata-3c791e9ee312b057091834ba274dec63e271071f.tar.xz serverdata-3c791e9ee312b057091834ba274dec63e271071f.zip | |
Merge branch 'bathunter' into 'master'
Bathunter
See merge request TMW2/serverdata!28
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/015-3/arkim.txt | 13 | ||||
| -rw-r--r-- | npc/functions/mobhunter.txt | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/npc/015-3/arkim.txt b/npc/015-3/arkim.txt index 274d9cd9b..6087333cc 100644 --- a/npc/015-3/arkim.txt +++ b/npc/015-3/arkim.txt @@ -52,7 +52,8 @@ L_Loop: Zeny=Zeny+70; break; case 3: - close; + goto L_Assign; + close; // Will never reach. break; case 4: goto L_Research; @@ -67,7 +68,8 @@ L_Timer: mesc l("You need at least level 20 to help."); mesn; mesq l("You've helped me plenty. Please come back in @@", FuzzyTime($@ARKIM_TIMER+(60*60*24),2,2)); - close; + goto L_Assign; + close; // Will never reach. // TODO L_Research: @@ -90,7 +92,8 @@ L_Research: switch (@menu) { case 1: mesq l("Good bye!"); - close; + goto L_Assign; + close; // Will never reach. break; case 2: mesq l("The @@ are specially dangerous, and archers love them.", getitemlink(CursedArrow)); @@ -139,6 +142,10 @@ L_Research: next; goto L_Research; +L_Assign: + GHQ_Assign(Bat, "Bat"); + end; + OnInit: .sex=G_MALE; .distance=5; diff --git a/npc/functions/mobhunter.txt b/npc/functions/mobhunter.txt index ce68ec0e5..527aacf3c 100644 --- a/npc/functions/mobhunter.txt +++ b/npc/functions/mobhunter.txt @@ -32,6 +32,9 @@ function script GHQ_GetQuestIDByMonsterID { case Duck: return 9; break; + case Bat: + return 10; + break; default: return Exception("GHQ GQID: Invalid ID: "+getarg(0), RB_DEFAULT^RB_PLEASEREPORT|RB_ISFATAL); break; @@ -69,6 +72,9 @@ function script GHQ_GetMonsterIDByQuestID { case 9: return Duck; break; + case 10: + return Bat; + break; default: return Exception("GHQ GMID: Invalid ID: "+getarg(0), RB_DEFAULT^RB_PLEASEREPORT|RB_ISFATAL); break; |