diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
| commit | 7464175373616085130e0d2e3b9ddc8e0322f291 (patch) | |
| tree | 039d01f52f6b76af2d1c7526b1673d646ddf532c /npc/001-2_Tulimshar | |
| parent | 60e20acf62941b81bd560c87a2cf161e16ea2277 (diff) | |
| parent | 291215cde58a739d13a5bfd519489b736d8302dc (diff) | |
| download | serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.gz serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.bz2 serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.xz serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.zip | |
Merge commit 'mainline/master'
Conflicts:
npc/001-1_Tulimshar/elanore.txt
npc/013-3_Cave/barrier.txt
npc/015-3/katze.txt
Diffstat (limited to 'npc/001-2_Tulimshar')
| -rw-r--r-- | npc/001-2_Tulimshar/casino.txt | 5 | ||||
| -rw-r--r-- | npc/001-2_Tulimshar/omar.txt | 1 | ||||
| -rw-r--r-- | npc/001-2_Tulimshar/shops.txt | 1 | ||||
| -rw-r--r-- | npc/001-2_Tulimshar/troupe_leader.txt | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/npc/001-2_Tulimshar/casino.txt b/npc/001-2_Tulimshar/casino.txt index 079f163d..d0d0c5f9 100644 --- a/npc/001-2_Tulimshar/casino.txt +++ b/npc/001-2_Tulimshar/casino.txt @@ -8,14 +8,17 @@ 001-2.gat,37,65,0 script Slot1 127,{ callfunc "SlotMachine"; + close; } 001-2.gat,39,65,0 script Slot2 127,{ callfunc "SlotMachine"; + close; } 001-2.gat,41,65,0 script Slot3 127,{ callfunc "SlotMachine"; + close; } 001-2.gat,32,67,0 shop MoneyChanger 124,503:10 @@ -90,7 +93,7 @@ L_Ace: menu "Yes", L_Another, "No", L_End; - + close; } 001-2.gat,22,69,0 script Roulette 107,{ diff --git a/npc/001-2_Tulimshar/omar.txt b/npc/001-2_Tulimshar/omar.txt index 009e7b5d..a495dd0a 100644 --- a/npc/001-2_Tulimshar/omar.txt +++ b/npc/001-2_Tulimshar/omar.txt @@ -3,4 +3,5 @@ 001-2.gat,70,60,0 script Omar 162,{ mes "[Omar]"; mes "\"Welcome to my humble abode.\""; + close; } diff --git a/npc/001-2_Tulimshar/shops.txt b/npc/001-2_Tulimshar/shops.txt index 479969cd..e607dd97 100644 --- a/npc/001-2_Tulimshar/shops.txt +++ b/npc/001-2_Tulimshar/shops.txt @@ -6,4 +6,5 @@ set @npcName$, "Rebecca the Inn Keeper"; set @cost, 100; callfunc "Inn"; + close; } diff --git a/npc/001-2_Tulimshar/troupe_leader.txt b/npc/001-2_Tulimshar/troupe_leader.txt index 7bace781..e7b0486e 100644 --- a/npc/001-2_Tulimshar/troupe_leader.txt +++ b/npc/001-2_Tulimshar/troupe_leader.txt @@ -47,4 +47,5 @@ L_NohMask_TooMany: next; mes "[Troupe Leader]"; mes "\"Except, you don't seem to have any room for it. I'll hold onto it for you until you do have room.\""; + close; } |