Fix the tutorial's "8 XP away from leveling" speech's trigger.

data/campaigns/tutorial/scenarios/2_Tutorial.cfg

@@ -127,25 +127,83 @@
     [/if]
 #enddef
 
-#define IMPORTANT_UNIT NAME
+#define CHECK_INTELLIGENT NAME
     [if]
-        # FIXME: Archer needs 44/35(intelligent), Fighter needs 38/30 (?)
+        [variable]
+            # Ignoring single-trait units, as we don't have those during the tutorial
+            name={NAME}.modifications.trait.length
+            equals=2
+        [/variable]
+        [then]
+            [if]
+                [variable]
+                    name={NAME}.modifications.trait[0].id
+                    equals=intelligent
+                [/variable]
+                [or]
+                    [variable]
+                        name={NAME}.modifications.trait[1].id
+                        equals=intelligent
+                    [/variable]
+                [/or]
+                [then]
+                    {VARIABLE is_intelligent yes}
+                [/then]
+                [else]
+                    {VARIABLE is_intelligent no}
+                [/else]
+            [/if]
+        [/then]
+        [else]
+            {VARIABLE is_intelligent no}
+        [/else]
+    [/if]
+#enddef
+
+#define IMPORTANT_UNIT NAME
+    {CHECK_INTELLIGENT {NAME}}
+    [if]
+        # Archer needs 44/35(intelligent), Fighter needs 40/32
         [variable]
             name={NAME}.type
             equals=Elvish Archer
         [/variable]
+        {BOOLEQ is_intelligent no}
         [variable]
             name={NAME}.experience
-            greater_than=30
+            greater_than=35
         [/variable]
+        [or]
+            [variable]
+                name={NAME}.type
+                equals=Elvish Archer
+            [/variable]
+            {BOOLEQ is_intelligent yes}
+            [variable]
+                name={NAME}.experience
+                greater_than=26
+            [/variable]
+        [/or]
         [or]
             [variable]
                 name={NAME}.type
                 equals=Elvish Fighter
             [/variable]
+            {BOOLEQ is_intelligent no}
             [variable]
                 name={NAME}.experience
-                greater_than=29
+                greater_than=31
+            [/variable]
+        [/or]
+        [or]
+            [variable]
+                name={NAME}.type
+                equals=Elvish Fighter
+            [/variable]
+            {BOOLEQ is_intelligent yes}
+            [variable]
+                name={NAME}.experience
+                greater_than=23
             [/variable]
         [/or]
         [then]
@@ -179,6 +237,7 @@
             {CLEAR_VARIABLE commented}
         [/then]
     [/if]
+    {CLEAR_VARIABLE is_intelligent}
 #enddef
 
 #define DEFENDER_INJURED NAME

data/campaigns/tutorial/scenarios/utils.cfg

@@ -89,6 +89,13 @@
     [/variable]
 #enddef
 
+#define BOOLEQ VAR VALUE
+    [variable]
+        name={VAR}
+        boolean_equals={VALUE}
+    [/variable]
+#enddef
+
 #define GENDER MALE_WML FEMALE_WML
     [if]
         [variable]