From c1cc06fa5b3ae49b7cdadf0af439f5858d8483eb Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 2 Mar 2018 16:21:18 -0500 Subject: Added "YOU GOT A MOON!" overlay to image The font used is MOON GET! (https://maxigamer.deviantart.com/art/Font-MOON-GET-A-Super-Mario-Odyssey-Typeface-732847350). The name of the achievement is also printed in a config-defined font. The correct moon image is also added to the output. Fixed issue where images wouldn't be stretched to conform to a 16:9 ratio. The bot will no longer generate multi moons. --- lunatic.cpp | 72 ++++++++++++++++++++------------------------------------ res/overlay.png | Bin 0 -> 17715 bytes res/overlay.psd | Bin 0 -> 180381 bytes 3 files changed, 26 insertions(+), 46 deletions(-) create mode 100644 res/overlay.png create mode 100644 res/overlay.psd diff --git a/lunatic.cpp b/lunatic.cpp index ca3140a..497c648 100644 --- a/lunatic.cpp +++ b/lunatic.cpp @@ -43,65 +43,45 @@ int main(int argc, char** argv) std::string imagePath = config["images"].as() + "/" + imageName; + Magick::Image overlay; + overlay.read("res/overlay.png"); + + Magick::Image moonColor; + moonColor.read("res/" + ach.color + ".png"); try { + // Start with the game image Magick::Image image; image.read(imagePath); - image.transform("1600x900"); - image.scale("160x90"); + + // Stretch and pixelate it + image.transform("1600x900!"); + image.scale("80x45"); image.scale("1600x900"); + + // Add the text and moon image from Odyssey + image.composite(overlay, 0, 0, Magick::OverCompositeOp); + image.composite(moonColor, 672, 85, Magick::OverCompositeOp); + + // Add the name of the achievement + image.fontPointsize(36); + image.fillColor("white"); + image.font("@" + config["font"].as()); + image.annotate( + ach.title, + Magick::Geometry(0, 0, 0, 672), + Magick::GravityType::NorthGravity); + + // Output for debug image.magick("png"); image.write("output.png"); } catch (const Magick::WarningCoder& ex) { // Ok } - - - - - - - - - - - - - /* - - // Reload achievements list every time in case it has been updated - std::vector achievements; - std::ifstream datafile(config["achievements"].as()); - if (!datafile.is_open()) - { - std::cout << "Could not find achievements file." << std::endl; - return 1; - } - - std::string line; - while (getline(datafile, line)) - { - if (line.back() == '\r') - { - line.pop_back(); - } - - achievements.push_back(line); - } - - std::uniform_int_distribution dist(0, achievements.size() - 1); - std::string achievement = achievements[dist(rng)];*/ - - std::string header; - if (std::bernoulli_distribution(1.0 / 50.0)(rng)) - { - header = "YOU GOT A MULTI MOON!"; - } else { - header = "YOU GOT A MOON!"; - } + std::string header = "YOU GOT A MOON!"; std::string action = header + "\n" + ach.title; action.resize(140); diff --git a/res/overlay.png b/res/overlay.png new file mode 100644 index 0000000..79d863b Binary files /dev/null and b/res/overlay.png differ diff --git a/res/overlay.psd b/res/overlay.psd new file mode 100644 index 0000000..2f7808b Binary files /dev/null and b/res/overlay.psd differ -- cgit 1.4.1