Skip to content

Commit

Permalink
Generic name to object (#38696)
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup authored Mar 11, 2020
1 parent 934bc2c commit bd0b60a
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion data/json/items/book/maps.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"id": "touristmap",
"copy-from": "abstractmap",
"type": "GENERIC",
"name": "tourist guide",
"name": { "str": "tourist guide" },
"description": "This is glossy printed pamphlet for tourists that details local hotels and attractions.",
"color": "blue",
"use_action": {
Expand Down
16 changes: 8 additions & 8 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
"category": "spare_parts",
"symbol": ",",
"color": "light_gray",
"name": "t-substrate sample",
"name": { "str": "t-substrate sample" },
"description": "An acrylic cube cast around a small black crystal. It's tepid to the touch.",
"price": 0,
"material": "stone",
Expand Down Expand Up @@ -784,7 +784,7 @@
"id": "television",
"symbol": ";",
"color": "dark_gray",
"name": "television",
"name": { "str": "television" },
"description": "A large LCD television, full of delicious electronics.",
"price": 0,
"material": "plastic",
Expand Down Expand Up @@ -812,7 +812,7 @@
"id": "toaster",
"symbol": ",",
"color": "light_gray",
"name": "toaster",
"name": { "str": "toaster" },
"description": "A small two slice toaster, not much use as anything but spare parts",
"price": 1000,
"material": [ "aluminum", "plastic" ],
Expand Down Expand Up @@ -1853,7 +1853,7 @@
"id": "tanbark",
"symbol": ",",
"color": "brown",
"name": "tanbark",
"name": { "str": "tanbark", "str_pl": "tanbark" },
"description": "A sheet of tannin-rich bark from a tree, useful for tanning leather",
"price": 0,
"material": "wood",
Expand Down Expand Up @@ -1995,7 +1995,7 @@
"id": "tourmaline",
"copy-from": "garnet",
"color": "light_red",
"name": "tourmaline",
"name": { "str": "tourmaline" },
"description": "A sparkling tourmaline."
},
{
Expand All @@ -2011,7 +2011,7 @@
"id": "blue_topaz",
"copy-from": "garnet",
"color": "light_blue",
"name": "topaz",
"name": { "str": "topaz" },
"description": "A sparkling blue topaz."
},
{
Expand Down Expand Up @@ -2145,7 +2145,7 @@
"id": "teddy",
"symbol": "o",
"color": "brown",
"name": "teddy bear",
"name": { "str": "teddy bear" },
"description": "An old and half rotten teddy bear. Looks like this one commemorates the grave of the child who once owned it.",
"price": 200,
"material": [ "cotton" ],
Expand All @@ -2158,7 +2158,7 @@
"id": "teddy_bear",
"symbol": "o",
"color": "brown",
"name": "teddy bear",
"name": { "str": "teddy bear" },
"description": "A mass-produced plush teddy bear. It is wearing a little red tshirt but no pants.",
"price": 200,
"material": [ "cotton" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/generic/bathroom_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
},
{
"id": "plunger_toilet",
"name": "toilet plunger",
"name": { "str": "toilet plunger" },
"type": "GENERIC",
"description": "A rubber-tipped tool for unclogging pipes, or a club for an immature survivor.",
"symbol": "p",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/melee/bludgeons.json
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@
{
"type": "GENERIC",
"id": "tonfa",
"name": "tonfa",
"name": { "str": "tonfa" },
"description": "A hard plastic truncheon commonly employed by police. Originally an Okinawan weapon, it consists of a stick with a perpendicular handle attached a third of the way down its length.",
"weight": "575 g",
"to_hit": 2,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@
"id": "tanto_fake",
"type": "GENERIC",
"category": "weapons",
"name": "tanto",
"name": { "str": "tanto" },
"description": "This is a dull, cheaply made replica of a long Japanese knife, typically used as a samurai's backup weapon.",
"weight": "374 g",
"volume": "500 ml",
Expand All @@ -843,7 +843,7 @@
"id": "tanto_inferior",
"type": "GENERIC",
"category": "weapons",
"name": "tanto",
"name": { "str": "tanto" },
"description": "Long Japanese knives like this more-modern remake were the samurai's backup weapon, before the advent of the larger wakizashi. This one doesn't feel well-balanced",
"weight": "3 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ranged/throwing.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"id": "throwing_axe",
"category": "weapons",
"price": 12400,
"name": "throwing axe",
"name": { "str": "throwing axe" },
"symbol": ";",
"color": "light_gray",
"description": "A lightweight hatchet made for throwing. Its ineffective cutting edge and light weight makes it unsuitable for use as a tool.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/robot_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
"type": "GENERIC",
"id": "targeting_module",
"name": "targeting module",
"name": { "str": "targeting module" },
"description": "This module integrates visual and proprioceptive information from peripheric sensors and outputs information necessary for accurate aiming.",
"copy-from": "robot_module_abstract"
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@
"id": "teapot",
"type": "GENERIC",
"category": "tools",
"name": "teapot",
"name": { "str": "teapot" },
"description": "A small metal teapot. Teatime wouldn't be complete without one.",
"weight": "229 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/explosives.json
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@
"id": "gasbomb",
"copy-from": "grenade_canister",
"type": "GENERIC",
"name": "tear gas grenade",
"name": { "str": "tear gas grenade" },
"price": 3600,
"description": "This is a canister grenade filled with noxious irritant. Use this item to pull the pin and light the fuse, turning it into an active tear gas grenade. In five turns it will begin to expel a highly toxic gas for some time. This gas damages and slows those who enter it, as well as obscuring vision and scent.",
"countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "gasbomb_act" }
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
"id": "teleumbrella",
"type": "GENERIC",
"category": "tools",
"name": "telescoping umbrella",
"name": { "str": "telescoping umbrella" },
"description": "A telescoping umbrella which collapses down for easy storage, useful for keeping dry when wielded.",
"weight": "118 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/science.json
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@
"id": "rack_test_tube",
"type": "GENERIC",
"category": "spare_parts",
"name": "test tube rack",
"name": { "str": "test tube rack" },
"description": "A plastic box with holes in it. Not that exciting, unless you're desperate for a place to store a test tube. Then it's great.",
"weight": "90 g",
"volume": "250ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/tailoring.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
"id": "tailoring_pattern_set",
"type": "GENERIC",
"category": "tools",
"name": "tailoring pattern set",
"name": { "str": "tailoring pattern set" },
"description": "This is a large set of tailoring patterns made from paper. They're useful for making any kind of cloth or leather items from scratch, but are necessary for more advanced projects.",
"weight": "1000 g",
"volume": "833 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"id": "engine_block_tiny",
"copy-from": "spare_part",
"type": "GENERIC",
"name": "tiny engine block",
"name": { "str": "tiny engine block" },
"description": "The beginnings of a tiny gas or diesel engine. It's not good for much of anything on its own.",
"material": "iron",
"weight": "8000 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/engineering.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"id": "cantilever_small",
"type": "GENERIC",
"category": "veh_parts",
"name": "telescopic cantilever",
"name": { "str": "telescopic cantilever" },
"description": "A small steel telescoping cantilever. If attached to a frame it could be used to lift up to 3.5 metric tonnes.",
"price": 7900,
"weight": "12000 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/motors.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
{
"type": "GENERIC",
"id": "motor_tiny",
"name": "tiny electric motor",
"name": { "str": "tiny electric motor" },
"description": "A tiny electric motor. Useful for crafting.",
"weight": "625 g",
"color": "light_cyan",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/utilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
{
"type": "GENERIC",
"id": "towel_hanger",
"name": "towel hanger",
"name": { "str": "towel hanger" },
"description": "A towel hanger with towels.",
"weight": "2000 g",
"to_hit": -1,
Expand Down

0 comments on commit bd0b60a

Please sign in to comment.