Skip to content

Commit

Permalink
Tool name to object
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup committed Feb 26, 2020
1 parent 241522e commit e1ef676
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"id": "betavoltaic",
"category": "spare_parts",
"price": 10000,
"name": "betavoltaic cell",
"name": { "str": "betavoltaic cell" },
"symbol": "=",
"color": "green",
"description": "Harness the power of radiation in your own home! This looks similar to a D-cell battery, but actually contains folded layers of radioactive material inside. It can produce electricity for several years at a steady voltage… but it's barely enough to power a small LED, and these batteries were worth hundreds of dollars. Mostly they're a good way to brag to your neighbors that you have a nuclear power source in your house.",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/fake.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"id": "fake_razor",
"copy-from": "fake_item",
"type": "TOOL",
"name": "bionic razor",
"name": { "str": "bionic razor" },
"qualities": [ [ "BUTCHER", 8 ] ]
},
{
Expand Down Expand Up @@ -124,7 +124,7 @@
"id": "boulder_anvil",
"type": "TOOL",
"copy-from": "fake_item",
"name": "boulder anvil",
"name": { "str": "boulder anvil" },
"qualities": [ [ "ANVIL", 1 ] ]
},
{
Expand All @@ -148,7 +148,7 @@
"id": "fake_firestarter",
"copy-from": "fake_item",
"type": "TOOL",
"name": "bionic firestarter",
"name": { "str": "bionic firestarter" },
"flags": [ "FIRESTARTER" ]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/melee/bludgeons.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"id": "battleaxe",
"type": "TOOL",
"category": "weapons",
"name": "battle axe",
"name": { "str": "battle axe" },
"description": "This is a huge axe designed for warfare. Though intended for use as a weapon, it can also be pressed into service as a rather clumsy woodcutting tool.",
"weight": "2002 g",
"volume": "2500 ml",
Expand Down Expand Up @@ -142,7 +142,7 @@
"type": "TOOL",
"symbol": "/",
"color": "light_gray",
"name": "battle axe",
"name": { "str": "battle axe" },
"description": "This is a huge axe designed for warfare. You notice that the axe heads aren't seated properly at all.",
"price": 40000,
"material": [ "budget_steel", "wood" ],
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 @@ -1103,7 +1103,7 @@
"id": "broadsword",
"type": "TOOL",
"category": "weapons",
"name": "broadsword",
"name": { "str": "broadsword" },
"description": "This is an early modern sword seeing use in the 16th, 17th, and 18th centuries. Called 'broad' to contrast with the slimmer rapiers.",
"weight": "1133 g",
"volume": "1750 ml",
Expand All @@ -1123,7 +1123,7 @@
"type": "TOOL",
"symbol": "/",
"color": "light_gray",
"name": "broadsword",
"name": { "str": "broadsword" },
"description": "This is an early modern sword seeing use in the 16th, 17th, and 18th centuries. This sword appears to be made very poorly, but it should still stand up to a few swings.",
"price": 120000,
"material": "budget_steel",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/deployable.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "brazier",
"type": "TOOL",
"name": "brazier",
"name": { "str": "brazier" },
"description": "A large metal stand used to contain a fire. Fires set in a brazier will not spread to surrounding flammable objects.",
"weight": "5000 g",
"volume": "2500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/entry_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
{
"id": "pseudo_bio_picklock",
"type": "TOOL",
"name": "bio lockpick",
"name": { "str": "bio lockpick" },
"description": "this a pseudo item",
"volume": 0,
"volume": "0 ml",
"price": 0,
"symbol": ";",
"color": "light_gray",
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 @@ -1208,7 +1208,7 @@
"id": "tool_black_powder_charge",
"type": "TOOL",
"category": "weapons",
"name": "black gunpowder charge",
"name": { "str": "black gunpowder charge" },
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with black gunpowder and scrap metal, equipped with a long fuse. Use this item to light the fuse. Should explode in a few minutes…",
"weight": "6500 g",
"volume": "4 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/metalworking.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{
"id": "anvil_bronze",
"type": "TOOL",
"name": "bronze anvil",
"name": { "str": "bronze anvil" },
"description": "This is a block of oddly shaped bronze with a chisel-like projection set into the corner. It's used in most metalworking fabrication recipes.",
"weight": "2180 g",
"volume": "2500 ml",
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 @@ -184,7 +184,7 @@
"id": "horn_bicycle",
"type": "TOOL",
"category": "veh_parts",
"name": "bicycle horn",
"name": { "str": "bicycle horn" },
"description": "This is a simple bulb horn, found on many bicycles. Use to honk. Honk honk.",
"weight": "170 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/raincatchers.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "birchbark_funnel",
"type": "TOOL",
"name": "birchbark funnel",
"name": { "str": "birchbark funnel" },
"description": "This is a small birchbark funnel. Place it above an outdoor container to collect rainwater.",
"weight": "3 g",
"volume": "250ml",
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 @@ -549,7 +549,7 @@
"id": "burette",
"type": "TOOL",
"category": "tools",
"name": "burette",
"name": { "str": "burette" },
"description": "A tall glass column with a stopcock at the end. If you're serious about chemistry, you probably have a tattoo of one of these somewhere.",
"weight": "300 g",
"volume": "1000ml",
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 @@ -62,7 +62,7 @@
{
"id": "needle_bone",
"type": "TOOL",
"name": "bone needle",
"name": { "str": "bone needle" },
"description": "This is sharp needle made from a bone. It would be useful for making rough clothing and items. Its low quality makes it rather unsuitable for anything requiring speed or precision.",
"weight": "85 g",
"volume": "250 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/tool/traps.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "beartrap",
"type": "TOOL",
"name": "bear trap",
"name": { "str": "bear trap" },
"description": "This is a spring-loaded pair of steel jaws connected to a sensitive pressure plate. Use it to set it on the ground, creating a trap that will ensnare and damage anything that steps on it. If you are carrying a shovel, you will have the option of burying it.",
"weight": "14000 g",
"volume": "1500 ml",
Expand All @@ -27,7 +27,7 @@
{
"id": "blade_trap",
"type": "TOOL",
"name": "blade trap",
"name": { "str": "blade trap" },
"description": "This is a machete attached laterally to a motor, with a tripwire controlling its throttle. When the tripwire is pulled, the blade is swung around with great force. The trap forms a 3x3 area of effect.",
"weight": "2381 g",
"volume": "4500 ml",
Expand Down Expand Up @@ -73,7 +73,7 @@
{
"id": "boobytrap",
"type": "TOOL",
"name": "booby trap",
"name": { "str": "booby trap" },
"description": "This is a crude explosive device triggered by a piece of string. Use it to set up and watch some poor bastard trigger it.",
"weight": "586 g",
"volume": "750 ml",
Expand All @@ -93,7 +93,7 @@
{
"id": "bubblewrap",
"type": "TOOL",
"name": "bubble wrap",
"name": { "str": "bubble wrap" },
"description": "This is a sheet of plastic covered with air-filled bubbles. Use it to set it on the ground, creating a trap that will warn you with noise when something steps on it.",
"weight": "6 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/workshop.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
{
"id": "brick_kiln",
"type": "TOOL",
"name": "brick kiln",
"name": { "str": "brick kiln" },
"description": "This is a portable charcoal-fired kiln. It is designed for firing bricks, but you could use it to fire anything made of clay.",
"weight": "9600 g",
"volume": "9 L",
Expand Down Expand Up @@ -315,7 +315,7 @@
{
"id": "jack",
"type": "TOOL",
"name": "bottle jack",
"name": { "str": "bottle jack" },
"description": "A portable hydraulic bottle jack used for lifting vehicles.",
"material": "steel",
"symbol": ";",
Expand Down

0 comments on commit e1ef676

Please sign in to comment.