Skip to content

Commit

Permalink
Merge pull request #31726 from ZhilkinSerg/obsolete-recipes
Browse files Browse the repository at this point in the history 
Suppress warnings when loading old save with obsolete recipe list
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored Jun 24, 2019
2 parents d5e1351 + 435b490 commit f26f75a
Show file tree
Hide file tree
Showing 2 changed files with 1,789 additions and 215 deletions.
215 changes: 0 additions & 215 deletions data/json/recipes/recipe_food.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3034,36 +3034,6 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "pinecone", 1 ] ] ]
},
{
"type": "recipe",
"result": "peanut_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "peanut", 1 ] ] ]
},
{
"type": "recipe",
"result": "walnut_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "walnut", 1 ] ] ]
},
{
"type": "recipe",
"result": "walnut_roasted",
Expand Down Expand Up @@ -3109,21 +3079,6 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "raw_edamame", 1 ] ] ]
},
{
"type": "recipe",
"result": "pecan_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "pecan", 1 ] ] ]
},
{
"type": "recipe",
"result": "pecan_roasted",
Expand All @@ -3139,21 +3094,6 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "pecan_unshelled", 1 ] ] ]
},
{
"type": "recipe",
"result": "pistachio_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "pistachio", 1 ] ] ]
},
{
"type": "recipe",
"result": "pistachio_roasted",
Expand All @@ -3169,21 +3109,6 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "pistachio_unshelled", 1 ] ] ]
},
{
"type": "recipe",
"result": "almond_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "almond", 1 ] ] ]
},
{
"type": "recipe",
"result": "almond_roasted",
Expand All @@ -3199,21 +3124,6 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "almond_unshelled", 1 ] ] ]
},
{
"type": "recipe",
"result": "chestnut_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "chestnut", 1 ] ] ]
},
{
"type": "recipe",
"result": "chestnut_roasted",
Expand All @@ -3229,21 +3139,6 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "chestnut_unshelled", 1 ] ] ]
},
{
"type": "recipe",
"result": "hazelnut_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "hazelnut", 1 ] ] ]
},
{
"type": "recipe",
"result": "hazelnut_roasted",
Expand Down Expand Up @@ -3274,21 +3169,6 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "acorns", 1 ] ] ]
},
{
"type": "recipe",
"result": "hickory_nut_unshelled",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "survival",
"difficulty": 1,
"charges": 1,
"time": "6 m",
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "hickory_nut", 1 ] ] ]
},
{
"type": "recipe",
"result": "hickory_nut_roasted",
Expand Down Expand Up @@ -4708,25 +4588,6 @@
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 2 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "bag_meat_vac",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 4,
"time": "20 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
"components": [
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "bag_plastic", 1 ] ],
[ [ "meat", 1 ] ],
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 2 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "salted_fish",
Expand All @@ -4748,25 +4609,6 @@
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "bag_fish_vac",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 4,
"time": "20 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
"components": [
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "bag_plastic", 1 ] ],
[ [ "fish", 1 ] ],
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "hflesh_salted",
Expand All @@ -4788,25 +4630,6 @@
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 2 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "bag_hflesh_vac",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 4,
"time": "20 m",
"book_learn": [ [ "cookbook_human", 4 ] ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
"components": [
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "bag_plastic", 1 ] ],
[ [ "human_flesh", 1 ] ],
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 2 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "veggy_salted",
Expand All @@ -4828,25 +4651,6 @@
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 2 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "bag_veggy_vac",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"difficulty": 4,
"time": "20 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
"components": [
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "bag_plastic", 1 ] ],
[ [ "mushroom", 1 ], [ "veggy_any_uncooked", 1, "LIST" ] ],
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 2 ], [ "chem_saltpetre", 1 ] ]
]
},
{
"type": "recipe",
"result": "apple_sugar",
Expand All @@ -4867,25 +4671,6 @@
[ [ "sugar", 8 ] ]
]
},
{
"type": "recipe",
"result": "bag_apple_vac",
"obsolete": true,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"difficulty": 4,
"time": "20 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "vac_sealer", 5 ], [ "makeshift_sealer", 10 ] ] ],
"components": [
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "bag_plastic", 1 ] ],
[ [ "sweet_fruit", 1, "LIST" ] ],
[ [ "sugar", 2 ] ]
]
},
{
"type": "recipe",
"result": "kompot",
Expand Down
Loading

0 comments on commit f26f75a

Please sign in to comment.