add on_quest_step callbacks

code/bits/Script.cc

@@ -9,6 +9,7 @@
 
 #include "Akagoria.h"
 #include "QuestState.h"
+#include "agate.h"
 
 namespace akgr {
 
@@ -129,7 +130,7 @@ namespace akgr {
 
   Script::~Script()
   {
-    for (auto* handle : { m_method_on_dialog, m_method_on_message, m_method_on_quest, m_method_start, m_method_initialize, m_class_adventure }) {
+    for (auto* handle : { m_method_on_dialog, m_method_on_message, m_method_on_quest, m_method_on_quest_step, m_method_start, m_method_initialize, m_class_adventure }) {
       if (handle != nullptr) {
         agateReleaseHandle(m_vm, handle);
       }
@@ -184,6 +185,8 @@ namespace akgr {
     assert(m_method_on_dialog);
     m_method_on_quest = agateMakeCallHandle(m_vm, "on_quest(_)");
     assert(m_method_on_quest);
+    m_method_on_quest_step = agateMakeCallHandle(m_vm, "on_quest_step(_,_)");
+    assert(m_method_on_quest_step);
   }
 
   const char* Script::load_module(std::filesystem::path name)
@@ -275,6 +278,25 @@ namespace akgr {
     }
   }
 
+  void Script::on_quest_step(const std::string& name, std::size_t step)
+  {
+    gf::Log::info("[SCRIPT] Adventure.on_quest_step({}, {})", name, step);
+
+    agateStackStart(m_vm);
+    ptrdiff_t arg0 = agateSlotAllocate(m_vm);
+    agateSlotSetHandle(m_vm, arg0, m_class_adventure);
+    ptrdiff_t arg1 = agateSlotAllocate(m_vm);
+    agateSlotSetString(m_vm, arg1, name.c_str());
+    ptrdiff_t arg2 = agateSlotAllocate(m_vm);
+    agateSlotSetInt(m_vm, arg2, int64_t(step));
+    AgateStatus result = agateCallHandle(m_vm, m_method_on_quest_step);
+    agateStackFinish(m_vm);
+
+    if (result != AGATE_STATUS_OK) {
+      gf::Log::error("Could not execute 'Adventure.on_quest_step(_,_)'");
+    }
+  }
+
   void Script::on_message_deferred(std::string name)
   {
     m_messages.push(std::move(name));

code/bits/Script.h

@@ -37,6 +37,7 @@ namespace akgr {
     void on_message(const std::string& name);
     void on_dialog(const std::string& name);
     void on_quest(const std::string& name);
+    void on_quest_step(const std::string& name, std::size_t step);
 
     void on_message_deferred(std::string name);
     void handle_deferred_messages();
@@ -82,6 +83,7 @@ namespace akgr {
     AgateHandle* m_method_on_message = nullptr;
     AgateHandle* m_method_on_dialog = nullptr;
     AgateHandle* m_method_on_quest = nullptr;
+    AgateHandle* m_method_on_quest_step = nullptr;
 
     std::queue<std::string> m_messages;
   };

code/bits/WorldModel.cc

@@ -249,7 +249,13 @@ namespace akgr {
   template<typename Predicate>
   void WorldModel::check_quest(QuestType type, Predicate predicate)
   {
+    struct QuestStepInfo {
+      std::string name;
+      std::size_t step;
+    };
+
     std::optional<std::string> finished_quest;
+    std::optional<QuestStepInfo> finished_quest_step;
 
     for (auto& quest : state.hero.quests) {
       if (quest.status == QuestStatus::Finished) {
@@ -270,13 +276,19 @@ namespace akgr {
           finished_quest = quest.data->label.tag;
         }
 
+        finished_quest_step = { quest.data->label.tag, quest.current_step };
         break;
       }
     }
 
     // get out of the loop because the script can add a new quest
     // and invalidate the current iterator
 
+    if (finished_quest_step) {
+      const QuestStepInfo& info = *finished_quest_step;
+      runtime.script.on_quest_step(info.name, info.step);
+    }
+
     if (finished_quest) {
       // TODO: automatic notification for the end of the quest?
       runtime.script.on_quest(*finished_quest);

data/akagoria/scripts/adventure.agate

@@ -31,6 +31,7 @@ class Adventure {
     @@messages = { }
     @@dialogs = { }
     @@quests = { }
+    @@quest_steps = { }
 
     # special messages
 
@@ -81,6 +82,21 @@ class Adventure {
     }
   }
 
+  static on_quest_step(quest, step) {
+    def callback_array = @@quest_steps[quest]
+
+    if (callback_array) {
+      def callback = callback_array[step]
+
+      if (callback) {
+        callback()
+        return
+      }
+    }
+
+    IO.println("No callback for quest step '%(quest)/%(step)'")
+  }
+
   #
   # Others
   #
@@ -96,4 +112,19 @@ class Adventure {
   static add_quest_callback(quest, fn) {
     @@quests[quest] = fn
   }
+
+  static add_quest_step_callback(quest, step, fn) {
+    def quest_steps = @@quest_steps[quest]
+
+    if (!quest_steps) {
+      quest_steps = @@quest_steps[quest] = []
+    }
+
+    while (step >= quest_steps.size) {
+      quest_steps.append(nil)
+    }
+
+    quest_steps[step] = fn
+  }
+
 }

data/akagoria/scripts/chapter1.agate

@@ -35,6 +35,13 @@ class Chapter1 {
     A.add_message_callback("ShagirConversation1") {
 #       W.add_dialog_to_character("ShagirConversation1", "Shagir")
     }
+
+    A.add_quest_step_callback("Intro0", 1) {
+      W.add_item("GemRuby#1", "GemRuby", "GemRubyLocation#1")
+      W.add_item("GemRuby#2", "GemRuby", "GemRubyLocation#2")
+      W.add_item("GemRuby#3", "GemRuby", "GemRubyLocation#3")
+      W.add_item("GemRuby#4", "GemRuby", "GemRubyLocation#4")
+    }
   }
 
 }

data/akagoria/scripts/kickoff.agate

@@ -29,10 +29,6 @@ class Kickoff {
     W.post_notification("Welcome")
     W.start_quest("Intro0")
 
-    W.add_item("GemRuby#1", "GemRuby", "GemRubyLocation#1")
-    W.add_item("GemRuby#2", "GemRuby", "GemRubyLocation#2")
-    W.add_item("GemRuby#3", "GemRuby", "GemRubyLocation#3")
-    W.add_item("GemRuby#4", "GemRuby", "GemRubyLocation#4")
 #     W.add_item("GemEmerald", "Emerald #1")
 #     W.add_item_to_inventory("GemEmerald")
 #     W.add_item_to_inventory("GemRuby")