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.

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

Require denomination pricing for price and price_postapoc #78905

Merged
merged 10 commits into from
Jan 8, 2025
12 changes: 6 additions & 6 deletions data/json/items/armor/combat_exoskeleton_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
"name": { "str": "heavy combat exoskeleton torso armor" },
"description": "Put the tank in tank suit with this 6mm thick exoskeleton armor, it even feels like wearing a real tank, you should stay wary of anti-material rounds though.",
"symbol": "[",
"price": 200000,
"price_postapoc": 60000,
"price": "2000 USD",
"price_postapoc": "600 USD",
"volume": "12000 ml",
"weight": "12700 g",
"flags": [ "EXO_TORSO_PLATE", "STURDY", "CANT_WEAR" ],
Expand All @@ -103,8 +103,8 @@
"name": { "str": "heavy combat exoskeleton arm armor" },
"description": "Put the tank in tank suit with this 6mm thick exoskeleton armor, it even feels like wearing a real tank, you should stay wary of anti-material rounds though.",
"symbol": "[",
"price": 200000,
"price_postapoc": 60000,
"price": "2000 USD",
"price_postapoc": "600 USD",
"volume": "9700 ml",
"weight": "10300 g",
"flags": [ "EXO_ARM_PLATE", "STURDY", "CANT_WEAR" ],
Expand Down Expand Up @@ -155,8 +155,8 @@
"name": { "str": "heavy combat exoskeleton leg armor" },
"description": "Put the tank in tank suit with this 6mm thick exoskeleton armor, it even feels like wearing a real tank, you should stay wary of anti-material rounds though.",
"symbol": "[",
"price": 200000,
"price_postapoc": 60000,
"price": "2000 USD",
"price_postapoc": "600 USD",
"volume": "10000 ml",
"weight": "10600 g",
"flags": [ "EXO_LEG_PLATE", "STURDY", "CANT_WEAR" ],
Expand Down
24 changes: 12 additions & 12 deletions data/json/items/book/abstract.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"description": "This is a template for pulp books. Which really all ought to be paperbacks, right?",
"looks_like": "novel_pulp",
"copy-from": "book_fict_soft_tpl",
"relative": { "intelligence": -1, "chapters": -2, "fun": 1, "price": -200, "price_postapoc": -1000 }
"relative": { "intelligence": -1, "chapters": -2, "fun": 1, "price": "-200 cent", "price_postapoc": "-10 USD" }
},
{
"abstract": "book_fict_soft_scifi_tpl",
Expand All @@ -112,7 +112,7 @@
"description": "This is a template for books about homemaking, style, home decor, and home economics.",
"weight": "1100 g",
"copy-from": "book_nonf_hard_tpl",
"relative": { "intelligence": -1, "price_postapoc": -1600, "chapters": 2 }
"relative": { "intelligence": -1, "price_postapoc": "-16 USD", "chapters": 2 }
},
{
"abstract": "book_nonf_hard_cook_tpl",
Expand Down Expand Up @@ -154,7 +154,7 @@
"fun": 1,
"time": "36 m",
"copy-from": "book_nonf_hard_tpl",
"relative": { "price": "5 USD", "price_postapoc": -2500, "intelligence": 3 }
"relative": { "price": "5 USD", "price_postapoc": "-25 USD", "intelligence": 3 }
},
{
"abstract": "book_nonf_soft_phil_tpl",
Expand All @@ -164,7 +164,7 @@
"fun": 1,
"time": "36 m",
"copy-from": "book_nonf_soft_tpl",
"relative": { "price": "4 USD", "price_postapoc": -2600, "intelligence": 3 }
"relative": { "price": "4 USD", "price_postapoc": "-26 USD", "intelligence": 3 }
},
{
"abstract": "book_pulp_newage_tpl",
Expand All @@ -173,7 +173,7 @@
"description": "This is a template for pulp new-age books. They're theoretically nonfiction.",
"copy-from": "book_fict_soft_pulp_tpl",
"weight": "250 g",
"relative": { "chapters": -6, "price": "25 USD", "price_postapoc": -100 }
"relative": { "chapters": -6, "price": "25 USD", "price_postapoc": "-1 USD" }
},
{
"abstract": "book_nonf_hard_sports_tpl",
Expand Down Expand Up @@ -236,47 +236,47 @@
"volume": "400 ml",
"copy-from": "book_fict_soft_tpl",
"time": "11 m",
"relative": { "price": -351, "price_postapoc": -800, "chapters": -8, "intelligence": -1 }
"relative": { "price": "-351 cent", "price_postapoc": "-800 cents", "chapters": -8, "intelligence": -1 }
},
{
"abstract": "paperback_romance_lnl",
"type": "BOOK",
"name": { "str": "Lorn and Loan Romance Novel" },
"description": "Lorn and Loan Press marketed romance paperbacks to a variety of alt demographics, especially those with a penchant for eyeliner. The books are billed as \"provocative,\" but words like \"malingering\" and \"turgid\" also come to mind.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_postapoc": -400, "intelligence": 1, "fun": -1 }
"relative": { "price_postapoc": "-400 cents", "intelligence": 1, "fun": -1 }
},
{
"abstract": "paperback_romance_vanilla",
"type": "BOOK",
"name": { "str": "Vanilla Romance Novel" },
"description": "Vanilla Media is a mainstream publisher providing romantic literature to everyday readers of taste. These stories contain explicit details only in the odd chapters, and invariably end with a conventionally uplifting moral.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_postapoc": -100, "intelligence": -1 }
"relative": { "price_postapoc": "-1 USD", "intelligence": -1 }
},
{
"abstract": "paperback_western_em",
"type": "BOOK",
"name": { "str": "The Everyman Library" },
"description": "The Everyman Library is an imprint of Vanilla Media that publishes stories about private eyes, cowboys, quarterbacks, and mobsters.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_postapoc": -100, "intelligence": -1 }
"relative": { "price_postapoc": "-1 USD", "intelligence": -1 }
},
{
"abstract": "book_fict_soft_ya_vanilla",
"type": "BOOK",
"name": { "str": "Tween Topics" },
"description": "Tween Topics is an imprint of Vanilla Media that publishes stories that appeal to the youth of today. Or, failing that, the parents of said youth.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_postapoc": -400, "intelligence": -1, "fun": -1 }
"relative": { "price_postapoc": "-4 USD", "intelligence": -1, "fun": -1 }
},
{
"abstract": "book_fict_soft_ya_quiddity",
"type": "BOOK",
"name": { "str": "Quiddity Books" },
"description": "Quiddity publishes books for young adults. They offer stories about self-discovery, personal identity, and contemporary trends.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_postapoc": -400, "chapters": 7 }
"relative": { "price_postapoc": "-4 USD", "chapters": 7 }
},
{
"abstract": "book_fict_hard_ya_quiddity",
Expand All @@ -287,7 +287,7 @@
"volume": "1014 ml",
"longest_side": "22 cm",
"copy-from": "book_fict_hard_tpl",
"relative": { "price_postapoc": -400, "chapters": 10 }
"relative": { "price_postapoc": "-4 USD", "chapters": 10 }
},
{
"abstract": "book_fict_soft_satire_tpl",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@
"weight": "120 g",
"volume": "300 ml",
"time": "10 m",
"relative": { "price": -251, "chapters": -26, "fun": 1 }
"relative": { "price": "-251 cent", "chapters": -26, "fun": 1 }
},
{
"id": "occult_bobliographon",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/misc_scifi.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
"name": { "str": "Brave New World", "str_pl": "copies of Brave New World" },
"description": "This is weather worn copy of \"Brave New World\" by Aldous Huxley looks like it has been left out in rain. The novel begins in a bleak building where fetuses are grown in bottles on an assembly line.",
"copy-from": "book_fict_soft_scifi_tpl",
"relative": { "chapters": -6, "price_postapoc": -1490 }
"relative": { "chapters": -6, "price_postapoc": "-1490 cents" }
},
{
"id": "book_fict_soft_scifi_roadp",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/drink.json
Original file line number Diff line number Diff line change
Expand Up @@ -1928,8 +1928,8 @@
"weight": "250 g",
"volume": "250 ml",
"charges": 1,
"price": 50,
"price_postapoc": 1,
"price": "50 cent",
"price_postapoc": "1 cent",
"symbol": "~",
"color": "light_blue",
"phase": "liquid",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/comestibles/junkfood.json
Original file line number Diff line number Diff line change
Expand Up @@ -1501,8 +1501,8 @@
"symbol": "%",
"color": "brown",
"looks_like": "pancakes",
"price": 200,
"price_postapoc": 20,
"price": "2 USD",
"price_postapoc": "20 cent",
"weight": "80 g",
"volume": "85 ml",
"comestible_type": "FOOD",
Expand All @@ -1522,8 +1522,8 @@
"symbol": "%",
"color": "brown",
"looks_like": "pancakes",
"price": 200,
"price_postapoc": 20,
"price": "2 USD",
"price_postapoc": "20 cent",
"weight": "80 g",
"volume": "85 ml",
"comestible_type": "FOOD",
Expand Down
16 changes: 8 additions & 8 deletions data/json/items/comestibles/meat_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1534,8 +1534,8 @@
"copy-from": "poultry_cooked",
"color": "light_red",
"description": "Reconstituted bird meat, which are much more enjoyable to eat now that they have been rehydrated.",
"price": 600,
"price_postapoc": 300,
"price": "6 USD",
"price_postapoc": "3 USD",
"fun": 2
},
{
Expand Down Expand Up @@ -1922,8 +1922,8 @@
"symbol": "%",
"calories": 400,
"description": "Originating from Punjabi cuisine, this deep-red and spicy baked chicken is marinated with a yogurt-based sauce and is traditionally baked directly on the walls of a wood-fired clay oven.",
"price": 1000,
"price_postapoc": 340,
"price": "10 USD",
"price_postapoc": "3 USD 40 cent",
"material": [ "flesh", "milk" ],
"primary_material": "flesh",
"volume": "250 ml",
Expand All @@ -1942,8 +1942,8 @@
"symbol": "%",
"calories": 403,
"description": "This delicious serving of poached chicken with rice is one of the national dishes of Singapore.",
"price": 1000,
"price_postapoc": 250,
"price": "10 USD",
"price_postapoc": "2 USD 50 cent",
"material": [ "flesh", "veggy" ],
"volume": "250 ml",
"flags": [ "EATEN_HOT" ],
Expand All @@ -1961,8 +1961,8 @@
"symbol": "%",
"calories": 620,
"description": "A classic Italian-American dish of breaded and fried chicken atop a bed of pasta, enrobed with tomato sauce and cheese.",
"price": 1000,
"price_postapoc": 250,
"price": "10 USD",
"price_postapoc": "2 USD 50 cent",
"material": [ "flesh", "wheat", "veggy" ],
"volume": "250 ml",
"flags": [ "EATEN_HOT" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/mushroom.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"material": [ "mushroom" ],
"symbol": "~",
"color": "brown",
"price": 4000,
"price_postapoc": 150,
"price": "40 USD",
"price_postapoc": "1 USD 50 cent",
"container": "bottle_glass",
"weight": "16 g",
"volume": "750 ml",
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/comestibles/raw_veggy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@
"name": { "str": "handful of chicory greens", "str_pl": "handfuls of chicory greens" },
"copy-from": "young_leaves",
"description": "Some chicory greens. They are quite bitter but high in calcium.",
"price_postapoc": 20,
"price_postapoc": "20 cent",
"weight": "29 g",
"volume": "250 ml",
"fun": -8,
Expand Down Expand Up @@ -1325,8 +1325,8 @@
"symbol": "%",
"calories": 12,
"description": "A handful of edible green seaweed. It makes a good snack as-is, but can be dried or prepared in a number of ways.",
"price": 10,
"price_postapoc": 10,
"price": "10 cent",
"price_postapoc": "10 cent",
"material": [ "veggy" ],
"volume": "250 ml",
"flags": [ "FREEZERBURN", "SMOKABLE", "CATTLE", "RABBIT" ],
Expand All @@ -1344,8 +1344,8 @@
"symbol": "%",
"calories": 17,
"description": "A sizable strip of new growth harvested from a sugar kelp. While these are most often dried, it seems edible enough as is.",
"price": 10,
"price_postapoc": 10,
"price": "10 cent",
"price_postapoc": "10 cent",
"material": [ "veggy" ],
"volume": "250 ml",
"flags": [ "FREEZERBURN", "SMOKABLE", "CATTLE", "RABBIT" ],
Expand All @@ -1363,8 +1363,8 @@
"symbol": "%",
"calories": 17,
"description": "A leafy bunch of seaweed covered in air bladders. Many claims are made about its health benefits, but at least as a foodstuff, it's no better or worse than other edible seaweed.",
"price": 10,
"price_postapoc": 10,
"price": "10 cent",
"price_postapoc": "10 cent",
"material": [ "veggy" ],
"volume": "250 ml",
"flags": [ "FREEZERBURN", "SMOKABLE", "CATTLE", "RABBIT" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/sandwich.json
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,8 @@
"symbol": "%",
"calories": 468,
"description": "A sandwich of crispy fried chicken topped with condiments and veggies. Also called chicken burger, or chicken on a bun.",
"price": 1000,
"price_postapoc": 250,
"price": "10 USD",
"price_postapoc": "2 USD 50 cent",
"material": [ "flesh", "wheat", "veggy" ],
"volume": "250 ml",
"flags": [ "EATEN_HOT" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
"type": "COMESTIBLE",
"id": "seed_cucumber",
"copy-from": "seed",
"price": 50,
"price": "50 cent",
"name": { "str_sp": "salad cucumber seeds" },
"description": "Some salad cucumber seeds.",
"flags": [ "PLANTABLE_SEED", "NUTRIENT_OVERRIDE", "INEDIBLE" ],
Expand All @@ -431,7 +431,7 @@
"type": "COMESTIBLE",
"id": "seed_gherkin",
"copy-from": "seed",
"price": 50,
"price": "50 cent",
"name": { "str_sp": "gherkin cucumber seeds" },
"description": "Some gherkin cucumber seeds.",
"flags": [ "PLANTABLE_SEED", "NUTRIENT_OVERRIDE", "INEDIBLE" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/soup.json
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,8 @@
"quench": 8,
"calories": 580,
"description": "French chicken stew braised with red wine.",
"price": 500,
"price_postapoc": 100,
"price": "5 USD",
"price_postapoc": "1 USD",
"material": [ "flesh", "veggy" ],
"primary_material": "flesh",
"volume": "500 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/comestibles/veggy_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1072,8 +1072,8 @@
],
"flags": [ "EATEN_HOT" ],
"relative": { "calories": 200, "fun": 2 },
"price": 500,
"price_postapoc": 50,
"price": "5 USD",
"price_postapoc": "50 cent",
"spoils_in": "7 days"
},
{
Expand Down Expand Up @@ -1670,8 +1670,8 @@
"symbol": "%",
"calories": 17,
"description": "An essential component of Japanese cuisine, this dried sheet of seaweed has hardened to the point of inedibility. Boiled in water, it should make an excellent broth.",
"price": 10,
"price_postapoc": 10,
"price": "10 cent",
"price_postapoc": "10 cent",
"material": [ "veggy" ],
"volume": "25 ml",
"flags": [ "INEDIBLE" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/containers/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@
"weight": "1 kg",
"volume": "1 L",
"longest_side": "150 cm",
"price": 0,
"price_postapoc": 0,
"price": "0 cent",
"price_postapoc": "0 cent",
"use_action": [ "CHANGE_OUTFIT" ],
"material": [ "plastic" ],
"pocket_data": [
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/fake.json
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@
},
"weight": "22680 g",
"volume": "15020 ml",
"price": 6000,
"price_postapoc": 1000,
"price": "60 USD",
"price_postapoc": "10 USD",
"to_hit": -3,
"material": [ { "type": "tnt", "portion": 95 }, { "type": "paper", "portion": 5 } ],
"symbol": "*",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/fuel.json
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@
"category": "fuel",
"weight": "800 mg",
"volume": "200ml",
"price": 20,
"price_postapoc": 50,
"price": "20 cent",
"price_postapoc": "50 cent",
"count": 250,
"stack_size": 200,
"phase": "liquid",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ranged/yrax_guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": { "str": "deterrent laser weapon" },
"description": "a very small laser weapon",
"volume": "3 L",
"price": 0,
"price": "0 cent",
"material": [ "steel", "plastic" ],
"symbol": "(",
"looks_like": "v29",
Expand Down
Loading
Loading