removes next; when followed by a close;

28 files changed, 1 insertions, 124 deletions

diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index 35936be4..ad550133 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -317,7 +317,7 @@ SPELL lesser-heal (target : STRING) : "#L00" =
                     IF failed(pc(target))
                       THEN (IF ((target = "mouboo" || target = "Mouboo")
                                  && rdistance(location(caster), location(npc("Mouboo"))) < 2 + (spellpower / 100))
-                            THEN { mes "Your spell seems to have no effect on the mouboo."; next; close; }
+                            THEN { mes "Your spell seems to have no effect on the mouboo."; close; }
                             ELSE target = caster;)
                       ELSE (target = pc(target);
                             IF is_dead(target)
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index 1b62953d..3b331e08 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -131,6 +131,5 @@ L_giveword:
 	mes "[Nina]";
         mes "Terrified, she looks around once more.";
         mes "\"But you mustn't tell anyone!\"";
-        next;
         close;
 }
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index 0b0b9c92..7dea2a32 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -218,20 +218,17 @@ L_Lifestones_Trade:
         mes "\"Five for you and five for me.\"";
         mes "She smiles.";
         mes "[200 experience points]";
-        next;
         close;
 
 L_Lifestones_NoRoom:
 	mes "[Elanore the Healer]";
         mes "\"Oh... it seems that you have no room for the lifestones.  But please do come back later when you have made a little space.\"";
-        next;
         close;
 
 L_Lifestones_Trade_Missing:
 	mes "[Elanore the Healer]";
         mes "Elanore counts the leaves you show her.";
         mes "\"No, I am sorry.  Please bring me ten leaves each of gamboge, alizarin, mauve, and cobalt.\"";
-        next;
         close;
 
 L_Lifestones_MakeSelf:
@@ -244,12 +241,10 @@ L_Lifestones_MakeSelf_yes:
         next;
 	mes "[Elanore the Healer]";
         mes "\"You will have to make sure that your powers are pure, though, either by wearing a white robe or some other special magical item that does this for you.\"";
-        next;
         close;
 
 L_Lifestones_MakeSelf_no:
         mes "\"No, you are not powerful enough yet.  Please come back and ask me again when you have learned to control more powerful magic, though!\"";
-        next;
         close;
 
 L_Teach:
@@ -263,7 +258,6 @@ L_Teach:
 
 	mes "[Elanore the Healer]";
         mes "\"You have made good progress, but you lack the magical power to advance further.  Also, I would like to observe you some more to be certain that you will make a good healer.\"";
-        next;
         close;
 
 L_Teach_Initial:
@@ -303,7 +297,6 @@ L_Teach_Initial:
 	mes "[Elanore the Healer]";
         mes "Elanore hands you the crystal.";
         mes "\"Here you are.  I hope that it will allow you to do good!\"";
-        next;
         close;
 
 L_Teach_Initial_Noroom:
@@ -378,7 +371,6 @@ L_Teach_CheckAdvanceToLOH:
         getexp 1000, 0;
         set @Q_status, @STATUS_LEARNED_LAY_ON_HANDS;
         callsub S_update_var;
-        next;
         close;
 
 L_Teach_LOH_advance_abort0:
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index 23757485..ba3bec00 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -78,14 +78,12 @@ L_Req4:
 L_Wait:
 	mes "[Vincent]";
 	mes "\"Now please go get me 10 [Bug Leg]s.\"";
-	next;
 	close;
 
 L_Progress:
 	if(countitem("BugLeg") >= 10) goto L_Have;
 	mes "[Vincent]";
 	mes "\"Please help me collect 10 [Bug Leg]s!\"";
-	next;
 	close;
 
 L_Have:
@@ -102,12 +100,10 @@ L_Have:
 	mes "\"Here you go, a little of my appreciation!\"";
 	mes "";
 	mes "[1000 gold]";
-	next;
 	close;
 
 L_Done:
 	mes "[Vincent]";
 	mes "\"Thanks for your help!\"";
-	next;
 	close;
 }
diff --git a/npc/002-1_Sandstorm/rogue.txt b/npc/002-1_Sandstorm/rogue.txt
index 9d6a555f..e5afe354 100644
--- a/npc/002-1_Sandstorm/rogue.txt
+++ b/npc/002-1_Sandstorm/rogue.txt
@@ -34,13 +34,11 @@ L_Reset:
 	mes "\"There you are.";
 	mes "";
 	mes "Good as new!\"";
