From 6fc5d864cecd417cccea499a699df5fe978ba67e Mon Sep 17 00:00:00 2001 From: Ryan Breuer Date: Sun, 30 Jan 2022 13:44:39 -0600 Subject: [PATCH] Consistently name saw tools and blades --- data/json/furniture_and_terrain/furniture-tools.json | 8 ++++---- data/json/items/fake.json | 6 +++--- .../surface_refugees/NPC_Boris_Borichenko.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index 1fa7ff01b681c..65a60ad74905d 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -674,9 +674,9 @@ { "type": "furniture", "id": "f_tablesaw", - "name": "tablesaw", + "name": "table saw", "looks_like": "f_machinery_light", - "description": "A rotating saw blade set into a large flat table, for making straight measured cuts, if supplied with power from UPS. One of the key tools in a carpenter's arsenal.", + "description": "A rotating sawblade set into a large flat table, for making straight measured cuts, if supplied with power from UPS. One of the key tools in a carpenter's arsenal.", "symbol": "7", "color": "yellow_red", "move_cost_mod": 8, @@ -715,7 +715,7 @@ "id": "f_mitresaw", "name": "mitre saw", "looks_like": "f_machinery_light", - "description": "A circular saw blade on an arm that can slide and rotate in several directions, this is a staple tool for nearly any carpentry, if supplied with power from UPS.", + "description": "A circular sawblade on an arm that can slide and rotate in several directions, this is a staple tool for nearly any carpentry, if supplied with power from UPS.", "symbol": "7", "color": "yellow_cyan", "move_cost_mod": -1, @@ -752,7 +752,7 @@ { "type": "furniture", "id": "f_bandsaw", - "name": "bandsaw", + "name": "band saw", "looks_like": "f_machinery_light", "description": "A ribbonlike sawblade runs in a single direction in this tool, allowing precise cuts at almost any angle, if supplied with power from UPS.", "symbol": "7", diff --git a/data/json/items/fake.json b/data/json/items/fake.json index d4f499140e4ee..d2e6bbeee6621 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -203,19 +203,19 @@ "id": "fake_tablesaw", "type": "TOOL", "copy-from": "fake_power_tool", - "name": { "str": "tablesaw" } + "name": { "str": "table saw" } }, { "id": "fake_mitresaw", "type": "TOOL", "copy-from": "fake_power_tool", - "name": { "str": "mitresaw" } + "name": { "str": "mitre saw" } }, { "id": "fake_bandsaw", "type": "TOOL", "copy-from": "fake_power_tool", - "name": { "str": "bandsaw" } + "name": { "str": "band saw" } }, { "id": "fake_router", diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json index a10a935bc249e..e4bdcbf6573a6 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json @@ -438,7 +438,7 @@ "followup": "MISSION_REFUGEE_Boris_LAPTOP", "dialogue": { "describe": "Find a circular saw for Boris.", - "offer": "We now have a space to work in, and I have wood and nails to spare. All I need is a saw. I would love tablesaw and mitre saw, but I can work with a hand held circular saw for now. I have looked, and what we have is garbage. Can you bring me a good one?", + "offer": "We now have a space to work in, and I have wood and nails to spare. All I need is a saw. I would love a table saw and mitre saw, but I can work with a hand held circular saw for now. I have looked, and what we have is garbage. Can you bring me a good one?", "accepted": "You are a kind soul.", "rejected": "Ah well. I can ask around myself, perhaps.", "advice": "It is not hard to find. I have even seen them for sale at the merchants, but they save them as trade goods and will not give me as a gift.",