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

Generic name to object #38686

Merged
merged 2 commits into from
Mar 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion data/json/items/book/maps.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"id": "survivormap",
"copy-from": "abstractmap",
"type": "GENERIC",
"name": "survivor's map",
"name": { "str": "survivor's map" },
"description": "This is a hand-drawn map of the local area. Whoever created it has marked down the locations of nearby supply sources including gun stores and gas stations. Using it will add points of interest to your map.",
"color": "white",
"use_action": {
Expand Down
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 @@ -1299,7 +1299,7 @@
"id": "steel_grille",
"type": "GENERIC",
"category": "other",
"name": "steel grille",
"name": { "str": "steel grille" },
"description": "This is a metal grille. It can be used as a framework for making a chemical catalyst.",
"weight": "600 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/bread.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"id": "sourdough_starter",
"type": "GENERIC",
"category": "food",
"name": "sourdough starter",
"name": { "str": "sourdough starter" },
"description": "This jar contains a precious mix of flour, water, molds and bacteria from the air. When you add flour and water to it, after a few hours it froths and rises.",
"weight": "52 g",
"looks_like": "jar_glass",
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 @@ -243,7 +243,7 @@
"category": "spare_parts",
"symbol": ",",
"color": "white",
"name": "superglue",
"name": { "str": "superglue", "str_pl": "superglue" },
"description": "A tube of strong glue. Used in many crafting recipes.",
"price": 1800,
"material": "plastic",
Expand Down Expand Up @@ -280,7 +280,7 @@
"type": "GENERIC",
"id": "chain",
"category": "spare_parts",
"name": "steel chain",
"name": { "str": "steel chain" },
"description": "A heavy steel chain. Useful as a weapon, or for crafting. It has a chance to wrap around your target, allowing for a bonus unarmed attack.",
"weight": "3628 g",
"color": "dark_gray",
Expand Down Expand Up @@ -436,7 +436,7 @@
"id": "spiral_stone",
"symbol": "*",
"color": "light_gray",
"name": "spiral stone",
"name": { "str": "spiral stone" },
"category": "artifacts",
"description": "A rock the size of your fist. It is covered with intricate spirals; it is impossible to tell whether they are carved, naturally formed, or some kind of fossil.",
"price": 20000,
Expand Down Expand Up @@ -696,7 +696,7 @@
"id": "spring",
"symbol": ",",
"color": "light_gray",
"name": "spring",
"name": { "str": "spring" },
"category": "spare_parts",
"description": "A large, heavy-duty spring. Expands with significant force when compressed.",
"price": 1000,
Expand Down Expand Up @@ -1724,7 +1724,7 @@
{
"type": "GENERIC",
"id": "sunflower",
"name": "sunflower",
"name": { "str": "sunflower" },
"description": "The top of a sunflower, with yellow pedals and some seeds that have yet to be eaten by animals.",
"weight": "450 g",
"to_hit": -2,
Expand Down Expand Up @@ -2633,7 +2633,7 @@
"category": "spare_parts",
"symbol": ",",
"color": "light_cyan",
"name": "steel plate",
"name": { "str": "steel plate" },
"description": "A steel armor plate, specifically engineered for use in a bullet resistant vest.",
"price": 9000,
"material": "steel",
Expand Down Expand Up @@ -2674,7 +2674,7 @@
"category": "spare_parts",
"symbol": "t",
"color": "dark_gray",
"name": "spare tire carrier",
"name": { "str": "spare tire carrier" },
"description": "A bumper mounted rig for attaching and storing a spare tire on the back of a vehicle. Combine it with a wheel to get a mountable piece.",
"price": 3500,
"material": "steel",
Expand Down Expand Up @@ -2825,7 +2825,7 @@
"id": "survival_kit",
"type": "GENERIC",
"category": "tools",
"name": "survival kit",
"name": { "str": "survival kit" },
"description": "A small box filled with tools and items to help you survive in case of an emergency. Disassemble to get its content.",
"weight": "1612 g",
"volume": "1 L",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/melee/spears_and_polearms.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
{
"type": "GENERIC",
"id": "spear_steel",
"name": "steel spear",
"name": { "str": "steel spear" },
"description": "A stout wooden pole with a hand-forged steel spearhead.",
"weight": "1498 g",
"to_hit": 2,
Expand Down Expand Up @@ -536,7 +536,7 @@
{
"id": "spear_stone",
"type": "GENERIC",
"name": "stone spear",
"name": { "str": "stone spear" },
"description": "A stout wooden pole with a sharp stone spearhead.",
"weight": "1098 g",
"volume": "1250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "sword cane",
"name": { "str": "sword cane" },
"description": "A sword with a thin blade designed to be hidden inside a hollow cane.",
"price": 2000,
"price_postapoc": 1000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/resources/metal.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
{
"type": "GENERIC",
"id": "spike",
"name": "spike",
"name": { "str": "spike" },
"description": "A large and slightly misshapen spike, could do some damage mounted on a vehicle.",
"category": "spare_parts",
"weight": "550 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/resources/wood.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"id": "splinter",
"symbol": "/",
"color": "brown",
"name": "splintered wood",
"name": { "str": "splintered wood", "str_pl": "splintered wood" },
"description": "A splintered piece of wood, could be used as a skewer or for kindling.",
"category": "other",
"material": "wood",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/software.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "software",
"type": "GENERIC",
"name": "software",
"name": { "str": "software", "str_pl": "software" },
"symbol": "#",
"container": "usb_drive",
"description": "IF YOU ARE SEEING THIS IT IS A BUG.",
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 @@ -1124,7 +1124,7 @@
"id": "smokebomb",
"copy-from": "grenade_canister",
"type": "GENERIC",
"name": "smoke bomb",
"name": { "str": "smoke bomb" },
"description": "This is a canister grenade filled with a variety of pyrotechnic chemicals. Use this item to pull the pin and light the fuse, turning it into an active smoke bomb. Five turns after you do that, it will begin to expel a thick black smoke. This smoke will slow those who enter it, as well as obscuring vision and scent.",
"price": 1800,
"weight": "569 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/stationary.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "stapler",
"type": "GENERIC",
"category": "tools",
"name": "stapler",
"name": { "str": "stapler" },
"description": "A stapler for fastening sheets of paper together.",
"weight": "300 g",
"volume": "250 ml",
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 @@ -21,7 +21,7 @@
"id": "awl_steel",
"copy-from": "awl_bone",
"type": "GENERIC",
"name": "steel sewing awl",
"name": { "str": "steel sewing awl" },
"description": "This is a steel awl with a wooden grip, usually used for leatherworking. It can also serve as an improvised stabbing weapon, but will break quickly.",
"weight": "170 g",
"price": 450,
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 @@ -3,7 +3,7 @@
"id": "cantilever_medium",
"type": "GENERIC",
"category": "veh_parts",
"name": "steel boom",
"name": { "str": "steel boom" },
"description": "A large rigid steel boom. If attached to a frame it could be used to lift up to 20 metric tonnes.",
"price": 23400,
"weight": "31600 g",
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 @@ -26,7 +26,7 @@
{
"type": "GENERIC",
"id": "frame",
"name": "steel frame",
"name": { "str": "steel frame" },
"description": "A large frame made of steel. Useful for crafting.",
"weight": "20000 g",
"to_hit": -5,
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 @@ -27,7 +27,7 @@
{
"type": "GENERIC",
"id": "motor_super",
"name": "super electric motor",
"name": { "str": "super electric motor" },
"description": "The most powerfull electric motor on the market. Useful for crafting.",
"weight": "125 kg",
"volume": "25 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/noise.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{
"type": "GENERIC",
"id": "stereo",
"name": "stereo system",
"name": { "str": "stereo system" },
"description": "A stereo system with speakers. It is capable of being hooked up to a vehicle.",
"weight": "800 g",
"to_hit": -2,
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/vehicle/plating.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
{
"type": "GENERIC",
"id": "steel_plate",
"name": "steel plating",
"name": { "str": "steel plating", "str_pl": "steel plating" },
"description": "A piece of armor plating made of steel.",
"weight": "12880 g",
"to_hit": -1,
Expand All @@ -65,7 +65,7 @@
{
"type": "GENERIC",
"id": "alloy_plate",
"name": "superalloy plating",
"name": { "str": "superalloy plating", "str_pl": "superalloy plating" },
"description": "A piece of armor plating made of sturdy superalloy.",
"weight": "10800 g",
"to_hit": -1,
Expand All @@ -81,7 +81,7 @@
{
"type": "GENERIC",
"id": "alloy_sheet",
"name": "superalloy sheet",
"name": { "str": "superalloy sheet" },
"description": "A sheet of sturdy superalloy, incredibly hard, yet incredibly malleable.",
"weight": "900 g",
"to_hit": -2,
Expand All @@ -96,7 +96,7 @@
{
"type": "GENERIC",
"id": "spiked_plate",
"name": "spiked plating",
"name": { "str": "spiked plating", "str_pl": "spiked plating" },
"description": "A piece of armor plating made of steel. It is covered with menacing spikes.",
"weight": "12240 g",
"to_hit": -1,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/vehicle/solar.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "GENERIC",
"id": "solar_panel",
"name": "solar panel",
"name": { "str": "solar panel" },
"description": "Electronic device that can convert solar radiation into electric power. Useful for a vehicle.",
"weight": "14000 g",
"to_hit": -4,
Expand Down Expand Up @@ -62,7 +62,7 @@
{
"type": "GENERIC",
"id": "solar_cell",
"name": "solar cell",
"name": { "str": "solar cell" },
"description": "A small electronic device that can convert solar radiation into electric power. Useful for crafting.",
"weight": "500 g",
"symbol": ";",
Expand Down