1.1.8

Author: TimeStepYT

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(DeltaruneTextboxes VERSION 1.1.7)
+project(DeltaruneTextboxes VERSION 1.1.8)
 
 add_library(${PROJECT_NAME} SHARED
     src/FLAlertLayer.cpp

README.md

@@ -2,7 +2,9 @@
 This Geometry Dash mod turns every Popup into a Deltarune styled Textbox!
 
 You can advance the text by pressing Z, Enter or by clicking/tapping on the screen!
-You can skip the text by pressing X or clicking/tapping on the screen!
+You can skip the text by pressing X, Space or clicking/tapping on the screen!
+
+Keybinds changeable if you use the Custom Keybinds mod!
 
 Apply using the Geode mod loader!
 

about.md

@@ -6,6 +6,8 @@ You can <cj>advance</c> the text by pressing <cy>Z</c>, <cy>Enter</c> or by </cy
 
 You can <cj>skip</c> the text by pressing <cy>X</c>, <cy>Space</c> or by <cy>tapping</c>/<cy>clicking</c> while the text rolls out!
 
+If you're <c>able</c> to use the <cj>Custom Keybinds</c> mod, then you can <cj>reconfigure</c> these buttons!
+
 ![[This should be a screenshot]](timestepyt.deltarune_textboxes/screenshot.jpg&scale:0.5)
 
 If you want to suggest a feature, create an issue on github or ping me on discord (@timestepyt)

changelog.md

@@ -1,8 +1,14 @@
+### v1.1.8
+- Text rolling pause is no longer limited to frame rate!
+- Fixed title positioning for titles that are multiple lines long
+- Fixed a crash for special type of DialogLayer that I thought I have already fixed
+- Now removing empty lines that are on the top of the textbox when opened
+
 ### v1.1.7
-- removed custom keybinds support for Android 32bit since it crashes the game
+- Removed custom keybinds support for Android 32bit since it crashes the game
 
 ### v1.1.6
-- very quick crashfix
+- Very quick crashfix
 
 ### v1.1.5 (never released)
 - Custom Keybinds support for Windows and Android (mac doesn't have it)
@@ -18,23 +24,23 @@
 
 ### v1.1.3 (never released)
 - Finally fixed choices not showing up (thanks prevter for having this bug and helping me fix it)
-- Mod comments support (kinda)
+- Mod comments supported (kinda)
 
 ### v1.1.2
-- Fix star not fully disappearing
-- Prevent the first line from being empty
+- Fixed star not fully disappearing
+- Prevented the first line from being empty
 - Animated corner pixels :D
 
 ### v1.1.1 (never released)
 - Crashfix
 
 ### v1.1.0 (never released)
-- Fix text being cut off on wider screens while having restrict width on
-- Fix weirdness with Prism Menu
-- Fix weirdness with Death Tracker
-- Fix buttons not showing up (maybe?)
-- Add drop shadow to text
-- Add star to non dialog as well
+- Fixed text being cut off on wider screens while having restrict width on
+- Fixed weirdness with Prism Menu
+- Fixed weirdness with Death Tracker
+- Fixed buttons not showing up (maybe?)
+- Added drop shadow to text
+- Added star to non dialog as well
 
 ### v1.0.0
 - Different character text sounds and fonts

mod.json

@@ -1,5 +1,5 @@
 {
-    "geode": "3.6.1",
+    "geode": "3.7.1",
     "gd": {
         "win": "2.206",
         "android": "2.206",
@@ -8,7 +8,7 @@
     },
     "id": "timestepyt.deltarune_textboxes",
     "name": "Deltarune Textboxes",
-    "version": "v1.1.7",
+    "version": "v1.1.8",
     "developer": "TimeStepYT",
     "description": "Makes FLAlertLayers look like textboxes from Deltarune",
     "repository": "https://github.com/Reinmmar/DeltaruneTextboxes",
@@ -121,7 +121,11 @@
             "type": "float",
             "min": 0,
             "max": 5,
-            "default": 1,
+            "default": 0.8,
+            "control": {
+                "arrow-step": 0.1,
+                "big-arrow-step": 1
+            },
             "description": "How many <cy>30th</c>s of a second it should <cj>pause</c> between characters for the <cg>rolling effect</c>"
         },
         "textSound": {

src/CCKeyboardDispatcher.cpp

@@ -50,13 +50,13 @@ class $modify(MyHookLol, CCKeyboardDispatcher) {
 				blockKeys = false;
 		}
 		// else if (down && key == KEY_G) {
-			// 	CCArray* objs = new CCArray();
-			// 	objs->addObject(DialogObject::create("Scratch", "fart\nUh oh", 25, 1, false, ccc3(0, 255, 255)));
-			// 	objs->addObject(DialogObject::create("The funny monkley", "stinky!", 26, 1, false, ccc3(0, 155, 155)));
-			// 	objs->addObject(DialogObject::create("Glungus", "poopy!", 28, 1, false, ccc3(0, 155, 155)));
-			// 	objs->addObject(DialogObject::create("Ned", "funny poopy!", 6, 1, false, ccc3(0, 155, 155)));
-			// 	objs->addObject(DialogObject::create("Smongus", "Sorry you had to... read this.", 21, 1, false, ccc3(0, 155, 155)));
-			// 	DialogLayer::createWithObjects(objs, 2);
+			// CCArray* objs = new CCArray();
+			// objs->addObject(DialogObject::create("Scratch", "fart\nUh oh", 25, 1, false, ccc3(0, 255, 255)));
+			// objs->addObject(DialogObject::create("The funny\nmonkley", "stinky!", 26, 1, false, ccc3(0, 155, 155)));
+			// objs->addObject(DialogObject::create("Glungus", "poopy!", 28, 1, false, ccc3(0, 155, 155)));
+			// objs->addObject(DialogObject::create("Ned", "funny poopy!", 6, 1, false, ccc3(0, 155, 155)));
+			// objs->addObject(DialogObject::create("Smongus", "Sorry you had to... read this.", 21, 1, false, ccc3(0, 155, 155)));
+			// auto layer = DialogLayer::createWithObjects(objs, 2);
 		// }
 		return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, idk);
 	}

src/DialogLayer.cpp

@@ -42,18 +42,21 @@ bool DeltaruneDialogLayer::init(DialogObject* dialogObject, CCArray* objects, in
 		}
 	}
 	m_fields->alert = unmodifiedAlert;
