From d0a5ecc020efa2455ec9b6e82ea3030c7cbb9fe6 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 24 Aug 2024 14:45:13 +0200 Subject: [PATCH] destroy --- .../Agriculture_Forage_Excavation/forage.json | 3 +-- data/json/itemgroups/Labs/labs_mutagen.json | 1 - data/json/itemgroups/misc.json | 10 +++++++ data/json/items/comestibles/egg.json | 20 -------------- .../migration_items.json | 5 ++++ data/json/recipes/chem/mutagens.json | 2 +- data/json/recipes/food/bread.json | 2 +- data/json/recipes/food/dry.json | 4 +-- data/json/recipes/food/frozen.json | 2 +- data/json/recipes/food/offal_dishes.json | 2 +- data/json/recipes/recipe_food.json | 26 +++++++++---------- .../json/requirements/cooking_components.json | 12 ++++----- 12 files changed, 41 insertions(+), 48 deletions(-) diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json index 4a63031440d78..d8c7d099551f6 100644 --- a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json +++ b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json @@ -8,7 +8,6 @@ { "item": "plant_stalk", "prob": 20, "count": [ 1, 3 ] }, { "group": "any_wild_egg", "prob": 15, "count": [ 2, 5 ] }, { "item": "groundnut", "prob": 5, "count": [ 1, 8 ] }, - { "item": "egg_reptile", "prob": 5, "count": [ 2, 5 ] }, { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] }, { "item": "wild_garlic", "prob": 5, "count": [ 2, 7 ] }, { "item": "rhubarb", "prob": 5, "count": [ 2, 5 ] }, @@ -34,7 +33,7 @@ { "item": "groundnut", "prob": 3, "count": [ 1, 6 ] }, { "group": "forage_mushroom", "prob": 25 }, { "group": "any_wild_egg", "prob": 5, "count": [ 2, 5 ] }, - { "item": "egg_reptile", "prob": 5, "count": [ 1, 3 ] }, + { "group": "egg_reptile_forest", "prob": 5, "count": [ 2, 5 ] }, { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] }, { "item": "wild_herbs", "prob": 20, "count": 20 }, { "item": "buckwheat", "prob": 5, "count": [ 2, 8 ] }, diff --git a/data/json/itemgroups/Labs/labs_mutagen.json b/data/json/itemgroups/Labs/labs_mutagen.json index a3d17f27b9ffe..82a52cd0df609 100644 --- a/data/json/itemgroups/Labs/labs_mutagen.json +++ b/data/json/itemgroups/Labs/labs_mutagen.json @@ -64,7 +64,6 @@ { "item": "slime_sample", "prob": 40, "count": [ 1, 3 ] }, { "item": "bird_sample", "prob": 40, "count": [ 1, 3 ] }, { "item": "crustacean_sample", "prob": 40, "count": [ 1, 3 ] }, - { "item": "egg_reptile", "prob": 20, "count": [ 1, 12 ] }, { "item": "water_clean", "container-item": "bottle_plastic", "prob": 65, "count": [ 1, 3 ], "sealed": false }, { "item": "water_mineral", "container-item": "bottle_plastic", "prob": 35, "count": [ 1, 2 ], "sealed": false } ] diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 390ddfcd7b748..d8ba423bd3e74 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -357,5 +357,15 @@ "type": "item_group", "id": "butterfly_net_any", "items": [ { "item": "butterfly_net_collapsible", "prob": 4 }, { "item": "butterfly_net_makeshift", "prob": 6 } ] + }, + { + "type": "item_group", + "id": "egg_reptile_forest", + "//": "Any reptile eggs that make sense to find in random underbrush, assuming that it's a fair distance away from water.", + "items": [ + { "item": "egg_turtle_painted", "prob": 5 }, + { "item": "egg_wormsnake", "prob": 2 }, + { "item": "egg_skink_fivelined", "prob": 2 } + ] } ] diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 5686966f3c7a8..77ce17bd4aa40 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -185,26 +185,6 @@ "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_PHEASANT" }, - { - "type": "COMESTIBLE", - "id": "egg_reptile", - "name": { "str": "reptile egg" }, - "weight": "60 g", - "color": "white", - "spoils_in": "28 days", - "comestible_type": "FOOD", - "symbol": "o", - "quench": 3, - "calories": 87, - "description": "An egg laid by one of reptile species found in New England.", - "price": "62 cent", - "price_postapoc": "12 cent", - "material": [ "egg" ], - "volume": "62 ml", - "fun": -12, - "flags": [ "RAW" ], - "vitamins": [ [ "egg_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "egg_wormsnake", diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index ed9a59ee1d3fb..2265d91bf35a7 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -1843,6 +1843,11 @@ "type": "MIGRATION", "replace": "egg_goose" }, + { + "id": "egg_reptile", + "type": "MIGRATION", + "replace": "egg_turtle_painted" + }, { "id": "ar_pistol", "type": "MIGRATION", diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index b696b60edd9b5..c4c2b07ce7be4 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -891,7 +891,7 @@ "components": [ [ [ "mutagen", 1 ] ], [ [ "lizard_sample", 1 ] ], - [ [ "egg_reptile", 1 ] ], + [ [ "eggs_reptile", 1, "LIST" ] ], [ [ "bfipowder", 4 ], [ "lizard_sample", 1 ] ] ], "flags": [ "SECRET" ] diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 3b67dfa2dd949..5ab59be063572 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -202,7 +202,7 @@ "//": "bread: 1u, oil: 1u, egg: 3u", "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_frying" } ], "components": [ - [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ], [ [ "bread_sandwich", 1, "LIST" ], [ "toast", 1 ], [ "buttered_toast", 1 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] ] diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index f9f30264cf0a1..a8ce69adc571d 100644 --- a/data/json/recipes/food/dry.json +++ b/data/json/recipes/food/dry.json @@ -755,7 +755,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 55, "LIST" ] ] ], "//": "by weight of unfertilized bird egg 550g of stuff", - "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "egg_reptile", 12 ], [ "eggs_invert", 1, "LIST" ] ] ] + "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "eggs_reptile", 12, "LIST" ], [ "eggs_invert", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -772,7 +772,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 55, "LIST" ] ], [ [ "surface_heat", 36, "LIST" ] ] ], "//": "by weight of unfertilized bird egg 550g of stuff plus 36u heat for the eggs (standard is 3 per egg)", - "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "egg_reptile", 12 ], [ "eggs_invert", 1, "LIST" ] ] ] + "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "eggs_reptile", 12, "LIST" ], [ "eggs_invert", 1, "LIST" ] ] ] }, { "result": "protein_powder", diff --git a/data/json/recipes/food/frozen.json b/data/json/recipes/food/frozen.json index 71c21bd5f7d1b..2b57a45e6127f 100644 --- a/data/json/recipes/food/frozen.json +++ b/data/json/recipes/food/frozen.json @@ -512,7 +512,7 @@ [ "blackberries", 1 ] ], [ [ "sugar", 10 ], [ "artificial_sweetener", 10 ] ], - [ [ "powder_eggs", 5 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ] + [ [ "powder_eggs", 5 ], [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ] ] }, { diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index b61ecec7c464e..81091e8fc96a5 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -216,7 +216,7 @@ [ "veggy_any", 2, "LIST" ], [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], - [ "egg_reptile", 2 ], + [ "eggs_reptile", 2, "LIST" ], [ "mushroom_cooked", 2 ], [ "morel_cooked", 2 ], [ "mushroom", 2 ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 23c3036a3be40..a859ad9c6f68c 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -5113,7 +5113,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil", - "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ] ], + "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ] ], "charges": 2 }, { @@ -5131,7 +5131,7 @@ "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "salt", 2 ], [ "seasoning_salt", 2 ], [ "pepper", 4 ] ] ], @@ -5152,7 +5152,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "//": "6u for the eggs, 1u for the oil, 2u for the veggy, 1u for the cheese", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "mushroom", 1 ], @@ -5184,7 +5184,7 @@ "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil. no energy is spent cooking the bread, that's already done.", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "condiment", 2, "LIST" ] ] @@ -5220,7 +5220,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil, 3u for the cheese and veggy. no energy is spent cooking the bread, that's already done.", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "mushroom", 1 ], @@ -5254,7 +5254,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] ] @@ -5274,7 +5274,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ], [ [ "veggy_any", 2, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] @@ -5295,7 +5295,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ], [ [ "veggy_any", 2, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ] ], @@ -5317,7 +5317,7 @@ "tools": [ [ [ "water_boiling_heat", 1, "LIST" ] ], [ [ "water", -1 ], [ "water_clean", -1 ] ] ], "//": "this is technically cheating on energy, as you need to boil the water longer to really cook the egg.", "//1": "However, water that boiled an egg in it doesn't get contaminated and you'd keep putting eggs into the same boiling water, so this recipe uses water as a tool and has lentient energy use.", - "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ] ] + "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -5333,7 +5333,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "//": "6u for the egg, meat not needed since it's just diced up and mixed in", - "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], [ [ "meat_cooked", 1, "LIST" ] ] ], + "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ] ] ], "charges": 3 }, { @@ -7510,7 +7510,7 @@ [ "milk_powder", 1 ], [ "con_milk", 1 ] ], - [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "sugar", 2 ], [ "artificial_sweetener", 2 ] ], [ [ "any_butter_or_oil", 8, "LIST" ] ], [ [ "water_clean", 1 ] ] @@ -8329,7 +8329,7 @@ "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "//": "3u for egg, 2u for milk", "components": [ - [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ], [ "powder_eggs", 1 ] ], + [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ], [ "powder_eggs", 1 ] ], [ [ "milk_standard_raw", 2, "LIST" ], [ "lf_milk_standard", 2, "LIST" ], [ "con_milk", 2 ] ], [ [ "sugar", 4 ], [ "artificial_sweetener", 4 ] ], [ [ "cinnamon", 2 ] ] @@ -8350,7 +8350,7 @@ "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "//": "3u for egg, 2u for milk, 1u for alcohol/sugar", "components": [ - [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ], [ "powder_eggs", 1 ] ], + [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ], [ "powder_eggs", 1 ] ], [ [ "milk_standard_raw", 2, "LIST" ], [ "lf_milk_standard", 2, "LIST" ], [ "con_milk", 2 ] ], [ [ "sugar", 4 ], [ "artificial_sweetener", 4 ] ], [ [ "hard_liquor_chem", 1, "LIST" ] ], diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index bf9dfe89a12f7..4da99e68dd10d 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -678,7 +678,7 @@ [ "sauerkraut", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "can_beans", 1 ], [ "beans_cooked", 1 ], [ "spaghetti_raw", 1 ], @@ -742,7 +742,7 @@ [ "crackers", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "dry_beans", 1 ], [ "raw_beans", 1 ], [ "dry_lentils", 1 ], @@ -807,7 +807,7 @@ [ "crackers", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "dry_beans", 1 ], [ "raw_beans", 1 ], [ "dry_lentils", 1 ], @@ -897,7 +897,7 @@ "type": "requirement", "components": [ [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "broth_meat", 1 ], [ "pine_tea", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ], [ [ "veggy_wild", 1 ], [ "veggy", 1 ], @@ -1261,7 +1261,7 @@ "id": "broth_meat_ingredients", "type": "requirement", "components": [ - [ [ "meat_nofish", 1, "LIST" ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "meat_nofish", 1, "LIST" ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ], [ [ "hot_sauce", 1 ], [ "seasoning_italian", 4 ], @@ -1289,7 +1289,7 @@ [ "sauerkraut", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "dry_beans", 1 ], [ "raw_beans", 1 ], [ "dry_rice", 1 ],