From 48c15f324bd056a3a1d6a239167d0ba6d9f1c611 Mon Sep 17 00:00:00 2001 From: tastytea Date: Mon, 22 Jan 2018 06:25:56 +0100 Subject: [PATCH] added ingredients, more vegetables in recipe --- CMakeLists.txt | 2 +- README.md | 2 +- ingredients.json | 6 ++++-- src/soupbot.cpp | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a05699d..7d8f8a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.7) include(GNUInstallDirs) project (soupbot - VERSION 0.2 + VERSION 0.2.1 LANGUAGES CXX ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall") diff --git a/README.md b/README.md index 1762720..323a732 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ * C++ compiler (tested: gcc 6.4) * [cmake](https://cmake.org/) (tested: 3.9.6) * [boost](http://www.boost.org/) (tested: 1.63.0) - * [mastodon-cpp](https://github.com/tastytea/mastodon-cpp) (at least: 0.1.4) + * [mastodon-cpp](https://github.com/tastytea/mastodon-cpp) (at least: 0.1.5) ## Get sourcecode diff --git a/ingredients.json b/ingredients.json index c6cd34e..992e15e 100644 --- a/ingredients.json +++ b/ingredients.json @@ -33,7 +33,8 @@ "mangel", "turnip", "maize", - "sweet potatoes" + "sweet potatoes", + "pumpkin" ], "spices": [ @@ -58,7 +59,8 @@ "allspice", "cumin", "curcuma", - "coriander" + "coriander", + "parsley" ], "fruits": [ diff --git a/src/soupbot.cpp b/src/soupbot.cpp index dbd535b..d0626bb 100644 --- a/src/soupbot.cpp +++ b/src/soupbot.cpp @@ -125,10 +125,14 @@ int main(int argc, char *argv[]) string toot = "Todays #soup is made of:\n\n"; toot += "1 part " + get_ingredient(vegetables); + if (dice() > 0) + toot += ",\n1 part " + get_ingredient(vegetables); if (dice() > 0) toot += ",\n1 part " + get_ingredient(vegetables); if (dice() > 1) toot += ",\n1 part " + get_ingredient(vegetables); + if (dice() > 2) + toot += ",\n1 part " + get_ingredient(vegetables); if (dice() > 1) toot += ",\na few " + get_ingredient(fruits);