diff --git a/changelog.md b/changelog.md index acfdf75..110be2f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # WholesomeEndTexts Changelog ## v1.1.3 -- Android support is being held together by mere shoelaces. +- Finally worked around how to play nice with Coco2D's tendency to ignore text alignment with multi-line quotes on Android. As such, quotes are no longer forcibly downscaled. If your `bigFont.fnt` is somehow monospaced, that's on you. ## v1.1.2 - Futureproofing the mod against unexpected `m_fields` behavior between Geode versions. Also raised the minimum Geode version requirement. ## v1.1.1 diff --git a/resources/technoblade.txt b/resources/technoblade.txt index 210c001..a3a1da5 100644 --- a/resources/technoblade.txt +++ b/resources/technoblade.txt @@ -1,20 +1,20 @@ -Skyblock teaches us that no matter how ridiculous the odds may seem, within us resides the power to overcome these challenges and achieve something beautiful. And one day, we'll look back at where we started, and be amazed by how far we've come. -WE WIN THESE! -Technoblade never dies! -I'M SO GOOD AT VIDEO GAMES!!! -I can tryhard any game. -Stay in school, kids. It makes you better at PvP. -For my part, I've realized that rank number 1 isn't an achievement. It's a prison which forces you to dedicate your life to defending a temporary title. -alright guys if my mic is muted say canada -All part of my master plan! -For reference, it took me three attempts to put on my shirt. -one of us, one of us, one of us, one of us! -I understand now that it is only with a worthy rival that one can reach their fullest potential. -Most opportunities are created by luck. It takes skill to grasp those opportunities and turn it into success. -As you can see, my FPS is around 18 or so, which means we can definitely take this further. -First try, part two! -And now we're gonna win video games... with the power of friendship! And also fireballs. -All right, you know what? You tried. I'll give you that. -You see, back in high school when I didn't have a huge ego, a lesbian referred to me as 'actually pretty funny', and my ego has been coastin' ever since. -YEAH! ANYTHING IS POSSIBLE! THE SKY'S THE LIMIT! YOU CAN ACHIEVE ANYTHING! -If you wish to defeat me, train for another 100 years. \ No newline at end of file +''Skyblock teaches us that no matter how ridiculous the odds may seem, within us resides the power to overcome these challenges and achieve something beautiful. And one day, we'll look back at where we started, and be amazed by how far we've come." +''WE WIN THESE!" +''Technoblade never dies!" +''I'M SO GOOD AT VIDEO GAMES!!!" +''I can tryhard any game." +''Stay in school, kids. It makes you better at PvP." +''For my part, I've realized that rank number 1 isn't an achievement. It's a prison which forces you to dedicate your life to defending a temporary title." +''alright guys if my mic is muted say canada" +''All part of my master plan!" +''For reference, it took me three attempts to put on my shirt." +''one of us, one of us, one of us, one of us!" +''I understand now that it is only with a worthy rival that one can reach their fullest potential." +''Most opportunities are created by luck. It takes skill to grasp those opportunities and turn it into success." +''As you can see, my FPS is around 18 or so, which means we can definitely take this further." +''First try, part two!" +''And now we're gonna win video games... with the power of friendship! And also fireballs." +''All right, you know what? You tried. I'll give you that." +''You see, back in high school when I didn't have a huge ego, a lesbian referred to me as 'actually pretty funny', and my ego has been coastin' ever since." +''YEAH! ANYTHING IS POSSIBLE! THE SKY'S THE LIMIT! YOU CAN ACHIEVE ANYTHING!" +''If you wish to defeat me, train for another 100 years." \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index e3a50c0..5b8ae5e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,7 +34,7 @@ float compactEndscreenFallbackPosition = CCDirector::get()->getWinSize().width * std::ifstream file(pathRogers); std::string technoblade; while (std::getline(file, technoblade)) { - quotes.push_back(fmt::format("''{}\"", technoblade)); + quotes.push_back(technoblade); } // technically i can write two one-time use boolean variables to allow people to toggle these things on and off as they please without the quotes adding themselves multiple times into the vector, but i'd rather add the "restart required" barrier just to be extra safe } @@ -268,10 +268,6 @@ class $modify(MyEndLevelLayer, EndLevelLayer) { if (strcmp("BELIEVE", randomString) == 0) { scale = 1.5f; } else if (strcmp("endTextLabel->setString(randomString.c_str(), true);", randomString) == 0) { scale = 0.4f;} else if (scale > Mod::get()->getSettingValue("maxScale")) { scale = Mod::get()->getSettingValue("maxScale"); } - // #ifdef GEODE_IS_MOBILE - // std::regex quotePattern("\".+\""); - // if (std::regex_match(std::string(randomString), quotePattern)) { scale = scale * .5f; } - // #endif endTextLabel->setScale(scale); endTextLabel->setWidth(336.f); // width of end screen minus 20px