-	next;
 	close;
 
 L_Pass:
 	mes "[Rogue Mage]";
 	mes "\"Very well then, see you.\"";
-	next;
 	close;
 
 L_NoMoney:
@@ -48,6 +46,5 @@ L_NoMoney:
 	mes "\"Oh dear, the price cannot be bargained.";
 	mes "";
 	mes "Perhaps you can borrow from a friend?\"";
-	next;
 	close;
 }
diff --git a/npc/005-1_Snake_desert/tree.txt b/npc/005-1_Snake_desert/tree.txt
index fc7d1888..4eea7845 100644
--- a/npc/005-1_Snake_desert/tree.txt
+++ b/npc/005-1_Snake_desert/tree.txt
@@ -27,7 +27,6 @@ L_cont:
         getexp 20000, 0;
         set @value, 15;
         callfunc "QuestSagathaHappy";
-        next;
         close;
 
 L_hug:
@@ -102,20 +101,17 @@ L_givewater:
 
 	mes "[Dying Tree]";
         mes "You pour a bottle of water into the sand.  The water dissipates quickly, without any effect.";
-        next;
         close;
 
 L_no_water:
 	mes "[Dying Tree]";
         mes "You don't have any water.";
-        next;
         close;
 
 L_kiss:
 	mes "[Dying Tree]";
         mes "You pluck out a splinter from your lip.";
         mes "Somehow, you don't think that this helped.";
-        next;
         close;
 
 L_do_cut:
@@ -142,13 +138,11 @@ L_really_cut:
 	mes "[Dying Tree]";
         mes "You cut off a branch from the tree.";
         mes "For an instant, you have an uneasy feeling, as if the branch were writhing in your hand...";
-        next;
         close;
 
 L_no_boneknife:
 	mes "[Dying Tree]";
 	mes "Try as you might, you can't seem to find a way to cut off a branch.  Perhaps you need a different tool for cutting?";
-        next;
         close;
 
 L_happy:
diff --git a/npc/008-1_Hurnscald_outskirts/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt
index ad692903..e61bc10a 100644
--- a/npc/008-1_Hurnscald_outskirts/hinnak.txt
+++ b/npc/008-1_Hurnscald_outskirts/hinnak.txt
@@ -221,32 +221,27 @@ L_GiveBeer:
 L_Sagatha_hahaha:
 	mes "[Farmer Hinnak]";
         mes "\"Yeah, funny now...  But you should've seen that stare!  Ah, well, never mind.\"";
-        next;
         close;
 
 L_Sagatha_scary:
 	mes "[Farmer Hinnak]";
         mes "\"Yeah, you could say that...\"";
         mes "He stares into his empty beer jug, as if wishing it weren't empty yet.";
-        next;
         close;
 
 L_Sagatha_word:
 	mes "[Farmer Hinnak]";
         mes "\"Oh, I can be sure... but something like '" + getspellinvocation("summon-maggots") + "', I think.\"";
-        next;
         close;
 
 L_NoBeer:
 	mes "[Farmer Hinnak]";
         mes "\"Ah... no beer?  Oh well.\"";
-        next;
         close;
 
 L_Bye:
 	mes "[Farmer Hinnak]";
         mes "\"Bye!\"";
-        next;
         close;
 
 L_NohMask:
diff --git a/npc/009-2_Hurnscald/doctor.txt b/npc/009-2_Hurnscald/doctor.txt
index df2c5542..e2cd6f20 100644
--- a/npc/009-2_Hurnscald/doctor.txt
+++ b/npc/009-2_Hurnscald/doctor.txt
@@ -50,7 +50,6 @@ L_Axe:
 	next;
 	mes "[Doctor]";
 	mes "\"Wait. Thats just a fake. Shame on you!\"";
-	next;
 	close;
 
 L_Eyepatch:
@@ -63,7 +62,6 @@ L_Eyepatch:
 
 	mes "[Doctor]";
 	mes "\"If you change you're mind, please come back and see me.\"";
-	next;
 	close;
 
 L_Eyepatch_GlassEye:
@@ -74,7 +72,6 @@ L_Eyepatch_GlassEye:
 
 	mes "[Doctor]";
 	mes "\"I can't seem to find where I put that box. You should come back later, I may have found them by then.\"";
-	next;
 	close;
 
 L_NohMask:
diff --git a/npc/009-2_Hurnscald/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt
index ba6cc02b..3806c10e 100644
--- a/npc/009-2_Hurnscald/kfahr.txt
+++ b/npc/009-2_Hurnscald/kfahr.txt
@@ -839,7 +839,6 @@ L_knife_quest_missing_stingers:
 		mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
 	if (countitem("BlackScorpionStinger") == 0)
 		mes "You didn't bring even a single one!\"";
