quest requirements/rewards

3 files changed, 37 insertions, 7 deletions

diff --git a/src/components.cpp b/src/components.cpp
index cbec9fc..dfce75c 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -257,7 +257,7 @@ void DialogSystem::receive(const MouseClickEvent &mce)
 								else {
 									qname = qxml->Attribute("check");
 									if (qname != nullptr) {
-										if (qname != nullptr && qsys->hasQuest(qname) && qsys->finish(qname) == 0) {
+										if (qname != nullptr && qsys->finish(qname) == 0) {
 											d.index = 9999;
 										} else {
 											ui::dialogBox(name.name, "", false, "Finish my quest u nug");
diff --git a/src/inventory.cpp b/src/inventory.cpp
index bf6b6bb..3995e3a 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -240,11 +240,12 @@ bool InventorySystem::take(const std::string& name, int count)
 				return ie.item != nullptr && ie.item->name == name;
 			});
 
-		if (i == items.end())
+		if (i >= items.end())
 			break;
 
 		toDelete.push_front(i);
 		taken += i->count;
+		next = i + 1;
 	}	
 
 	if (taken < count)
diff --git a/src/quest.cpp b/src/quest.cpp
index a0f9a6d..71a37fd 100644
--- a/src/quest.cpp
+++ b/src/quest.cpp
@@ -2,8 +2,20 @@
 
 #include <algorithm>
 
+#include <engine.hpp>
+#include <inventory.hpp>
 #include <tokens.hpp>
 
+std::string& trim(std::string& s)
+{
+	auto start = std::find_if(s.begin(), s.end(),
+		[](char c) { return !isspace(c); }) - s.begin();
+	auto end = std::find_if(s.rbegin(), s.rend(),
+		[](char c) { return !isspace(c); }).base() - s.begin();
+	s = s.substr(start, end - start);
+	return s;
+}
+
 void QuestSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
 {
 	(void)en;
@@ -13,14 +25,25 @@ void QuestSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 
 int QuestSystem::assign(std::string title, std::string desc, std::string req)
 {
+	current.emplace_back(title, desc);
+
+	auto* list = &current.back().reqs;
+	std::string reqTitle;
 	for (auto s : tokens(req, ',')) {
-		s.erase(std::remove_if(s.begin(), s.end(),
-			[](char c) { return isspace(c); }), s.end());
+		trim(s);
 
-		std::cout << s << '\n';
+		if (s == "Reward") {
+			list = &current.back().rewards;
+		} else {
+			if (!reqTitle.empty()) {
+				list->emplace_front(reqTitle, std::stoi(s));
+				reqTitle.clear();
+			} else {
+				reqTitle = s;
+			}
+		}
 	}
 
-	current.emplace_back(title, desc);
 	return 0;
 }
 
@@ -39,7 +62,13 @@ int QuestSystem::finish(std::string title)
 	if (quest == std::end(current))
 		return -1;
 
-	// TODO requirements
+	for (const auto& r : quest->reqs) {
+		if (!game::engine.getSystem<InventorySystem>()->take(r.first, r.second))
+			return -1;
+	}
+
+	for (const auto& r : quest->rewards)
+		game::engine.getSystem<InventorySystem>()->add(r.first, r.second);
 
 	drop(title);