From 051a0461b6251535c5c3019ae8e5c1fbe1347a66 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 16 Feb 2009 09:36:41 +0000 Subject: Make sure no script just ends --- data/008-1.wlk | Bin 18484 -> 18484 bytes npc/001-1_Tulimshar/banker.txt | 1 + npc/001-1_Tulimshar/constable.txt | 1 + npc/001-1_Tulimshar/elanore.txt | 2 - npc/001-1_Tulimshar/guards.txt | 2 +- npc/001-1_Tulimshar/rules.txt | 1 + npc/001-1_Tulimshar/sandra.txt | 1 + npc/001-1_Tulimshar/soul-menhir.txt | 1 + npc/001-1_Tulimshar/vincent.txt | 1 - npc/001-2_Tulimshar/casino.txt | 5 +- npc/001-2_Tulimshar/omar.txt | 1 + npc/001-2_Tulimshar/shops.txt | 1 + npc/001-2_Tulimshar/troupe_leader.txt | 1 + npc/002-1_Sandstorm/_import.txt | 1 - npc/002-1_Sandstorm/dark_mage.txt | 48 ----------- npc/006-1_Desert_mountains/pachua.txt | 1 + npc/009-1_Hurnscald/soul-menhir.txt | 5 +- npc/009-2_Hurnscald/nicholas.txt | 1 + npc/009-2_Hurnscald/richard.txt | 1 + npc/010-2_Dimonds_Cove/doug.txt | 3 +- npc/010-2_Dimonds_Cove/workers.txt | 2 + npc/011-1_Woodland/alchemist.txt | 1 + npc/011-3_Hermits_cave/hermit.txt | 1 - npc/013-2_Magic_house/apprentice.txt | 1 + npc/013-2_Magic_house/notes.txt | 129 +++++++++++++++--------------- npc/013-3_Cave/barrier.txt | 1 + npc/014-1_Woodland/wedding-officiator.txt | 1 + npc/015-1_Woodland/alice.txt | 2 - npc/015-3/katze.txt | 11 --- npc/015-3/pot.txt | 5 -- npc/018-1_Woodland_mining_camp/miners.txt | 1 + npc/018-2_Woodland_mining_camp/caul.txt | 2 - npc/018-3_Cave/bookcase.txt | 1 + npc/019-1_Snow_field/taro.txt | 1 - npc/020-1_Nivalis/soul-menhir.txt | 1 + npc/020-2_Nivalis/furquest.txt | 1 + npc/020-2_Nivalis/shops.txt | 1 + npc/021-1_Tulimshar/_warps.txt | 3 + npc/021-1_Tulimshar/bakery.txt | 1 + npc/021-1_Tulimshar/gate_guards.txt | 6 ++ npc/021-1_Tulimshar/inac.txt | 2 +- npc/021-1_Tulimshar/magic_school.txt | 3 + npc/021-1_Tulimshar/north_shops.txt | 3 + npc/021-1_Tulimshar/royal_guards.txt | 2 + npc/021-2/_import.txt | 3 + npc/021-2/_mobs.txt | 7 ++ npc/021-2/_warps.txt | 5 ++ npc/021-8_Meeting_Rooms/_import.txt | 3 + npc/021-8_Meeting_Rooms/_mobs.txt | 7 ++ npc/021-8_Meeting_Rooms/_warps.txt | 2 + 50 files changed, 143 insertions(+), 144 deletions(-) delete mode 100644 npc/002-1_Sandstorm/dark_mage.txt create mode 100644 npc/021-2/_import.txt create mode 100644 npc/021-2/_mobs.txt create mode 100644 npc/021-2/_warps.txt create mode 100644 npc/021-8_Meeting_Rooms/_import.txt create mode 100644 npc/021-8_Meeting_Rooms/_mobs.txt create mode 100644 npc/021-8_Meeting_Rooms/_warps.txt diff --git a/data/008-1.wlk b/data/008-1.wlk index 54e6bad7..a513fdc2 100644 Binary files a/data/008-1.wlk and b/data/008-1.wlk differ diff --git a/npc/001-1_Tulimshar/banker.txt b/npc/001-1_Tulimshar/banker.txt index f94ea304..4fc05f62 100644 --- a/npc/001-1_Tulimshar/banker.txt +++ b/npc/001-1_Tulimshar/banker.txt @@ -1,4 +1,5 @@ 001-1.gat,57,52,0 script Tybalt 107,{ set @npcName$, "Tybalt"; callfunc "Banker"; + close; } diff --git a/npc/001-1_Tulimshar/constable.txt b/npc/001-1_Tulimshar/constable.txt index c07889c6..f6423d5a 100644 --- a/npc/001-1_Tulimshar/constable.txt +++ b/npc/001-1_Tulimshar/constable.txt @@ -4,4 +4,5 @@ // set @npcName$, "Constable Perry Graf"; set @canSkip, 1; callfunc "GameRules"; + close; } diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt index 4171e54f..68f0676b 100644 --- a/npc/001-1_Tulimshar/elanore.txt +++ b/npc/001-1_Tulimshar/elanore.txt @@ -85,6 +85,4 @@ L_NoHeal: mes "You can get some rest in the inn near here.\""; close; - } - diff --git a/npc/001-1_Tulimshar/guards.txt b/npc/001-1_Tulimshar/guards.txt index 366f4475..ce7556a7 100644 --- a/npc/001-1_Tulimshar/guards.txt +++ b/npc/001-1_Tulimshar/guards.txt @@ -72,5 +72,5 @@ L_disaster: mes "[Ryan the Town Guard]"; mes "\"Hmmmmmmh...?"; mes "Oh, I wasn't sleeping, I was just resting my eyes!\""; -close; + close; } diff --git a/npc/001-1_Tulimshar/rules.txt b/npc/001-1_Tulimshar/rules.txt index a67eeb14..1a0f3b82 100644 --- a/npc/001-1_Tulimshar/rules.txt +++ b/npc/001-1_Tulimshar/rules.txt @@ -4,4 +4,5 @@ if (TUT_var & 1 == 1) close; callfunc "GameRules"; mes "Ian, the trainer, can help you get to know the game."; + close; } diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt index 314e009a..f49c849b 100644 --- a/npc/001-1_Tulimshar/sandra.txt +++ b/npc/001-1_Tulimshar/sandra.txt @@ -101,4 +101,5 @@ L_TooMany: next; mes "[Sandra]"; mes "\"You don't have room for my reward. I'll wait until you do.\""; + close; } diff --git a/npc/001-1_Tulimshar/soul-menhir.txt b/npc/001-1_Tulimshar/soul-menhir.txt index 45c5dfea..58e450a6 100644 --- a/npc/001-1_Tulimshar/soul-menhir.txt +++ b/npc/001-1_Tulimshar/soul-menhir.txt @@ -5,4 +5,5 @@ set @x, 38; set @y, 70; callfunc "SoulMenhir"; + close; } diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt index b0412517..2ab79e4f 100644 --- a/npc/001-1_Tulimshar/vincent.txt +++ b/npc/001-1_Tulimshar/vincent.txt @@ -102,4 +102,3 @@ L_Done: mes "\"Thanks for your help!\""; close; } - diff --git a/npc/001-2_Tulimshar/casino.txt b/npc/001-2_Tulimshar/casino.txt index b5da3933..bc07cab8 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 d5c8bbfd..92ab46ef 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; } diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt index cb6b0a78..0066d7bd 100644 --- a/npc/002-1_Sandstorm/_import.txt +++ b/npc/002-1_Sandstorm/_import.txt @@ -1,7 +1,6 @@ map: 002-1.gat npc: npc/002-1_Sandstorm/_mobs.txt npc: npc/002-1_Sandstorm/_warps.txt -npc: npc/002-1_Sandstorm/dark_mage.txt npc: npc/002-1_Sandstorm/merchant.txt npc: npc/002-1_Sandstorm/nomads.txt npc: npc/002-1_Sandstorm/rogue.txt diff --git a/npc/002-1_Sandstorm/dark_mage.txt b/npc/002-1_Sandstorm/dark_mage.txt deleted file mode 100644 index 002b5ed9..00000000 --- a/npc/002-1_Sandstorm/dark_mage.txt +++ /dev/null @@ -1,48 +0,0 @@ -// - -// 002-1.gat,24,24,0 script SoulThief 103,{ - -// if (class == 1) goto L_Soul; -// mes "[Dark Mage]"; -// mes "\"Psss hey would you like to have more power?\""; -// next; - -// menu -// "You fool, that's not possible", -, -// "I'm listening...", L_Go; -// close; - -// L_Go: -// mes "[Dark Mage]"; -// mes "\"I can give you ancient powers that will let you become the greatest warrior in The Mana World, or the best merchant."; -// mes "But everything has got his price...\""; -// next; - -// mes "[Dark Mage]"; -// mes "\"Oh nothing important nor expensive."; -// mes "Just your soul!\""; -// next; - -// menu -// "My soul? Here it is", L_Soul, -// "I need a better explanation!", -; - -// mes "[Dark Mage]"; -// mes "Well there's a very small possibility that your player will be translated into the new server."; -// mes "I said a very, very small possibility."; -// mes "Players without a soul instead will be lost forever..."; -// mes "Come on, you won't loose that much!\""; -// next; - -// menu -// "Hmmm ok, I guess you can take it.", L_Soul, -// "Maybe I'll think about it a bit more", -; -// mes "\"I know you'll come here again when you'll get killed by a maggot, begging me to help you\""; -// close; - -// L_Soul: -// mes "[Dark Mage]"; -// mes "\"Hrhrhr, your soul is finally mine!\""; -// jobchange 1; -// close; -// } diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt index 51c2d3b2..3c63cb27 100644 --- a/npc/006-1_Desert_mountains/pachua.txt +++ b/npc/006-1_Desert_mountains/pachua.txt @@ -197,4 +197,5 @@ L_End: L_TooMany: mes "[Chief Pachua]"; mes "\"You don't have room for a leather patch. Come back later.\""; + close; } diff --git a/npc/009-1_Hurnscald/soul-menhir.txt b/npc/009-1_Hurnscald/soul-menhir.txt index d8eac7c6..5de1f9c2 100644 --- a/npc/009-1_Hurnscald/soul-menhir.txt +++ b/npc/009-1_Hurnscald/soul-menhir.txt @@ -1,8 +1,9 @@ +// + 009-1.gat,53,40,0 script Soul Menhir 144, { set @map$, "009-1.gat"; set @x, 53; set @y, 41; callfunc "SoulMenhir"; + close; } - - diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt index 349593db..b9c8a36d 100644 --- a/npc/009-2_Hurnscald/nicholas.txt +++ b/npc/009-2_Hurnscald/nicholas.txt @@ -413,4 +413,5 @@ L_Update_Var: L_TooMany: mes "[Nicholas]"; mes "\"You don't have room for it. Come back later when you do.\""; + close; } diff --git a/npc/009-2_Hurnscald/richard.txt b/npc/009-2_Hurnscald/richard.txt index 9b9714c2..6020569c 100644 --- a/npc/009-2_Hurnscald/richard.txt +++ b/npc/009-2_Hurnscald/richard.txt @@ -3,4 +3,5 @@ 009-2.gat,20, 99,0 script Richard 161,{ set @npcName$, "Richard"; callfunc "Banker"; + close; } diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt index 49bb349c..34dbb609 100644 --- a/npc/010-2_Dimonds_Cove/doug.txt +++ b/npc/010-2_Dimonds_Cove/doug.txt @@ -1,3 +1,5 @@ +// + 010-2.gat,68,87,0 script Doug 113,{ if(CaveSnakeLamp == 1) goto L_State2; if(CaveSnakeLamp == 2) goto L_Done; @@ -98,4 +100,3 @@ L_Done: mes "\"Thanks for your help! Those snakes sure have bright lamps!\""; close; } - diff --git a/npc/010-2_Dimonds_Cove/workers.txt b/npc/010-2_Dimonds_Cove/workers.txt index 13704115..0d80f700 100644 --- a/npc/010-2_Dimonds_Cove/workers.txt +++ b/npc/010-2_Dimonds_Cove/workers.txt @@ -1,3 +1,5 @@ +// + 010-2.gat,23,70,0 script Josh 155,{ mes "[Josh]"; mes "\"We're working on getting the cellar pass open.\""; diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt index 6329a5d6..e66ec84d 100644 --- a/npc/011-1_Woodland/alchemist.txt +++ b/npc/011-1_Woodland/alchemist.txt @@ -742,4 +742,5 @@ L_Update_Var: L_TooMany: mes "[Rauk the Alchemist]"; mes "You don't have room for this."; + close; } diff --git a/npc/011-3_Hermits_cave/hermit.txt b/npc/011-3_Hermits_cave/hermit.txt index 0c6f7550..f732f83a 100644 --- a/npc/011-3_Hermits_cave/hermit.txt +++ b/npc/011-3_Hermits_cave/hermit.txt @@ -12,5 +12,4 @@ L_Sure: warp "011-1.gat", 60, 95; close; - } diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt index abb96e6b..b0f32116 100644 --- a/npc/013-2_Magic_house/apprentice.txt +++ b/npc/013-2_Magic_house/apprentice.txt @@ -89,4 +89,5 @@ L_Finish: L_TooMany: mes "[Fabius]"; mes "\"You don't have room for it.\""; + close; } diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2_Magic_house/notes.txt index c30f7c46..e8a19103 100644 --- a/npc/013-2_Magic_house/notes.txt +++ b/npc/013-2_Magic_house/notes.txt @@ -1,102 +1,103 @@ +// + 013-2.gat,23,32,0 script Motto 127,{ - mes "Mid pleasures and palaces though we may roam,"; - mes "Be it ever so humble, there's no place like home."; - close; + mes "Mid pleasures and palaces though we may roam,"; + mes "Be it ever so humble, there's no place like home."; + close; } 013-2.gat,30,32,0 script Note 127,{ - mes "Please do not open."; - close; + mes "Please do not open."; + close; } 013-2.gat,38,20,0 script Saying 127,{ - mes "The early bird catcheth the worm."; - close; + mes "The early bird catcheth the worm."; + close; } - + 013-2.gat,27,21,0 script Mirror 127,{ - mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\""; - next; - mes "\"Oh fair adventurer, your hair indeed looks nice. But wouldn't it look much better, after I have rolled my dice?\""; - next; - mes "Your looks suddenly change..."; - next; - set @style,rand(6); - set @color,rand(9); - setlook 1,@style+1; - setlook 6,@color; - close; + mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\""; + next; + mes "\"Oh fair adventurer, your hair indeed looks nice. But wouldn't it look much better, after I have rolled my dice?\""; + next; + mes "Your looks suddenly change..."; + next; + set @style,rand(6); + set @color,rand(9); + setlook 1,@style+1; + setlook 6,@color; + close; } // Warp to north-eastern woods 013-2.gat,25,23,0 script Spell 127,{ - mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\""; - next; - mes "You think: \"Huh?\""; - next; - mes "The spell fulfills its inevitable purpose..."; - next; - warp "013-1.gat",128,28; - close; + mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\""; + next; + mes "You think: \"Huh?\""; + next; + mes "The spell fulfills its inevitable purpose..."; + next; + warp "013-1.gat",128,28; + close; } // Warp to Indian in south-eastern desert 013-2.gat,27,24,0 script Spell 127,{ - mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\""; - next; - mes "You feel the floor disappear below your feet..."; - next; - warp "006-1.gat",33,93; - close; + mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\""; + next; + mes "You feel the floor disappear below your feet..."; + next; + warp "006-1.gat",33,93; + close; } // Warp to snow land 013-2.gat,25,27,0 script Spell 127,{ - mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; - next; - mes "You feel yourself getting lighter..."; - next; - warp "020-1.gat",84,68; - close; + mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; + next; + mes "You feel yourself getting lighter..."; + next; + warp "020-1.gat",84,68; + close; } // Warp to Dimond 013-2.gat,27,27,0 script Spell 127,{ - mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; - next; - mes "The world around you slowly dissolves..."; - next; - warp "010-2.gat",34,42; - close; + mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; + next; + mes "The world around you slowly dissolves..."; + next; + warp "010-2.gat",34,42; + close; } // Warp to mines level 2 013-2.gat,26,28,0 script Spell 127,{ - mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\""; - next; - mes "For a moment everything turns black..."; - next; - warp "002-4.gat",91,41; - close; + mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\""; + next; + mes "For a moment everything turns black..."; + next; + warp "002-4.gat",91,41; + close; } // Death 013-2.gat,21,29,0 script Spell 127,{ - mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\""; - next; - mes "You're losing control of your body... everything turns black... while slipping to the floor, you hear a faraway scream... suddenly, you see THE LIGHT!"; - next; - gmcommand strcharinfo(0)+":@die "; - close; + mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\""; + next; + mes "You're losing control of your body... everything turns black... while slipping to the floor, you hear a faraway scream... suddenly, you see THE LIGHT!"; + next; + gmcommand strcharinfo(0)+":@die "; + close; } // Naked 013-2.gat,28,29,0 script Spell 127,{ - mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\""; - next; - mes "You suddenly feel naked; you ARE naked!"; - next; - nude; - close; + mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\""; + next; + mes "You suddenly feel naked; you ARE naked!"; + next; + nude; + close; } - diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt index 90d10ce5..16f78946 100644 --- a/npc/013-3_Cave/barrier.txt +++ b/npc/013-3_Cave/barrier.txt @@ -14,4 +14,5 @@ L_Has_Jack_O_Soul: mes "The barrier around the opening allows you passage."; set QUEST_demon_mines, 2; delitem 1198, 1; + close; } diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index 26f2fc56..662aafc6 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -249,4 +249,5 @@ L_do_divorce: L_No_Room_For_Rings: mes "[Wedding Officiator]"; mes "\"You don't have room to carry the rings.\""; + close; } diff --git a/npc/015-1_Woodland/alice.txt b/npc/015-1_Woodland/alice.txt index 629cfed5..3d789eae 100644 --- a/npc/015-1_Woodland/alice.txt +++ b/npc/015-1_Woodland/alice.txt @@ -65,7 +65,6 @@ L_cave: "What a stupid cat!", -; mes "[Alice]"; mes "\"Please don't do her any harm. See you later!\""; - next; close; L_cat: @@ -76,6 +75,5 @@ L_cat: "Are you crazy? Taming a cat?", -; mes "[Alice]"; mes "\"Well, it's up to you.\""; - next; close; } diff --git a/npc/015-3/katze.txt b/npc/015-3/katze.txt index c24a9f80..19611e93 100644 --- a/npc/015-3/katze.txt +++ b/npc/015-3/katze.txt @@ -52,7 +52,6 @@ L_ThrowStone: warp "015-1.gat", 60, 32; mes "\"GRAAUWL! Hissss...\""; mes "Yikes, the cat attacked you! Your whole body is scratched. Maybe throwing a stone wasn't such a great idea..."; - next; close; L_PreNeedsFood: @@ -85,7 +84,6 @@ L_MoveFur: mes "The cat jumps at the fur! You quickly let go of it. The cat happily returns to its spot, carrying the fur in its mouth."; next; mes "The cat drops the fur and looks at you with half opened eyes. Suddenly she starts talking, and says: \"That was very kind of you.\" She seems to be smiling."; - next; close; L_NeedsWood: @@ -101,12 +99,10 @@ L_NeedsWood: L_GiveWood: mes "[Katze]"; mes "\"Sure! Please put it next to the pot.\""; - next; close; L_PreNeedsStuff: mes "The cat is still eyeing the piece of wood. She probably needs to be left alone for a bit again."; - next; close; L_NeedsStuff: @@ -119,7 +115,6 @@ L_NeedsStuff: mes "2 white furs,"; mes "2 hard spikes and"; mes "2 tiny healing potions.\""; - next; close; L_NeedsStuff2: @@ -148,7 +143,6 @@ L_Please: mes "2 white furs,"; mes "2 hard spikes and"; mes "2 tiny healing potions.\""; - next; close; L_CatChecksStuff: @@ -161,7 +155,6 @@ L_CatChecksStuff: goto L_GiveStuff; mes "[Katze]"; mes "\"You don't seem to have everything yet. Come back later when you do.\""; - next; close; L_GiveStuff: @@ -175,13 +168,11 @@ L_GiveStuff: set KatzeBeenOutside, 0; mes "[Katze]"; mes "\"Nicely done! Now leave me alone for a while, I need some time to prepare your present.\""; - next; close; L_PreGainEars: mes "[Katze]"; mes "\"Please leave me alone for a while, so I can prepare your present.\""; - next; close; L_GainEars: @@ -193,7 +184,6 @@ L_GainEars: mes "\"Look what I made for you! It makes you look a bit like me! Maybe it will give you a feeling of what it is like to be a cat.\""; mes "The cat winks at you."; mes "[You gain " + @xpval + " experience points]"; - next; close; L_Finished: @@ -202,6 +192,5 @@ L_Finished: mes "\"Meow, fellow cat.\""; if (getequipid(equip_head) != 1217) mes "\"Meow. Lost your ears?\""; - next; close; } diff --git a/npc/015-3/pot.txt b/npc/015-3/pot.txt index bf3bd945..94039990 100644 --- a/npc/015-3/pot.txt +++ b/npc/015-3/pot.txt @@ -34,7 +34,6 @@ L_GiveMilk: L_HasMilk: mes "There is milk in it."; - next; close; L_NeedsFood: @@ -70,7 +69,6 @@ L_GiveSteak: L_HasFood: mes "There is some food in it."; - next; close; L_NeedsFur: @@ -84,7 +82,6 @@ L_NeedsFur: L_GiveFur: mes "You put down the fur, but the cat doesn't seem to take any notice. Maybe there's something else you could do. You pick the fur up again."; - next; close; L_NeedsWood: @@ -98,12 +95,10 @@ L_GiveWood: set Katze, 4; set KatzeBeenOutside, 0; mes "You put the wooden log next to the pot. The cat eyes it suspiciously, but remains on her spot."; - next; close; L_HasWood: mes "A wooden log is patiently lying next to it."; - next; close; L_Finished: diff --git a/npc/018-1_Woodland_mining_camp/miners.txt b/npc/018-1_Woodland_mining_camp/miners.txt index cfa990dd..f16b8bd7 100644 --- a/npc/018-1_Woodland_mining_camp/miners.txt +++ b/npc/018-1_Woodland_mining_camp/miners.txt @@ -3,4 +3,5 @@ 018-1.gat,80,61,0 script Miner 109,{ mes "[Miner]"; mes "\"Be careful in there.\""; + close; } diff --git a/npc/018-2_Woodland_mining_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt index 1aeda920..a4d22ea7 100644 --- a/npc/018-2_Woodland_mining_camp/caul.txt +++ b/npc/018-2_Woodland_mining_camp/caul.txt @@ -475,5 +475,3 @@ L_NohMask: mes "\"I'm sorry, but I didn't. I'm staying in town. Try asking one of the miners.\""; close; } - - diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3_Cave/bookcase.txt index 9706d46a..c4970fed 100644 --- a/npc/018-3_Cave/bookcase.txt +++ b/npc/018-3_Cave/bookcase.txt @@ -61,4 +61,5 @@ L_Search: next; if (QUEST_demon_mines == 0) set QUEST_demon_mines, 1; + close; } diff --git a/npc/019-1_Snow_field/taro.txt b/npc/019-1_Snow_field/taro.txt index cdd368e5..f2170390 100644 --- a/npc/019-1_Snow_field/taro.txt +++ b/npc/019-1_Snow_field/taro.txt @@ -70,4 +70,3 @@ L_Warp: warp "014-1.gat", 52, 45; close; } - diff --git a/npc/020-1_Nivalis/soul-menhir.txt b/npc/020-1_Nivalis/soul-menhir.txt index 3d0bc82a..7cfcbe97 100644 --- a/npc/020-1_Nivalis/soul-menhir.txt +++ b/npc/020-1_Nivalis/soul-menhir.txt @@ -5,4 +5,5 @@ set @x, 64; set @y, 90; callfunc "SoulMenhir"; + close; } diff --git a/npc/020-2_Nivalis/furquest.txt b/npc/020-2_Nivalis/furquest.txt index 67a6eb10..afcb5221 100644 --- a/npc/020-2_Nivalis/furquest.txt +++ b/npc/020-2_Nivalis/furquest.txt @@ -333,4 +333,5 @@ L_State_13: L_TooMany: mes "[Agostine, The Legendary Tailor]"; mes "\"You don't have anywhere to put them. Come back when you do."; + close; } diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2_Nivalis/shops.txt index f3d9dedc..fa7d8fe6 100644 --- a/npc/020-2_Nivalis/shops.txt +++ b/npc/020-2_Nivalis/shops.txt @@ -18,4 +18,5 @@ mes "That's impossible!\""; next; callfunc "Inn"; + close; } diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt index ac940f69..ccd01723 100644 --- a/npc/021-1_Tulimshar/_warps.txt +++ b/npc/021-1_Tulimshar/_warps.txt @@ -2,3 +2,6 @@ 021-1.gat,55,146 warp toBazaar 3,-1,001-1.gat,44,20 021-1.gat,136,146 warp toSouthTulimshar 0,-1,001-1.gat,124,21 +021-1.gat,53,134 warp toBuilding -1,-1,021-2.gat,27,29 +021-1.gat,55,134 warp toBuilding -1,-1,021-2.gat,33,29 +021-1.gat,57,134 warp toBuilding -1,-1,021-2.gat,39,29 diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt index af0e8d87..aff3cc5e 100644 --- a/npc/021-1_Tulimshar/bakery.txt +++ b/npc/021-1_Tulimshar/bakery.txt @@ -7,4 +7,5 @@ mes "\"This bakery is the best!\""; mes ""; mes "\"Too bad they haven't fully opened yet.\""; + close; } diff --git a/npc/021-1_Tulimshar/gate_guards.txt b/npc/021-1_Tulimshar/gate_guards.txt index fcc55c87..1a090c5f 100644 --- a/npc/021-1_Tulimshar/gate_guards.txt +++ b/npc/021-1_Tulimshar/gate_guards.txt @@ -4,32 +4,38 @@ 021-1.gat,70,23,0 script Guard 104,{ mes "[Guard]"; mes "\"Lot's of stuff happens in the port district. Those sailors can get quite roudy.\""; + close; } 021-1.gat,110,23,0 script Guard 104,{ mes "[Guard]"; mes "\"I'm not quite sure why I'm here, since that bridge is out.\""; + close; } // Guard near the magic school 021-1.gat,46,65,0 script Guard 104,{ mes "[Guard]"; mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\""; + close; } // Guards by the gates to East Tulimshar 021-1.gat,156,42,0 script Guard 104,{ mes "[Guard]"; mes "\"It's still a mess in East Tulimshar. The volcano and earthquake did a lot of damage.\""; + close; } 021-1.gat,156,95,0 script Guard 104,{ mes "[Guard]"; mes "\"It can get quite dangerous east of town. But for now, the passage is closed.\""; + close; } // Near the bazaar, outside the government building 021-1.gat,58,135,0 script Guard 123,{ mes "[Guard]"; mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\""; + close; } diff --git a/npc/021-1_Tulimshar/inac.txt b/npc/021-1_Tulimshar/inac.txt index 3160ad9b..15f9eca3 100644 --- a/npc/021-1_Tulimshar/inac.txt +++ b/npc/021-1_Tulimshar/inac.txt @@ -9,5 +9,5 @@ next; mes "[Inac]"; mes "\"They also say monsters have moved into the underground tunnels that bring and distribute water.\""; - next; + close; } diff --git a/npc/021-1_Tulimshar/magic_school.txt b/npc/021-1_Tulimshar/magic_school.txt index 54c49d56..1bbf0734 100644 --- a/npc/021-1_Tulimshar/magic_school.txt +++ b/npc/021-1_Tulimshar/magic_school.txt @@ -3,14 +3,17 @@ 021-1.gat,45,54,0 script Tinris 160,{ mes "[Tinris]"; mes "\"This is a magic school.\""; + close; } 021-1.gat,46,41,0 script Tondar 168,{ mes "[Tondar]"; mes "\"We're not accepting any new students right now.\""; + close; } 021-1.gat,32,46,0 script Ched 113,{ mes "[Ched]"; mes "\"I'm a student here.\""; + close; } diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt index 9d409616..cf2dbbe2 100644 --- a/npc/021-1_Tulimshar/north_shops.txt +++ b/npc/021-1_Tulimshar/north_shops.txt @@ -12,6 +12,7 @@ 021-1.gat,138,29,0 script Latoy 106,{ mes "[Latoy]"; mes "\"There's nothing here you could want or afford.\""; + close; } // A barber (later we can make it so certain styles need to come from him, for a price) @@ -29,10 +30,12 @@ 021-1.gat,122,32,0 script Hydusun 149,{ set @npcName$, "Hydusun"; callfunc "Banker"; + close; } // An officer (for security) 021-1.gat,130,38,0 script Officer 150,{ mes "[Officer]"; mes "I'm here for extra secutiry for this market."; + close; } diff --git a/npc/021-1_Tulimshar/royal_guards.txt b/npc/021-1_Tulimshar/royal_guards.txt index b24b0076..02996184 100644 --- a/npc/021-1_Tulimshar/royal_guards.txt +++ b/npc/021-1_Tulimshar/royal_guards.txt @@ -3,9 +3,11 @@ 021-1.gat,141,23,0 script Guard 126,{ mes "[Guard]"; mes "\"Stay away.\""; + close; } 021-1.gat,147,23,0 script Guard 126,{ mes "[Guard]"; mes "\"Stay away.\""; + close; } diff --git a/npc/021-2/_import.txt b/npc/021-2/_import.txt new file mode 100644 index 00000000..f00477be --- /dev/null +++ b/npc/021-2/_import.txt @@ -0,0 +1,3 @@ +map: 021-2.gat +npc: npc/021-2/_mobs.txt +npc: npc/021-2/_warps.txt diff --git a/npc/021-2/_mobs.txt b/npc/021-2/_mobs.txt new file mode 100644 index 00000000..e192181c --- /dev/null +++ b/npc/021-2/_mobs.txt @@ -0,0 +1,7 @@ +// 021-2 mobs + + + +021-2.gat,0,0,0 script Mob021-2 -1,{ + end; +} diff --git a/npc/021-2/_warps.txt b/npc/021-2/_warps.txt new file mode 100644 index 00000000..947ede8e --- /dev/null +++ b/npc/021-2/_warps.txt @@ -0,0 +1,5 @@ +// 021-2 warps + +021-2.gat,27,30 warp toOutside -1,-1,021-1.gat,53,135 +021-2.gat,33,30 warp toOutside -1,-1,021-1.gat,55,135 +021-2.gat,39,30 warp toOutside -1,-1,021-1.gat,57,135 diff --git a/npc/021-8_Meeting_Rooms/_import.txt b/npc/021-8_Meeting_Rooms/_import.txt new file mode 100644 index 00000000..3c454cc1 --- /dev/null +++ b/npc/021-8_Meeting_Rooms/_import.txt @@ -0,0 +1,3 @@ +map: 021-8.gat +npc: npc/021-8_Meeting_Rooms/_mobs.txt +npc: npc/021-8_Meeting_Rooms/_warps.txt diff --git a/npc/021-8_Meeting_Rooms/_mobs.txt b/npc/021-8_Meeting_Rooms/_mobs.txt new file mode 100644 index 00000000..993017ea --- /dev/null +++ b/npc/021-8_Meeting_Rooms/_mobs.txt @@ -0,0 +1,7 @@ +// 021-8 Meeting Rooms mobs + + + +021-8.gat,0,0,0 script Mob021-8 -1,{ + end; +} diff --git a/npc/021-8_Meeting_Rooms/_warps.txt b/npc/021-8_Meeting_Rooms/_warps.txt new file mode 100644 index 00000000..9d92f8c4 --- /dev/null +++ b/npc/021-8_Meeting_Rooms/_warps.txt @@ -0,0 +1,2 @@ +// 021-8 Meeting Rooms warps + -- cgit v1.2.3-60-g2f50