From 83ecacd8ad5af77da2faf27af59c9657d5601ab5 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:25:17 +0800 Subject: [PATCH] [Magiclysm] Fix meat component (#76407) * Update cooking_components.json * add into meat_red_raw * Update comestibles.json * Update comestibles.json * Update comestibles.json * Update comestibles.json * Update comestibles.json * Update comestibles.json * It still need the delete * Update comestibles.json * make impure meat able to pass autocheck * It might need more * a small test * a small test * remove the right one --- data/mods/Magiclysm/items/comestibles.json | 7 +++++-- data/mods/Magiclysm/requirements/cooking_components.json | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json index 538066c6d8ba6..a9b4e01235dc6 100644 --- a/data/mods/Magiclysm/items/comestibles.json +++ b/data/mods/Magiclysm/items/comestibles.json @@ -90,15 +90,18 @@ "extend": { "flags": [ "NUTRIENT_OVERRIDE" ] }, "name": { "str_sp": "purified meat" }, "description": "Indistinguishable from pre-Cataclysm lab grown beef. It should be excellent but somehow it's just edible.", + "calories": 402, "price": "4 USD" }, { "id": "impure_meat", "type": "COMESTIBLE", "copy-from": "mutant_meat", - "extend": { "flags": [ "NUTRIENT_OVERRIDE" ] }, "name": { "str_sp": "impure meat" }, "description": "Not as tainted as previously and tastes like the real thing. You do not want to cook this for your friends, though if you do they won't know the difference for a while.", - "price": "1 USD" + "delete": { "proportional": { "price": 0.2, "calories": 0.5 } }, + "calories": 201, + "price": "1 USD", + "extend": { "flags": [ "NUTRIENT_OVERRIDE" ] } } ] diff --git a/data/mods/Magiclysm/requirements/cooking_components.json b/data/mods/Magiclysm/requirements/cooking_components.json index d4a02ab34cc50..cc488dfe7d29e 100644 --- a/data/mods/Magiclysm/requirements/cooking_components.json +++ b/data/mods/Magiclysm/requirements/cooking_components.json @@ -1,7 +1,12 @@ [ { - "id": "meat_raw_steak", + "id": "meat_red_raw_steak", "type": "requirement", "extend": { "components": [ [ [ "purified_meat", 1 ], [ "impure_meat", 1 ] ] ] } + }, + { + "id": "meat_red_raw", + "type": "requirement", + "extend": { "components": [ [ [ "purified_meat", 1 ] ] ] } } ]