Remove switches and ritual book functionality

2 files changed, 69 insertions, 513 deletions

diff --git a/npc/099-1/main.txt b/npc/099-1/main.txt
index cbd57a0d..61ee1c65 100644
--- a/npc/099-1/main.txt
+++ b/npc/099-1/main.txt
@@ -48,10 +48,9 @@
     mes "In this maze, sixteen numeric passwords lie.";
     mes "All sixteen passwords must be chanted in their sequence.";
     mes "";
-    mes "Chanting can be done on the book at right.";
-    mes "##9Only one player may chant all passwords.";
-    mes "##9No reward is provided.";
-    mes "##9If you get a number wrong, you'll be penalized!";
+    mes "Chanting could be done on the book at right.";
+    mes "";
+    mes sprintf("[@@https://wiki.themanaworld.org/index.php/Legacy:Doomsday|%s@@]", l("Learn more"));
 	close;
 }
 
@@ -59,147 +58,16 @@
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
-    if ($@DD5_OPENSESAME) goto L_Complete;
 
 	mes ".:: Ritual Book ::.";
-    mes "Perform the ritual?";
-    next;
-    menu
-        "Yes", L_RB_0,
-        "No", L_close;
-
-L_RB_0:
-    mes "Say the password - ##B NULL##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[0]) goto L_Failure;
-    goto L_RB_1;
-
-L_RB_1:
-    mes "Say the password - ##B EIN##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[1]) goto L_Failure;
-    goto L_RB_2;
-
-L_RB_2:
-    mes "Say the password - ##B ZWEI##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[2]) goto L_Failure;
-    goto L_RB_3;
-
-L_RB_3:
-    mes "Say the password - ##B DREI##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[3]) goto L_Failure;
-    goto L_RB_4;
-
-L_RB_4:
-    mes "Say the password - ##B VIER##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[4]) goto L_Failure;
-    goto L_RB_5;
-
-L_RB_5:
-    mes "Say the password - ##B FUNF##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[5]) goto L_Failure;
-    goto L_RB_6;
-
-L_RB_6:
-    mes "Say the password - ##B SECHS##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[6]) goto L_Failure;
-    goto L_RB_7;
-
-L_RB_7:
-    mes "Say the password - ##B SIEBEN##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[7]) goto L_Failure;
-    goto L_RB_8;
-
-L_RB_8:
-    mes "Say the password - ##B ACHT##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[8]) goto L_Failure;
-    goto L_RB_9;
-
-L_RB_9:
-    mes "Say the password - ##B NEUN##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[9]) goto L_Failure;
-    goto L_RB_10;
-
-L_RB_10:
-    mes "Say the password - ##B ZEHN##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[10]) goto L_Failure;
-    goto L_RB_11;
-
-L_RB_11:
-    mes "Say the password - ##B ELF##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[11]) goto L_Failure;
-    goto L_RB_12;
-
-L_RB_12:
-    mes "Say the password - ##B ZWOLF##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[12]) goto L_Failure;
-    goto L_RB_13;
-
-L_RB_13:
-    mes "Say the password - ##B DREIZEHN##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[13]) goto L_Failure;
-    goto L_RB_14;
-
-L_RB_14:
-    mes "Say the password - ##B VIERZEHN##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[14]) goto L_Failure;
-    goto L_RB_15;
-
-L_RB_15:
-    mes "Say the password - ##B FUNFZEHN##b";
-    input @pass;
-
-    if (@pass != $@DD5_PASSWORDS[15]) goto L_Failure;
-    goto L_Success;
-
-L_Failure:
-    mes "##1THAT WAS WRONG!";
-    mes "##1THE RITUAL BACKFIRES!";
-    Hp = 1;
-    warp "099-1", 0, 0;
-    close;
-
-L_Success:
-    $@DD5_OPENSESAME = 1;
-	mes ".:: Ritual Book ::.";
-    mes "The portal magic is now active.";
-    close;
-
-L_Complete:
-	mes ".:: Ritual Book ::.";
     mes "The ritual was already performed.";
+    mes sprintf("[@@https://wiki.themanaworld.org/index.php/Legacy:Doomsday|%s@@]", l("Learn more"));
+    // Eternal memorial for those whom won it FIRST. Randomly
+    if (any(true, false, false)) {
+        mes "";
+        mesc l("The following names can be read on the pages: %s", "matto Hello=) Nced omido Rill- xarxax");
+    }
     close;
-
-L_close:
-	close;
 }
 
 099-3,72,75,0	script	#WarpToFinalShowdown	NPC424,0,0,{
@@ -207,42 +75,12 @@ L_close:
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-    if ($@DD5_TSWITCH != 18)
-        goto L_NotSwitch;
-
-    if (!$@DD5_OPENSESAME)
-        goto L_NotSesame;
-
 	mes "Walk here to go to the ##BFinal Showdown##b.";
     mes "";
     mes "##1##BWARNING:##b##0 Come prepared!";
 	close;
 
-L_NotSwitch:
-    mes "All 18 switches must be flipped in order to this warp to work!";
-    close;
-
-L_NotSesame:
-    mes "The ritual need to be performed to use this warp!";
-    close;
-
-L_Busy:
-    mes "This warp cannot be used while players are on the other side!";
-    close;
-
 OnTouch:
-    if ($DOOMSDAY_VANILLA)
-        goto L_Menu;
-
-    if ($@DD5_TSWITCH != 18)
-        goto L_NotSwitch;
-
-    if (!$@DD5_OPENSESAME)
-        goto L_NotSesame;
-
-    goto L_Menu;
-
-L_Menu:
     if ($@DD5_STATUS > 1)
         goto L_Busy;
 
@@ -261,7 +99,9 @@ L_Menu:
         "Yes", L_Yes,
         "No", L_No;
 L_No:
+    closeclientdialog;
     close;
+
 L_Yes:
     warp "099-5", 50, 66;
     if (!$@DD5_STATUS) {
@@ -270,5 +110,9 @@ L_Yes:
         donpcevent "#TMWFinalExam::OnWarn0";
     }
     close;
+
+L_Busy:
+    mes "This warp cannot be used while players are on the other side!";
+    close;
 }
 
diff --git a/npc/099-2/logic.txt b/npc/099-2/logic.txt
index 7875df67..8c8fe9f8 100644
--- a/npc/099-2/logic.txt
+++ b/npc/099-2/logic.txt
@@ -89,455 +89,167 @@ OnJanitor:
     end;
 }
 
-099-2,25,17,0	script	#099-2_25_17	NPC422,{
+099-2,25,17,0	script	#099-2_25_17	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[0]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[0], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-2,90,18,0	script	#099-2_90_18	NPC422,{
+099-2,90,18,0	script	#099-2_90_18	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[1]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[1], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-2,121,70,0	script	#099-2_121_70	NPC422,{
+099-2,121,70,0	script	#099-2_121_70	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[2]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[2], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-2,23,95,0	script	#099-2_23_95	NPC422,{
+099-2,23,95,0	script	#099-2_23_95	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[3]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[3], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-2,57,130,0	script	#099-2_57_130	NPC422,{
+099-2,57,130,0	script	#099-2_57_130	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[4]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[4], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-6,25,17,0	script	#099-6_25_17	NPC422,{
+099-6,25,17,0	script	#099-6_25_17	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[5]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[5], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-6,90,18,0	script	#099-6_90_18	NPC422,{
+099-6,90,18,0	script	#099-6_90_18	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[6]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[6], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-6,121,71,0	script	#099-6_121_71	NPC422,{
+099-6,121,71,0	script	#099-6_121_71	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[7]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[7], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-6,23,95,0	script	#099-6_23_95	NPC422,{
+099-6,23,95,0	script	#099-6_23_95	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[8]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[8], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-6,57,130,0	script	#099-6_57_130	NPC422,{
+099-6,57,130,0	script	#099-6_57_130	NPC423,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[9]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[9], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,29,69,0	script	#099-3_29_69	NPC422,{
+099-3,29,69,0	script	#099-3_29_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[10]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[10], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,35,69,0	script	#099-3_35_69	NPC422,{
+099-3,35,69,0	script	#099-3_35_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[11]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[11], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,41,69,0	script	#099-3_41_69	NPC422,{
+099-3,41,69,0	script	#099-3_41_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[12]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[12], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,59,69,0	script	#099-3_59_69	NPC422,{
+099-3,59,69,0	script	#099-3_59_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[13]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[13], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,79,69,0	script	#099-3_79_69	NPC422,{
+099-3,79,69,0	script	#099-3_79_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[14]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[14], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,91,69,0	script	#099-3_91_69	NPC422,{
+099-3,91,69,0	script	#099-3_91_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[15]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[15], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,97,69,0	script	#099-3_97_69	NPC422,{
+099-3,97,69,0	script	#099-3_97_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[16]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[16], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }
 
-099-3,115,69,0	script	#099-3_115_69	NPC422,{
+099-3,115,69,0	script	#099-3_115_69	NPC423,{
     // For the cells I need a smaller distance
     @npc_distance = 2;
     if(@npc_check) end;
 
-	if (!$@DD5_SWITCH[17]) goto L_Enable;
-	end;
-
-L_NoItem:
-	mes "The switch is stuck, if I only had a Needle or something...";
-	close;
-
-L_Enable:
-	if ($DOOMSDAY_VANILLA)
-		end;
-	if (countitem(BentNeedle) == 0) goto L_NoItem;
-	delitem BentNeedle, 1;
-	setnpcdisplay strnpcinfo(0), strnpcinfo(0)+"_", 423;
-	set $@DD5_SWITCH[17], 1;
-	set $@DD5_TSWITCH, $@DD5_TSWITCH+1;
-	getexp 100000, 0;
-	message strcharinfo(0), "The switch is now on!";
-	end;
+    mesc l("This switch is already active.");
+    close;
 }