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

Generic modern json #38004

Merged
merged 2 commits into from
Feb 14, 2020
Merged

Generic modern json #38004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be7a1c3
Name to object, volume to string
snipercup Feb 14, 2020
4191157
Name to object, volume to string
snipercup Feb 14, 2020
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
18 changes: 7 additions & 11 deletions data/json/items/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
"id": "fire",
"symbol": "$",
"color": "red",
"name": "nearby fire",
"name_plural": "none",
"name": { "str": "nearby fire", "str_pl": "none" },
"description": "seeing this is a bug",
"price": 0,
"volume": 0,
"volume": "1 ml",
"flags": [ "PSEUDO" ]
},
{
Expand All @@ -32,12 +31,11 @@
"id": "muscle",
"symbol": "?",
"color": "white",
"name": "muscle",
"name_plural": "none",
"name": { "str": "muscle", "str_pl": "none" },
"description": "seeing this is a bug",
"stackable": true,
"price": 0,
"volume": 0,
"volume": "0 ml",
"flags": [ "PSEUDO", "PERPETUAL" ],
"fuel": { "energy": 1 }
},
Expand Down Expand Up @@ -102,11 +100,10 @@
"id": "null",
"symbol": "$",
"color": "red",
"name": "none",
"name_plural": "none",
"name": { "str": "none", "str_pl": "none" },
"description": "seeing this is a bug",
"price": 0,
"volume": 0,
"volume": "0 ml",
"flags": [ "PSEUDO", "UNARMED_WEAPON" ],
"//": "Fist is internally represented as 'wielding a none as a weapon'"
},
Expand Down Expand Up @@ -1885,8 +1882,7 @@
"id": "mortar_build",
"symbol": "%",
"color": "light_gray",
"name": "mortar",
"name_plural": "mortar",
"name": { "str": "mortar", "str_pl": "mortar" },
"description": "Some mortar, ready to be used in building projects.",
"category": "spare_parts",
"container": "bag_canvas",
Expand Down
9 changes: 3 additions & 6 deletions data/json/items/melee/spears_and_polearms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@
{
"type": "GENERIC",
"id": "naginata",
"name": "naginata",
"name_plural": "naginata",
"name": { "str": "naginata", "str_pl": "naginata" },
"description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades. Occasionally used by samurai in early periods, or by their wives in defense of the household.",
"weight": "1700 g",
"to_hit": 2,
Expand All @@ -332,8 +331,7 @@
{
"type": "GENERIC",
"id": "naginata_inferior",
"name": "naginata",
"name_plural": "naginata",
"name": { "str": "naginata", "str_pl": "naginata" },
"description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades. This one has a bit of wiggle to its blade and feels a bit shoddily made.",
"weight": "1700 g",
"color": "light_gray",
Expand All @@ -351,8 +349,7 @@
{
"type": "GENERIC",
"id": "naginata_fake",
"name": "naginata",
"name_plural": "naginata",
"name": { "str": "naginata", "str_pl": "naginata" },
"description": "This is a dull, slightly floppy replica of a Japanese polearm with a curved blade. With a little difficulty, you could use it administer a solid slap from a distance.",
"weight": "1400 g",
"color": "light_gray",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/melee/swords_and_blades.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,8 +883,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "nodachi",
"name_plural": "nodachi",
"name": { "str": "nodachi", "str_pl": "nodachi" },
"description": "This is a dull, cheaply made replica of a huge, curved, two-handed sword from Japan. It is surprisingly light for its size.",
"price": 15000,
"price_postapoc": 0,
Expand All @@ -903,8 +902,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "nodachi",
"name_plural": "nodachi",
"name": { "str": "nodachi", "str_pl": "nodachi" },
"description": "This is a huge, curved, two-handed sword from Japan. It is surprisingly light for its size, but also much bendier than a sword should be.",
"price": 15000,
"price_postapoc": 0,
Expand Down
30 changes: 12 additions & 18 deletions data/json/items/newspaper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,89 +67,83 @@
"category": "books",
"symbol": ",",
"color": "white",
"name": "newspaper page",
"name_plural": "newspaper pages",
"name": { "str": "newspaper page" },
"snippet_category": "newest_news",
"description": "A single sheet of newspaper broadsheet. It is possibly one of the last issues printed before New England was overwhelmed. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
"weight": "3 g",
"volume": 0
"volume": "1 ml"
},
{
"type": "GENERIC",
"id": "many_years_old_newspaper",
"category": "books",
"symbol": ",",
"color": "white",
"name": "newspaper page",
"name_plural": "newspaper pages",
"name": { "str": "newspaper page" },
"snippet_category": "many_years_old_news",
"description": "A single sheet of newspaper broadsheet. It seems to date from several years ago, and you've NO idea how it lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
"weight": "3 g",
"volume": 0
"volume": "1 ml"
},
{
"type": "GENERIC",
"id": "years_old_newspaper",
"category": "books",
"symbol": ",",
"color": "white",
"name": "newspaper page",
"name_plural": "newspaper pages",
"name": { "str": "newspaper page" },
"snippet_category": "years_old_news",
"description": "A single sheet of newspaper broadsheet. It seems to date from a few years ago--amazing it has lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
"weight": "3 g",
"volume": 0
"volume": "1 ml"
},
{
"type": "GENERIC",
"id": "one_year_old_newspaper",
"category": "books",
"symbol": ",",
"color": "white",
"name": "newspaper page",
"name_plural": "newspaper pages",
"name": { "str": "newspaper page" },
"snippet_category": "one_year_old_news",
"description": "A single sheet of newspaper broadsheet. It was printed more than a year ago. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
"weight": "3 g",
"volume": 0
"volume": "1 ml"
},
{
"type": "GENERIC",
"id": "months_old_newspaper",
"category": "books",
"symbol": ",",
"color": "white",
"name": "newspaper page",
"name_plural": "newspaper pages",
"name": { "str": "newspaper page" },
"snippet_category": "months_old_news",
"description": "A single sheet of newspaper broadsheet. It was printed in the months leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
"weight": "3 g",
"volume": 0
"volume": "1 ml"
},
{
"type": "GENERIC",
"id": "weeks_old_newspaper",
"category": "books",
"symbol": ",",
"color": "white",
"name": "newspaper page",
"name_plural": "newspaper pages",
"name": { "str": "newspaper page" },
"snippet_category": "weeks_old_news",
"description": "A single sheet of newspaper broadsheet. It was printed in the weeks leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
"weight": "3 g",
"volume": 0
"volume": "1 ml"
},
{
"type": "GENERIC",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/software.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"id": "software_useless",
"copy-from": "software",
"type": "GENERIC",
"name": "misc software",
"name_plural": "misc software",
"name": { "str": "misc software", "str_pl": "misc software" },
"description": "A miscellaneous piece of hobby software. Probably useless.",
"price": 300
},
Expand Down Expand Up @@ -69,8 +68,7 @@
{
"id": "mind_scan_robofac",
"type": "GENERIC",
"name": "neural data",
"name_plural": "neural data",
"name": { "str": "neural data", "str_pl": "neural data" },
"symbol": "#",
"container": "data_card",
"description": "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n\nWhatever the case, the idea of perpetually keeping a part of you within a metallic pill makes you feel uncomfortable.",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/vehicle/boat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
{
"type": "GENERIC",
"id": "hand_paddles",
"name": "oars",
"name_plural": "oars",
"name": { "str": "oars", "str_pl": "oars" },
"description": "Oars for a boat.",
"weight": "8 kg",
"to_hit": -1,
Expand Down