merge + more WIP

1 files changed, 15 insertions, 3 deletions

diff --git a/game/prefab/ZapperPoolSubScene.cpp b/game/prefab/ZapperPoolSubScene.cpp
index 578688a..d7d30ea 100644
--- a/game/prefab/ZapperPoolSubScene.cpp
+++ b/game/prefab/ZapperPoolSubScene.cpp
@@ -1,13 +1,25 @@
+#include <crepe/api/BehaviorScript.h>
+
 #include "ZapperPoolSubScene.h"
+#include "ZapperPoolScript.h"
 
 using namespace crepe;
 using namespace std;
 
 ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene)
 	: controller { scene.new_object("controller") } {
-		for (size_t i = 0; i < this->POOL_SIZE; i++)
-			zappers.emplace_back(scene.new_object("zapper"));
+	this->controller.add_component<BehaviorScript>().set_script<ZapperPoolScript>(*this);
+
+	Log::logf(Log::DEBUG, "Building zapper pool...");
+	for (size_t i = 0; i < this->POOL_SIZE; i++)
+		zappers.emplace_back(scene.new_object("zapper"));
+}
 
-	
+OptionalRef<ZapperObject> ZapperPoolSubScene::get_next_zapper() {
+	for (ZapperObject & zapper : this->zappers) {
+		if (!zapper.active) continue;
+		return zapper;
+	}
+	return {};
 }