6 files changed, 42 insertions, 29 deletions

@@ -1,25 +0,0 @@
-#ifndef AUTOMATABLE_H_3D519131
-#define AUTOMATABLE_H_3D519131
-
-#include "component.h"
-#include <sol.hpp>
-#include <memory>
-
-class AutomatableComponent : public Component {
-public:
-
-  std::unique_ptr<sol::thread> runner;
-  std::unique_ptr<sol::coroutine> behavior;
-
-  sol::environment origBehavior;
-
-  /**
-   * If this flag is disabled, the entity will be ignored by the automating
-   * system.
-   *
-   * @managed_by RealizingSystem
-   */
-  bool active = false;
-};
-
-#endif /* end of include guard: AUTOMATABLE_H_3D519131 */
@@ -27,6 +27,9 @@ public:
   size_t checkpointMapId;
   vec2d checkpointPos;
 
+  bool checkpointMapObject = false;
+  size_t checkpointMapObjectIndex;
+
 };
 
 #endif /* end of include guard: PLAYABLE_H_DDC566C3 */
@@ -34,7 +34,8 @@ public:
     platform,
     adjacency,
     warp,
-    danger
+    danger,
+    event
   };
 
   /**
@@ -0,0 +1,22 @@
+#ifndef PROTOTYPABLE_H_817F2205
+#define PROTOTYPABLE_H_817F2205
+
+#include "component.h"
+#include "entity_manager.h"
+
+class PrototypableComponent : public Component {
+public:
+
+  using id_type = EntityManager::id_type;
+
+  size_t mapObjectIndex;
+
+  std::string prototypeId;
+
+  bool hasBehavior = false;
+  bool runningBehavior = false;
+
+  id_type behaviorScript;
+};
+
+#endif /* end of include guard: PROTOTYPABLE_H_817F2205 */
@@ -4,7 +4,6 @@
 #include "component.h"
 #include <set>
 #include <map>
-#include <sol.hpp>
 #include "entity_manager.h"
 #include "vector.h"
 
@@ -70,8 +69,6 @@ public:
    * The entity ID of the currently active player.
    */
   id_type activePlayer;
-
-  sol::state scriptEngine;
 };
 
 #endif /* end of include guard: REALIZABLE_H_36D8D71E */
@@ -0,0 +1,15 @@
+#ifndef AUTOMATABLE_H_3D519131
+#define AUTOMATABLE_H_3D519131
+
+#include "component.h"
+#include <sol.hpp>
+#include <memory>
+
+class RunnableComponent : public Component {
+public:
+
+  std::unique_ptr<sol::thread> runner;
+  std::unique_ptr<sol::coroutine> callable;
+};
+
+#endif /* end of include guard: AUTOMATABLE_H_3D519131 */