tweaked text sound rates

Author: TimeStepYT

CMakeLists.txt

@@ -8,7 +8,7 @@ else()
 endif()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(DeltaruneTextboxes VERSION 1.5.0)
+project(DeltaruneTextboxes VERSION 1.5.2)
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS OR (ANDROID AND ANDROID_ABI STREQUAL "armeabi-v7a"))
     add_compile_definitions(DISABLE_KEYBOARD)

changelog.md

@@ -1,3 +1,6 @@
+### v1.5.2
+- Tweaked the rate of the text sounds for some characters
+
 ### v1.5.1
 - Updated to newer Geode version so that iOS 26 works that came out right after I submitted v1.5.0, just my luck!
 

mod.json

@@ -1,5 +1,5 @@
 {
-    "geode": "4.6.0",
+    "geode": "4.6.1",
     "gd": {
         "win": "2.2074",
         "android": "2.2074",
@@ -8,7 +8,7 @@
     },
     "id": "timestepyt.deltarune_textboxes",
     "name": "Deltarune Textboxes",
-    "version": "v1.5.1",
+    "version": "v1.5.2",
     "developer": "TimeStepYT",
     "description": "Makes Popups look like Deltarune",
     "links": {

src/FLAlertLayer.cpp

@@ -24,6 +24,7 @@ float randomNumberInAGivenRangeThatGetsAddedOrRemovedFromADifferentNumber(float
 void DeltaruneAlertLayer::initMaps() {
     auto& nameToFile = m_fields->nameToFile;
     auto& nameToSound = m_fields->nameToSound;
+    auto& nameToSoundRate = m_fields->nameToSoundRate;
 
     nameToFile["Default"] = "SND_TXT1";
     nameToFile["Typewriter"] = "SND_TXT2";
@@ -57,6 +58,24 @@ void DeltaruneAlertLayer::initMaps() {
     nameToSound["Globed"] = "Tenna";
     nameToSound["Globed Error"] = "Tenna";
     nameToSound["Globed notice"] = "Tenna";  // I thought it was funny
+
+    nameToSoundRate["Tenna"] = 3;
+    nameToSoundRate["Jackenstein"] = 3;
+    nameToSoundRate["Gerson"] = 3;
+    nameToSoundRate["Queen"] = 3;
+}
+
+void DeltaruneAlertLayer::initSoundRate() {
+    auto& soundRate = m_fields->soundRate;
+    auto& soundTimer = m_fields->soundTimer;
+    auto& textSound = m_fields->textSound;
+    auto& nameToSoundRate = m_fields->nameToSoundRate;
+
+    if (nameToSoundRate.find(textSound) == nameToSoundRate.end())
+        return;
+
+    soundRate = nameToSoundRate[textSound];
+    soundTimer = soundRate;
 }
 
 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) {
@@ -88,6 +107,7 @@ bool DeltaruneAlertLayer::init(FLAlertLayerProtocol* delegate, char const* title
     auto& titleNode = m_fields->title;
 
     initMaps();  // for sounds
+    initSoundRate();
 
     this->m_noElasticity = true;
 
@@ -520,25 +540,28 @@ void DeltaruneAlertLayer::rollText(float dt) {
     int& linesProgressed = m_fields->linesProgressed;
     int& characterCount = m_fields->characterCount;
     int& rollingLine = m_fields->rollingLine;
-    bool& playedSound = m_fields->playedSound;
     bool& doneRolling = m_fields->doneRolling;
     bool& rolledPage = m_fields->rolledPage;
     float& lostTime = m_fields->lostTime;
     double const pause = Mod::get()->getSettingValue<double>("textRollingPause") / 30;
+    auto& soundTimer = m_fields->soundTimer;
+    auto& soundRate = m_fields->soundRate;
 
     if (dt - pause > pause)
         lostTime += dt - pause;
 
     bool playSound = true;
     char character;
 
+    soundTimer++;
+
     for (bool firstRun{true}; lostTime >= pause || firstRun; firstRun = false) {
         bool newLine = false;
 
         if (waitQueue != 0) {
             waitQueue--;
-            playedSound = false;
             playSound = false;
+
             if (lostTime >= pause && !firstRun) {
                 lostTime -= pause;
             }
@@ -570,7 +593,7 @@ void DeltaruneAlertLayer::rollText(float dt) {
                 character = line->getString()[characterCount];
                 switch (character) {
                     case ' ':
-                        waitQueue = 1;
+                        waitQueue = 0;
                         playSound = false;
                         break;
                     case '.':
@@ -611,8 +634,7 @@ void DeltaruneAlertLayer::rollText(float dt) {
         }
     }
 
-    if (!playSound || playedSound) {
-        playedSound = false;
+    if (!playSound || soundTimer < soundRate) {
         return;
     }
 
@@ -622,16 +644,18 @@ void DeltaruneAlertLayer::rollText(float dt) {
 void DeltaruneAlertLayer::playSound(char character) {
     auto& nameToFile = m_fields->nameToFile;
     auto& textSound = m_fields->textSound;
-    auto& playedSound = m_fields->playedSound;
-	auto& prevSoundNum = m_fields->prevSoundNum;
+    auto& soundRate = m_fields->soundRate;
+    auto& soundTimer = m_fields->soundTimer;
+    auto& prevSoundNum = m_fields->prevSoundNum;
     auto const resFolder = Mod::get()->getResourcesDir();
 
     if (nameToFile.find(textSound) == nameToFile.end()) return;
 
     handleAprilFools();
 
     float pitch = 1.f;
-    playedSound = true;
+
+    soundTimer = 0;
 
     auto& system = m_fields->system;
     auto& channel = m_fields->channel;
@@ -649,12 +673,12 @@ void DeltaruneAlertLayer::playSound(char character) {
             soundNumber = 5;
         else {
             soundNumber = mt() % numSounds + 1;
-			while (prevSoundNum == soundNumber) {
-				soundNumber = mt() % numSounds + 1;
-			}
+            while (prevSoundNum == soundNumber) {
+                soundNumber = mt() % numSounds + 1;
+            }
         }
 
-		prevSoundNum = soundNumber;
+        prevSoundNum = soundNumber;
 
         file = fmt::format("snd_txtten{}", soundNumber);
     }

src/FLAlertLayer.hpp

@@ -11,7 +11,6 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 		bool noShadow = false;
 		bool doneRolling = false;
 		bool rolledPage = false;
-		bool playedSound = false;
 		bool done = false;
 		bool dontRestrictWidth = Mod::get()->getSettingValue<bool>("dontRestrictWidth");
 		bool disableClickToProgress = Mod::get()->getSettingValue<bool>("disableClickToProgress");
@@ -26,6 +25,8 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 		int btnSelected = 0;
 		int dialogCount = 0;
 		int prevSoundNum = 200;
+		int soundRate = 2;
+		int soundTimer = 0;
 		CCMenuItemSpriteExtra* btn1;
 		CCMenuItemSpriteExtra* btn2;
 		CCNode* textAreaClippingNode;
@@ -38,14 +39,15 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 		ImageNode* imageNode;
 		DialogLayer* dialogLayer;
 		FMOD::System* system = FMODAudioEngine::sharedEngine()->m_system;
-		FMOD::Channel* channel;
-		FMOD::Sound* sound;
+		FMOD::Channel* channel = nullptr;
+		FMOD::Sound* sound = nullptr;
 		std::vector<std::string> characterSpriteNames;
 		std::vector<std::string> titles;
 		std::string text = "";
 		std::string textSound = Mod::get()->getSettingValue<std::string>("textSound");
 		std::unordered_map<std::string, std::string> nameToFile;
 		std::unordered_map<std::string, std::string_view> nameToSound;
+		std::unordered_map<std::string, int> nameToSoundRate;
 	};
 	void animateBG(float);
 	void changeBG();
@@ -58,6 +60,7 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 	void changeLook();
 	void decideToBlockKeys();
 	void show() override;
+	void initSoundRate();
 	void initMaps();
 	bool init(FLAlertLayerProtocol*, char const*, gd::string, char const*, char const*, float, bool, float, float);
 	void rollText(float);