From 6cb89772f70014ad13b64309501dce391bd9492f Mon Sep 17 00:00:00 2001 From: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com> Date: Thu, 2 Jan 2025 01:53:40 -0500 Subject: [PATCH] fix(content): Fix inappropriate vitamin extensions (#5861) Fix inappropriate vitamin extensions --- data/json/items/comestibles/drink_other.json | 17 +++++- data/json/items/comestibles/sandwich.json | 57 +++++++++++-------- data/json/items/comestibles/veggy_dishes.json | 9 ++- 3 files changed, 58 insertions(+), 25 deletions(-) diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index e2dde1660fee..04fc48e7dbd6 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -208,9 +208,24 @@ "type": "COMESTIBLE", "id": "cooking_oil2", "name": { "str_sp": "animal cooking oil" }, - "copy-from": "cooking_oil", + "//": "Can't copy-from the vegetable oil because it extends vitamins instead of overwriting them", + "weight": "15 g", + "color": "yellow", + "container": "jug_plastic", + "comestible_type": "DRINK", + "symbol": "~", + "quench": -1, + "healthy": -2, + "calories": 127, "description": "Thin yellow animal oil used for cooking.", + "price": "40 cent", + "price_postapoc": "5 USD", "material": [ "flesh", "oil" ], + "volume": "250 ml", + "charges": 16, + "phase": "liquid", + "fun": -25, + "flags": [ "NUTRIENT_OVERRIDE" ], "vitamins": [ [ "meat_allergen", 1 ] ] }, { diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index 6ebbcb33741e..a210bf623bb3 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -1,7 +1,29 @@ [ + { + "type": "COMESTIBLE", + "id": "sandwich_generic", + "name": { "str": "GENERIC SANDWICH", "str_pl": "GENERIC SANDWICHES" }, + "weight": "300 g", + "healthy": 1, + "calories": 300, + "color": "brown", + "spoils_in": "1 day 12 hours", + "container": "wrapper", + "comestible_type": "FOOD", + "symbol": "%", + "description": "If you can see this, you shouldn't be able to. This is to solve dumb copy-from issues.", + "price": "2 USD", + "price_postapoc": "2 USD", + "primary_material": "wheat", + "volume": "500 ml", + "material": [ "wheat" ], + "fun": 12, + "charges": 4 + }, { "type": "COMESTIBLE", "id": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "deluxe sandwich", "str_pl": "deluxe sandwiches" }, "conditional_names": [ { @@ -23,21 +45,11 @@ { "type": "COMPONENT_ID", "condition": "soysauce", "name": "%s with soy sauce" }, { "type": "COMPONENT_ID", "condition": "seasoning_salt", "name": "%s with seasoned salt" } ], - "weight": "300 g", - "healthy": 1, - "calories": 300, - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", "description": "A sandwich of meat, vegetables, and cheese with condiments. Tasty and nutritious!", "price": "12 USD", "price_postapoc": "3 USD", "primary_material": "wheat", - "volume": "500 ml", "material": [ "flesh", "veggy", "wheat", "milk" ], - "fun": 12, "vitamins": [ [ "vitA", 8 ], [ "vitC", 26 ], @@ -48,13 +60,12 @@ [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] - ], - "charges": 4 + ] }, { "type": "COMESTIBLE", "id": "sandwich_cheese_grilled", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "grilled cheese sandwich", "str_pl": "grilled cheese sandwiches" }, "calories": 160, "description": "A delicious grilled cheese sandwich, because everything is better with melted cheese.", @@ -68,7 +79,7 @@ { "type": "COMESTIBLE", "id": "sandwich_cheese", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "cheese sandwich", "str_pl": "cheese sandwiches" }, "calories": 160, "description": "A simple cheese sandwich.", @@ -81,7 +92,7 @@ { "type": "COMESTIBLE", "id": "sandwich_jam", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "jam sandwich", "str_pl": "jam sandwiches" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "apple", "name": "apple %s" }, @@ -122,7 +133,7 @@ { "type": "COMESTIBLE", "id": "sandwich_fairy", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str_sp": "fairy bread" }, "calories": 200, "description": "An 'open-faced sandwich' consisting of sliced white bread, a healthy crust-to-crust slathering of butter, and sprinkles. Supposedly a staple of birthday parties in Australia.", @@ -135,7 +146,7 @@ { "type": "COMESTIBLE", "id": "sandwich_honey", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "honey sandwich", "str_pl": "honey sandwiches" }, "calories": 200, "description": "A delicious honey sandwich.", @@ -148,7 +159,7 @@ { "type": "COMESTIBLE", "id": "sandwich_sauce", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "sauce sandwich", "str_pl": "sauce sandwiches" }, "conditional_names": [ { @@ -208,7 +219,7 @@ { "type": "COMESTIBLE", "id": "sandwich_veggy", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "vegetable sandwich", "str_pl": "vegetable sandwiches" }, "calories": 180, "description": "Bread and vegetables, that's it.", @@ -222,7 +233,7 @@ { "type": "COMESTIBLE", "id": "sandwich_t", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "meat sandwich", "str_pl": "meat sandwiches" }, "conditional_names": [ { @@ -295,7 +306,7 @@ { "type": "COMESTIBLE", "id": "fish_sandwich", - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "name": { "str": "fish sandwich", "str_pl": "fish sandwiches" }, "calories": 200, "description": "A delicious fish sandwich.", @@ -309,7 +320,7 @@ "type": "COMESTIBLE", "id": "sandwich_okay", "name": { "str": "okay sandwich", "str_pl": "okay sandwiches" }, - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "looks_like": "sandwich_deluxe", "description": "A simple sandwich, little more than meat and veggies on bread. Rather dry.", "price": "2 USD", @@ -322,7 +333,7 @@ "type": "COMESTIBLE", "id": "sandwich_deluxe_nocheese", "name": { "str": "dairy-free deluxe sandwich", "str_pl": "dairy-free deluxe sandwiches" }, - "copy-from": "sandwich_deluxe", + "copy-from": "sandwich_generic", "looks_like": "sandwich_deluxe", "conditional_names": [ { diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 15e880c41080..738d88e3ebbb 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -908,12 +908,19 @@ "type": "COMESTIBLE", "id": "veggy_sausage", "name": "smoked veggy sausage", - "copy-from": "sausage", + "weight": "148 g", + "comestible_type": "FOOD", + "symbol": "%", + "quench": -1, "calories": 56, "healthy": 1, "material": [ "veggy" ], "description": "A plant based sausage that has been cured and smoked for long term storage.", + "price": "16 USD", + "volume": "250 ml", + "price_postapoc": "3 USD", "fun": 4, + "flags": [ "EATEN_HOT", "SMOKED" ], "vitamins": [ [ "veggy_allergen", 1 ] ] }, {