Added IF Event Parsing

src/dawn/games/vn/events/VNDummyEvent.hpp

@@ -10,7 +10,6 @@ namespace Dawn {
   class VNDummyEvent : public VNEvent {
     protected:
       void onStart() override {
-        std::cout << "Dummy VN Event" << std::endl;
         this->next();
       }
   };

src/dawn/games/vn/events/VNEvent.cpp

@@ -34,7 +34,7 @@ void VNEvent::next() {
 
   this->end();
   auto next = this->getNextEvent();
-  this->manager->currentEvent = next;
+  this->parent->currentEvent = next;
   if(next != nullptr) next->start(this->parent, this);
 }
 

src/dawn/games/vn/events/VNIfEvent.hpp

@@ -7,22 +7,29 @@
 #include "VNEvent.hpp"
 
 namespace Dawn {
-  class VNIfEvent : public VNEvent {
+  class VNIfEvent :
+    public VNEvent,
+    public IVNEventParent
+  {
     public:
       std::string key;
       std::string value;
       VNEvent *ifTrue = nullptr;
-
+      VNEvent *ifEnd = nullptr;
-      VNEvent * getNextEvent() override {
-        if(this->manager.getFlag(key) == value) {
-          return ifTrue;
-        }
-        return VNEvent::getNextEvent();
-      }
 
     protected:
       void onStart() override {
+        assertNotNull(ifTrue);
+        assertNotNull(ifEnd);
+
+        if(this->manager->getFlag(key) == value) {
+          useEvent([&]{
+            if(ifEnd->getNextEvent() == nullptr) this->next();
+          }, ifEnd->eventFinished);
+          ifTrue->start(this, nullptr);
+        } else {
           this->next();
         }
       }
+  };
 }

src/dawntools/vnscenetool/VNSceneGen.cpp

@@ -103,6 +103,40 @@ void VNSceneGen::test(
       line(&afterLines, eventName + "->value = \"" + event->choiceSet.value + "\";", "");
       break;
 
+    case VN_SCENE_EVENT_TYPE_IF: {
+      initType = "VNIfEvent";
+      toInclude = "games/vn/events/VNIfEvent.hpp";
+      line(&afterLines, eventName + "->key = \"" + event->ifEvent.key + "\";", "");
+      line(&afterLines, eventName + "->value = \"" + event->ifEvent.value + "\";", "");
+
+      std::string ifPrevious = "";
+      std::string ifFirst = "";
+      auto itIf = event->ifEvent.events.events.begin();
+      while(itIf != event->ifEvent.events.events.end()) {
+        std::string ifEventName = "ifEvent" + std::to_string((*eventIndex)++);
+        VNSceneGen::test(
+          ifEventName,
+          &(*itIf),
+          eventIndex,
+          &afterLines,
+          includes
+        );
+        if(!ifPrevious.empty()) line(&afterLines, ifPrevious + "->then(" + ifEventName + ");", "");
+        ifPrevious = ifEventName;
+        if(ifFirst == "") ifFirst = ifEventName;
+        ++itIf;
+      }
+
+      if(ifFirst == "" || ifPrevious == "") {
+        std::cout << "If event must have at least one event" << std::endl;
+        assertUnreachable();
+      }
+
+      line(&afterLines, eventName + "->ifTrue = " + ifFirst + ";", "");
+      line(&afterLines, eventName + "->ifEnd = " + ifPrevious + ";", "");
+      break;
+    }
+
     default:
       std::cout << "Unknown event type: " << event->type << std::endl;
       assertUnreachable();

src/dawntools/vnscenetool/events/CMakeLists.txt

@@ -16,4 +16,5 @@ target_sources(vnscenetool
     VNGoToMarkerEventParser.cpp
     VNChoiceEventParser.cpp
     VNChoiceSetEventParser.cpp
+    VNIfEventParser.cpp
 )

src/dawntools/vnscenetool/events/VNIfEventParser.cpp

@@ -0,0 +1,30 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "VNIfEventParser.hpp"
+#include "VNSceneEventsParser.hpp"
+
+using namespace Dawn;
+
+std::vector<std::string> VNIfEventParser::getRequiredAttributes() {
+  return { "key", "value" };
+}
+
+std::map<std::string, std::string> VNIfEventParser::getOptionalAttributes() {
+  return {};
+}
+
+int32_t VNIfEventParser::onParse(
+  Xml *node,
+  std::map<std::string, std::string> values,
+  struct VNIfEvent *out,
+  std::string *error
+) {
+  //Get the key and value
+  out->key = values["key"];
+  out->value = values["value"];
+
+  return (VNSceneEventsParser()).parse(node, &out->events, error);
+}

src/dawntools/vnscenetool/events/VNIfEventParser.hpp

@@ -0,0 +1,23 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "util/XmlParser.hpp"
+
+namespace Dawn {
+  struct VNIfEvent;
+
+  class VNIfEventParser : public XmlParser<struct VNIfEvent> {
+    protected:
+      std::vector<std::string> getRequiredAttributes() override;
+      std::map<std::string, std::string> getOptionalAttributes() override;
+      int32_t onParse(
+        Xml *node,
+        std::map<std::string, std::string> values,
+        struct VNIfEvent *out,
+        std::string *error
+      ) override;
+  };
+}

src/dawntools/vnscenetool/events/VNSceneEventsParser.cpp

@@ -75,6 +75,11 @@ int32_t VNSceneEventsParser::onParse(
       ret = (VNChoiceSetEventParser()).parse(child, &event.choiceSet, error);
       if(ret != 0) return ret;
 
+    } else if(child->node == "if") {
+      event.type = VN_SCENE_EVENT_TYPE_IF;
+      ret = (VNIfEventParser()).parse(child, &event.ifEvent, error);
+      if(ret != 0) return ret;
+
     } else {
       *error = "Unknown child node '" + child->node + "'";
       return -1;

src/dawntools/vnscenetool/events/VNSceneEventsParser.hpp

@@ -13,6 +13,7 @@
 #include "VNGoToMarkerEventParser.hpp"
 #include "VNChoiceEventParser.hpp"
 #include "VNChoiceSetEventParser.hpp"
+#include "VNIfEventParser.hpp"
 
 namespace Dawn {
   struct VNSceneEvent;
@@ -30,13 +31,20 @@ namespace Dawn {
     VN_SCENE_EVENT_TYPE_MARKER,
     VN_SCENE_EVENT_TYPE_GOTO_MARKER,
     VN_SCENE_EVENT_TYPE_CHOICES,
-    VN_SCENE_EVENT_TYPE_CHOICE_SET
+    VN_SCENE_EVENT_TYPE_CHOICE_SET,
+    VN_SCENE_EVENT_TYPE_IF
   };
 
   struct VNParallelEvent {
     struct VNSceneEventList events;
   };
   
+  struct VNIfEvent {
+    std::string key;
+    std::string value;
+    struct VNSceneEventList events;
+  };
+
   struct VNSceneEvent {
     enum VNSceneEventType type;
     
@@ -49,6 +57,7 @@ namespace Dawn {
     struct VNGoToMarkerEvent gotoMarker;
     struct VNChoiceEvent choices;
     struct VNChoiceSetEvent choiceSet;
+    struct VNIfEvent ifEvent;
   };
 
   class VNSceneEventsParser : public XmlParser<struct VNSceneEventList> {