Skip to content

Commit

Permalink
Generic name to object
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup committed Mar 4, 2020
1 parent 616e03e commit c0c9cff
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@
"id": "hickory_root",
"symbol": "/",
"color": "brown",
"name": "hickory root",
"name": { "str": "hickory root" },
"description": "A root from a hickory tree. It has an earthy smell.",
"price": 0,
"material": "wood",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@
"id": "element",
"symbol": ",",
"color": "light_gray",
"name": "heating element",
"name": { "str": "heating element" },
"category": "spare_parts",
"description": "A heating element, like the ones used in hotplates or kettles.",
"price": 1000,
Expand Down Expand Up @@ -1754,7 +1754,7 @@
"id": "mirror",
"symbol": "o",
"color": "light_cyan",
"name": "hand mirror",
"name": { "str": "hand mirror" },
"description": "A small hand mirror.",
"price": 15000,
"material": "glass",
Expand Down Expand Up @@ -2006,7 +2006,7 @@
"id": "garnet",
"symbol": "*",
"color": "red",
"name": "garnet",
"name": { "str": "garnet" },
"description": "A sparkling garnet.",
"price": 800000,
"price_postapoc": 80,
Expand Down Expand Up @@ -2716,7 +2716,7 @@
"category": "spare_parts",
"symbol": ",",
"color": "light_cyan",
"name": "hard steel plate",
"name": { "str": "hard steel plate" },
"description": "An armor plating made of a very thick steel, specifically engineered for use in a bullet resistant vest.",
"price": 10000,
"material": "hardsteel",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/generic/bathroom_house.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id": "base_toiletries",
"name": "generic grooming",
"name": { "str": "generic grooming" },
"type": "GENERIC",
"description": "generic item template",
"symbol": "+",
Expand Down Expand Up @@ -82,7 +82,7 @@
},
{
"id": "curler_hair",
"name": "hair curler",
"name": { "str": "hair curler" },
"type": "GENERIC",
"description": "A soft plastic cylinder you can wrap a lock of your hair around to curl it.",
"copy-from": "base_toiletries",
Expand Down Expand Up @@ -181,7 +181,7 @@
},
{
"id": "hair_dryer",
"name": "hair dryer",
"name": { "str": "hair dryer" },
"type": "GENERIC",
"description": "This tool dries your hair by pushing air through a coil of hot wires. Without a functioning power grid, it is a motorized paper weight.",
"symbol": "(",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/generic/spares.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"id": "glowplug",
"copy-from": "spare_part",
"type": "GENERIC",
"name": "glow plug",
"name": { "str": "glow plug" },
"description": "A cylindrical heating device designed to be screwed in to a diesel engine to aid starting in cold weather.",
"material": [ "plastic", "copper" ],
"weight": "260 g",
Expand All @@ -89,7 +89,7 @@
"id": "pump_complex",
"copy-from": "spare_part",
"type": "GENERIC",
"name": "high-pressure pump",
"name": { "str": "high-pressure pump" },
"description": "A complex mechanical pump capable of achieving high pressures. Far beyond anything you could reasonably improvise.",
"material": "iron",
"weight": "2800 g",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/generic/toys_and_sports.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"id": "golf_tee",
"type": "GENERIC",
"category": "other",
"name": "golf tee",
"name": { "str": "golf tee" },
"description": "A pin shaped piece of wood meant for holding a golf ball slightly off the ground.",
"weight": "3 g",
"volume": "250 ml",
Expand All @@ -80,7 +80,7 @@
"id": "golf_ball",
"type": "GENERIC",
"category": "other",
"name": "golf ball",
"name": { "str": "golf ball" },
"description": "A small ball with round indentations on it.",
"weight": "50 g",
"volume": "250 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/melee/bludgeons.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
"id": "glass_shiv",
"symbol": ",",
"color": "light_cyan",
"name": "glass shiv",
"name": { "str": "glass shiv" },
"description": "A glass shard with wrapping at one end so it can be safely wielded.",
"material": [ "glass", "cotton" ],
"weight": "115 g",
Expand All @@ -351,7 +351,7 @@
"id": "golf_club",
"symbol": ";",
"color": "light_gray",
"name": "golf club",
"name": { "str": "golf club" },
"description": "A long handle with a big metal head, flat on one side, for driving golf balls. Fore!",
"price": 13000,
"price_postapoc": 2200,
Expand Down Expand Up @@ -416,7 +416,7 @@
{
"type": "GENERIC",
"id": "hammer_sledge_heavy",
"name": "heavy sledge hammer",
"name": { "str": "heavy sledge hammer" },
"description": "A large sledge hammer with a massive, heavy head. This unwieldy tool is meant to break concrete, rock, brick, anything really.",
"weight": "9500 g",
"color": "brown",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/melee/spears_and_polearms.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "halberd",
"name": { "str": "halberd" },
"description": "This is a versatile polearm with an axe blade, a spike, and other fun things attached to a long stick.",
"price": 50000,
"material": [ "wood", "steel" ],
Expand All @@ -279,7 +279,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "halberd",
"name": { "str": "halberd" },
"description": "This is a dull, cheaply made replica of a polearm with an axe blade, a spike, and other fun things attached to a long stick.",
"price": 5000,
"material": [ "wood", "aluminum" ],
Expand All @@ -297,7 +297,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "glaive",
"name": { "str": "glaive" },
"description": "A sturdy polearm with a sizable, single-edged blade on the end.",
"price": 50000,
"material": [ "steel", "wood" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/resources/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
"type": "GENERIC",
"symbol": ",",
"color": "dark_gray",
"name": "grenade launcher buttstock",
"name": { "str": "grenade launcher buttstock" },
"category": "spare_parts",
"description": "A collapsible buttstock designed for the M320 grenade launcher. When combined with this stock, the M320 can be used as a standalone weapon",
"price": 10000,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/resources/wood.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"id": "stick",
"symbol": "/",
"color": "brown",
"name": "heavy stick",
"name": { "str": "heavy stick" },
"description": "A sturdy, heavy stick. Makes a decent melee weapon.",
"material": "wood",
"techniques": [ "WBLOCK_1" ],
Expand Down Expand Up @@ -106,7 +106,7 @@
{
"type": "GENERIC",
"id": "wood_beam",
"name": "heavy wooden beam",
"name": { "str": "heavy wooden beam" },
"description": "An enormous beam of solid wood, very heavy and hard to lug around, but also very sturdy for construction. You could saw or chop it into smaller pieces, like planks or panels.",
"category": "spare_parts",
"weight": "36000 g",
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 @@ -79,7 +79,7 @@
{
"type": "GENERIC",
"id": "gun_module",
"name": "gun operating system",
"name": { "str": "gun operating system" },
"description": "This system can operate most conventional weapons.",
"copy-from": "robot_module_abstract"
},
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 @@ -131,7 +131,7 @@
"id": "grapnel",
"type": "GENERIC",
"category": "tools",
"name": "grappling hook",
"name": { "str": "grappling hook" },
"description": "A folding grappling hook attached to a stout 30-foot long piece of lightweight cord. Useful for keeping yourself safe from falls. Can be used in place of a long rope for butchering, in a pinch.",
"weight": "760 g",
"volume": "750 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 @@ -471,7 +471,7 @@
"id": "glass_prism",
"type": "GENERIC",
"category": "spare_parts",
"name": "glass prism",
"name": { "str": "glass prism" },
"description": "This is a high quality crystal glass prism for separating and redirecting light.",
"weight": "50 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/woodworking.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"id": "hatchet",
"symbol": ";",
"color": "light_gray",
"name": "hatchet",
"name": { "str": "hatchet" },
"description": "A one-handed hatchet. Makes a great melee weapon, and is useful both for chopping things and for use as a hammer.",
"price": 2500,
"price_postapoc": 5000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/frames.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{
"type": "GENERIC",
"id": "hdframe",
"name": "heavy duty frame",
"name": { "str": "heavy duty frame" },
"description": "A large, reinforced steel frame, used in military vehicle construction.",
"weight": "100000 g",
"to_hit": -6,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/plating.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
{
"type": "GENERIC",
"id": "hard_plate",
"name": "hard plating",
"name": { "str": "hard plating" },
"description": "A piece of very thick armor plating made of steel.",
"weight": "32640 g",
"to_hit": -1,
Expand Down

0 comments on commit c0c9cff

Please sign in to comment.