Changing vacuum-packed food to work the same as canned food

[lancewf]

📋 Todo

• Add migration
• remove old items
• Clean up tiles with multiple plastic_bag_vac
• combine fish_salted and salted_fish
• test migration

How to use

Recipes salted meat slice, salted fish, salted simpleton slices, salted veggy chunk, and fruit slice are vacuum-packed and do not spoil until unloaded or eatten.

Summary

SUMMARY: Bugfixes "Changing vacuum-packed food to work the same as canned foods"

Purpose of change

The crafting and eating of vacuum-packed foods should work the same as canned and jarred foods. Currently, vacuum-packed foods do not show up in the eating menu (pressing 'E'.) One has to first unseal the item to eat it. But canned items do show up in the eat menu and when eat them they automatically unseal the item. This change creates the same behavior for vacuum-packed food.

With these changes and this PR #26553 this fixes the problem where rotten food when vacuum-packed turns fresh.

Describe the solution

Describe alternatives you've considered

Additional context

migration items
bag_fish_vac -> plastic_bag_vac with fish_salted
bag_apple_vac -> plastic_bag_vac with apple_sugar
bag_hflesh_vac -> plastic_bag_vac with hflesh_salted
bag_meat_vac -> plastic_bag_vac with meat_salted
bag_veggy_vac -> plastic_bag_vac with veggy_salted

fish_vac -> fish_salted
apple_vac -> apple_sugar
hflesh_vac -> hflesh_salted
meat_vac -> meat_salted
veggy_vac -> veggy_salted

Testing

• Create a character on master with vacuum-packed meat, fish, veggies, and fruit. Then update to branch and ensure no problems.
• On this branch ensure a character can create vacuum-packed meat, fish, veggies, and fruit.
• Ensure that vacuum-packed meat, fish, veggies, and fruit do not spoil

Not Tested

• All the tileset updates.

Migration Warning!!!

When migrating vacuum-packed food it will become unsealed and will spoil in the 2 to 3 days. The reason for this is because we can not migrate an item to be in a container.

[Zetsukaze]

Yes please

[Night-Pryanik]

Suggested change

	"description": "This is a bag of vacuum packed food",
	"description": "This is a bag of vacuum-packed food.",

[Night-Pryanik]

Plastic?

[lancewf]

Good catch. I copied this from the tin can.

[Night-Pryanik]

This is the weight of filled bag. Empty it should weight much less.

[Night-Pryanik]

Too much.

[lancewf]

I made it the same price as a plastic bag

[Night-Pryanik]

Vacuum-packed bag?

[lancewf]

Adding bag does look correct.

[lancewf]

[lancewf]

Update this to match the removed fish_vac item.

[lancewf]

When migrating to this branch's changes the below errors will be seen.

There are 5 of these one for bag_meat_vac, bag_veggy_vac, bag_fruit_vac, bag_fish_vac, bag_hflesh_vac. All these recipes have been removed and the error does not affect the game.

Is this acceptable or is there a way to remove recipes in a migration?

[kevingranade]

The current status quo is that you get the error once and then never again since it also silently fails to save.
It would be a nice-to-have for a flag that would still make the recipe go away but would silence the warning, but that doesn't exist right now.

I think something like this would do it:
In src/recipe_dictionary.cpp

template<>
const recipe &string_id<recipe>::obj() const
{
    const auto iter = recipe_dict.recipes.find( *this );
    if( iter != recipe_dict.recipes.end() ) {
        if( iter->second.obsolete ) {
            return null_recipe;
        }
        return iter->second;
    }
    if( *this != NULL_ID() ) {
        debugmsg( "invalid recipe id \"%s\"", c_str() );
    }
    return null_recipe;
}

In src/recipe.cpp

void recipe::load( JsonObject &jo, const std::string &src )
{
...
    if( jo.has_bool( "obsolete" ) ) {
        assign( jo, "obsolete", obsolete );
    }

In src/recipe.h

class recipe {
...
    bool obsolete = false;

[lancewf]

Thank you @kevingranade. I added your suggestion in this (cb8ad29) commit. I tested it out and I do not see any warnings or the old recipes.

[lancewf]

Mark these recipes as obsolete instead of deleting them so they do not display the warning when a user migrates to this version. These recipes should later be deleted.