summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Readme.txt48
-rw-r--r--json/items/comestible/veggy_dishes.json7
-rw-r--r--json/recipes/ammo/40x46mm.json148
-rw-r--r--json/recipes/ammo/40x53mm.json75
-rw-r--r--json/recipes/electronic/other.json38
-rw-r--r--json/recipes/food/canned.json62
-rw-r--r--json/recipes/food/uncategorized.json253
-rw-r--r--json/recipes/other/materials.json18
-rw-r--r--json/recipes/other/medical.json22
-rw-r--r--json/requirements/cooking_components.json2
10 files changed, 56 insertions, 617 deletions
diff --git a/Readme.txt b/Readme.txt
index 1486e44..26a6073 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -1,16 +1,10 @@
--
-BLT, Cheeseburger, Cucumber Sandwich, Fish Soup, and French Toast
-can now be made with brioche.
-
-Hamburgers and Fish Sandwiches could be made with brioche yet these
-comparable sandwiches could not. Also French Toast and Fish Soup
-allowed every other bread.
+blt and sandwich_cucumber now uses bread_sandwich instead of defining certain breads.
--
+Fish Soup and French Toast can now be made with brioche.
-Hamburgers can now be made with lettuce.
-
-Cheeseburgers were able to.
+French Toast and Fish Soup allowed every other bread.
--
@@ -56,11 +50,6 @@ able to use them as well. And supreme is already a veggy dish.
--
-Mexican hot chocolate no longer requires dirty water in addtion to clean water.
-This was just silly.
-
---
-
Peanut Butter can now be preserved.
--
@@ -84,37 +73,6 @@ Chili Con Carne:
Is now a liquid.
If curry is considered a liquid, chili is too.
-
---
-Bone meal:
-Now allows human bones with food processor.
-If it can fit bones from a skeleton brute, it can fit human ones.
-
-
--
Chitin powder:
Now allows biosilicified chitin with mortar and pestle.
-
---
-Wasteland sausages:
-Can now use human stomachs.
-They could already use human flesh, may as well add the human stomachs.
-
---
-Bone Broth:
-Can now use human bones in preserved versions.
-The base one could.
-
----
-40x46mm reloaded:
-Use shot_forming instead of bulltet_forming.
-Use small pistol primer instead of large pistol primer.
-
----
-40x53mm reloaded:
-Use shot_forming instead of bulltet_forming.
-
----
-Light Turret:
-6h ->30m
-It took 12 times as long as the medium turret.
diff --git a/json/items/comestible/veggy_dishes.json b/json/items/comestible/veggy_dishes.json
index 12aeced..af181f8 100644
--- a/json/items/comestible/veggy_dishes.json
+++ b/json/items/comestible/veggy_dishes.json
@@ -2,7 +2,7 @@
{
"type": "COMESTIBLE",
"id": "tofu_stirfry",
- "name": { "str": "tofu stirfry", "str_pl": "tofu stirfry" },
+ "name": { "str_sp": "tofu stirfry" },
"weight": "135 g",
"color": "yellow",
"spoils_in": "4 days",
@@ -13,9 +13,10 @@
"charges": 4,
"description": "A tofu stirfry with rice and a sweet bold flavor sure to be on your mind through these dark days.",
"price": 1200,
- "material": "veggy",
+ "price_postapoc": 200,
+ "material": [ "veggy" ],
"volume": "1 L",
- "flags": [ "EATEN_HOT" ],
+ "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ],
"fun": 12,
"vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "iron", 5 ], [ "vitC", 24 ] ]
},
diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json
deleted file mode 100644
index 35c33d7..0000000
--- a/json/recipes/ammo/40x46mm.json
+++ /dev/null
@@ -1,148 +0,0 @@
-[
- {
- "result": "40x46mm_buckshot_m118",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m118_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
- ]
- },
- {
- "result": "40x46mm_buckshot_m199",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m199_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
- ]
- },
- {
- "result": "40x46mm_slug_m118",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m118_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
- ]
- },
- {
- "result": "40x46mm_slug_m199",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m199_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
- ]
- },
- {
- "result": "40x46mm_flechette_m118",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "combatnail", 70 ] ],
- [ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m118_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
- ]
- },
- {
- "result": "40x46mm_flechette_m199",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "combatnail", 70 ] ],
- [ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m199_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
- ]
- }
-]
diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json
deleted file mode 100644
index 0827c20..0000000
--- a/json/recipes/ammo/40x53mm.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
- {
- "result": "40x53mm_buckshot_m169",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 16 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "gunpowder", 35 ] ],
- [ [ "40x53mm_m169_casing", 1 ] ],
- [ [ "lgrifle_primer", 1 ] ]
- ]
- },
- {
- "result": "40x53mm_slug_m169",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 16 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "gunpowder", 35 ] ],
- [ [ "40x53mm_m169_casing", 1 ] ],
- [ [ "lgrifle_primer", 1 ] ]
- ]
- },
- {
- "result": "40x53mm_flechette_m169",
- "type": "recipe",
- "category": "CC_AMMO",
- "subcategory": "CSC_AMMO_SHOT",
- "skill_used": "fabrication",
- "difficulty": 4,
- "skills_required": [ "launcher", 2 ],
- "time": "10 m",
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
- "charges": 1,
- "reversible": true,
- "using": [ [ "shot_forming", 2 ] ],
- "tools": [ [ [ "swage", -1 ] ] ],
- "qualities": [ { "id": "CUT", "level": 1 } ],
- "components": [
- [ [ "sheet_metal_small", 1 ] ],
- [ [ "paper", 1 ], [ "wax", 1 ] ],
- [ [ "combatnail", 100 ] ],
- [ [ "gunpowder", 35 ] ],
- [ [ "40x53mm_m169_casing", 1 ] ],
- [ [ "lgrifle_primer", 1 ] ]
- ]
- }
-]
diff --git a/json/recipes/electronic/other.json b/json/recipes/electronic/other.json
deleted file mode 100644
index a8d4600..0000000
--- a/json/recipes/electronic/other.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
- {
- "type": "recipe",
- "result": "bot_turret_light",
- "category": "CC_ELECTRONIC",
- "subcategory": "CSC_ELECTRONIC_OTHER",
- "skill_used": "electronics",
- "skills_required": [ [ "mechanics", 6 ], [ "computer", 6 ], [ "fabrication", 6 ] ],
- "difficulty": 7,
- "time": "30 m",
- "reversible": true,
- "decomp_learn": 8,
- "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_robots", 9 ] ],
- "using": [ [ "steel_standard", 1 ], [ "welding_standard", 20 ], [ "soldering_standard", 14 ] ],
- "qualities": [
- { "id": "SCREW", "level": 1 },
- { "id": "SCREW_FINE", "level": 1 },
- { "id": "WRENCH", "level": 2 },
- { "id": "WRENCH_FINE", "level": 1 },
- { "id": "SAW_M", "level": 1 },
- { "id": "SAW_M_FINE", "level": 1 }
- ],
- "components": [
- [ [ "ai_module", 1 ] ],
- [ [ "identification_module", 1 ] ],
- [ [ "targeting_module", 1 ] ],
- [ [ "gun_module", 1 ] ],
- [ [ "camera", 1 ], [ "camera_pro", 1 ], [ "omnicamera", 1 ], [ "sensor_module", 1 ] ],
- [ [ "small_storage_battery", 1 ] ],
- [ [ "power_supply", 1 ] ],
- [ [ "robot_controls", 1 ] ],
- [ [ "ksub2000", 1 ] ],
- [ [ "sheet_metal", 2 ] ],
- [ [ "pipe", 4 ] ],
- [ [ "spring", 2 ] ]
- ]
- }
-]
diff --git a/json/recipes/food/canned.json b/json/recipes/food/canned.json
index 19b19ed..1bc7457 100644
--- a/json/recipes/food/canned.json
+++ b/json/recipes/food/canned.json
@@ -1,65 +1,7 @@
[
{
"type": "recipe",
- "result": "broth_bone",
- "id_suffix": "canned",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_OTHER",
- "skill_used": "cooking",
- "difficulty": 4,
- "time": "24 m",
- "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
- "contained": true,
- "batch_time_factors": [ 80, 5 ],
- "qualities": [
- { "id": "SAW_M", "level": 1 },
- { "id": "HAMMER", "level": 1 },
- { "id": "CUT", "level": 1 },
- { "id": "COOK", "level": 3 }
- ],
- "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
- "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bone", 20 ], [ "bone_human", 20 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
- },
- {
- "type": "recipe",
- "result": "broth_bone",
- "id_suffix": "jarred",
- "byproducts": [ [ "water", 10 ] ],
- "container": "jar_glass_sealed",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_OTHER",
- "skill_used": "cooking",
- "skills_required": [ "mechanics", 1 ],
- "difficulty": 4,
- "time": "1 h",
- "charges": 2,
- "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
- "batch_time_factors": [ 80, 5 ],
- "qualities": [ { "id": "COOK", "level": 3 } ],
- "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
- "components": [ [ [ "jar_glass", 1 ] ], [ [ "bone", 20 ], [ "bone_human", 20 ] ], [ [ "water", 12 ], [ "water_clean", 12 ] ] ]
- },
- {
- "type": "recipe",
- "result": "broth_bone",
- "id_suffix": "jarred_3l",
- "byproducts": [ [ "water", 10 ] ],
- "container": "jar_3l_glass_sealed",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_OTHER",
- "skill_used": "cooking",
- "skills_required": [ "mechanics", 1 ],
- "difficulty": 4,
- "time": "1 h 10 m",
- "charges": 12,
- "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
- "batch_time_factors": [ 80, 5 ],
- "qualities": [ { "id": "COOK", "level": 3 } ],
- "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
- "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "bone", 120 ], [ "bone_human", 120 ] ] ]
- },
- {
- "type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "peanutbutter",
"id_suffix": "jarred",
"container": "jar_glass_sealed",
@@ -81,6 +23,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "peanutbutter_imitation",
"id_suffix": "jarred",
"container": "jar_glass_sealed",
@@ -114,6 +57,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "sauce_pesto",
"id_suffix": "jarred",
"container": "jar_glass_sealed",
diff --git a/json/recipes/food/uncategorized.json b/json/recipes/food/uncategorized.json
index febf340..0a6fa58 100644
--- a/json/recipes/food/uncategorized.json
+++ b/json/recipes/food/uncategorized.json
@@ -1,6 +1,7 @@
[
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "tofu_rice",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_OTHER",
@@ -10,7 +11,6 @@
"autolearn": true,
"qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
- "batch_time_factors": [ 80, 1 ],
"components": [
[ [ "rice_cooked", 1 ] ],
[ [ "tofu", 1 ], [ "dry_tofu", 1 ] ],
@@ -19,6 +19,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "tofu_stirfry",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
@@ -28,7 +29,7 @@
"time": "20 m",
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
- "batch_time_factors": [ 80, 1 ],
+ "batch_time_factors": [ 25, 2 ],
"components": [
[ [ "tofu", 4 ], [ "dry_tofu", 4 ] ],
[ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ],
@@ -40,6 +41,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "meat_stirfry",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
@@ -49,7 +51,7 @@
"time": "20 m",
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
- "batch_time_factors": [ 80, 1 ],
+ "batch_time_factors": [ 25, 2 ],
"components": [
[ [ "meat_red", 4, "LIST" ], [ "dry_meat", 4 ], [ "can_chicken", 4 ] ],
[ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ],
@@ -61,16 +63,17 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "veggy_stirfry",
"category": "CC_FOOD",
- "subcategory": "CSC_FOOD_VEGGI",
+ "subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 3,
"book_learn": [ [ "cookbook_sushi", 3 ] ],
"time": "20 m",
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
- "batch_time_factors": [ 80, 1 ],
+ "batch_time_factors": [ 25, 2 ],
"components": [
[ [ "veggy_any_uncooked", 4, "LIST" ] ],
[ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ],
@@ -82,6 +85,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "beansnrice",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
@@ -89,17 +93,18 @@
"difficulty": 1,
"time": "6 m",
"autolearn": true,
- "batch_time_factors": [ 80, 1 ],
+ "batch_time_factors": [ 82, 4 ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
"components": [
[ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
- [ [ "rice_cooked", 1 ] ],
+ [ [ "dry_rice", 1 ] ],
[ [ "water", 1 ], [ "water_clean", 1 ] ]
]
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "deluxe_beansnrice",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_OTHER",
@@ -107,7 +112,6 @@
"difficulty": 2,
"time": "9 m",
"autolearn": true,
- "batch_time_factors": [ 80, 1 ],
"qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
"components": [
@@ -123,6 +127,8 @@
[ "fish_smoked", 1 ],
[ "dry_fish", 1 ],
[ "rehydrated_fish", 1 ],
+ [ "salted_fish", 1 ],
+ [ "meat_salted", 1 ],
[ "fish_canned", 1 ],
[ "can_salmon", 1 ],
[ "can_tuna", 1 ],
@@ -140,6 +146,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "deluxe_veggy_beansnrice",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
@@ -147,7 +154,6 @@
"difficulty": 2,
"time": "9 m",
"autolearn": true,
- "batch_time_factors": [ 80, 1 ],
"qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
"components": [
@@ -167,6 +173,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "chili",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
@@ -174,7 +181,6 @@
"difficulty": 2,
"time": "20 m",
"charges": 2,
- "batch_time_factors": [ 80, 5 ],
"book_learn": [ [ "cookbook_italian", 2 ] ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
@@ -198,6 +204,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "frenchtoast",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREAD",
@@ -206,7 +213,6 @@
"time": "12 m",
"charges": 3,
"autolearn": true,
- "batch_time_factors": [ 80, 1 ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
"components": [
@@ -226,6 +232,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "curry_meat",
"charges": 1,
"category": "CC_FOOD",
@@ -233,8 +240,7 @@
"skill_used": "cooking",
"difficulty": 2,
"time": "20 m",
- "autolearn": true,
- "batch_time_factors": [ 80, 5 ],
+ "book_learn": [ [ "cookbook_indian", 1 ] ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
"components": [
@@ -263,6 +269,7 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "curry_veggy",
"charges": 1,
"category": "CC_FOOD",
@@ -270,8 +277,7 @@
"skill_used": "cooking",
"difficulty": 2,
"time": "20 m",
- "autolearn": true,
- "batch_time_factors": [ 80, 5 ],
+ "book_learn": [ [ "cookbook_indian", 1 ] ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
"components": [
@@ -297,15 +303,15 @@
[ [ "curry_powder", 4 ], [ "chilly-p", 4 ] ]
]
},
- {
+ {
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "pizza_meat",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 3,
"time": "20 m",
- "batch_time_factors": [ 50, 3 ],
"book_learn": [ [ "cookbook_italian", 2 ] ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
@@ -337,13 +343,13 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "pizza_supreme",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 3,
"time": "30 m",
- "batch_time_factors": [ 50, 3 ],
"book_learn": [ [ "cookbook_italian", 3 ] ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
@@ -386,99 +392,7 @@
},
{
"type": "recipe",
- "result": "cheeseburger",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_MEAT",
- "skill_used": "cooking",
- "difficulty": 3,
- "time": "9 m",
- "charges": 2,
- "autolearn": true,
- "batch_time_factors": [ 80, 5 ],
- "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
- "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
- "components": [
- [ [ "meat_red", 1, "LIST" ] ],
- [
- [ "flatbread", 2 ],
- [ "bread", 2 ],
- [ "cornbread", 2 ],
- [ "wastebread", 2 ],
- [ "sourdough_bread", 2 ],
- [ "brioche", 2 ]
- ],
- [ [ "cheese", 1 ], [ "cheese_hard", 1 ], [ "can_cheese", 1 ] ],
- [
- [ "pickle", 1 ],
- [ "veggy_pickled", 1 ],
- [ "irradiated_onion", 1 ],
- [ "onion", 1 ],
- [ "can_tomato", 1 ],
- [ "irradiated_tomato", 1 ],
- [ "tomato", 1 ],
- [ "lettuce", 1 ],
- [ "irradiated_lettuce", 1 ]
- ],
- [
- [ "ketchup", 1 ],
- [ "mustard", 1 ],
- [ "horseradish", 1 ],
- [ "mayonnaise", 1 ],
- [ "bacon", 1 ],
- [ "seasoning_salt", 1 ],
- [ "soysauce", 1 ],
- [ "sauerkraut", 1 ]
- ]
- ]
- },
- {
- "type": "recipe",
- "result": "hamburger",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_MEAT",
- "skill_used": "cooking",
- "difficulty": 3,
- "time": "8 m",
- "charges": 2,
- "autolearn": true,
- "batch_time_factors": [ 80, 5 ],
- "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
- "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
- "components": [
- [ [ "meat_red", 1, "LIST" ] ],
- [
- [ "flatbread", 2 ],
- [ "bread", 2 ],
- [ "cornbread", 2 ],
- [ "wastebread", 2 ],
- [ "sourdough_bread", 2 ],
- [ "brioche", 2 ]
- ],
- [
- [ "pickle", 1 ],
- [ "veggy_pickled", 1 ],
- [ "irradiated_onion", 1 ],
- [ "onion", 1 ],
- [ "can_tomato", 1 ],
- [ "irradiated_tomato", 1 ],
- [ "tomato", 1 ],
- [ "lettuce", 1 ],
- [ "irradiated_lettuce", 1 ]
- ],
- [
- [ "ketchup", 1 ],
- [ "mustard", 1 ],
- [ "horseradish", 1 ],
- [ "mayonnaise", 1 ],
- [ "bacon", 1 ],
- [ "seasoning_salt", 1 ],
- [ "soysauce", 1 ],
- [ "sauerkraut", 1 ]
- ]
- ]
- },
- {
- "type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "blt",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
@@ -486,18 +400,10 @@
"difficulty": 2,
"time": "6 m",
"autolearn": true,
- "batch_time_factors": [ 50, 3 ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [
- [
- [ "flatbread", 2 ],
- [ "bread", 2 ],
- [ "cornbread", 2 ],
- [ "wastebread", 2 ],
- [ "sourdough_bread", 2 ],
- [ "brioche", 2 ]
- ],
+ [ [ "bread_sandwich", 2, "LIST" ] ],
[ [ "bacon", 1 ] ],
[ [ "lettuce", 1 ], [ "irradiated_lettuce", 1 ] ],
[ [ "can_tomato", 1 ], [ "irradiated_tomato", 1 ], [ "tomato", 1 ] ]
@@ -505,51 +411,23 @@
},
{
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "sandwich_cucumber",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_SNACK",
"skill_used": "cooking",
"time": "1 m",
"autolearn": true,
- "batch_time_factors": [ 50, 3 ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [
- [ "flatbread", 2 ],
- [ "bread", 2 ],
- [ "cornbread", 2 ],
- [ "wastebread", 2 ],
- [ "sourdough_bread", 2 ],
- [ "brioche", 2 ]
- ],
+ [ [ "bread_sandwich", 2, "LIST" ] ],
[ [ "cucumber", 1 ], [ "irradiated_cucumber", 1 ] ],
[ [ "mayonnaise", 1 ], [ "mustard", 1 ], [ "horseradish", 1 ], [ "seasoning_salt", 1 ] ]
]
},
{
- "result": "mex_chocolate",
- "type": "recipe",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_DRINKS",
- "skill_used": "cooking",
- "difficulty": 1,
- "time": "5 m",
- "book_learn": [ [ "family_cookbook", 2 ] ],
- "charges": 6,
- "batch_time_factors": [ 80, 5 ],
- "qualities": [ { "id": "COOK", "level": 3 } ],
- "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
- "components": [
- [ [ "chocolate", 2 ] ],
- [ [ "milk_standard_raw", 1, "LIST" ], [ "con_milk", 1 ], [ "milk_powder", 1 ] ],
- [ [ "sugar", 5 ] ],
- [ [ "chilly-p", 1 ] ],
- [ [ "cinnamon", 1 ] ],
- [ [ "water", 6 ], [ "water_clean", 6 ] ]
- ]
- },
- {
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"result": "homemade_burrito",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
@@ -558,6 +436,7 @@
"charges": 3,
"time": "30 m",
"autolearn": true,
+ "//": "Someone should make a Mexican cookbook",
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [
@@ -573,6 +452,7 @@
[ "lettuce", 2 ],
[ "irradiated_lettuce", 2 ],
[ "dandelion_cooked", 2 ],
+ [ "burdock_cooked", 2 ],
[ "veggy_wild_cooked", 2 ],
[ "irradiated_cabbage", 2 ],
[ "cabbage", 2 ]
@@ -580,76 +460,5 @@
[ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ], [ "onion", 1 ], [ "irradiated_onion", 1 ] ],
[ [ "pepper", 20 ], [ "chilly-p", 20 ], [ "garlic_clove", 6 ], [ "chili_pepper", 2 ] ]
]
- },
- {
- "result": "meal_bone",
- "type": "recipe",
- "id_suffix": "with_from_food_processor",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_OTHER",
- "skill_used": "cooking",
- "difficulty": 2,
- "time": "15 m",
- "autolearn": true,
- "batch_time_factors": [ 50, 3 ],
- "tools": [ [ [ "food_processor", 20 ] ] ],
- "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ]
- },
- {
- "type": "recipe",
- "result": "sausage_wasteland",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_MEAT",
- "skill_used": "cooking",
- "difficulty": 4,
- "charges": 2,
- "time": "1 h 10 m",
- "autolearn": true,
- "batch_time_factors": [ 80, 5 ],
- "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ],
- "tools": [ [ [ "char_smoker", 10 ] ] ],
- "components": [
- [ [ "offal", 4 ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
- [ [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ],
- [
- [ "salt_water", 4 ],
- [ "saline", 8 ],
- [ "salt", 4 ],
- [ "chem_saltpetre", 2 ],
- [ "soysauce", 2 ],
- [ "seasoning_italian", 4 ],
- [ "wild_herbs", 4 ],
- [ "seasoning_salt", 4 ],
- [ "pepper", 4 ]
- ]
- ]
- },
- {
- "type": "recipe",
- "result": "sausage_wasteland_raw",
- "category": "CC_FOOD",
- "subcategory": "CSC_FOOD_MEAT",
- "skill_used": "cooking",
- "difficulty": 4,
- "charges": 2,
- "time": "10 m",
- "autolearn": true,
- "batch_time_factors": [ 50, 3 ],
- "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ],
- "components": [
- [ [ "offal", 4 ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
- [ [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ],
- [
- [ "salt_water", 4 ],
- [ "saline", 8 ],
- [ "salt", 4 ],
- [ "chem_saltpetre", 2 ],
- [ "soysauce", 2 ],
- [ "seasoning_italian", 4 ],
- [ "wild_herbs", 4 ],
- [ "seasoning_salt", 4 ],
- [ "pepper", 4 ]
- ]
- ]
}
]
diff --git a/json/recipes/other/materials.json b/json/recipes/other/materials.json
deleted file mode 100644
index 429c893..0000000
--- a/json/recipes/other/materials.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
- "type": "recipe",
- "result": "meal_chitin_piece",
- "id_suffix": "mortar",
- "category": "CC_OTHER",
- "subcategory": "CSC_OTHER_MATERIALS",
- "skill_used": "cooking",
- "skills_required": [ [ "survival", 1 ] ],
- "difficulty": 2,
- "time": "1 h 30 m",
- "autolearn": true,
- "batch_time_factors": [ 83, 3 ],
- "flags": [ "BLIND_EASY" ],
- "tools": [ [ [ "mortar_pestle", -1 ] ] ],
- "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ] ] ]
- }
-]
diff --git a/json/recipes/other/medical.json b/json/recipes/other/medical.json
index 102eed4..4184b5d 100644
--- a/json/recipes/other/medical.json
+++ b/json/recipes/other/medical.json
@@ -2,18 +2,24 @@
{
"result": "anesthetic",
"type": "recipe",
+ "activity_level": "LIGHT_EXERCISE",
"category": "CC_OTHER",
- "subcategory": "CC_OTHER_MEDICAL",
+ "subcategory": "CSC_OTHER_MEDICAL",
"skill_used": "firstaid",
- "difficulty": 3,
- "batch_time_factors": [ 99, 1 ],
- "//": "This difficulty assumes that anaesthesia administration will be handled by the autodoc or the person using the kit. The included amount of ether is an estimate, based on average body size.",
- "time": "2 m 30 s",
- "book_learn": [ [ "textbook_firstaid", 6 ], [ "emergency_book", 5 ] ],
- "qualities": [ { "id": "CONTAIN", "level": 1 } ],
+ "difficulty": 6,
+ "skills_required": [ "chemistry", 5 ],
+ "batch_time_factors": [ 75, 1 ],
+ "time": "40 m",
+ "book_learn": [ [ "textbook_firstaid", 6 ], [ "textbook_toxicology", 6 ] ],
+ "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CHEM", "level": 3 }, { "id": "SEPARATE", "level": 1 } ],
+ "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "syringe", -1 ] ] ],
+ "//": "This makes 5 charges for an average-sized survivor, morphine assumed as 1 ch=5mg, heroin as 50% pure.",
"components": [
[ [ "ether", 500 ] ],
- [ [ "heroin", 1 ], [ "oxycodone", 2 ], [ "tramadol", 3 ], [ "codeine", 4 ], [ "poppy_pain", 4 ] ]
+ [ [ "heroin", 20 ], [ "morphine", 10 ] ],
+ [ [ "datura_seed", 5 ] ],
+ [ [ "conc_venom", 5 ], [ "stimpack_ammo", 5 ] ],
+ [ [ "conc_paralytic", 5 ], [ "rocuronium", 5 ] ]
]
}
]
diff --git a/json/requirements/cooking_components.json b/json/requirements/cooking_components.json
index b4ddcc1..4daac54 100644
--- a/json/requirements/cooking_components.json
+++ b/json/requirements/cooking_components.json
@@ -43,7 +43,7 @@
[ "morel_cooked", 1 ],
[ "acorns_cooked", 1 ]
],
- [
+ [
[ "fish", 2 ],
[ "dry_fish", 2 ],
[ "fish_smoked", 2 ],
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-20 07:24:40 +0000