important textls

3 files changed, 45 insertions, 11 deletions

diff --git a/src/components.cpp b/src/components.cpp
index d89e195..dcb1551 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -50,11 +50,9 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 					fl = (direction.x < 0);
 			}
 
-			// make the entity wander
-			// TODO initialX and range?
-			if (entity.has_component<Aggro>()) {
-				auto ppos = game::engine.getSystem<PlayerSystem>()->getPosition();
-				if (ppos.x > position.x && ppos.x < position.x + entity.component<Solid>()->width) {
+			auto ppos = game::engine.getSystem<PlayerSystem>()->getPosition();
+			if (ppos.x > position.x && ppos.x < position.x + entity.component<Solid>()->width) {
+				if (entity.has_component<Aggro>()) {
 					auto dim = entity.component<Solid>();
 					ev.emit<AttackEvent>(vec2(position.x + dim->width, position.y + dim->height),
 						AttackType::ShortSlash, false);
@@ -64,9 +62,27 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 						toFight = entity;
 						h = 0;
 					}*/
-				} else
-					direction.x = (ppos.x > position.x) ? .01 : -.01;
-			} else if (entity.has_component<Wander>()) {
+				} else if (entity.has_component<Trigger>()) {
+					static bool triggering = false;
+					if (!triggering) {
+						triggering = true;
+						std::thread([&](entityx::Entity e) {
+							UISystem::fadeToggle();
+							UISystem::waitForCover();
+							UISystem::dialogImportant(e.component<Trigger>()->text);
+							UISystem::waitForDialog();
+							UISystem::fadeToggle();
+							e.destroy();
+							triggering = false;
+						}, entity).detach();
+					}
+					return;
+				}
+			}
+
+			// make the entity wander
+			// TODO initialX and range?
+			if (entity.has_component<Wander>()) {
 				auto& countdown = entity.component<Wander>()->countdown;
 
 				if (countdown > 0) {
diff --git a/src/ui.cpp b/src/ui.cpp
index fc815f2..d14b0a6 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -618,6 +618,20 @@ namespace ui {
 
 		fclose(bmp);
 	}
+
+	bool handleGLEvent(SDL_Event& e) {
+		switch (e.type) {
+		case SDL_MOUSEBUTTONDOWN:
+			if ((UISystem::isDialog() | pageTexReady) && (e.button.button & SDL_BUTTON_RIGHT))
+					UISystem::advanceDialog();
+			return true;
+			break;
+		default:
+			break;
+		}
+
+		return false;
+	}
 }
 
 using namespace ui;
@@ -658,8 +672,6 @@ void InputSystem::receive(const MainSDLEvent& event)
 	case SDL_MOUSEBUTTONDOWN:
 		ev.emit<MouseClickEvent>(mouse, e.button.button);
 
-		UISystem::advanceDialog();
-
 		if (UISystem::isDialog() || pageTexReady) {
 			if ((e.button.button & SDL_BUTTON_RIGHT))
 				UISystem::advanceDialog();
@@ -974,6 +986,10 @@ void UISystem::render(void)
 	}
 
 	if (!importantText.empty()) {
-		putStringCentered(offset, importantText);
+		FontSystem::setFontSize(24);
+		FontSystem::setFontZ(-9.0f);
+		putStringCentered(vec2(offset.x, 400), importantText);
+		FontSystem::setFontZ(-6.0f);
+		FontSystem::setFontSize(16);
 	}
 }
diff --git a/src/world.cpp b/src/world.cpp
index 648507a..e251706 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -389,6 +389,8 @@ void WorldSystem::load(const std::string& file)
 						entity.assign<Aggro>(wxml, abcd);
 					else if (tname == "Animation")
 						entity.assign<Animate>(wxml, abcd);
+					else if (tname == "Trigger")
+						entity.assign<Trigger>(wxml, abcd);
 
 					abcd = abcd->NextSiblingElement();
 				}