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

Generic modern json #38012

Merged
merged 1 commit into from
Feb 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/fake.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@
"id": "fake_milling_item",
"copy-from": "fake_item",
"type": "GENERIC",
"name": "semi ground grains",
"name_plural": "semi ground grains",
"name": { "str": "semi ground grains", "str_pl": "semi ground grains" },
"description": "A paste of half-finished milled grains, not yet flour.",
"flags": [ "TRADER_AVOID", "FAKE_MILL" ]
},
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,7 @@
"category": "spare_parts",
"symbol": ",",
"color": "light_gray",
"name": "set of 100 ceramic disk",
"name_plural": "ceramic disks",
"name": { "str": "set of 100 ceramic disk", "str_pl": "ceramic disks" },
"description": "A set of small slightly elongated disks, made of high-grade ceramic. They remind you of scales.",
"price": 0,
"material": "lightceramic",
Expand Down
7 changes: 3 additions & 4 deletions data/json/items/newspaper.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,14 @@
"category": "other",
"symbol": ",",
"color": "dark_gray",
"name": "score card",
"name_plural": "score cards",
"name": { "str": "score card" },
"snippet_category": "scores",
"description": "A colorfully printed score card.",
"price": 0,
"material": "paper",
"flags": "TRADER_AVOID",
"flags": [ "TRADER_AVOID" ],
"weight": "3 g",
"volume": 0
"volume": "1 ml"
},
{
"type": "GENERIC",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/resources/metal.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,7 @@
"id": "scrap_copper",
"symbol": ",",
"color": "light_gray",
"name": "scrap copper",
"name_plural": "scrap copper",
"name": { "str": "scrap copper", "str_pl": "scrap copper" },
"category": "spare_parts",
"description": "A small chunk of copper, usable for crafting or repairs.",
"price": 1000,
Expand Down
21 changes: 7 additions & 14 deletions data/json/items/robot_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@
{
"type": "GENERIC",
"id": "spidery_legs_small",
"name": "set of tiny spidery legs",
"name_plural": "sets of tiny spidery legs",
"name": { "str": "set of tiny spidery legs", "str_pl": "sets of tiny spidery legs" },
"description": "A set of tiny pointy legs, like the ones found under a skitterbot.",
"symbol": "w",
"color": "light_gray",
Expand All @@ -100,8 +99,7 @@
{
"type": "GENERIC",
"id": "reverse_jointed_legs",
"name": "set of reverse-jointed legs",
"name_plural": "sets of reverse-jointed legs",
"name": { "str": "set of reverse-jointed legs", "str_pl": "sets of reverse-jointed legs" },
"description": "A set of reverse-jointed legs, like the ones found under a chicken walker.",
"symbol": "k",
"color": "light_gray",
Expand All @@ -114,8 +112,7 @@
{
"type": "GENERIC",
"id": "omni_wheel",
"name": "set of omni wheels",
"name_plural": "sets of omni wheels",
"name": { "str": "set of omni wheels", "str_pl": "sets of omni wheels" },
"description": "A set of omni wheels, like the ones found under a police bot.",
"symbol": "o",
"color": "light_gray",
Expand All @@ -128,8 +125,7 @@
{
"type": "GENERIC",
"id": "quad_rotors",
"name": "set of rotors",
"name_plural": "sets of rotors",
"name": { "str": "set of rotors", "str_pl": "sets of rotors" },
"description": "A set of rotors able to lift a small drone.",
"symbol": "#",
"color": "light_gray",
Expand All @@ -142,8 +138,7 @@
{
"type": "GENERIC",
"id": "android_legs",
"name": "set of android legs",
"name_plural": "sets of android legs",
"name": { "str": "set of android legs", "str_pl": "sets of android legs" },
"description": "A set of human-like legs.",
"symbol": "M",
"color": "light_gray",
Expand All @@ -156,8 +151,7 @@
{
"type": "GENERIC",
"id": "android_arms",
"name": "set of android arms",
"name_plural": "sets of android arms",
"name": { "str": "set of android arms", "str_pl": "sets of android arms" },
"description": "A set of human-like arms.",
"symbol": "m",
"color": "light_gray",
Expand All @@ -170,8 +164,7 @@
{
"type": "GENERIC",
"id": "tank_tread",
"name": "set of small tank tread",
"name_plural": "sets of small tank tread",
"name": { "str": "set of small tank tread", "str_pl": "sets of small tank tread" },
"description": "A set of small tank tread, like the one used by the \"Beagle\" mini-tank.",
"symbol": "=",
"color": "light_gray",
Expand Down
9 changes: 3 additions & 6 deletions data/json/items/tool/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,7 @@
"id": "jar_eggs_pickled",
"type": "GENERIC",
"category": "food",
"name": "sealed jar of eggs",
"name_plural": "sealed jars of eggs",
"name": { "str": "sealed jar of eggs", "str_pl": "sealed jars of eggs" },
"description": "This is a sealed glass jar containing pickled eggs. Use to open and eat to enjoy.",
"weight": "1750 g",
"volume": "500 ml",
Expand All @@ -453,8 +452,7 @@
"id": "jar_pickles_pickled",
"type": "GENERIC",
"category": "food",
"name": "sealed jar of pickles",
"name_plural": "sealed jars of pickles",
"name": { "str": "sealed jar of pickles", "str_pl": "sealed jars of pickles" },
"description": "This is a sealed glass jar containing pickles. Use to open and eat to enjoy.",
"weight": "1750 g",
"volume": "500 ml",
Expand All @@ -476,8 +474,7 @@
"id": "jar_sauerkraut_pickled",
"type": "GENERIC",
"category": "food",
"name": "sealed jar of sauerkraut",
"name_plural": "sealed jars of sauerkraut",
"name": { "str": "sealed jar of sauerkraut", "str_pl": "sealed jars of sauerkraut" },
"description": "This is a sealed glass jar containing sauerkraut. Use to open and eat to enjoy.",
"weight": "1750 g",
"volume": "500 ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/tool/science.json
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,7 @@
"id": "stand_ring_clamps",
"type": "GENERIC",
"category": "spare_parts",
"name": "set of ring stand clamps",
"name_plural": "sets of ring stand clamps",
"name": { "str": "set of ring stand clamps", "str_pl": "sets of ring stand clamps" },
"description": "This is a small box with a jumbled assortment of clamps for mounting on ring stands. There seems to be some sort of rule that all of them are missing at least one wing nut for tightening them; it looks like judicious use of twist ties, duct tape, and other random stuff has been used to compensate.",
"weight": "300 g",
"volume": "450ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/vehicle/farming.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"type": "GENERIC",
"id": "v_planter_item",
"symbol": "8",
"name": "seed drill",
"name_plural": "seed drills",
"name": { "str": "seed drill" },
"description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land.",
"material": [ "steel", "plastic" ],
"copy-from": "v_scoop_item"
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/vehicle/manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
{
"type": "GENERIC",
"id": "hand_rims",
"name": "set of hand rims",
"name_plural": "sets of hand rims",
"name": { "str": "set of hand rims", "str_pl": "sets of hand rims" },
"description": "Hand rims for use on a wheelchair.",
"weight": "816 g",
"to_hit": -1,
Expand Down