-	next;
 	close;
 
 L_knife_quest_missing_stingers_2:
@@ -849,7 +848,6 @@ L_knife_quest_missing_stingers_2:
 		mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
 	if (countitem("BlackScorpionStinger") == 0)
 		mes "You didn't bring even a single one!\"";
-	next;
 	close;
 
 L_knife_quest_missing_mushrooms:
@@ -859,7 +857,6 @@ L_knife_quest_missing_mushrooms:
 		mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
 	if (countitem("SmallMushroom") == 0)
 		mes "You didn't bring me even a single little mushroom!\"";
-	next;
 	close;
 
 L_knife_quest_missing_mushrooms_2:
@@ -869,7 +866,6 @@ L_knife_quest_missing_mushrooms_2:
 		mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
 	if (countitem("SmallMushroom") == 0)
 		mes "You didn't bring me even a single little mushroom!\"";
-	next;
 	close;
 
 L_stinger_quest_check:
@@ -913,7 +909,6 @@ L_snakeskins_missing:
 		mes "You will need " + (@SNAKE_SKINS_NR - (countitem ("SnakeSkin"))) + " more of those.\"";
 	if (countitem("SnakeSkin") == 0)
 		mes "You didn't bring even a single skin!\"";
-	next;
 	close;
 
 L_SnakeSkins_TooMany:
diff --git a/npc/009-2_Hurnscald/misc.txt b/npc/009-2_Hurnscald/misc.txt
index 60acf766..b969af7d 100644
--- a/npc/009-2_Hurnscald/misc.txt
+++ b/npc/009-2_Hurnscald/misc.txt
@@ -52,7 +52,6 @@ L_magic:
 
         mes "[Bookshelf]";
         mes "You can't make out anything else of value, so you place the manuscript back in the bookshelf.";
-        next;
         close;
 
 L_magic_boring:
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index f808959d..0a1834f0 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -264,51 +264,43 @@ L_YesShield:
         callsub L_Update_Var;
 
         getitem "SteelShield", 1;
-        next;
         close;
 
 L_ShieldNoZeny:
         mes "[Nicholas]";
         mes "\"I am sorry, but I must ask that you pay 20,000 GP; this is qualty work.\"";
-        next;
         close;
 
 L_ShieldNoInfantry:
         mes "[Nicholas]";
         mes "\"Now this is strange... I could have sworn that you had two infantry helmets right here.  Well, come back if you have some more!\"";
-        next;
         close;
 
 L_ShieldNoOre:
         mes "[Nicholas]";
         mes "\"How odd... didn't I put your iron ore on the table right here?  Well, I will need it back to make the shield.\"";
-        next;
         close;
 
 L_ShieldNoLeatherPatch:
         mes "[Nicholas]";
         mes "\"You don't have a suitable leather patch.  I'm sorry, but a shield without one would chafe terribly.\"";
-        next;
         close;
 
 L_MoreInfantry:
         mes "[Nicholas]";
         mes "Nicholas takes your infantry helmet and examines it.";
         mes "\"Yes, this is perfect!  If you can bring me another one of those, I can make your shield.\"";
-        next;
         close;
 	
 L_NoInfantry:
         mes "[Nicholas]";
         mes "Nicholas shakes his head.";
         mes "\"No, none of these items are suitable.  Try looking for somewhat large metal things.\"";
-        next;
         close;
 
 L_WhereLeather:
         mes "[Nicholas]";
 	mes "\"Hmm.  You should look for someone who can work with some kind of leather.  Rumor has it that there is someone in the eastern desert who can, but I haven't been there.\"";
-        next;
         close;
 
 
@@ -357,38 +349,31 @@ L_SetzerQuest:
 
         mes "[Nicholas]";
         mes "\"I'm quite happy with this one.  Be careful around the edge, though, it is quite sharp.\"";
-        next;
-
         close;
 
 L_ExplainMonsterOil:
         mes "[Nicholas]";
         mes "\"Monster oil is a special oil that can be used to harden thin sheets of metal, if used properly.  Unfortunately it is very hard to get.  Perhaps one of our local alchemists can help you with it?\"";
-        next;
         close;
 
 L_SetzerNoZeny:
         mes "[Nicholas]";
         mes "\"I am sorry, but I must ask that you pay 50,000 GP; the kind of weapon I am thinking of is not easy to make.\"";
