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 Feb 25, 2020
1 parent 7e64112 commit 2b1680c
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
12 changes: 6 additions & 6 deletions data/json/items/basecamp.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "fake_char_smoker",
"type": "TOOL",
"copy-from": "fake_item",
"name": "basecamp charcoal smoker",
"name": { "str": "basecamp charcoal smoker" },
"description": "A fake charcoal smoker used for basecamps.",
"sub": "char_smoker",
"ammo": "charcoal",
Expand All @@ -13,7 +13,7 @@
"id": "fake_fireplace",
"type": "TOOL",
"copy-from": "fake_item",
"name": "basecamp fireplace",
"name": { "str": "basecamp fireplace" },
"description": "A fake fireplace used for basecamps.",
"sub": "hotplate",
"ammo": "tinder",
Expand All @@ -24,7 +24,7 @@
"id": "fake_forge",
"type": "TOOL",
"copy-from": "fake_item",
"name": "basecamp forge",
"name": { "str": "basecamp forge" },
"description": "A fake forge used for basecamps.",
"sub": "char_forge",
"ammo": "charcoal",
Expand All @@ -34,7 +34,7 @@
"id": "fake_char_kiln",
"type": "TOOL",
"copy-from": "fake_item",
"name": "basecamp kiln",
"name": { "str": "basecamp kiln" },
"description": "A fake kiln used for basecamps.",
"sub": "char_kiln",
"ammo": "charcoal",
Expand All @@ -44,7 +44,7 @@
"id": "fake_stove",
"type": "TOOL",
"copy-from": "fake_item",
"name": "basecamp stove",
"name": { "str": "basecamp stove" },
"description": "A fake stove used for basecamps.",
"sub": "hotplate",
"ammo": "tinder",
Expand All @@ -55,7 +55,7 @@
"id": "fake_drop_hammer",
"type": "TOOL",
"copy-from": "fake_item",
"name": "basecamp drop hammer",
"name": { "str": "basecamp drop hammer" },
"description": "A fake drop hammer used for basecamps.",
"qualities": [ [ "HAMMER", 5 ] ]
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/fake.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"id": "arcfurnace",
"copy-from": "fake_item",
"type": "TOOL",
"name": "arc furnace"
"name": { "str": "arc furnace" }
},
{
"id": "fake_burrowing",
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 @@ -562,7 +562,7 @@
"type": "TOOL",
"symbol": "/",
"color": "light_gray",
"name": "arming sword",
"name": { "str": "arming sword" },
"description": "This is a classic medieval sword, just the right size to use one-handed.",
"price": 100000,
"material": "steel",
Expand Down Expand Up @@ -602,7 +602,7 @@
"symbol": "/",
"color": "light_gray",
"looks_like": "arming_sword",
"name": "arming sword",
"name": { "str": "arming sword" },
"description": "This is a classic medieval sword, just the right size to use one-handed. This one doesn't seem to have been made right.",
"price": 100000,
"material": "budget_steel",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/resources/alien.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"id": "alien_pod_resin",
"type": "TOOL",
"category": "spare_parts",
"name": "alien resin pod",
"name": { "str": "alien resin pod" },
"description": "This is a large pod, the size of a keg, filled with gooey alien resin. Squeezing it firmly causes resin to squirt from the broken stalk at the end, hardening within a few seconds of being exposed to the air.",
"weight": "70000 g",
"volume": "22000 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/fishing.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{
"id": "fishing_rod_basic",
"type": "TOOL",
"name": "basic fishing rod",
"name": { "str": "basic fishing rod" },
"description": "'Fishing rod' might be a bit too charitable of a description. In truth, this is a stick with a piece of string and a hook.",
"weight": "1700 g",
"volume": "1250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "anesthetic_kit",
"type": "TOOL",
"name": "anesthesia kit",
"name": { "str": "anesthesia kit" },
"description": "A kit for inducing anesthesia for surgery, containing specialized canisters with a variety of powerful hypnotic, analgetic, and stimulative drugs. It's intended for use in specialized medical equipment, and can't be administered manually.",
"weight": "100 g",
"volume": "3250 ml",
Expand All @@ -19,7 +19,7 @@
{
"id": "autoclave",
"type": "TOOL",
"name": "autoclave",
"name": { "str": "autoclave" },
"description": "This is an autoclave. It's useful for sterilizing things like CBMs. It requires a massive amount of power, so standard batteries will not power it sufficiently.",
"weight": "34500 g",
"volume": "76 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 @@ -2,7 +2,7 @@
{
"id": "anvil",
"type": "TOOL",
"name": "anvil",
"name": { "str": "anvil" },
"description": "This is an enormously heavy block of oddly shaped steel with a chisel-like projection set into the corner. It's used in most metalworking fabrication recipes.",
"weight": "54000 g",
"volume": "4 L",
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 @@ -30,7 +30,7 @@
{
"id": "alarmclock",
"type": "TOOL",
"name": "alarm clock",
"name": { "str": "alarm clock" },
"description": "A wind-up alarm clock. Though the noise it makes is unpleasant to wake up to, it's always good to get an early start to your day. Can also be disassembled into some useful parts.",
"weight": "562 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/science.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"id": "chemistry_set_basic",
"type": "TOOL",
"category": "tools",
"name": "basic chemistry set",
"name": { "str": "basic chemistry set" },
"description": "This is a basic chemistry set which includes glass containers, hoses and safety glasses. It might be used to craft some chemistry projects if you're so inclined, but you'll need a source of heat.",
"weight": "1884 g",
"volume": "2750 ml",
Expand Down Expand Up @@ -270,7 +270,7 @@
"id": "analytical_set_basic",
"type": "TOOL",
"category": "tools",
"name": "basic laboratory analysis kit",
"name": { "str": "basic laboratory analysis kit" },
"description": "This hefty kit contains some basic things you should probably not try to do precise chemistry without: namely, a small balance scale, a spectrophotometer, a melting point apparatus, a pH meter, and a set of paper for thin layer chromatography. This makes it a lot easier to feel confident that the chemical you've made is what you think you've made.",
"weight": "12500 g",
"volume": "5 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/smoking.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "advanced_ecig",
"type": "TOOL",
"name": "advanced electronic cigarette",
"name": { "str": "advanced electronic cigarette" },
"description": "An advanced version of the electronic cigarette. A less harmful way to get your nicotine fix than regular cigarettes, but still addictive. It needs batteries and nicotine liquid to function.",
"category": "drugs",
"weight": "200 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/toileteries.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "bathroom_scale",
"type": "TOOL",
"name": "bathroom scale",
"name": { "str": "bathroom scale" },
"symbol": "",
"color": "light_gray",
"description": "This is a small bathroom scale, meant to weigh a person while naked.",
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 @@ -56,7 +56,7 @@
{
"id": "angle_grinder",
"type": "TOOL",
"name": "angle grinder",
"name": { "str": "angle grinder" },
"description": "This widespread powertool is often used for removing excess material or polishing surfaces.",
"weight": "2780 g",
"volume": "1750 ml",
Expand Down Expand Up @@ -899,7 +899,7 @@
{
"id": "welder",
"type": "TOOL",
"name": "arc welder",
"name": { "str": "arc welder" },
"description": "This is a battery powered tool for welding metal pieces together using an electric arc. It is an indispensable tool for construction or repair.",
"weight": "4200 g",
"volume": "2500 ml",
Expand Down

0 comments on commit 2b1680c

Please sign in to comment.