From 0fe1b0bd8c3dd6d03459111b5d49b4a667e33457 Mon Sep 17 00:00:00 2001
From: Eric Gallager <egall@gwmail.gwu.edu>
Date: Tue, 21 Dec 2021 21:17:12 -0500
Subject: [PATCH] minor commentary update

mostly for nemaara/A_New_Order#19
---
 macros/ano-14macros.cfg             | 12 +++++++++---
 scenarios/18_Start_of_the_Quest.cfg |  1 +
 scenarios/19c_The_Oracle.cfg        |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/macros/ano-14macros.cfg b/macros/ano-14macros.cfg
index 86c7834..3ad4900 100644
--- a/macros/ano-14macros.cfg
+++ b/macros/ano-14macros.cfg
@@ -31,11 +31,12 @@
             id=Karen
         [/filter_second]
         {IF_HAVE_UNIT (Lady Lorin)}
+        # already did the competition in a previous scenario:
         {IF ano_competition equals end}
         {IF ano_competition_k equals 0}
         {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Scored!"}
         {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        # FIXME: the word "again" doesn't make sense if this is the first kill of the competition:
+        # FIXME: the word "again" doesn't make sense if this is the first kill of the competition, or if the competition ended in the previous scenario without anyone killing anyone (resulting in there being no dialogue about it):
         _"Don't start again, kid. I won't play that game this time."}
         {VARIABLE ano_competition_k 1}
         {END_IF_WITHOUT_ELSE}
@@ -92,6 +93,7 @@
             id=Lady Lorin
         [/filter_second]
         {IF ano_competition equals end}
+        # (already did the competition in a previous scenario)
         {ELSE}
         {IF ano_competition_l equals 0}
         {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin) _"First kill today!"}
@@ -142,16 +144,17 @@
 #enddef
 #define LORIN_KAREN_COMPV
     {IF ano_competition equals end}
+    # (already did the competition in a previous scenario)
     {ELSE}
     {IF_HAVE_UNIT (Lady Lorin)}
     {IF ano_competition_l greater_than $ano_competition_k}
     {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-    _"By the way, I won. Scored $ano_competition_l"}
+    _"By the way, I won: I scored $ano_competition_l|."}
     {MESSAGE (Majid Yahyazad) (portraits/majid.png) (Majid Yahyazad)
     _"Girls, what do you exactly mean by 'scored'? Is it because you are slicing up your fallen foes?"}
     {ELSE_IF ano_competition_k greater_than $ano_competition_l}
     {MESSAGE (Karen) (portraits/karen.png) (Karen)
-    _"By the way, I won. Scored $ano_competition_k"}
+    _"By the way, I won: I scored $ano_competition_k|."}
     {MESSAGE (Majid Yahyazad) (portraits/majid.png) (Majid Yahyazad)
     _"Girls, what do you exactly mean by 'scored'? Is it because you are slicing up your fallen foes?"}
     {ELSE_IF ano_competition_k greater_than 0}
@@ -163,13 +166,16 @@
     {MESSAGE (Karen) (portraits/karen.png) (Karen)
     _"That's what I meant. You have not won, great super killing machine, so you have lost."}
     {ELSE}
+    # TODO: put something here
     {TWO_END_IFs}
     {END_IF}
     {ELSE}
+    # TODO: put something here
     {END_IF}
     {VARIABLE ano_competition end}
     {VARIABLE ano_competition_k 0}
     {END_IF}
+    # FIXME: why is this here?
     {IF ano_bug_fix equals yes}
     {CLEAR_VARIABLE ano_bug_fix}
     {VARIABLE ano_competition start}
diff --git a/scenarios/18_Start_of_the_Quest.cfg b/scenarios/18_Start_of_the_Quest.cfg
index 35dd504..d0bc4e9 100644
--- a/scenarios/18_Start_of_the_Quest.cfg
+++ b/scenarios/18_Start_of_the_Quest.cfg
@@ -150,6 +150,7 @@
         {IF ano_opt equals yes}
         {NEXT_SCENARIO_CONTINUE 19c_The_Oracle}
         {ELSE}
+        # FIXME: can't actually undo here?
         [allow_undo][/allow_undo]
         {END_IF}
         {ELSE}
diff --git a/scenarios/19c_The_Oracle.cfg b/scenarios/19c_The_Oracle.cfg
index 63cc619..6a8d63a 100644
--- a/scenarios/19c_The_Oracle.cfg
+++ b/scenarios/19c_The_Oracle.cfg
@@ -20,6 +20,7 @@
             story=_"The Oracle was the title of a woman living in ruins of an old city. For generations, there had always been one female mage with prophetic abilities living there, so long that no one remembered now what the city had once been named. Now it was just 'the city of the Oracle.'"
         [/part]
         [part]
+            # TODO: tune enemy AI so that their behavior better matches the disunity described here:
             story=_"When we arrived, we found the city of the Oracle besieged. Four different armies, each under a different leader, surrounded it. This disunity seemed to contribute heavily to fact the Oracle still could defend herself. Each army seemed to siege the city on its own. But the city was ready to fall; our army had arrived in at the last possible moment for relief."
         [/part]
     [/story]