1 files changed, 92 insertions, 0 deletions
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index 7dab6424..ed5b31f1 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -473,6 +473,7 @@ L_InitVars:
     cmdothernpc "#IlliaDaemon", "Toggle";
     // init various variables
     set $@illia_progress, 1;
+    callfunc "UpdateIlliaProgress";
     set $@illia_level_1_progress, 0;
     set $@illia_level_2_progress, 0;
     set $@illia_level_3_progress, 0;
@@ -542,6 +543,7 @@ L_EndQuest:
     set $@ILLIA_HELPER2$, "";
     set $@ILLIA_HELPER3$, "";
     set $@illia_progress, 0;
+    callfunc "UpdateIlliaProgress";
     set $@illia_level_1_progress, 0;
     set $@illia_level_2_progress, 0;
     set $@illia_level_3_progress, 0;
@@ -656,6 +658,14 @@ OnTimer300000:
 end;
 
 onInit:
+    disablenpc "#IlliaTorch1";
+    disablenpc "#IlliaTorch2";
+    disablenpc "#IlliaTorch3";
+    disablenpc "#IlliaTorch4";
+    disablenpc "#IlliaTorch5";
+    disablenpc "#IlliaTorch6";
+    disablenpc "#IlliaTorch7";
+    disablenpc "#IlliaTorch8";
     set $@illia_max_time, 900;
     end;
 
@@ -875,3 +885,85 @@ L_Start:
     end;
 
 }
+
+function|script|UpdateIlliaProgress|{
+
+    if ($@illia_progress == 1)
+        goto L_Torch1;
+    if ($@illia_progress == 2)
+        goto L_Torch2;
+    if ($@illia_progress == 3)
+        goto L_Torch3;
+    if ($@illia_progress == 4)
+        goto L_Torch4;
+    if ($@illia_progress == 5)
+        goto L_Torch5;
+    if ($@illia_progress == 6)
+        goto L_Torch6;
+    if ($@illia_progress == 7)
+        goto L_Torch7;
+    if ($@illia_progress == 8)
+        goto L_Torch8;
+    // Else, we disable everything
+    disablenpc "#IlliaTorch1";
+    disablenpc "#IlliaTorch2";
+    disablenpc "#IlliaTorch3";
+    disablenpc "#IlliaTorch4";
+    disablenpc "#IlliaTorch5";
+    disablenpc "#IlliaTorch6";
+    disablenpc "#IlliaTorch7";
+    disablenpc "#IlliaTorch8";
+    return;
+
+L_Torch8:
+    enablenpc "#IlliaTorch8";
+L_Torch7:
+    enablenpc "#IlliaTorch7";
+L_Torch6:
+    enablenpc "#IlliaTorch6";
+L_Torch5:
+    enablenpc "#IlliaTorch5";
+L_Torch4:
+    enablenpc "#IlliaTorch4";
+L_Torch3:
+    enablenpc "#IlliaTorch3";
+L_Torch2:
+    enablenpc "#IlliaTorch2";
+L_Torch1:
+    enablenpc "#IlliaTorch1";
+
+return;
+
+}
+
+007-1.gat,72,88,0|script|#IlliaTorch1|374,{
+end;
+}
+
+007-1.gat,71,85,0|script|#IlliaTorch2|374,{
+end;
+}
+
+007-1.gat,75,70,0|script|#IlliaTorch3|374,{
+end;
+}
+
+007-1.gat,85,71,0|script|#IlliaTorch4|374,{
+end;
+}
+
+007-1.gat,88,69,0|script|#IlliaTorch5|374,{
+end;
+}
+
+007-1.gat,86,68,0|script|#IlliaTorch6|374,{
+end;
+}
+
+007-1.gat,87,68,0|script|#IlliaTorch7|374,{
+end;
+}
+
+007-1.gat,88,67,0|script|#IlliaTorch8|374,{
+end;
+}