-        next;
         close;
 
 L_SetzerNoOre:
         mes "[Nicholas]";
         mes "\"Without five chunks of iron ore I can't improve your sword.\"";
-        next;
         close;
 
 L_SetzerNoMonsterOil:
         mes "[Nicholas]";
         mes "\"I know that monster oil is hard to come by, but I can't do much without it.  Ask an alchemist if you need help making it.\"";
-        next;
         close;
 
 L_SetzerNoSword:
         mes "[Nicholas]";
         mes "\"I will need your old short sword as a basis.  Please bring it to me first.\"";
-        next;
         close;
 
 L_end:
diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2_Hurnscald/selim.txt
index bfd8bc46..356416e9 100644
--- a/npc/009-2_Hurnscald/selim.txt
+++ b/npc/009-2_Hurnscald/selim.txt
@@ -146,7 +146,6 @@ L_explain_dye:
         mes "[Selim]";	
         mes "\"Well, dye is very expensive, and since I don't charge adventurers anything, I can't give you any for free.";
         mes "But most alchemists can make dye; perhaps you can find one around here.\"";
-        next;
         close;
 
 L_finish:
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2_Hurnscald/wyara.txt
index 01793fee..d37e386a 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2_Hurnscald/wyara.txt
@@ -56,7 +56,6 @@ L_Main:
 L_Shop:
 	mes "[Wyara the Witch]";
         mes "\"Please have a look at the shelf behind me.\"";
-        next;
         close;
 
 L_Question:
@@ -352,7 +351,6 @@ L_Magic_purify_explained:
 L_Magic_purify_doit:
         mes "[Wyara the Witch]";
         mes "\"Take your purification potion to the pond, right next to its center, and pour the potion in.\"";
-        next;
         close;
 
 L_Magic_purify_nospace:
@@ -402,7 +400,6 @@ L_Magic_purify_once:
 L_Magic_purify_doit2:
         mes "[Wyara the Witch]";
         mes "\"Please apply this one quickly, again.\"";
-        next;
         close;
 
 L_Magic_purify_done:
@@ -449,7 +446,6 @@ L_Magic_purify_done:
 L_Magic_purify_abort:
         mes "[Wyara the Witch]";
         mes "\"I can't help you if you don't subject yourself to the ritual.\"";
-        next;
         close;
 
 L_Magic_train_no:
diff --git a/npc/009-3_Cave_beneath_Hurnscald/sword.txt b/npc/009-3_Cave_beneath_Hurnscald/sword.txt
index 2ff1d958..fbb47433 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/sword.txt
+++ b/npc/009-3_Cave_beneath_Hurnscald/sword.txt
@@ -31,7 +31,6 @@ L_message:
 
         mes "[Magic Sword]";
         mes "\"Come back when thou art stronger.\"";
-        next;
         close;
 
 L_Initial:
@@ -63,7 +62,6 @@ L_Initial:
 
         mes "[Magic Sword]";
         mes "There is no answer.";
-        next;
         close;
 
 L_PostFlareDart:
@@ -82,7 +80,6 @@ L_PostFlareDart:
 L_PostFlareDart_hi:
         mes "[Magic Sword]";
         mes "\"Mortal... I have seen pain and death beyond thine reckoning!  Mock me not with thine idle questions!\"";
-        next;
         close;
 
 L_PostFlareDart_sister:
@@ -120,7 +117,6 @@ L_PostFlareDart_teach:
 
         mes "[Magic Sword]";
         mes "\"But beware... the path of war that thou hast embarked upon is one from which few return.  May luck be on thy side...\"";
-        next;
         close;
 
 L_PostFlareDart_teach2:
@@ -163,26 +159,22 @@ L_L2_W11:
 
         mes "[Magic Sword]";
         mes "\"Take twenty arrows, sprinkle sulphur powder over them, and then speak '" + getspellinvocation("arrow-hail") + "'.  Throw them high up in the air, and watch the hail unfold before thy feet.\"";
-        next;
         close;
 
 
 L_L2_almost_done:
         mes "[Magic Sword]";
         mes "\"Return to my sister now.  I expect that she shall teach thee one more spell.\"";
-        next;
         close;
 
 L_lacking_mobpoints:
         mes "[Magic Sword]";
         mes "\"Thou lackest the monster points needed to prove thy worthiness.  I shall not reveal more to thee until thou hast slain more monsters.\"";
