Merge branch 'master' of git://gitorious.org/+tmw-admins/tmw/tmwa-server-test

7 files changed, 35 insertions, 20 deletions

diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index fdc7098a..efb3058f 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -1,3 +1,5 @@
+// Authors: alastrim, Ali-g, Dark Mage
+
 009-2.gat,63,79,0	script	Olana	190,{
 
   if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index df5ffc2a..7a238480 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -1,4 +1,5 @@
-//
+// Authors: alastrim, Ali-g, Dark Mage
+
 025-1.gat,42,79,0	script	#JuliaBarrier	45,1,1,{
   if (Rossy_Quest <= 13) goto L_Block;
   if (@Alrd_Been != 1 && Rossy_Quest == 14) message strcharinfo(0), "You hear distant screams of fear.";
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index b78def6b..3cfc834a 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -1,3 +1,5 @@
+// Authors: alastrim, Ali-g, Dark Mage
+
 025-1.gat,80,88,0	script	Rossy	114,{ 
 
   if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 647fbd2a..a21ab25a 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -1,3 +1,5 @@
+// Authors: alastrim, Ali-g, Dark Mage
+
 // -----------------------------------Warp to Cave 1 ---------------------------------------
 
 025-3.gat,78,127,0	script	#WarpBattleCave1	45,1,1,{
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.";
diff --git a/world/map/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt
index 1acba11d..e8db37bc 100644
--- a/world/map/npc/025-4/clauquer.txt
+++ b/world/map/npc/025-4/clauquer.txt
@@ -1,3 +1,5 @@
+// Authors: alastrim, Ali-g, Dark Mage
+
 025-4.gat,30,30,0	script	Clauquer	169,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Rescued;
@@ -22,7 +24,9 @@ L_Help:
   mes "[Clauquer]";
   mes "\"I can see that you really want to save the little girl. She is trapped in a place inside one of these caves, protected by a magic barrier created by a fey spirit. To save her, you have to annulate the energy sources of this barrier. They are located in 10 different spots, each one in a different cave.\"";
   next;
-  mes "\"To do this, you have to place a root on the exact center of the energy source. Once you do this, its entire power will transmute into some terrible earth monsters. If you defeat them, this source of energy will be close to nothing and the barrier will be weaker.\"";
+  menu
+    "But how can I annulate this barrier?", -;
+  mes "\"It is simple, you just have to place a root on the exact center of the energy source. Once you do this, its entire power will transmute into some terrible earth monsters. If you defeat them, this source of energy will be close to nothing and the barrier will be weaker.\"";
   next;
   mes "\"If my observations are correct, the girl is trapped in a cave protected by a barrier fed by 9 different power sources. And inside this cave, there is another barrier, fed by a single, but very strong, power source. The girl is inside that cave, protected by that strong barrier.\"";
   next;
diff --git a/world/map/npc/025-4/julia.txt b/world/map/npc/025-4/julia.txt
index 8c7b3ce4..78283344 100644
--- a/world/map/npc/025-4/julia.txt
+++ b/world/map/npc/025-4/julia.txt
@@ -1,3 +1,5 @@
+// Authors: alastrim, Ali-g, Dark Mage
+
 025-4.gat,89,21,0	script	Julia	114,{
 
   if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_End;