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

turn all the remaining bare name strings into name objects #46964

Merged
merged 39 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
1e91eba
artifact name update
TheGoatGod Jan 23, 2021
9a00123
json name update
TheGoatGod Jan 23, 2021
f8b8cf3
armor name update
TheGoatGod Jan 23, 2021
fc5a17c
items name update
TheGoatGod Jan 23, 2021
7277df5
book name update
TheGoatGod Jan 23, 2021
d8a47fa
item name update
TheGoatGod Jan 23, 2021
74057a3
comestibles name update 1
TheGoatGod Jan 23, 2021
90325e3
comestible name update 2
TheGoatGod Jan 23, 2021
2617aa6
comestible name update 3
TheGoatGod Jan 23, 2021
350ab0b
comestible name update 4
TheGoatGod Jan 23, 2021
c5dd042
corpses name update
TheGoatGod Jan 23, 2021
d816a1a
generic name update
TheGoatGod Jan 23, 2021
24f2d62
gun name update
TheGoatGod Jan 23, 2021
b50fb4e
gun mod name update
TheGoatGod Jan 23, 2021
1c2d23d
resources name update
TheGoatGod Jan 23, 2021
1011e9a
tool name update
TheGoatGod Jan 23, 2021
dc46b8a
vehicle tool name update
TheGoatGod Jan 23, 2021
c4ef37a
monster special attack name update
TheGoatGod Jan 23, 2021
ac60e3d
monster name update
TheGoatGod Jan 23, 2021
9313b50
npc name update
TheGoatGod Jan 23, 2021
63b3f7e
vehicleparts name update
TheGoatGod Jan 23, 2021
ebbe217
json name update
TheGoatGod Jan 23, 2021
41829af
legacy name update
TheGoatGod Jan 23, 2021
2bd8827
rename files for linter
TheGoatGod Jan 23, 2021
a0d7b5b
rural-cowboy trader name update
TheGoatGod Jan 23, 2021
a6d9d25
Create name.py
TheGoatGod Jan 23, 2021
b89a337
Update name.py
TheGoatGod Jan 23, 2021
aeb785a
Update name.py
TheGoatGod Jan 23, 2021
a83cfa7
Update name.py
TheGoatGod Jan 23, 2021
3a9c444
Update name.py
TheGoatGod Jan 23, 2021
f15ecea
Update name.py
TheGoatGod Jan 23, 2021
9b84ab8
Update tools/name.py
TheGoatGod Jan 25, 2021
b178995
Update tools/name.py
TheGoatGod Jan 25, 2021
fb361e8
Update tools/name.py
TheGoatGod Jan 25, 2021
5619444
Update tools/name.py
TheGoatGod Jan 25, 2021
59275aa
Update tools/name.py
TheGoatGod Jan 25, 2021
615843b
Update name.py
TheGoatGod Jan 25, 2021
b7d9257
rename script
TheGoatGod Jan 25, 2021
f64f320
move script to /json_tools
TheGoatGod Jan 25, 2021
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
8 changes: 4 additions & 4 deletions data/json/artifact/altered_object_active.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
{
"id": "AO_FORCE_PULL",
"type": "SPELL",
"name": "Artifact Force Pull",
"name": { "str": "Artifact Force Pull" },
"description": "Pull objects.",
"effect": "area_pull",
"shape": "blast",
Expand All @@ -55,7 +55,7 @@
{
"id": "AO_TELEPORTITIS",
"type": "SPELL",
"name": "Artifact Teleportitis",
"name": { "str": "Artifact Teleportitis" },
"description": "Causes you to teleport uncontrollably.",
"message": "The world loses coherence, with images of nearby places forming and disappearing around you.",
"valid_targets": [ "self" ],
Expand All @@ -69,7 +69,7 @@
{
"id": "AO_SLOW",
"type": "SPELL",
"name": "Artifact Slow",
"name": { "str": "Artifact Slow" },
"description": "Slows you for a few turns.",
"message": "The world shifts blue, and reality accelerates around you.",
"valid_targets": [ "self" ],
Expand All @@ -83,7 +83,7 @@
{
"id": "AO_TIME_STOP",
"type": "SPELL",
"name": "Artifact Time Stop",
"name": { "str": "Artifact Time Stop" },
"description": "Grants you a few turns of super speed.",
"message": "Stale golden light floods the world, and reality stands still.",
"valid_targets": [ "self" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/artifact/legacy_artifact_passive.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
{
"type": "SPELL",
"id": "AEP_EVIL_SPELL",
"name": "EEEEEEVVVVVIIIIILLLL!",
"name": { "str": "EEEEEEVVVVVIIIIILLLL!" },
"description": "You debugged in this spell! It makes you evil for 30 minutes.",
"valid_targets": [ "hostile", "ally", "self" ],
"effect": "attack",
Expand Down
2 changes: 1 addition & 1 deletion data/json/item_actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@
{
"type": "item_action",
"id": "FITNESS_CHECK",
"name": "Check health metrics"
"name": { "str": "Check health metrics" }
},
{
"type": "item_action",
Expand Down
2 changes: 1 addition & 1 deletion data/json/item_spell_effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{
"id": "fog_machine",
"type": "SPELL",
"name": "fog ex machina",
"name": { "str": "fog ex machina" },
"description": "You see fog bubbling out of the device.",
"effect": "attack",
"shape": "cone",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/altered_object_auras.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
"id": "artifact_teleportitis_aura",
"type": "ARMOR",
"name": "strange pressure",
"name": { "str": "strange pressure" },
"description": "You feel a strange force pressing you inwards and inside-out.",
"weight": "1g",
"volume": "1ml",
Expand All @@ -25,7 +25,7 @@
{
"id": "artifact_slow_aura",
"type": "ARMOR",
"name": "temporal distortion",
"name": { "str": "temporal distortion" },
"description": "A slight temporal distortion appears to be centered around you.",
"weight": "1g",
"volume": "1ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@
"copy-from": "raw_leather",
"type": "COMESTIBLE",
"category": "clothing",
"name": "hide bag",
"name": { "str": "hide bag" },
"description": "The raw skin of an animal, quickly turned into a makeshift bag for storage. It will still rot, and needs to be cured and tanned.",
"symbol": "[",
"looks_like": "plastic_shopping_bag",
Expand Down Expand Up @@ -660,7 +660,7 @@
"copy-from": "raw_tainted_leather",
"type": "COMESTIBLE",
"category": "clothing",
"name": "tainted hide bag",
"name": { "str": "tainted hide bag" },
"description": "The raw skin of a monster, quickly turned into a makeshift bag for storage. It will still rot, and needs to be cured and tanned.",
"symbol": "[",
"looks_like": "hide_bag",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/biosignatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"type": "COMESTIBLE",
"id": "feces_cow",
"name": "cow pie",
"name": { "str": "cow pie" },
"copy-from": "feces_bird",
"weight": "750 g",
"volume": "1 L",
Expand All @@ -33,14 +33,14 @@
{
"type": "COMESTIBLE",
"id": "feces_dog",
"name": "dog dung",
"name": { "str": "dog dung" },
"copy-from": "feces_manure",
"description": "Droppings from a canine."
},
{
"type": "COMESTIBLE",
"id": "feces_manure",
"name": "manure",
"name": { "str": "manure" },
"copy-from": "feces_bird",
"weight": "250 g",
"volume": "500 ml",
Expand All @@ -49,7 +49,7 @@
{
"type": "COMESTIBLE",
"id": "feces_roach",
"name": "roach dirt",
"name": { "str": "roach dirt" },
"copy-from": "feces_bird",
"description": "Large black pellets of rotting material."
},
Expand Down
58 changes: 29 additions & 29 deletions data/json/items/book/abstract.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"abstract": "book_nonf_tpl",
"type": "BOOK",
"name": "Generic Nonfiction Book",
"name": { "str": "Generic Nonfiction Book" },
"description": "template for a manuscript purporting to be factual",
"intelligence": 5,
"symbol": "?",
Expand All @@ -13,7 +13,7 @@
{
"abstract": "book_fict_tpl",
"type": "BOOK",
"name": "Generic Fiction Book",
"name": { "str": "Generic Fiction Book" },
"description": "template for a work of fiction",
"intelligence": 5,
"symbol": "?",
Expand All @@ -26,7 +26,7 @@
{
"abstract": "book_fict_hard_tpl",
"type": "BOOK",
"name": "Generic Hard Bound Fiction Book",
"name": { "str": "Generic Hard Bound Fiction Book" },
"description": "Template for hard bound book of fiction",
"weight": "1000 g",
"volume": "1100 ml",
Expand Down Expand Up @@ -55,7 +55,7 @@
{
"abstract": "book_nonf_hard_tpl",
"type": "BOOK",
"name": "Nonfiction Book",
"name": { "str": "Nonfiction Book" },
"description": "template for hard bound nonfiction book",
"weight": "1 kg",
"volume": "1100 ml",
Expand All @@ -69,7 +69,7 @@
{
"abstract": "book_nonf_soft_tpl",
"type": "BOOK",
"name": "Nonfiction Paperback",
"name": { "str": "Nonfiction Paperback" },
"description": "template for a paperback nonfiction book",
"weight": "460 g",
"volume": "500 ml",
Expand All @@ -83,7 +83,7 @@
{
"abstract": "book_fict_soft_pulp_tpl",
"type": "BOOK",
"name": "Generic Pulp Book",
"name": { "str": "Generic Pulp Book" },
"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",
Expand All @@ -92,23 +92,23 @@
{
"abstract": "book_fict_soft_scifi_tpl",
"type": "BOOK",
"name": "Generic SciFi Book",
"name": { "str": "Generic SciFi Book" },
"description": "This is a template for paperback scifi books.",
"copy-from": "book_fict_soft_tpl",
"relative": { "intelligence": 1, "chapters": 8, "fun": 1 }
},
{
"abstract": "book_fict_hard_scifi_tpl",
"type": "BOOK",
"name": "Generic SciFi Book",
"name": { "str": "Generic SciFi Book" },
"description": "This is a template for a hard cover scifi book.",
"copy-from": "book_fict_hard_tpl",
"relative": { "intelligence": 1, "chapters": 8, "fun": 1 }
},
{
"abstract": "book_nonf_hard_homemk_tpl",
"type": "BOOK",
"name": "Homemaking Book",
"name": { "str": "Homemaking Book" },
"description": "This is a template for books about homemaking, style, home decor, and home economics.",
"weight": "1100 g",
"copy-from": "book_nonf_hard_tpl",
Expand All @@ -117,7 +117,7 @@
{
"abstract": "book_nonf_hard_cook_tpl",
"type": "BOOK",
"name": "Hardcover Cookbook",
"name": { "str": "Hardcover Cookbook" },
"description": "This is a template for books about cooking.",
"skill": "cooking",
"copy-from": "book_nonf_hard_tpl",
Expand All @@ -126,7 +126,7 @@
{
"abstract": "book_nonf_soft_cook_tpl",
"type": "BOOK",
"name": "Softcover Cookbook",
"name": { "str": "Softcover Cookbook" },
"description": "This is a template for books about cooking.",
"skill": "cooking",
"copy-from": "book_nonf_soft_tpl",
Expand All @@ -135,7 +135,7 @@
{
"abstract": "book_nonf_hard_dodge_tpl",
"type": "BOOK",
"name": "dodge skillbook abstract",
"name": { "str": "dodge skillbook abstract" },
"description": "An ordinary book. Or is it? It is.",
"weight": "600 g",
"price": 1000,
Expand All @@ -150,7 +150,7 @@
{
"abstract": "book_nonf_hard_phil_tpl",
"type": "BOOK",
"name": "Hardcover Philosophy",
"name": { "str": "Hardcover Philosophy" },
"description": "This is a template for books about philosophy.",
"fun": 1,
"time": "36 m",
Expand All @@ -160,7 +160,7 @@
{
"abstract": "book_nonf_soft_phil_tpl",
"type": "BOOK",
"name": "Softcover Philosophy.",
"name": { "str": "Softcover Philosophy." },
"description": "This is a template for paperbacks about philosophy.",
"fun": 1,
"time": "36 m",
Expand All @@ -170,39 +170,39 @@
{
"abstract": "book_nonf_hard_sports_tpl",
"type": "BOOK",
"name": "Hardcover Nonfiction Sports Book",
"name": { "str": "Hardcover Nonfiction Sports Book" },
"description": "This is a template.",
"fun": 1,
"copy-from": "book_nonf_hard_tpl"
},
{
"abstract": "book_nonf_soft_sports_tpl",
"type": "BOOK",
"name": "Softcover Nonfiction Sports Book.",
"name": { "str": "Softcover Nonfiction Sports Book." },
"description": "This is a template.",
"fun": 1,
"copy-from": "book_nonf_soft_tpl"
},
{
"abstract": "book_fict_hard_sports_tpl",
"type": "BOOK",
"name": "Hardcover Fictional Sports Book",
"name": { "str": "Hardcover Fictional Sports Book" },
"description": "This is a template.",
"fun": 2,
"copy-from": "book_fict_hard_tpl"
},
{
"abstract": "book_fict_soft_sports_tpl",
"type": "BOOK",
"name": "Softcover Fictional Sports Book.",
"name": { "str": "Softcover Fictional Sports Book." },
"description": "This is a template.",
"fun": 2,
"copy-from": "book_fict_soft_tpl"
},
{
"abstract": "paperback_occult",
"type": "BOOK",
"name": "template for mass produced books on esoteric subjects",
"name": { "str": "template for mass produced books on esoteric subjects" },
"description": "An ordinary paperback book. Or is it? Is that a glimmer of higher truth?",
"weight": "371 g",
"volume": "700 ml",
Expand All @@ -222,7 +222,7 @@
{
"abstract": "paperback_romance_spb",
"type": "BOOK",
"name": "Sweet Providence Romance Novel",
"name": { "str": "Sweet Providence Romance Novel" },
"description": "Sweet Providence Books is a publisher of discount romance paperbacks easily recognized by their blue and yellow cover illustrations. Despite the adult nature of their subject matter, the books tend to be under 250 pages of large print written in a vocabulary consistent with a 4th grade reading level.",
"//": "these are books are tiny",
"weight": "200 g",
Expand All @@ -234,47 +234,47 @@
{
"abstract": "paperback_romance_lnl",
"type": "BOOK",
"name": "Lorn and Loan Romance Novel",
"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 }
},
{
"abstract": "paperback_romance_vanilla",
"type": "BOOK",
"name": "Vanilla Romance Novel",
"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 }
},
{
"abstract": "paperback_western_em",
"type": "BOOK",
"name": "The Everyman Library",
"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 }
},
{
"abstract": "book_fict_soft_ya_vanilla",
"type": "BOOK",
"name": "Tween Topics",
"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 }
},
{
"abstract": "book_fict_soft_ya_quiddity",
"type": "BOOK",
"name": "Quiddity Books",
"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 }
},
{
"abstract": "book_fict_hard_ya_quiddity",
"type": "BOOK",
"name": "Quiddity Books",
"name": { "str": "Quiddity Books" },
"description": "Quiddity publishes books for young adults. They offer stories about self-discovery, personal identity, and contemporary trends.",
"weight": "500 g",
"volume": "1014 ml",
Expand All @@ -285,7 +285,7 @@
{
"abstract": "book_fict_soft_satire_tpl",
"type": "BOOK",
"name": "Satire Template",
"name": { "str": "Satire Template" },
"description": "template for mass produced satirical fiction",
"copy-from": "book_fict_soft_tpl",
"time": "20 m",
Expand All @@ -294,7 +294,7 @@
{
"abstract": "book_nonf_zine",
"type": "BOOK",
"name": "Magazine Template",
"name": { "str": "Magazine Template" },
"description": "template for magazine",
"intelligence": 4,
"weight": "60 g",
Expand All @@ -310,7 +310,7 @@
{
"abstract": "book_nonf_zine_news_tpl",
"type": "BOOK",
"name": "News Magazine Template",
"name": { "str": "News Magazine Template" },
"description": "template for news magazine",
"looks_like": "flyer",
"copy-from": "book_nonf_zine",
Expand Down
Loading