-        next;
         close;
 
 L_sayhi:
         mes "[Magic Sword]";
         mes "\"Please leave me in peace.\"";
-        next;
         close;
 
 S_update_var:
diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt
index ff28325f..43b1df2d 100644
--- a/npc/010-2_Dimonds_Cove/doug.txt
+++ b/npc/010-2_Dimonds_Cove/doug.txt
@@ -77,14 +77,12 @@ J_3:
 L_Go:
 	mes "[Doug]";
 	mes "\"Now please go get me 20 [Cave Snake Lamp]s.\"";
-	next;
 	close;
 
 L_State2:
 	if(countitem("CaveSnakeLamp") >= 20) goto L_Have;
 	mes "[Doug]";
 	mes "\"Please help me collect 20 [Cave Snake Lamp]s!\"";
-	next;
 	close;
 
 L_Have:
@@ -103,12 +101,10 @@ L_Have:
 	mes "";
 	mes "[5000 experience points]";
 	mes "[5000 gold]";
-	next;
 	close;
 
 L_Done:
 	mes "[Doug]";
 	mes "\"Thanks for your help! Those snakes sure have bright lamps!\"";
-	next;
 	close;
 }
diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt
index ebe9a0c5..3b452318 100644
--- a/npc/010-2_Dimonds_Cove/loratay.txt
+++ b/npc/010-2_Dimonds_Cove/loratay.txt
@@ -49,13 +49,11 @@ L_intro_over:
 L_hello_0:
         mes "She raises an eyebrow.";
         mes "\"That,\", she notes dryly, \"is hardly my fault.  And now I would greatly appreciate it if you were to get out of here and leave me to my work!\"";
-        next;
         close;
 
 L_hello_1:
         mes "She frowns.";
         mes "\"No, I am an accupuncturist, I just happen to practice on cloth!  Get out of here with your silly questions!\"";
-        next;
         close;
 
 L_hello_2:
@@ -65,7 +63,6 @@ L_hello_2:
         mes "[Lora Tay the Seamstress]";
         mes "\"I do not work for petty peasants or arrogant adventurers.  Get out of my sight!\"";
         mes "She waves you away and returns to her work.";
-        next;
         close;
 
 
@@ -96,7 +93,6 @@ L_agostine_1:
         if (QUEST_WG_state == 9)
            set QUEST_WG_state, 10;
 
-        next;
         close;
 
 L_agostine_menu:
@@ -162,20 +158,17 @@ L_agostine_2:
 
         mes "[Lora Tay the Seamstress]";
         mes "She holds out your gloves for you to pick up, then waves you out of the room.  Fortunately, her cough seems to be slowly subsiding.";
-        next;
         close;
 
 L_agostine_3:
         mes "[Lora Tay the Seamstress]";
         mes "She frowns at you.";
         mes "\"What other self-absorbed tailor-pretends with the sewing skill of a mouboo are there around?  Stop wasting my time.\"";
-        next;
         close;
 
 L_agostine_4:
         mes "[Lora Tay the Seamstress]";
         mes "\"Is it not obvious?  We are talking about someone so self-absorbed that he chose to ignore the advice of myself, greatest of the seven southern seamstresses!  I cannot stand such arrogance.\"";
-        next;
         close;
 
 L_agostine_5:
@@ -187,7 +180,6 @@ L_no_water:
         mes "Checking more closely, you realize that you are out of water.";
         mes "You apologise to Lora, though it fortunately seems that her cough is subsiding.";
         mes "She waves you out of the room.";
-        next;
         close;
 
 L_regular_intro:
diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index 5ad0e363..8c9e39ff 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
@@ -158,26 +158,21 @@ L_iron_powder:
 	mes "[Rauk the Alchemist]";
         mes "Rauk pours another liquid over the resultant mixture, then pours the result through a piece of cloth placed in a funnel, followed by a cup of water.  He removes the residual metal powder from the cloth and hands it to you.";
         mes "\"This is about as fine as I can make it without mechanical help.\"";
-        next;
-
         close;
 
 L_iron_powder_noore:
 	mes "[Rauk the Alchemist]";
         mes "\"I do need a chunk of iron ore.  Please return when you have one.\"";
-        next;
         close;
 
 L_iron_powder_nozeny:
 	mes "[Rauk the Alchemist]";
         mes "\"I'm sorry, but I must ask that you pay 100 GP-- the acid I use is not cheap.\"";
-        next;
         close;
 
 L_iron_powder_full:
 	mes "[Rauk the Alchemist]";
         mes "\"I don't think that you have room to carry this.  Please come back later.\"";
