Improve support of Else for AI

Don't show in changelog

Author: 4ian

newIDE/app/src/EventsSheet/EventsTree/TextRenderer/TextRenderer.spec.js

@@ -433,23 +433,23 @@ describe('EventsTree/TextRenderer', () => {
            Actions:
            - Change the number of the animation of MySpriteObject: = 1
           </event-0.7>
-          <event-0.8>
+          <event-0.8 else-of=\\"event-0.7\\">
            Else
 
            Conditions:
            (no conditions)
            Actions:
            - Show GroupOfObjects
           </event-0.8>
-          <event-0.9>
+          <event-0.9 else-of=\\"event-0.8\\">
            Else if
 
            Conditions:
            - GroupOfSpriteObjectsWithBehaviors is falling
            Actions:
            - Change the number of the animation of MySpriteObject: = 1
           </event-0.9>
-          <event-0.10>
+          <event-0.10 else-of=\\"event-0.9\\">
            Else
            - Declare local variable \\"MyElseVar\\" of type \\"number\\" with value \`42\`
 

newIDE/app/src/EventsSheet/EventsTree/TextRenderer/index.js

@@ -1,6 +1,6 @@
 // @flow
 import { mapFor, mapVector } from '../../../Utils/MapFor';
-import { isElseEventValid } from '../helpers';
+import { isElseEventValid, getPreviousExecutableEventIndex } from '../helpers';
 
 const gd: libGDevelop = global.gd;
 
@@ -351,7 +351,18 @@ export const renderEventsAsText = ({
       padding: padding + ' ',
     });
 
-    return `${padding}<event-${eventPath}>
+    let elseOfAttribute = '';
+    if (
+      event.getType() === 'BuiltinCommonInstructions::Else' &&
+      isElseEventValid(eventsList, i)
+    ) {
+      const previousIndex = getPreviousExecutableEventIndex(eventsList, i);
+      const previousEventPath =
+        (parentPath ? parentPath + '.' : '') + previousIndex;
+      elseOfAttribute = ` else-of="event-${previousEventPath}"`;
+    }
+
+    return `${padding}<event-${eventPath}${elseOfAttribute}>
 ${eventAndSubEventsText}
 ${padding}</event-${eventPath}>`;
   }).join('\n');

newIDE/app/src/EventsSheet/EventsTree/helpers.js

@@ -109,19 +109,36 @@ export const getNodeAtPath = (
   );
 };
 
-export const isElseEventValid = (
+/**
+ * Returns the index of the previous non-disabled, executable event
+ * in the list, or -1 if none is found.
+ */
+export const getPreviousExecutableEventIndex = (
   eventsList: gdEventsList,
-  elseEventIndex: number
-): boolean => {
-  for (let j = elseEventIndex - 1; j >= 0; j--) {
+  eventIndex: number
+): number => {
+  const startIndex = Math.min(eventIndex - 1, eventsList.getEventsCount() - 1);
+  for (let j = startIndex; j >= 0; j--) {
     const previousEvent = eventsList.getEventAt(j);
     if (!previousEvent.isDisabled() && previousEvent.isExecutable()) {
-      const previousEventType = previousEvent.getType();
-      return (
-        previousEventType === 'BuiltinCommonInstructions::Standard' ||
-        previousEventType === 'BuiltinCommonInstructions::Else'
-      );
+      return j;
     }
   }
-  return false;
+  return -1;
+};
+
+export const isElseEventValid = (
+  eventsList: gdEventsList,
+  elseEventIndex: number
+): boolean => {
+  const previousIndex = getPreviousExecutableEventIndex(
+    eventsList,
+    elseEventIndex
+  );
+  if (previousIndex === -1) return false;
+  const previousEventType = eventsList.getEventAt(previousIndex).getType();
+  return (
+    previousEventType === 'BuiltinCommonInstructions::Standard' ||
+    previousEventType === 'BuiltinCommonInstructions::Else'
+  );
 };