-
 	alert->m_fields->dialog = true;
 	alert->m_fields->dialogLayer = this;
 
-	Loader::get()->queueInMainThread([=]{
+	Loader::get()->queueInMainThread([=] {
 		this->setVisible(false);
-	});
+		if (!this->getParent()) {
+			alert->addChild(this);
+		}
+		});
 
 	alert->show();
 	return true;
 }
 void DeltaruneDialogLayer::displayNextObject() {
+	DialogLayer::displayNextObject();
 	this->setVisible(false);
 }
 void DeltaruneDialogLayer::displayDialogObject(DialogObject* obj) {
@@ -63,5 +66,4 @@ void DeltaruneDialogLayer::displayDialogObject(DialogObject* obj) {
 bool DeltaruneDialogLayer::ccTouchBegan(CCTouch* touch, CCEvent* event) {
 	return false;
 }
-void DeltaruneDialogLayer::keyDown(enumKeyCodes key) {
-}
+void DeltaruneDialogLayer::keyDown(enumKeyCodes key) {}

src/FLAlertLayer.cpp

@@ -1,5 +1,5 @@
-#include "include.h"
 #include "FLAlertLayer.h"
+#include "DialogLayer.h"
 
 bool blockKeys = false;
 
@@ -131,7 +131,6 @@ void DeltaruneAlertLayer::onBtn2(CCObject* sender) {
 	else if (btnSelected == 1) FLAlertLayer::onBtn1(sender);
 }
 void DeltaruneAlertLayer::onBtn1(CCObject* sender) {
-	bool dialog = m_fields->dialog;
 	if (m_fields->incompatible) {
 		FLAlertLayer::onBtn1(sender);
 		return;
@@ -374,6 +373,27 @@ void DeltaruneAlertLayer::skipText() {
 	if (doneRolling) showButtons();
 }
 
+int DeltaruneAlertLayer::emptyLinesAmount(int offset) {
+	auto& textArea = m_fields->textArea;
+	auto& linesProgressed = m_fields->linesProgressed;
+	auto fontNode = (CCNode*) textArea->getChildren()->objectAtIndex(0);
+	int lines = 0;
+	while (true) {
+		auto topLine = (CCLabelBMFont*) fontNode->getChildren()->objectAtIndex(linesProgressed + lines + offset);
+		if (!topLine) break;
+		std::string topLineString = topLine->getString();
+		std::string noSpaceTopLineString = "";
+		std::for_each(topLineString.begin(), topLineString.end(), [&noSpaceTopLineString](char c) {
+			if (c != ' ') noSpaceTopLineString += c;
+			});
+		if (noSpaceTopLineString != "") break;
+		lines++;
+		m_mainLayer->getChildByID("star"_spr)->setVisible(true);
+		if (!Mod::get()->getSettingValue<bool>("noShadow")) m_mainLayer->getChildByID("starShadow"_spr)->setVisible(true);
+	}
+	return lines;
+}
+
 void DeltaruneAlertLayer::progressText() {
 	if (!m_mainLayer) return;
 	if (!m_buttonMenu) return;
@@ -393,11 +413,12 @@ void DeltaruneAlertLayer::progressText() {
 
 	if (getLinesLeft() <= 3) {
 		if (!m_button2) {
-			bool dialog = m_fields->dialog;
-			DialogLayer* dialogLayer = m_fields->dialogLayer;
+			auto dialogLayer = m_fields->dialogLayer;
 			done = true;
+			if (m_fields->dialog && dialogLayer) {
+				dialogLayer->onClose();
+			}
 			FLAlertLayer::onBtn1(btn1);
-			if (dialog && dialogLayer) dialogLayer->onClose();
 			return;
 		}
 		else if (btnSelected != 0) {
@@ -426,26 +447,12 @@ void DeltaruneAlertLayer::progressText() {
 	else if (getLinesLeft() == 3)
 		offset = 1;
 
-	auto fontNode = (CCNode*) textArea->getChildren()->objectAtIndex(0);
-	bool emptyLinesRemoved = false;
-	while (true) {
-		auto topLine = (CCLabelBMFont*) fontNode->getChildren()->objectAtIndex(linesProgressed + offset);
-		if (!topLine) break;
-		std::string topLineString = topLine->getString();
-		std::string noSpaceTopLineString = "";
-		std::for_each(topLineString.begin(), topLineString.end(), [&noSpaceTopLineString](char c) {
-			if (c != ' ') noSpaceTopLineString += c;
-			});
-		if (noSpaceTopLineString != "") break;
-		offset++;
-		m_mainLayer->getChildByID("star"_spr)->setVisible(true);
-		if (!noShadow) m_mainLayer->getChildByID("starShadow"_spr)->setVisible(true);
-		emptyLinesRemoved = true;
-	}
+	int emptyLines = emptyLinesAmount(offset);
+	offset += emptyLines;
 
 	auto& characters = m_fields->characterSpriteNames;
 	int& dialogCount = m_fields->dialogCount;
-	if (emptyLinesRemoved && characters.size() > 1) {
+	if (characters.size() > 1) {
 		dialogCount++;
 		auto& spriteName = characters[dialogCount];
 		auto prevChar = (CCSpriteGrayscale*) m_mainLayer->getChildByID("character-sprite"_spr);
@@ -483,70 +490,84 @@ void DeltaruneAlertLayer::rollText(float dt) {
 	bool& playedSound = m_fields->playedSound;
 	bool& doneRolling = m_fields->doneRolling;
 	bool& rolledPage = m_fields->rolledPage;
+	float& lostTime = m_fields->lostTime;
+	float const pause = Mod::get()->getSettingValue<double>("textRollingPause") / 30;
 
-	if (waitQueue != 0) {
-		waitQueue--;
-		playedSound = false;
-		return;
-	}
-	CCArrayExt<TextArea*> textAreas = m_fields->textAreaClippingNode->getChildren();
-	if (rollingLine == 3) {
-		unschedule(schedule_selector(DeltaruneAlertLayer::rollText));
-		rolledPage = true;
-		return;
-	}
-	else rolledPage = false;
+	if (dt - pause > pause)
+		lostTime += dt - pause;
 
-	bool newLine = false;
 	bool playSound = true;
-	for (auto textArea : textAreas) {
-		CCArrayExt<CCLabelBMFont*> lines = static_cast<CCNode*>(textArea->getChildren()->objectAtIndex(0))->getChildren();
-		int i = linesProgressed + rollingLine;
-		if (i < lines.size() && i < linesProgressed + 3) {
-			auto line = lines[i];
-			CCArrayExt<CCNode*> letters = line->getChildren();
-			auto letter = letters[characterCount];
-			if (letter->isVisible()) {
+
+	for (bool firstRun = true; lostTime >= pause || firstRun;) {
+		bool newLine = false;
+		firstRun = false;
+		if (waitQueue != 0) {
+			waitQueue--;
+			playedSound = false;
+			if (lostTime >= pause && !firstRun) {
+				lostTime -= pause;
+			}
+			continue;
+		}
+		CCArrayExt<TextArea*> textAreas = m_fields->textAreaClippingNode->getChildren();
+		if (rollingLine == 3) {
+			unschedule(schedule_selector(DeltaruneAlertLayer::rollText));
+			rolledPage = true;
+			return;
+		}
+		else rolledPage = false;
+
+		for (auto textArea : textAreas) {
+			CCArrayExt<CCLabelBMFont*> lines = static_cast<CCNode*>(textArea->getChildren()->objectAtIndex(0))->getChildren();
+			int currentLine = linesProgressed + rollingLine;
+			if (currentLine < lines.size() && currentLine < linesProgressed + 3) {
+				auto line = lines[currentLine];
+				CCArrayExt<CCNode*> letters = line->getChildren();
+				auto letter = letters[characterCount];
+				if (letter->isVisible()) {
+					unschedule(schedule_selector(DeltaruneAlertLayer::rollText));
+					doneRolling = true;
+					rolledPage = true;
+					showButtons();
+					return;
+				}
+				letter->setVisible(true);
+				switch (line->getString()[characterCount]) {
+					case ' ':
+						playSound = false;
+						break;
+					case '.': [[fallthrough]];
+					case ',': [[fallthrough]];
+					case ':': [[fallthrough]];
+					case ';': [[fallthrough]];
+					case '?': [[fallthrough]];
+					case '!':
+						waitQueue = 2;
+						break;
+					default:
+						break;
+				}
+				if (characterCount == line->getChildrenCount() - 1) {
+					newLine = true;
+				}
+			}
+			else {
 				unschedule(schedule_selector(DeltaruneAlertLayer::rollText));
 				doneRolling = true;
 				rolledPage = true;
 				showButtons();
 				return;
 			}
-			letter->setVisible(true);
-			switch (line->getString()[characterCount]) {
-				case ' ':
-					playSound = false;
-					break;
-				case '.': [[fallthrough]];
-				case ',': [[fallthrough]];
-				case ':': [[fallthrough]];
-				case ';': [[fallthrough]];
-				case '?': [[fallthrough]];
-				case '!':
-					waitQueue = 2;
-					break;
-				default:
-					break;
-			}
-			if (characterCount == line->getChildrenCount() - 1) {
-				newLine = true;
-			}
 		}
-		else {
-			unschedule(schedule_selector(DeltaruneAlertLayer::rollText));
-			doneRolling = true;
-			rolledPage = true;
-			showButtons();
-			return;
+		characterCount++;
+		if (newLine) {
+			characterCount = 0;
+			rollingLine++;
+		}
+		if (lostTime >= pause && !firstRun) {
+			lostTime -= pause;
 		}
 	}
-	characterCount++;
-	if (newLine) {
-		characterCount = 0;
-		rollingLine++;
-	}
-
 	auto nameToFile = m_fields->nameToFile;
 	std::string const textSound = m_fields->textSound;
 	std::string const resFolder = Mod::get()->getResourcesDir().string();