-        next;
         close;
 
 L_sulphur:
@@ -207,25 +202,21 @@ L_sulphur:
 	mes "[Rauk the Alchemist]";
         mes "The water having evaporated, only some yellow powder is left over.  Rauk carefully pours it into your hand.";
         mes "\"This should be precisely twelve half-ounces of sulphur powder.\"";
-        next;
         close;
 
 L_sulphur_noash:
 	mes "[Rauk the Alchemist]";
         mes "\"You don't seem to have all three piles of volcanic ash.\"";
-        next;
         close;
 
 L_sulphur_nomauve:
 	mes "[Rauk the Alchemist]";
         mes "\"You don't seem to have the three mauve leaves I asked for.\"";
-        next;
         close;
 
 L_sulphur_nospace:
 	mes "[Rauk the Alchemist]";
         mes "\"Oh dear.  You don't seem to be able to carry the sulphur powder.\"";
-        next;
         close;
 
 L_mana_potion:
@@ -347,7 +338,6 @@ L_wumpus_egg_intro:
 	mes "Rauk's eyes brighten up.";
 	mes "\"Ah, a wumpus egg is one of the most powerful catalysts out there, useful for transmutation and transchromation! Unfortunately the Common Wumpus is almost completely extinct these days, so they are hard to find.";
 	mes "Should you find one, please let me know-- I will pay well for one!\"";
-	next;
 	close;
 
 L_obsidian_spork_intro:
@@ -358,7 +348,6 @@ L_obsidian_spork_intro:
 	mes "[Rauk the Alchemist]";
 	mes "\"Obsidian sporks are therefore hard to make, but they are said to be very useful in certain kinds of alchemy.";
 	mes "Should you find one, please let me know!\"";
-	next;
 	close;
 
 L_pick_colour:
