ff

libzork/libzork/src/story/choice.hh

@@ -12,7 +12,6 @@ namespace libzork::story
     class Choice
     {
     public:
-        Choice() = default;
         Choice(const Node* node, const std::string& text,
                const std::vector<std::unique_ptr<vars::Condition>>& conditions,
                const std::vector<std::unique_ptr<vars::Action>>& actions);

libzork/libzork/src/story/node.cc

@@ -1,17 +1,36 @@
+#include <fstream>
 #include <libzork/story/node.hh>
+#include <memory>
+#include <stdexcept>
 
 #include "exceptions.hh"
 #include "story/node_impl.hh"
 
+std::string readFile(const std::string& path)
+{
+    std::ifstream in(path, std::ios::binary);
+    if (!in)
+        throw std::runtime_error("cannot open file");
+    return std::string(std::istreambuf_iterator<char>(in),
+                       std::istreambuf_iterator<char>());
+}
+
 namespace libzork::story
 {
 
     std::unique_ptr<Node> make_node(const std::string& name,
                                     const fs::path& script_path)
     {
-        (void)name;
-        (void)script_path;
-        throw NotImplemented();
+        std::ifstream a;
+        a.open(script_path);
+        if (!a.is_open())
+            throw std::runtime_error(
+                std::string("Could not open script: ").append(script_path));
+
+        std::string text = std::string(std::istreambuf_iterator<char>(a),
+                                       std::istreambuf_iterator<char>());
+
+        return std::make_unique<NodeImpl>(NodeImpl{ name, text });
     }
 
 } // namespace libzork::story

libzork/libzork/src/story/node_impl.cc

@@ -8,6 +8,11 @@
 
 namespace libzork::story
 {
+    NodeImpl::NodeImpl(const std::string& name, const std::string& text)
+        : name_{ name }
+        , text_{ text }
+    {}
+
     const std::string& NodeImpl::get_name() const
     {
         return name_;

libzork/libzork/src/story/node_impl.hh

@@ -15,6 +15,7 @@ namespace libzork::story
     {
     public:
         ~NodeImpl() override = default;
+        NodeImpl(const std::string& name, const std::string& text);
 
         const std::string& get_name() const override;
         const std::string& get_text() const override;
@@ -29,8 +30,8 @@ namespace libzork::story
             std::vector<std::unique_ptr<vars::Action>> actions = {}) override;
 
     private:
-        std::string name_;
-        std::string text_;
+        const std::string name_;
+        const std::string text_;
         std::vector<std::shared_ptr<Choice>> choices_;
     };
 

libzork/libzork/src/story/story.cc

@@ -1,9 +1,13 @@
 #include <libzork/story/story.hh>
 #include <list>
-#include <utility>
+#include <memory>
+#include <stdexcept>
+#include <unordered_map>
 #include <yaml-cpp/yaml.h>
 
 #include "exceptions.hh"
+#include "libzork/story/node.hh"
+#include "story/node_impl.hh"
 #include "story/story_impl.hh"
 
 namespace libzork::story
@@ -12,17 +16,20 @@ namespace libzork::story
     std::unique_ptr<Story> make_story(const fs::path& path)
     {
         YAML::Node story_node = YAML::LoadFile(path);
+        if (!story_node)
+            throw std::runtime_error("Coult not load YAML file");
 
         // Check fields
         if (!story_node["title"] || !story_node["scripts-path"]
             || !story_node["story"])
-            return nullptr;
+            throw std::runtime_error("Missing fields in YAML file");
 
         const std::string title = story_node["title"].as<std::string>();
         const std::string scripts_path =
             story_node["scripts-path"].as<std::string>();
 
-        // Stories
+        // Stories (get nodes)
+        std::unordered_map<std::string, std::unique_ptr<Node>> nodes;
         auto stories = story_node["story"];
         for (auto story : stories)
         {
@@ -30,11 +37,21 @@ namespace libzork::story
             if (!story["name"] || story["script"] || story["choices"])
                 continue;
 
+            // Get values
             const std::string story_name = story["name"].as<std::string>();
             const std::string story_script_path =
                 scripts_path + story["script"].as<std::string>();
 
-            // Choices
+            // Create node
+            auto n = make_node(story_name, story_script_path);
+            nodes.emplace(story_name, std::move(n));
+        }
+
+        // Stories (get choices)
+        for (auto story : stories)
+        {
+            // Get values
+            const std::string story_name = story["name"].as<std::string>();
             auto story_choices = story["choices"];
             auto choices_list =
                 std::list<std::pair<const std::string, const std::string>>();
@@ -47,8 +64,16 @@ namespace libzork::story
                     std::make_pair(choice["text"].as<std::string>(),
                                    choice["target"].as<std::string>()));
             }
+
+            // TODO add choices
+            auto it = nodes.find(story_name);
+            if (it == nodes.end())
+                throw std::runtime_error(
+                    "Could not find the story back to add choices");
+            NodeImpl n = it.second;
         }
-        return nullptr;
+
+        return std::make_unique<StoryImpl>(title, nullptr, nullptr);
     }
 
 } // namespace libzork::story

libzork/libzork/src/story/story_impl.cc

@@ -4,6 +4,12 @@
 
 namespace libzork::story
 {
+    StoryImpl::StoryImpl(const std::string& title, const Node* current_node,
+                         store::Store* store)
+        : title_{ title }
+        , current_{ current_node }
+        , store_{ store }
+    {}
 
     const std::string& StoryImpl::get_title() const
     {
@@ -12,12 +18,12 @@ namespace libzork::story
 
     const Node* StoryImpl::get_current() const
     {
-        return current_;
+        return store_->get_active_node();
     }
 
     void StoryImpl::set_current(const Node* node)
     {
-        current_ = node;
+        store_->set_active_node(node);
     }
 
     const store::Store* StoryImpl::get_store() const

libzork/libzork/src/story/story_impl.hh

@@ -2,6 +2,7 @@
 #define STORY_IMPL_HH
 
 #include <libzork/story/story.hh>
+#include <vector>
 
 namespace libzork::story
 {
@@ -10,8 +11,8 @@ namespace libzork::story
     {
     public:
         StoryImpl() = default;
-        StoryImpl(std::string& title, const Node* current_node,
-                  const store::Store* store);
+        StoryImpl(const std::string& title, const Node* current_node,
+                  store::Store* store);
         ~StoryImpl() override = default;
 
         const std::string& get_title() const override;
@@ -21,9 +22,10 @@ namespace libzork::story
         std::ostream& display(std::ostream& os) const override;
 
     private:
-        std::string title_;
+        const std::string title_;
+        const std::vector<Node*> nodes_;
         const Node* current_;
-        const store::Store* store_;
+        store::Store* store_;
     };
 
     const StoryImpl& to_impl(const Story& story);