1.1.4

Author: TimeStepYT

README.md

@@ -6,6 +6,8 @@ You can skip the text by pressing X or clicking/tapping on the screen!
 
 Apply using the Geode mod loader!
 
+<img src="resources/screenshot.jpg" alt="[This should show a screenshot]">
+
 ## Sources:
 - Fonts:
 	- [Determination Extended](https://fontstruct.com/fontstructions/show/2460153/determination-40-7)

about.md

@@ -4,12 +4,13 @@
 
 You can <cj>advance</c> the text by pressing <cy>Z</c>, <cy>Enter</c> or by </cy>tapping</c>/</cy>clicking</c> on the screen!
 
-You can <cj>skip</c> the text by pressing <cy>X</c> or <cy>tapping</c>/<cy>clicking</c> while the text rolls out!
+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 want to suggest a feature, create an issue on github or ping me on discord (@timestepyt)
+![[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)
 
-## Special Thanks
+# Special Thanks
 <cr>prevter</c>: Answered my stupid questions, and helped a lot!
 
 JohnnyEnglish1: Reported a bug where choices don't appear, which never happened to me.

changelog.md

@@ -1,20 +1,21 @@
 ### v1.1.4
 - A little bit of cleanup
 - Crashfix
+- Choices now show two lines of previous text instead of just one
 
-### v1.1.3
-- Finally fixed choices not showing up
-- Mod comments support
+### 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)
 
 ### v1.1.2
 - Fix star not fully disappearing
 - Prevent the first line from being empty
 - Animated corner pixels :D
 
-### v1.1.1
+### v1.1.1 (never released)
 - Crashfix
 
-### v1.1.0
+### 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

mod.json

@@ -8,7 +8,7 @@
     },
     "id": "timestepyt.deltarune_textboxes",
     "name": "Deltarune Textboxes",
-    "version": "v1.1.3-beta",
+    "version": "v1.1.4",
     "developer": "TimeStepYT",
     "description": "Makes FLAlertLayers look like textboxes from Deltarune",
     "repository": "https://github.com/Reinmmar/DeltaruneTextboxes",
@@ -68,6 +68,7 @@
             "resources/snd_txtspam.wav",
             "resources/snd_txtspam2.wav",
             "resources/snd_txtq.wav",
+            "resources/screenshot.jpg",
             "resources/g.jpg"
         ]
     },
@@ -128,7 +129,8 @@
                 "Berdly",
                 "Queen",
                 "Spamton",
-                "Spamton NEO"
+                "Spamton NEO",
+                "No Sound"
             ]
         }
     }

resources/screenshot.jpg

@@ -7,6 +7,38 @@ float randomNumberInAGivenRangeThatGetsAddedOrRemovedFromADifferentNumber(float
 	return static_cast<float>(rand() % static_cast<int>(range * 100 + 1)) / 100.f - (range / 2.f);
 }
 