diff --git a/npc/012-1_Woodland_Hills/injured-mouboo.txt b/npc/012-1_Woodland_Hills/injured-mouboo.txt
index ae203a9a..4adbca98 100644
--- a/npc/012-1_Woodland_Hills/injured-mouboo.txt
+++ b/npc/012-1_Woodland_Hills/injured-mouboo.txt
@@ -33,7 +33,6 @@ function	script	QuestMoubooHeal	{
 
 L_nothing:
 	mes "Your spell has no effect.";
-        next;
         close;
 
 S_update_var:
@@ -201,25 +200,20 @@ L_dead:
 
         set @Q_status, @STATE_TOOK_KILL_REWARD;
         callsub S_update_var;
-
-        next;
         close;
 
 L_took_reward:
 	mes "[Dead Mouboo]";
         mes "You see a dead mouboo.";
-        next;
         close;
 
 L_nopickup:
 	mes "Unfortunately, you can't carry any more.";
-        next;
         close;
 
 L_healed:
 	mes "[Mouboo]";
         mes "The mouboo is sleeping soundly, smiling in its dreams.";
-        next;
         close;
 
 S_update_var:
diff --git a/npc/013-1_Woodland_hills/sagatha.txt b/npc/013-1_Woodland_hills/sagatha.txt
index f1f14130..f5e2f606 100644
--- a/npc/013-1_Woodland_hills/sagatha.txt
+++ b/npc/013-1_Woodland_hills/sagatha.txt
@@ -163,14 +163,12 @@ L_intro_givename:
 L_evil:
 	mes "The witch's eyes flare up in anger as she notices you, and she turns away from you.";
         mes "Whatever the reason, she doesn't seem to like you.";
-        next;
         close;
 
 L_unhappy:
 	mes "The witch glares at you in anger.";
         mes "\"I wonder if you can still sleep after killing those innocent forest creatures!";
         mes "I am sure that they will come back to haunt you in your dreams!\"";
-        next;
         close;
 
 L_wb:
diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
index d1e18f00..e74b15ec 100644
--- a/npc/013-2_Magic_house/wizard.txt
+++ b/npc/013-2_Magic_house/wizard.txt
@@ -69,7 +69,6 @@ L_new_student:
 
         mes "[Old Wizard]";
         mes "\"I'm not sure if you are experienced enough to cast it yet, though.  You may need to first learn astral magic.\"";
-        next;
         close;
 
 ok:
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 9a5cfd33..2cc50197 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -118,7 +118,6 @@ L_get_married:
 	mes "[Wedding Officiator]";
         mes "\"So... I wish you the very, very best, a wonderful and happy and successful marriage!\"";
         mes "She smiles at you again.";
-        next;
         close;
 
 L_end:
@@ -128,7 +127,6 @@ L_too_young:
 	mes "[Wedding Officiator]";
         mes "Wendy looks at her notes, shaking her head; pain is evident in her eyes.";
         mes "\"I'm really, really sorry-- I wish I could allow that, but you are still too young.  You have to be at least " + @WEDDING_MIN_LEVEL + " levels of age.\"";
-        next;
         close;
 
 L_too_poor:
@@ -136,7 +134,6 @@ L_too_poor:
         mes "\"Oh, this is so sad... you want to get married but don't have the money!\"";
         mes "Wendy is visibly unhappy.";
         mes "\"I wish I could help you, but the rules... you see...  Well, I'm afraid that you will just have to come back when you have " + @WEDDING_FEE + " GP.\"";
-        next;
         close;
 
 L_main_married:
@@ -153,7 +150,6 @@ L_farewell:
 	mes "[Wedding Officiator]";
         mes "Wendy is beaming.";
         mes "\"That's wonderful!  Please do say `hi' to your spouse from me!\"";
-        next;
         close;
 
 L_talk_divorce:
@@ -230,7 +226,6 @@ L_makesure_divorce:
 L_divorce_nomoney:
         mes "[Wedding Officiator]";
         mes "\"I am sorry, but you can't seem to afford the " + @divorce_cost + " GP for a divorce at this time.  Please come back later.\"";
-        next;
         close;
 
 L_do_divorce:
diff --git a/npc/015-1_Woodland/sword.txt b/npc/015-1_Woodland/sword.txt
index 5c154e46..38f89612 100644
--- a/npc/015-1_Woodland/sword.txt
+++ b/npc/015-1_Woodland/sword.txt
@@ -31,7 +31,6 @@ L_message:
 
         mes "[Mystic Sword]";
         mes "\"I have taught thee all I can teach for now.\"";
-        next;
         close;
 
 L_Initial:
@@ -60,13 +59,11 @@ L_noq:
         mes "[Mystic Sword]";
         mes "The voice sounds slightly amused.";
         mes "\"How sad to hear how manners have degenerated in recent centuries.  Farewell for now, dear mortal.\"";
-        next;
         close;
 
 L_Initial_nothing:
         mes "[Mystic Sword]";
         mes "\"Then I wish thee well in thy travels, wanderer!\"";
-        next;
         close;
 
 L_Initial_learn:
@@ -98,7 +95,6 @@ L_Initial_learn:
 L_Initial_selfish:
         mes "[Mystic Sword]";
         mes "\"Please return when thou art taking thy quest for magic a little more seriously.\"";
-        next;
         close;
 
 L_Initial_dontknow:
@@ -145,7 +141,6 @@ L_FlareStage_impolite:
         mes "[Mystic Sword]";
         mes "You hear a metallic chime in your head.  After a second, you come to the conclusion that it was probably the sword sighing.";
         mes "\"Greetings to thee, too, mortal, and farewell until thou hast learned some proper manners.\"";
-        next;
         close;
 
 L_FlareStage_hello:
@@ -257,7 +252,6 @@ L_Levelup2_must_practice:
 L_Farewell:
         mes "[Mystic Sword]";
         mes "\"Farewell for now!\"";
-        next;
         close;
 
 L_L2_W12:
@@ -288,13 +282,11 @@ L_L2_W12:
 
         mes "[Mystic Sword]";
         mes "\"Speak '" + getspellinvocation("magic-knuckles") + "' and take a glass of beer and drink it, without ever taking it off thy lips.  This will harden and enchant thy fists, turning them into powerful weapons.\"";
-        next;
         close;
 
 L_L2_almost_done:
         mes "[Mystic Sword]";
         mes "\"Greetings once more, traveler!  I have another spell I wish to teach thee, but first thou must learn my brother's arrow spell.\"";
-        next;
         close;
 
 L_L2_W10:
@@ -338,19 +330,16 @@ L_L2_W10:
 L_no_ore:
         mes "[Mystic Sword]";
         mes "\"Thou dost appear to lack ore.  We cannot continue; please fare well and return swiftly!\"";
-        next;
         close;
 
 L_farewell:
         mes "[Mystic Sword]";
         mes "\"Then I bid thee farewell for now!\"";
-        next;
         close;
 
 L_lacking_mobpoints:
         mes "[Mystic Sword]";
         mes "\"Thou dost not have enough monster points to prove thy worthiness.  Return when thou hast slain more monsters!\"";
-        next;
         close;
 
 S_update_var:
diff --git a/npc/018-1_Woodland_mining_camp/sword.txt b/npc/018-1_Woodland_mining_camp/sword.txt
index 7352384d..78cad244 100644
--- a/npc/018-1_Woodland_mining_camp/sword.txt
+++ b/npc/018-1_Woodland_mining_camp/sword.txt
@@ -7,6 +7,5 @@
 L_message:
         mes "[Sword in Pond]";
         mes "\"Zzzzzz.....\"";
-        next;
         close;
 }
