Illia: allow players to see the progress of the team. Update submodule pointer

9 files changed, 99 insertions, 0 deletions

diff --git a/client-data b/client-data
-Subproject ef0d82c93e1a304748db7d84b3c0cb7c325820c
+Subproject 843b33d10861552bfc558c9fb505be44dbb7ce9
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;
+}
diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt
index ba163347..1f3676cc 100644
--- a/world/map/npc/051-1/desert.txt
+++ b/world/map/npc/051-1/desert.txt
@@ -106,6 +106,7 @@ L_CheckSouls:
     delitem "SealedSoul", $@illia_num_sealed_souls;
     set $@illia_level_3_progress, 2;
     set $@illia_progress, 4;
+    callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 1200;
 
     // Clean all spawned monsters
diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt
index e21940ce..a69aba8b 100644
--- a/world/map/npc/051-1/forest.txt
+++ b/world/map/npc/051-1/forest.txt
@@ -51,6 +51,7 @@ L_TaskNotComplete:
 L_TaskComplete:
     set $@illia_level_1_progress, 3;
     set $@illia_progress, 2;
+    callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 900;
     mes "You insert the rock in the mechanism, then hear an unlock noise. The rocks move by themselves in a rumbling noise, making an opening in the wall.";
     close;
diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt
index 91cfaf37..0d1f0d79 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -72,6 +72,7 @@ OnTimer2000:
 L_OpenDoor:
     set $@illia_level_2_progress, 4;
     set $@illia_progress, 3;
+    callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 900;
     areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::onKeyFound";
     stopnpctimer;
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 4c2c3765..e374dc77 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -272,6 +272,7 @@ L_ChannellingComplete:
     set $@illia_char_channelling$, "";
     set $@illia_level_4_progress, 2;
     set $@illia_progress, 5;
+    callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 900;
     // Effect to display the disenchant is cast
     misceffect FX_CHANNELLING_CAST;
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index 69953ce9..53de723c 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -322,6 +322,7 @@ L_AllWavesClear:
 
 L_ChaseLuvia:
     set $@illia_progress, 6;
+    callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 600;
     areatimer "052-2.gat", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN";
     end;
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index f5173c0a..cfb6c4a5 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -216,6 +216,7 @@ onDeath:
     areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::onW00t";
 
     set $@illia_progress, 8;
+    callfunc "UpdateIlliaProgress";
     // Set the number of common rewards rewards
     if ($Illia_Luvia_Harvest < 15)
         set $@illia_num_common_reward_items, 3;
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index e914635b..b52dc759 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -148,6 +148,7 @@ L_Stop:
     set $@illia_storage_max_items, 0;
     set $@illia_level_6_progress, 2;
     set $@illia_progress, 7;
+    callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 1200;
     areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onStop";
     end;