added a nice setting

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.2.4)
+project(DeltaruneTextboxes VERSION 1.2.6)
 
 add_library(${PROJECT_NAME} SHARED
     src/FLAlertLayer.cpp

changelog.md

@@ -1,3 +1,7 @@
+### v1.2.6
+- Reenabled grayscale dialog portraits on mac
+- Added the option to switch between grayscale and colored dialog portraits
+
 ### v1.2.5
 - Update to Geode 4.0.0-beta.1
 

mod.json

@@ -8,7 +8,7 @@
     },
     "id": "timestepyt.deltarune_textboxes",
     "name": "Deltarune Textboxes",
-    "version": "v1.2.5",
+    "version": "v1.2.6",
     "developer": "TimeStepYT",
     "description": "Makes Popups look like Deltarune",
     "links": {
@@ -101,6 +101,12 @@
             "description": "Disables <cy>clicking</c> to progress textboxes",
             "platforms": ["win", "mac"]
         },
+        "coloredPortraits": {
+            "name": "Colored Portraits",
+            "type": "bool",
+            "default": false,
+            "description": "<cr>Disables</c> the <cy>grayscale</c> effect on the <cj>dialog portraits</c>."
+        },
         "noGradientOverlay": {
             "name": "Disable gradient",
             "type": "bool",

src/DialogLayer.cpp

@@ -26,22 +26,23 @@ bool DeltaruneDialogLayer::init(DialogObject* dialogObject, CCArray* objects, in
 	auto alert = static_cast<DeltaruneAlertLayer*>(unmodifiedAlert);
 
 	if (dialogObject) {
+		CCSprite* sprite;
 		auto texture = m_characterSprite->getTexture();
-#ifdef COLORED_SPRITES
-		auto sprite = CCSprite::createWithTexture(texture);
-#else
-		auto sprite = CCSpriteGrayscale::createWithTexture(texture);
-#endif
+
+		if (Mod::get()->getSettingValue<bool>("coloredPortraits"))
+			sprite = CCSprite::createWithTexture(texture);
+		else sprite = CCSpriteGrayscale::createWithTexture(texture);
+
 		alert->m_fields->characterSprite = sprite;
 	}
 	else {
 		auto firstObj = static_cast<DialogObject*>(objects->objectAtIndex(0));
 		std::string textureName = fmt::format("dialogIcon_{:03}.png", firstObj->m_characterFrame);
-#ifdef COLORED_SPRITES
-		alert->m_fields->characterSprite = CCSprite::create(textureName.c_str());
-#else
-		alert->m_fields->characterSprite = CCSpriteGrayscale::create(textureName);
-#endif
+
+		if (Mod::get()->getSettingValue<bool>("coloredPortraits"))
+			alert->m_fields->characterSprite = CCSprite::create(textureName.c_str());
+		else alert->m_fields->characterSprite = CCSpriteGrayscale::create(textureName);
+
 		for (int i = 0; i < objects->count(); i++) {
 			auto diaObj = static_cast<DialogObject*>(objects->objectAtIndex(i));
 			textureName = fmt::format("dialogIcon_{:03}.png", diaObj->m_characterFrame);

src/FLAlertLayer.cpp

@@ -469,18 +469,25 @@ void DeltaruneAlertLayer::progressText() {
 	if (progressDialog) {
 		dialogCount++;
 		auto& spriteName = characters[dialogCount];
-#ifdef COLORED_SPRITES
-		auto prevChar = (CCSprite*) m_mainLayer->getChildByID("character-sprite"_spr);
-		auto newChar = CCSprite::create(spriteName.c_str());
-#else
-		auto prevChar = (CCSpriteGrayscale*) m_mainLayer->getChildByID("character-sprite"_spr);
-		auto newChar = CCSpriteGrayscale::create(spriteName);
-#endif
-		newChar->setPosition(prevChar->getPosition());
-		newChar->setZOrder(prevChar->getZOrder());
-		m_fields->characterSprite = newChar;
-		newChar->setID("character-sprite"_spr);
-		m_mainLayer->addChild(newChar);
+		if (Mod::get()->getSettingValue<bool>("coloredPortraits")) {
+			auto prevChar = (CCSprite*) m_mainLayer->getChildByID("character-sprite"_spr);
+			auto newChar = CCSprite::create(spriteName.c_str());
+			newChar->setPosition(prevChar->getPosition());
+			newChar->setZOrder(prevChar->getZOrder());
+			m_fields->characterSprite = newChar;
+			newChar->setID("character-sprite"_spr);
+			m_mainLayer->addChild(newChar);
+		}
+		else {
+			auto prevChar = (CCSpriteGrayscale*) m_mainLayer->getChildByID("character-sprite"_spr);
+			auto newChar = CCSpriteGrayscale::create(spriteName);
+			newChar->setPosition(prevChar->getPosition());
+			newChar->setZOrder(prevChar->getZOrder());
+			m_fields->characterSprite = newChar;
+			newChar->setID("character-sprite"_spr);
+			m_mainLayer->addChild(newChar);
+		}
+
 
 		auto title = m_fields->titles[dialogCount];
 		auto& nameToSound = m_fields->nameToSound;

src/FLAlertLayer.h

@@ -33,11 +33,7 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 		CCNode* bg;
 		CCSprite* heart;
 		CCLabelBMFont* title;
-#ifdef COLORED_SPRITES
 		CCSprite* characterSprite;
-#else
-		CCSpriteGrayscale* characterSprite;
-#endif
 		DialogLayer* dialogLayer;
 		FMOD::System* system = FMODAudioEngine::sharedEngine()->m_system;
 		FMOD::Channel* channel;

src/changeDesign.cpp

@@ -146,6 +146,7 @@ void DeltaruneAlertLayer::changeText() {
 			sound = nameToSound[titleString];
 		else
 			sound = "Default";
+
 		xOffset = m_fields->characterSprite->getContentWidth() + 27 + star->getContentWidth();
 	}
 	star->setPositionX(bg->getPositionX() - screenSize / 2 + xOffset - star->getContentWidth() + 27);

src/include.h

@@ -1,9 +1,5 @@
 #include <Geode/Geode.hpp>
 
-#ifdef GEODE_IS_MACOS
-#define COLORED_SPRITES 1
-#endif
-
 #include <Geode/fmod/fmod.hpp>
 #if !(defined(GEODE_IS_MACOS) || defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
 #include <geode.custom-keybinds/include/Keybinds.hpp>