Removed the usage of deprecated command goto from npc scripts (except custom folder).

Signed-off-by: Ragno <ragno@atlantis-ro.net>

1 files changed, 20 insertions, 22 deletions

diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 4c42f6b39..53c7b331f 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -265,7 +265,7 @@ tha_t01,149,78,4	script	Guide	4_F_01,{
 				mes "to access the higher levels";
 				mes "here in Thanatos Tower.";
 				next;
-				goto L_Contract;
+				break;
 			case 3:
 				mes "[Ditze]";
 				mes "To develop the floors above";
@@ -276,6 +276,7 @@ tha_t01,149,78,4	script	Guide	4_F_01,{
 				mes "for us under a temp contract?";
 				close;
 			}
+			break;
 		case 2:
 			mes "[Ditze]";
 			mes "You may have already heard";
@@ -291,7 +292,7 @@ tha_t01,149,78,4	script	Guide	4_F_01,{
 			mes "to access the higher levels";
 			mes "here in Thanatos Tower.";
 			next;
-			goto L_Contract;
+			break;
 		case 3:
 			mes "[Ditze]";
 			mes "Well, if you have any";
@@ -300,16 +301,15 @@ tha_t01,149,78,4	script	Guide	4_F_01,{
 			mes "Ditze Lappa. Have a good day!";
 			close;
 		}
+	} else {
+		mes "[Ditze]";
+		mes "For more detailed information";
+		mes "about monster exterminations,";
+		mes "please ask the 2nd Floor Guide";
+		mes "and the Guide next to me. Well,";
+		mes "we hope you enjoy your experience working with Rekenber Corporation~";
+		close;
 	}
-	mes "[Ditze]";
-	mes "For more detailed information";
-	mes "about monster exterminations,";
-	mes "please ask the 2nd Floor Guide";
-	mes "and the Guide next to me. Well,";
-	mes "we hope you enjoy your experience working with Rekenber Corporation~";
-	close;
-
-L_Contract:
 	switch(select("Maybe next time", "Sure, I'd like to work for you.")) {
 	case 1:
 		mes "[Ditze]";
@@ -930,7 +930,6 @@ tha_t03,67,70,0	script	Rune Device#tt1	HIDDEN_NPC,4,4,{
 				mes "field fizzles out with a soft,";
 				mes "gentle ''pzzzzzh'' sound.^000000";
 				next;
-				goto L_Key;
 			}
 			else if (getequipweaponlv(4) == 4) {
 				mes "^3355FFWith your "+getequipname(4)+" in";
@@ -939,7 +938,6 @@ tha_t03,67,70,0	script	Rune Device#tt1	HIDDEN_NPC,4,4,{
 				mes "field fizzles out with a soft,";
 				mes "gentle ''pzzzzzh'' sound.^000000";
 				next;
-				goto L_Key;
 			}
 			else {
 				mes "^3355FFYou smash the energy";
@@ -951,21 +949,16 @@ tha_t03,67,70,0	script	Rune Device#tt1	HIDDEN_NPC,4,4,{
 				mes "powerful weapon...^000000";
 				close;
 			}
+			break;
 		case 2:
 			mes "^3355FFYou decide to leave";
 			mes "the machine alone.^000000";
 			close;
 		}
+	} else {
+		mes "You've acquired everything you need from this rune device.";
+		close;
 	}
-	mes "You've acquired everything you need from this rune device.";
-	close;
-
-OnTouch:
-	if ((countitem(Key_Red) == 0) && (countitem(Magic_Gem_Red) == 0))
-		specialeffect EF_LEVEL99_4;
-	end;
-
-L_Key:
 	specialeffect EF_BRANDISH2;
 	mes "After breaking the device, the exterior shatters.";
 	mes "The energy field begins to disappear,";
@@ -1024,6 +1017,11 @@ L_Key:
 		specialeffect2 EF_COMBOATTACK1;
 		close;
 	}
+
+OnTouch:
+	if ((countitem(Key_Red) == 0) && (countitem(Magic_Gem_Red) == 0))
+		specialeffect EF_LEVEL99_4;
+	end;
 }
 
 tha_t04,195,195,0	script	Rune Device#tt2	HIDDEN_NPC,3,3,{