+void DeltaruneAlertLayer::initMaps() {
+	auto& nameToFile = m_fields->nameToFile;
+	auto& nameToSound = m_fields->nameToSound;
+
+	nameToFile["Default"] = "SND_TXT1";
+	nameToFile["Typewriter"] = "SND_TXT2";
+	nameToFile["Toriel"] = "snd_txttor";
+	nameToFile["Sans"] = "snd_txtsans";
+	nameToFile["Papyrus"] = "snd_txtpap";
+	nameToFile["Undyne"] = "snd_txtund";
+	nameToFile["Alphys"] = "snd_txtal";
+	nameToFile["Asgore"] = "snd_txtasg";
+	nameToFile["Asriel"] = "snd_txtasr";
+	nameToFile["Susie"] = "snd_txtsus";
+	nameToFile["Ralsei"] = "snd_txtral";
+	nameToFile["Lancer"] = "snd_txtlan";
+	nameToFile["Noelle"] = "snd_txtnoe";
+	nameToFile["Berdly"] = "snd_txtber";
+	nameToFile["Spamton"] = "snd_txtspam";
+	nameToFile["Spamton NEO"] = "snd_txtspam2";
+	nameToFile["Jevil"] = "snd_txtjok";
+	nameToFile["Queen"] = "snd_txtq";
+
+	nameToSound["The Mechanic"] = "Alphys";
+	nameToSound["The Shopkeeper"] = "Spamton";
+	nameToSound["Scratch"] = "Lancer";
+	nameToSound["Potbor"] = "Spamton NEO";
+	nameToSound["Diamond Shopkeeper"] = "Papyrus";
+	nameToSound["The Keymaster"] = "Susie";
+
+}
+
 bool DeltaruneAlertLayer::init(FLAlertLayerProtocol* delegate, char const* title, gd::string desc, char const* btn1, char const* btn2, float width, bool scroll, float height, float textScale) {
 	float& screenSize = m_fields->screenSize;
 	if (screenSize >= 569 && !m_fields->dontRestrictWidth)
@@ -19,17 +51,20 @@ bool DeltaruneAlertLayer::init(FLAlertLayerProtocol* delegate, char const* title
 
 	NodeIDs::provideFor(this);
 	setID("FLAlertLayer");
-	if (Loader::get()->isModLoaded("firee.prism")) {
+	if (Loader::get()->isModLoaded("firee.prism")) { // probably the easiest way to detect a Prism Menu alert :3
 		if (desc == "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") {
 			m_fields->incompatible = true;
 			return true;
 		}
 	}
 
+
 	auto& textArea = m_fields->textArea;
 	auto& bg = m_fields->bg;
 	auto& titleNode = m_fields->title;
 
+	initMaps(); // for sounds
+
 	this->m_noElasticity = true;
 
 	m_fields->btn1 = m_button1 ? this->m_button1->getParent() : nullptr;
@@ -220,7 +255,7 @@ void DeltaruneAlertLayer::keyDown(enumKeyCodes key) {
 			progressText();
 		return;
 	}
-	else if (key == enumKeyCodes::KEY_X || key == enumKeyCodes::KEY_Shift || key == enumKeyCodes::CONTROLLER_B) {
+	else if (key == enumKeyCodes::KEY_X || key == enumKeyCodes::KEY_Space || key == enumKeyCodes::CONTROLLER_B) {
 		skipText();
 		return;
 	}
@@ -321,46 +356,37 @@ void DeltaruneAlertLayer::progressText() {
 		}
 		else if (btnSelected != 0) {
 			done = true;
-			if (btnSelected == 1)
-				FLAlertLayer::onBtn1(btn1);
-			else if (btnSelected == 2)
-				FLAlertLayer::onBtn2(btn2);
+			if (btnSelected == 1) FLAlertLayer::onBtn1(btn1);
+			else if (btnSelected == 2) FLAlertLayer::onBtn2(btn2);
 			return;
 		}
 	}
+	// Don't progress if there's only a choice left!
 	if (getLinesLeft() < 3 && m_button2)
 		return;
 
-	// move EVERYTHING up
-	
+	// Move EVERYTHING up
+
 	int offset;
-	
 	m_mainLayer->getChildByID("star"_spr)->setVisible(false);
-	
 	if (!noShadow) m_mainLayer->getChildByID("starShadow"_spr)->setVisible(false);
-	
-
 
 	unschedule(schedule_selector(DeltaruneAlertLayer::rollText));
 	m_fields->characterCount = 0;
 	m_fields->rollingLine = 0;
 
-
 	if (getLinesLeft() > 3)
 		offset = 3;
 	else if (getLinesLeft() == 3)
-		offset = 2;
-
+		offset = 1;
 
 	auto fontNode = (CCNode*) textArea->getChildren()->objectAtIndex(0);
-
-
 	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(), [&](char c) {
+		std::for_each(topLineString.begin(), topLineString.end(), [&noSpaceTopLineString](char c) {
 			if (c != ' ') noSpaceTopLineString += c;
 			});
 		if (noSpaceTopLineString != "") break;
@@ -369,20 +395,16 @@ void DeltaruneAlertLayer::progressText() {
 		if (!noShadow) m_mainLayer->getChildByID("starShadow"_spr)->setVisible(true);
 	}
 
-
 	linesProgressed += offset;
 	textArea->setPositionY(textArea->getPositionY() + m_fields->textSize * offset);
-	if (gradientOverlay)
-		gradientOverlay->setPositionY(textArea->getPositionY());
-	if (shadow)
-		shadow->setPositionY(textArea->getPositionY() - 1);
-
+	if (gradientOverlay) gradientOverlay->setPositionY(textArea->getPositionY());
+	if (shadow) shadow->setPositionY(textArea->getPositionY() - 1);
 
 	showButtons();
 	float pause = Mod::get()->getSettingValue<double>("textRollingPause");
 	schedule(schedule_selector(DeltaruneAlertLayer::rollText), pause / 30);
-	log::info("Finished");
 }
+
 void DeltaruneAlertLayer::rollText(float dt) {
 	int& waitQueue = m_fields->waitQueue;
 	int& linesProgressed = m_fields->linesProgressed;
@@ -454,44 +476,30 @@ void DeltaruneAlertLayer::rollText(float dt) {
 		characterCount = 0;
 		rollingLine++;
 	}
-	if (playSound) {
-		if (playedSound) {
-			playedSound = false;
-			return;
-		}
-		float pitch = 1;
-		playedSound = true;
-		std::string sound = "";
-		if (sound == "Default") sound = "SND_TXT1";
-		else if (sound == "Typewriter") sound = "SND_TXT2";
-		else if (sound == "Toriel") sound = "snd_txttor";
-		else if (sound == "Sans") sound = "snd_txtsans";
-		else if (sound == "Papyrus") sound = "snd_txtpap";
-		else if (sound == "Undyne") sound = "snd_txtund";
-		else if (sound == "Alphys") sound = "snd_txtal";
-		else if (sound == "Asgore") sound = "snd_txtasg";
-		else if (sound == "Asriel") sound = "snd_txtasr";
-		else if (sound == "Susie") sound = "snd_txtsus";
-		else if (sound == "Ralsei") sound = "snd_txtral";
-		else if (sound == "Lancer") sound = "snd_txtlan";
-		else if (sound == "Noelle") sound = "snd_txtnoe";
-		else if (sound == "Berdly") sound = "snd_txtber";
-		else if (sound == "Spamton") sound = "snd_txtspam";
-		else if (sound == "Spamton NEO") sound = "snd_txtspam2";
-		else if (sound == "Jevil") sound = "snd_txtjok";
-		else if (sound == "Queen") {
-			sound = "snd_txtq";
-			pitch = 1 + randomNumberInAGivenRangeThatGetsAddedOrRemovedFromADifferentNumber(0.2f);
-		}
-		std::string path = fmt::format("{}/{}.wav", Mod::get()->getResourcesDir().string(), sound);
-		auto& system = m_fields->system;
-		auto& fmodSound = m_fields->sound;
-		auto& channel = m_fields->channel;
-
-		system->createSound(path.c_str(), FMOD_DEFAULT, nullptr, &fmodSound);
-		system->playSound(fmodSound, nullptr, false, &channel);
-		channel->setPitch(pitch);
-		channel->setVolume(FMODAudioEngine::sharedEngine()->m_sfxVolume);
+
+	auto nameToFile = m_fields->nameToFile;
+	std::string const textSound = m_fields->textSound;
+	std::string const resFolder = Mod::get()->getResourcesDir().string();
+	std::string path = fmt::format("{}/{}.wav", resFolder, nameToFile[textSound]);
+	
+	if (nameToFile.find(textSound) == nameToFile.end()) return;
+
+	if (!playSound || playedSound) {
+		playedSound = false;
+		return;
 	}
-	else playedSound = false;
+	float pitch = 1;
+	playedSound = true;
+
+	auto& system = m_fields->system;
+	auto& channel = m_fields->channel;
+	auto& sound = m_fields->sound;
+
+	if (textSound == "Queen")
+		pitch = 1 + randomNumberInAGivenRangeThatGetsAddedOrRemovedFromADifferentNumber(0.2f);
+
+	system->createSound(path.c_str(), FMOD_DEFAULT, nullptr, &sound);
+	system->playSound(sound, nullptr, false, &channel);
+	channel->setPitch(pitch);
+	channel->setVolume(FMODAudioEngine::sharedEngine()->m_sfxVolume);
 }

src/FLAlertLayer.cpp

@@ -36,6 +36,8 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 		FMOD::System* system = FMODAudioEngine::sharedEngine()->m_system;
 		FMOD::Channel* channel;
 		FMOD::Sound* sound;
+		std::unordered_map<std::string, std::string> nameToFile;
+		std::unordered_map<std::string, std::string> nameToSound;
 	};
 	void animateBG(float);
 	void changeBG();
@@ -45,6 +47,7 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 	void changeLook();
 	void decideToBlockKeys();
 	void show() override;
+	void initMaps();
 	bool init(FLAlertLayerProtocol*, char const*, gd::string, char const*, char const*, float, bool, float, float);
 	void rollText(float);
 	void showButtons();

src/FLAlertLayer.h

@@ -115,8 +115,10 @@ void DeltaruneAlertLayer::changeText() {
 
 	auto& sound = m_fields->textSound;
 	auto& size = m_fields->textSize;
+	auto& nameToSound = m_fields->nameToSound;
 	bool& noShadow = m_fields->noShadow;
 
+
 	noShadow = Mod::get()->getSettingValue<bool>("noShadow") || sound == "Sans" || sound == "Papyrus";
 
 	CCLabelBMFont* star = CCLabelBMFont::create("*", "Determination.fnt"_spr);
@@ -125,19 +127,14 @@ void DeltaruneAlertLayer::changeText() {
 
 	auto str = m_fields->text;
 	auto screenSize = m_fields->screenSize;
-	auto titleString = std::string_view(m_fields->title->getString());
 	auto& bg = m_fields->bg;
+	std::string titleString = m_fields->title->getString();
 
 	int xOffset = star->getContentWidth();
 
 	if (m_fields->dialog) {
+		if (nameToSound.find(titleString.c_str()) != nameToSound.end()) sound = nameToSound[titleString];
 		xOffset = m_fields->characterSprite->getContentWidth() + 27 + star->getContentWidth();
-		if (titleString == "The Mechanic") sound = "Alphys";
-		else if (titleString == "Scratch") sound = "Lancer";
-		else if (titleString == "The Shopkeeper") sound = "Spamton";
-		else if (titleString == "Potbor") sound = "Spamton NEO";
-		else if (titleString == "Diamond Shopkeeper") sound = "Papyrus";
-		else if (titleString == "The Keymaster") sound = "Susie";
 	}
 	star->setPositionX(bg->getPositionX() - screenSize / 2 + xOffset - star->getContentWidth() + 27);
 	star->setPositionY(110);
@@ -168,7 +165,7 @@ void DeltaruneAlertLayer::changeText() {
 		false
 	);
 
-	newDesc->setContentWidth(screenSize);
+	newDesc->setContentWidth(creatingWidth);
 	newDesc->setAnchorPoint(CCPoint{ 0, 1 });
 	newDesc->setPositionY(110);
 	newDesc->setZOrder(textArea->getZOrder());
@@ -186,7 +183,7 @@ void DeltaruneAlertLayer::changeText() {
 			size,
 			false
 		);
-		newDescGrad->setContentWidth(screenSize);
+		newDescGrad->setContentWidth(creatingWidth);
 		newDescGrad->setAnchorPoint(CCPoint{ 0, 1 });
 		newDescGrad->setPositionY(110);
 		newDescGrad->setZOrder(textArea->getZOrder() + 1);
@@ -211,7 +208,7 @@ void DeltaruneAlertLayer::changeText() {
 			size,
 			false
 		);
-		newDescShad->setContentWidth(screenSize);
+		newDescShad->setContentWidth(creatingWidth);
 		newDescShad->setAnchorPoint(CCPoint{ 0, 1 });
 		newDescShad->setPositionY(109);
 		newDescShad->setPositionX(newDescShad->getPositionX() + 1);
@@ -228,7 +225,8 @@ void DeltaruneAlertLayer::changeText() {
 				auto origLine = (CCLabelBMFont*) origLinesParent->getChildren()->objectAtIndex(i);
 				auto origChar = (CCSprite*) origLine->getChildren()->objectAtIndex(j);
 				auto color = origChar->getColor();
-				if (color == ccColor3B{ 255,255,255 })	letter->setColor({ 15, 15, 127 });
+
+				if (color == ccColor3B{ 255,255,255 }) letter->setColor({ 15, 15, 127 });
 				else if (color == ccColor3B{ 255, 0, 255 }) letter->setColor({ 76, 0, 76 });
 				else if (color == ccColor3B{ 255, 90, 90 }) letter->setColor({ 76, 0, 0 });
 				else if (color == ccColor3B{ 255, 165, 75 }) letter->setColor({ 76, 38, 18 });