Merge commit 'mainline/master'

Conflicts:
	npc/001-1_Tulimshar/elanore.txt
	npc/013-3_Cave/barrier.txt
	npc/015-3/katze.txt

3 files changed, 6 insertions, 23 deletions

diff --git a/npc/015-3/barrier.txt b/npc/015-3/barrier.txt
index 3abffbb1..27a18bc3 100644
--- a/npc/015-3/barrier.txt
+++ b/npc/015-3/barrier.txt
@@ -23,6 +23,5 @@ L_Not_Naked:
     set LastHiss, 1;
     mes "\"GRAAUWL! Hissss...\"";
     mes "Scared of what you hear, you flee back outside.";
-    next;
     close;
 }
diff --git a/npc/015-3/katze.txt b/npc/015-3/katze.txt
index a3cc0626..1654542c 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 fur]s,";
     mes "2 [hard spike]s and";
     mes "2 [tiny healing potion]s.\"";
-    next;
     close;
 
 L_NeedsStuff2:
@@ -142,13 +137,12 @@ L_WhatsNeeded:
 L_Please:
     mes "[Katze]";
     mes "\"Alright... [the cat glares at you] it was";
-    mes "2 snake skins,";
-    mes "2 snake tongues,";
-    mes "2 maggot slimes,";
-    mes "2 white furs,";
-    mes "2 hard spikes and";
-    mes "2 tiny healing potions.\"";
-    next;
+    mes "2 [snake skin]s,";
+    mes "2 [snake tongue]s,";
+    mes "2 [maggot slime]s,";
+    mes "2 [white fur]s,";
+    mes "2 [hard spike]s and";
+    mes "2 [tiny healing potion]s.\"";
     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 434954c7..a965223d 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: