Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comestible Name to object, double have decimal #38075

Merged
merged 1 commit into from
Feb 16, 2020
Merged

Comestible Name to object, double have decimal #38075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions data/json/items/chemicals_and_resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@
{
"type": "COMESTIBLE",
"id": "fertilizer_liquid",
"name": "liquid fertilizer",
"name_plural": "liquid fertilizer",
"name": { "str": "liquid fertilizer", "str_pl": "liquid fertilizer" },
"weight": "67 g",
"color": "yellow",
"flags": [ "FERTILIZER", "NUTRIENT_OVERRIDE" ],
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,8 +964,7 @@
"id": "meat_bark",
"copy-from": "meat_frond",
"type": "COMESTIBLE",
"name": "leech bark",
"name_plural": "scraps of leech bark",
"name": { "str": "leech bark", "str_pl": "scraps of leech bark" },
"description": "Dry and tough bark matter harvested from an alien plant. It is slightly translucent, and if placed against the light you can distinguish glistening blue veins running through it.",
"vitamins": [ [ "vitA", 6 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 8 ], [ "vitB", 6 ], [ "mutant_toxin", 12 ] ]
}
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/drink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,7 @@
{
"type": "COMESTIBLE",
"id": "lemonade",
"name": "lemonade",
"name_plural": "lemonade",
"name": { "str": "lemonade", "str_pl": "lemonade" },
"weight": "260 g",
"color": "yellow",
"container": "bottle_plastic",
Expand Down
90 changes: 39 additions & 51 deletions data/json/items/comestibles/irradiated_fruit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,87 +3,79 @@
"type": "COMESTIBLE",
"id": "irradiated_rose_hips",
"copy-from": "rose_hips",
"name": "irradiated rose hips",
"name_plural": "irradiated rose hips",
"name": { "str": "irradiated rose hips", "str_pl": "irradiated rose hips" },
"description": "An irradiated rose hips will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_elderberries",
"copy-from": "elderberries",
"name": "irradiated elderberry",
"name_plural": "irradiated elderberries",
"name": { "str": "irradiated elderberry", "str_pl": "irradiated elderberries" },
"description": "An irradiated elderberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_mulberries",
"copy-from": "mulberries",
"name": "irradiated mulberry",
"name_plural": "irradiated mulberries",
"name": { "str": "irradiated mulberry", "str_pl": "irradiated mulberries" },
"description": "An irradiated mulberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_huckleberries",
"copy-from": "huckleberries",
"name": "irradiated huckleberry",
"name_plural": "irradiated huckleberries",
"name": { "str": "irradiated huckleberry", "str_pl": "irradiated huckleberries" },
"description": "An irradiated huckleberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_raspberries",
"copy-from": "raspberries",
"name": "irradiated raspberry",
"name_plural": "irradiated raspberries",
"name": { "str": "irradiated raspberry", "str_pl": "irradiated raspberries" },
"description": "An irradiated raspberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_cranberries",
"copy-from": "cranberries",
"name": "irradiated cranberry",
"name_plural": "irradiated cranberries",
"name": { "str": "irradiated cranberry", "str_pl": "irradiated cranberries" },
"description": "An irradiated cranberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_strawberries",
"copy-from": "strawberries",
"name": "irradiated strawberry",
"name_plural": "irradiated strawberries",
"name": { "str": "irradiated strawberry", "str_pl": "irradiated strawberries" },
"description": "An irradiated strawberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_blueberries",
"copy-from": "blueberries",
"name": "irradiated blueberry",
"name_plural": "irradiated blueberries",
"name": { "str": "irradiated blueberry", "str_pl": "irradiated blueberries" },
"description": "An irradiated blueberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -93,7 +85,7 @@
"copy-from": "apple",
"name": "irradiated apple",
"description": "Mmm, irradiated. Will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -103,7 +95,7 @@
"copy-from": "banana",
"name": "irradiated banana",
"description": "An irradiated banana will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -113,7 +105,7 @@
"copy-from": "orange",
"name": "irradiated orange",
"description": "An irradiated orange will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -123,7 +115,7 @@
"copy-from": "lemon",
"name": "irradiated lemon",
"description": "An irradiated lemon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -133,7 +125,7 @@
"copy-from": "grapefruit",
"name": "irradiated grapefruit",
"description": "An irradiated grapefruit will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -143,7 +135,7 @@
"copy-from": "pear",
"name": "irradiated pear",
"description": "An irradiated pear will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"flags": [ "FREEZERBURN", "SMOKABLE" ],
"container": "bag_plastic"
Expand All @@ -152,10 +144,9 @@
"type": "COMESTIBLE",
"id": "irradiated_cherries",
"copy-from": "cherries",
"name": "irradiated cherry",
"name_plural": "irradiated cherries",
"name": { "str": "irradiated cherry", "str_pl": "irradiated cherries" },
"description": "An irradiated cherry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -165,18 +156,17 @@
"copy-from": "plums",
"name": "irradiated plum",
"description": "A group of irradiated plums will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_grapes",
"copy-from": "grapes",
"name": "irradiated grape",
"name_plural": "irradiated grapes",
"name": { "str": "irradiated grape" },
"description": "An irradiated grape will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -186,18 +176,17 @@
"copy-from": "pineapple",
"name": "irradiated pineapple",
"description": "An irradiated pineapple will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_peach",
"copy-from": "peach",
"name": "irradiated peach",
"name_plural": "irradiated peaches",
"name": { "str": "irradiated peach", "str_pl": "irradiated peaches" },
"description": "An irradiated peach will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -207,7 +196,7 @@
"copy-from": "watermelon",
"name": "irradiated watermelon",
"description": "An irradiated watermelon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"flags": [ "EATEN_COLD", "FREEZERBURN", "SMOKABLE" ],
"container": "bag_plastic"
Expand All @@ -218,18 +207,17 @@
"copy-from": "melon",
"name": "irradiated melon",
"description": "An irradiated melon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
{
"type": "COMESTIBLE",
"id": "irradiated_blackberries",
"copy-from": "blackberries",
"name": "irradiated blackberry",
"name_plural": "irradiated blackberries",
"name": { "str": "irradiated blackberry", "str_pl": "irradiated blackberries" },
"description": "An irradiated blackberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -239,7 +227,7 @@
"copy-from": "mango",
"name": "irradiated mango",
"description": "An irradiated mango will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -249,7 +237,7 @@
"copy-from": "pomegranate",
"name": "irradiated pomegranate",
"description": "An irradiated pomegranate will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -259,7 +247,7 @@
"copy-from": "papaya",
"name": "irradiated papaya",
"description": "An irradiated papaya will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -269,7 +257,7 @@
"copy-from": "kiwi",
"name": "irradiated kiwi",
"description": "An irradiated kiwi will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
},
Expand All @@ -279,7 +267,7 @@
"copy-from": "apricot",
"name": "irradiated apricot",
"description": "An irradiated apricot will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2 },
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
}
Expand Down
Loading