diff --git a/npc/018-2_Woodland_mining_camp/angus.txt b/npc/018-2_Woodland_mining_camp/angus.txt
index bf9f725e..846bed7d 100644
--- a/npc/018-2_Woodland_mining_camp/angus.txt
+++ b/npc/018-2_Woodland_mining_camp/angus.txt
@@ -9,7 +9,6 @@
 	mes "[Angus]";
 	mes "Angus is tinkering with some mechanical concoction.";
 	mes "\"It keeps breakin' left an' right...  fortunat'ly I put in redundancies everywhere, but I haf' to keep repairin'.\"";
-	next;
 	close;
 
 L_NohMask:
diff --git a/npc/018-2_Woodland_mining_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt
index 8b79658a..cd166796 100644
--- a/npc/018-2_Woodland_mining_camp/caul.txt
+++ b/npc/018-2_Woodland_mining_camp/caul.txt
@@ -274,13 +274,11 @@ L_monster_oil_start_brew:
 L_monster_oil_missing:
 	mes "[Caul]";
 	mes "\"You don't seem to have all of the ingredients.  You need one pearl, two snake skins, three black stingers, two piles of ash, and one golden stinger.\"";
-        next;
         close;
 
 L_monster_oil_missing_gold:
 	mes "[Caul]";
 	mes "\"You seem to have everything except for the golden stinger.  I understand that this one is hard to get, but I'm sure that you can find one somewhere.\"";
-        next;
         close;
 
 L_monster_oil_loop:
@@ -303,7 +301,6 @@ L_monster_oil_loop:
         next;
 	mes "[Caul]";
         mes "\"I'm glad to see that you chose to brew another day... perhaps it might be best if you give up on this dangerous concoction, though!\"";
-        next;
         close;
 
 L_monster_oil_out_of_leaves:
@@ -434,7 +431,6 @@ L_monster_oil_explode_dodge:
 	mes "[Caul]";
         mes "Caul nods at you from underneath a chair.";
         mes "\"I told you, it's dangerous!!\"";
-        next;
         close;
 
 L_monster_oil_done:
@@ -464,13 +460,11 @@ L_monster_oil_done:
         mes "Caul gets up from underneath the cover he was taking and looks at your brew.  He is visibly impressed.";
         mes "\"Well done!  This should be just enough for one potion of monster oil.  Let me get you a bottle.\"";
         mes "He hands you the monster oil.";
-        next;
         close;
 
 L_monster_oil_no_gold_end:
 	mes "But where is your golden stinger?  Didn't you have one earlier?";
         mes "Frustrated, you give up.";
-        next;
         close;
 
 L_mopox_cure_start:
diff --git a/npc/018-3_Cave/sword.txt b/npc/018-3_Cave/sword.txt
index c4a62a8a..f8ee7725 100644
--- a/npc/018-3_Cave/sword.txt
+++ b/npc/018-3_Cave/sword.txt
@@ -7,6 +7,5 @@
 L_message:
         mes "[Sword in Rock]";
         mes "\"Ouch... my head...\"";
-        next;
         close;
 }
diff --git a/npc/020-2_Nivalis/furquest.txt b/npc/020-2_Nivalis/furquest.txt
index debce274..42a16a25 100644
--- a/npc/020-2_Nivalis/furquest.txt
+++ b/npc/020-2_Nivalis/furquest.txt
@@ -170,7 +170,6 @@ L_State_3:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"Remember, I want the best of fur!\"";
 	set QUEST_WG_state, 4;
-	next;
 	close;
 
 L_State_4:
diff --git a/npc/functions/inn.txt b/npc/functions/inn.txt
index 770f17be..00366cb2 100644
--- a/npc/functions/inn.txt
+++ b/npc/functions/inn.txt
@@ -15,7 +15,6 @@ function	script	Inn	{
 
 	mes "[" + @npcName$ + "]";
 	mes "\"Sleep well!\"";
-	next;
 	close;
 	
 L_No: