The Return of Blanc

1 files changed, 0 insertions, 239 deletions

diff --git a/world/map/npc/functions/doomsday.txt b/world/map/npc/functions/doomsday.txt
index 474b5937..99861278 100644
--- a/world/map/npc/functions/doomsday.txt
+++ b/world/map/npc/functions/doomsday.txt
@@ -215,31 +215,6 @@ OnJanitor:
     set $@DoomsdayLoc, 0;
     set $@DoomsdayMc, 0;
     set $@DD_LOC$, "";
-    // Act 4: Disable council puppets
-    disablenpc "Sagatha#_DT";
-    disablenpc "Elanore#_DT";
-    disablenpc "Nikolai#_DT";
-    disablenpc "Morgan#_DT";
-    disablenpc "Valia#_DT";
-    disablenpc "Waric#_DT";
-    disablenpc "Golbenez#_DT";
-    disablenpc "Sagatha#_DH";
-    disablenpc "Elanore#_DH";
-    disablenpc "Nikolai#_DH";
-    disablenpc "Morgan#_DH";
-    disablenpc "Valia#_DH";
-    disablenpc "Waric#_DH";
-    disablenpc "Golbenez#_DH";
-    disablenpc "Sagatha#_DN";
-    disablenpc "Elanore#_DN";
-    disablenpc "Nikolai#_DN";
-    disablenpc "Morgan#_DN";
-    disablenpc "Valia#_DN";
-    disablenpc "Waric#_DN";
-    disablenpc "Golbenez#_DN";
-    disablenpc "Arch-Wizard#_DT";
-    disablenpc "Arch-Wizard#_DH";
-    disablenpc "Arch-Wizard#_DN";
     // Act 5: Cleanup
     if ($DOOMSDAY == 3 && !$DOOMSDAY_TWARP)
         donpcevent "Keshlam Maze::OnInit"; // Spawn monsters if needed
@@ -322,16 +297,6 @@ L_Doomsday2:
     end;
 
 OnDoomsday2Restart:
-    disablenpc "Wizard#1";
-    disablenpc "Wizard#2";
-    disablenpc "Wizard#3";
-    disablenpc "Wizard#4";
-    disablenpc "Wizard#5";
-    disablenpc "Wizard#6";
-    disablenpc "Wizard#7";
-    disablenpc "Wizard#8";
-    disablenpc "Arch-Wizard#9";
-
     // TODO: Maybe the town was taken over?
     if (!$DOOMSDAY_TAKENOVER)
         end;
@@ -1016,210 +981,6 @@ OnDeathAct4:
 
 }
 
-// Control puppets for Doomsday Council Meetings
--|script|Doomsday Council|32767
-{
-    if (GM >= G_DEV)
-        mes "["+strnpcinfo(0)+"]";
-    mes "You probably should try talking to them normally.";
-    if (GM >= G_DEV)
-        mes "##9 Use: @npctalk \""+strnpcinfo(0)+"\" \"your message goes here\"##0";
-    close;
-
-OnInit:
-    // Tulimshar room (Doomsday Tulim: _DT)
-    if (puppet("001-2", 99,  22, "Sagatha#_DT",            167) < 1) mapexit;
-    if (puppet("001-2", 92,  24, "Elanore#_DT",            108) < 1) mapexit;
-    if (puppet("001-2", 92,  30, "Nikolai#_DT",            362) < 1) mapexit;
-    if (puppet("001-2", 99,  32, "Morgan#_DT",             355) < 1) mapexit;
-    if (puppet("001-2", 110, 22, "Valia#_DT",              370) < 1) mapexit;
-    if (puppet("001-2", 117, 24, "Waric#_DT",              153) < 1) mapexit;
-    if (puppet("001-2", 117, 30, "Golbenez#_DT",           307) < 1) mapexit;
-    if (puppet("001-2", 110, 32, "Numa#_DT",               393) < 1) mapexit;
-
-    // Hurnscald room (Doomsday Hurns: _DH)
-    if (puppet("069-2", 101, 85, "Sagatha#_DH",            167) < 1) mapexit;
-    if (puppet("069-2", 94,  87, "Elanore#_DH",            108) < 1) mapexit;
-    if (puppet("069-2", 94,  93, "Nikolai#_DH",            362) < 1) mapexit;
-    if (puppet("069-2", 101, 95, "Morgan#_DH",             355) < 1) mapexit;
-    if (puppet("069-2", 112, 85, "Valia#_DH",              370) < 1) mapexit;
-    if (puppet("069-2", 119, 87, "Waric#_DH",              153) < 1) mapexit;
-    if (puppet("069-2", 119, 93, "Golbenez#_DH",           307) < 1) mapexit;
-    if (puppet("069-2", 112, 95, "Numa#_DH",               393) < 1) mapexit;
-
-    // Nivalis room (Doomsday Nivalis: _DN)
-    if (puppet("048-2", 113, 86, "Sagatha#_DN",            167) < 1) mapexit;
-    if (puppet("048-2", 112, 87, "Elanore#_DN",            108) < 1) mapexit;
-    if (puppet("048-2", 114, 87, "Nikolai#_DN",            362) < 1) mapexit;
-    if (puppet("048-2", 113, 88, "Morgan#_DN",             355) < 1) mapexit;
-    if (puppet("048-2", 118, 85, "Valia#_DN",              370) < 1) mapexit;
-    if (puppet("048-2", 117, 86, "Waric#_DN",              153) < 1) mapexit;
-    if (puppet("048-2", 119, 86, "Golbenez#_DN",           307) < 1) mapexit;
-    if (puppet("048-2", 118, 87, "Numa#_DN",               393) < 1) mapexit;
-
-    // Disable puppets
-    disablenpc "Sagatha#_DT";
-    disablenpc "Elanore#_DT";
-    disablenpc "Nikolai#_DT";
-    disablenpc "Morgan#_DT";
-    disablenpc "Valia#_DT";
-    disablenpc "Waric#_DT";
-    disablenpc "Golbenez#_DT";
-    disablenpc "Numa#_DT";
-
-    disablenpc "Sagatha#_DH";
-    disablenpc "Elanore#_DH";
-    disablenpc "Nikolai#_DH";
-    disablenpc "Morgan#_DH";
-    disablenpc "Valia#_DH";
-    disablenpc "Waric#_DH";
-    disablenpc "Golbenez#_DH";
-    disablenpc "Numa#_DH";
-
-    disablenpc "Sagatha#_DN";
-    disablenpc "Elanore#_DN";
-    disablenpc "Nikolai#_DN";
-    disablenpc "Morgan#_DN";
-    disablenpc "Valia#_DN";
-    disablenpc "Waric#_DN";
-    disablenpc "Golbenez#_DN";
-    disablenpc "Numa#_DN";
-    end;
-}
-
-// 114,80
--|script|Doomsday Council Master|32767
-{
-    mes "The wizard seems to ignore you.";
-    if (GM < G_DEV)
-        close;
-    goto L_Main;
-
-L_Main:
-    explode @n$, strnpcinfo(0), "#";
-    // @n$[1] = _DT/_DH/_DN for dismissal
-    mes "";
-    menu
-        "[GM 40] Enable Sagatha", L_Sagatha,
-        "[GM 40] Enable Elanore", L_Elanore,
-        "[GM 40] Enable Nikolai", L_Nikolai,
-        "[GM 40] Enable Morgan", L_Morgan,
-        "[GM 40] Enable Valia", L_Valia,
-        "[GM 40] Enable Waric", L_Waric,
-        "[GM 40] Enable Golbenez", L_Golbenez,
-        "[GM 98] Enable Numa", L_Numa,
-        "[GM 40] Disable Sagatha", L_NoSagatha,
-        "[GM 40] Disable Elanore", L_NoElanore,
-        "[GM 40] Disable Nikolai", L_NoNikolai,
-        "[GM 40] Disable Morgan", L_NoMorgan,
-        "[GM 40] Disable Valia", L_NoValia,
-        "[GM 40] Disable Waric", L_NoWaric,
-        "[GM 40] Disable Golbenez", L_NoGolbenez,
-        "[GM 98] Disable Numa", L_NoNuma,
-        "[GM 60] Cancel Next Siege", L_SkipSiege,
-        "[GM 80] Dismiss the council", L_Dismiss;
-
-L_Sagatha:
-    enablenpc "Sagatha#"+@n$[1];
-    goto L_Main;
-L_NoSagatha:
-    disablenpc "Sagatha#"+@n$[1];
-    goto L_Main;
-
-L_Elanore:
-    enablenpc "Elanore#"+@n$[1];
-    goto L_Main;
-L_NoElanore:
-    disablenpc "Elanore#"+@n$[1];
-    goto L_Main;
-
-L_Nikolai:
-    enablenpc "Nikolai#"+@n$[1];
-    goto L_Main;
-L_NoNikolai:
-    disablenpc "Nikolai#"+@n$[1];
-    goto L_Main;
-
-L_Morgan:
-    enablenpc "Morgan#"+@n$[1];
-    goto L_Main;
-L_NoMorgan:
-    disablenpc "Morgan#"+@n$[1];
-    goto L_Main;
-
-L_Valia:
-    enablenpc "Valia#"+@n$[1];
-    goto L_Main;
-L_NoValia:
-    disablenpc "Valia#"+@n$[1];
-    goto L_Main;
-
-L_Waric:
-    enablenpc "Waric#"+@n$[1];
-    goto L_Main;
-L_NoWaric:
-    disablenpc "Waric#"+@n$[1];
-    goto L_Main;
-
-L_Golbenez:
-    enablenpc "Golbenez#"+@n$[1];
-    goto L_Main;
-L_NoGolbenez:
-    disablenpc "Golbenez#"+@n$[1];
-    goto L_Main;
-
-L_Numa:
-    if (GM < G_SYSOP)
-        mes "Your GM level does not authorizes you to perform this operation.";
-    if (GM < G_SYSOP)
-        close;
-    enablenpc "Numa#"+@n$[1];
-    goto L_Main;
-L_NoNuma:
-    if (GM < G_SYSOP)
-        mes "Your GM level does not authorizes you to perform this operation.";
-    if (GM < G_SYSOP)
-        close;
-    disablenpc "Numa#"+@n$[1];
-    goto L_Main;
-
-L_Dismiss:
-    if (GM < G_ADMIN)
-        mes "Your GM level does not authorizes you to perform this operation.";
-    if (GM < G_ADMIN)
-        close;
-    disablenpc "Sagatha#"+@n$[1];
-    disablenpc "Elanore#"+@n$[1];
-    disablenpc "Nikolai#"+@n$[1];
-    disablenpc "Morgan#"+@n$[1];
-    disablenpc "Valia#"+@n$[1];
-    disablenpc "Waric#"+@n$[1];
-    disablenpc "Golbenez#"+@n$[1];
-    disablenpc "Arch-Wizard#"+@n$[1];
-    gmlog strcharinfo(0) + " dismissed the Council.";
-    close;
-
-L_SkipSiege:
-    if (GM < G_GM)
-        mes "Your GM level does not authorizes you to perform this operation.";
-    if (GM < G_GM)
-        close;
-    set $@DOOMSDAY_SKIP, 1;
-    announce "Jande : I do not believe the enemy army will move this time. We should be safe for now.", 0;
-    gmlog strcharinfo(0) + " cancelled the scheduled doomsday attack.";
-    close;
 
-OnInit:
-    // Tulimshar room (Doomsday Tulim: _DT)
-    if (puppet("001-2", 104, 27, "Arch-Wizard#_DT",           354) < 1) mapexit;
-    if (puppet("069-2", 106, 90, "Arch-Wizard#_DH",           354) < 1) mapexit;
-    if (puppet("048-2", 114, 80, "Arch-Wizard#_DN",           354) < 1) mapexit;
-
-    // Disable puppets
-    disablenpc "Arch-Wizard#_DT";
-    disablenpc "Arch-Wizard#_DH";
-    disablenpc "Arch-Wizard#_DN";
-    end;
-}