Victory condition. Hopefully Serena's Quest is finishable now (even if ugly)

2 files changed, 17 insertions, 5 deletions

diff --git a/npc/001-2-32/serena.txt b/npc/001-2-32/serena.txt
index 5284caa6..b25d32be 100644
--- a/npc/001-2-32/serena.txt
+++ b/npc/001-2-32/serena.txt
@@ -6,9 +6,6 @@
 //    Artis's Legion of Aemil officier of the fighting room.
 // Note:
 //    ATL - Artis Training Legion
-// TODO: Handle victory (3 waves?)
-// TODO: Handle logout
-// TODO: EVERYTHING!!
 
 001-2-32,27,27,0	script	Serena	NPC_SERENA,{
     mesn;
@@ -29,6 +26,8 @@ OnInit:
 }
 
 001-2-35,26,27,0	script	Serena#Ctrl	NPC_SERENA,{
+    function checkVictory;
+
     // We can't begin if we're already doing it
     if (.atlf) {
         // TODO: We should check if the timers are running
@@ -169,17 +168,29 @@ OnVerify:
     if (readbattleparam(getcharid(3), UDT_ADELAY) < .atl_bDly)
         .atl_bDly=readbattleparam(getcharid(3), UDT_DELAY);
 
-    // TODO: Victory conditions
+    // Victory conditions
+    if (getq(Artis_Legion_Progress) == 3)
+        checkVictory();
 
     addtimer(5000, instance_npcname(.name$)+"::OnVerify");
     end;
+
+    // Victory conditions
+    function checkVictory {
+        if (.atlf > 3) {
+            npctalk l("Congratulations, %s. I think this is enough. You can continue fighting to set a good score or report to Lozerk.", strcharinfo(0));
+            setq Artis_Legion_Progress, 4, 0;
+        }
+        return;
+    }
+
 }
 
 // Helper function for failure
 function	script	ATLFightEnd	{
-    .@mapn$="atl2@"+getcharid(0);
     if (@ATLFIGHT) {
         @ATLFIGHT=false;
+        .@mapn$="atl2@"+getcharid(0);
         killmonster(.@mapn$, "all", false);
         set(getvariableofnpc(.atlf, instance_npcname("Serena#Ctrl")), 0));
     }
diff --git a/npc/001-2-35/doors.txt b/npc/001-2-35/doors.txt
index 461ef6eb..64fcb30f 100644
--- a/npc/001-2-35/doors.txt
+++ b/npc/001-2-35/doors.txt
@@ -12,6 +12,7 @@ OnTouch:
         dispbottom l("I am not a coward. I shall not give up!");
         end;
     }
+    ATLFightEnd();
     warp "001-2-32", 32, 29;
     end;
 }