Add comments and some small changes in the conditionals for the pentagrams.

1 files changed, 20 insertions, 18 deletions

diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index 69788bda..60432c61 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -1,10 +1,12 @@
+// Authors: alastrim, Ali-g, Dark Mage
+
 // ---------------------------------    Cave 1    -----------------------------------
 
 025-4.gat,42,80,0	script	#StartCaveFight1	324,{
-    if ($@wave_cave1 != 0) end;
+    if ($@wave_cave1 != 0 && $@cave1fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave1 != 0 && $@cave1fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave1 == 1) goto L_Start;
-    end;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -101,10 +103,10 @@ L_Done:
 
 
 025-4.gat,115,77,0	script	#StartCaveFight2	324,{
-    if ($@wave_cave2 != 0) end;
+    if ($@wave_cave2 != 0 && $@cave2fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave2 != 0 && $@cave2fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave2 == 1) goto L_Start;
-    end;
     
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -200,10 +202,10 @@ L_Done:
 
 // ------------------------------------    Cave 3    --------------------------------------
 025-4.gat,164,103,0	script	#StartCaveFight3	324,{
-    if ($@wave_cave3 != 0) end;
+    if ($@wave_cave3 != 0 && $@cave3fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave3 != 0 && $@cave3fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave3 == 1) goto L_Start;
-    end;
     
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -299,10 +301,10 @@ L_Done:
 
 // ---------------------------    Cave 4    --------------------------------
 025-4.gat,39,143,0	script	#StartCaveFight4	324,{
-    if ($@wave_cave4 != 0) end;
+    if ($@wave_cave4 != 0 && $@cave4fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave4 != 0 && $@cave4fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave4 == 1) goto L_Start;
-    end;
     
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -398,10 +400,10 @@ L_Done:
 // ----------------------------    Cave 5    ------------------------------
 
 025-4.gat,109,143,0	script	#StartCaveFight5	324,{
-    if ($@wave_cave5 != 0) end;
+    if ($@wave_cave5 != 0 && $@cave5fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave5 != 0 && $@cave5fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave5 == 1) goto L_Start;
-    end;
     
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -497,10 +499,10 @@ L_Done:
 // --------------------------------    Cave 6    -----------------------------------------
 
 025-4.gat,162,162,0	script	#StartCaveFight6	324,{
-    if ($@wave_cave6 != 0) end;
+    if ($@wave_cave6 != 0 && $@cave6fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave6 != 0 && $@cave6fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave6 == 1) goto L_Start;
-    end;
     
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -596,10 +598,10 @@ L_Done:
 // --------------------------------    Cave 7    -----------------------------------
 
 025-4.gat,44,202,0	script	#StartCaveFight7	324,{
-    if ($@wave_cave7 != 0) end;
+    if ($@wave_cave7 != 0 && $@cave7fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave7 != 0 && $@cave7fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave7 == 1) goto L_Start;
-    end;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -696,10 +698,10 @@ L_Done:
 // ---------------------------    Cave 8    -------------------------------
 
 025-4.gat,105,210,0	script	#StartCaveFight8	324,{
-    if ($@wave_cave8 != 0) end;
+    if ($@wave_cave8 != 0 && $@cave8fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave8 != 0 && $@cave8fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave8 == 1) goto L_Start;
-    end;
     
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -796,10 +798,10 @@ L_Done:
 // ---------------------------    Cave 9    -------------------------------
 
 025-4.gat,157,220,0	script	#StartCaveFight9	324,{
-    if ($@wave_cave9 != 0) end;
+    if ($@wave_cave9 != 0 && $@cave9fighter$ == strcharinfo(0)) end;
+    if ($@wave_cave9 != 0 && $@cave9fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave9 == 1) goto L_Start;
-    end;
     
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";