From 5d2fa1bd35e4239d2b02143245dd9a8fa772b872 Mon Sep 17 00:00:00 2001 From: anothersimulacrum <42699974+anothersimulacrum@users.noreply.github.com> Date: Tue, 11 Aug 2020 12:39:05 -0700 Subject: [PATCH] Make exertion levels mandatory Prevent potential unintended behavior and remove the hacks necessary for automation - make all recipes specify an activity level. --- src/recipe.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/recipe.cpp b/src/recipe.cpp index bbf86cf31cbf7..14608f164b681 100644 --- a/src/recipe.cpp +++ b/src/recipe.cpp @@ -219,12 +219,7 @@ void recipe::load( const JsonObject &jo, const std::string &src ) } // Mandatory: This recipe's exertion level - // TODO: Make this mandatory, no default or 'fake' exception - std::string exert = jo.get_string( "activity_level", "MODERATE_EXERCISE" ); - // For making scripting that needs to be broken up over multiple PRs easier - if( exert == "fake" ) { - exert = "MODERATE_EXERCISE"; - } + std::string exert = jo.get_string( "activity_level" ); const auto it = activity_levels.find( exert ); if( it == activity_levels.end() ) { jo.throw_error( string_format( "Invalid activity level %s", exert ), "activity_level" );