From 1e7a2e5e3a1b582296e631b9e3a8db78b53f820f Mon Sep 17 00:00:00 2001 From: XygenSS Date: Thu, 7 Nov 2019 10:20:42 +0900 Subject: [PATCH 1/3] Add "looks_like" to all entries Part #1 Adds "looks_like" line to all terrain and furniture to help out tileset devs. --- .../furniture-appliances.json | 14 +- .../furniture-barriers.json | 3 + .../furniture-decorative.json | 27 +- .../furniture-domestic_plants.json | 8 +- .../furniture_and_terrain/furniture-eggs.json | 4 + .../furniture-fakes.json | 4 +- .../furniture-fireplaces.json | 8 +- .../furniture-flora.json | 11 +- .../furniture-fungal.json | 4 + .../furniture-graves.json | 5 + .../furniture-industrial.json | 2 + .../furniture-medical.json | 26 +- .../furniture_and_terrain/furniture-migo.json | 9 + .../furniture-plumbing.json | 6 +- .../furniture-recreation.json | 13 +- .../furniture_and_terrain/furniture-roof.json | 6 + .../furniture-rural.json | 2 + .../furniture-seats.json | 28 +- .../furniture-signs.json | 23 +- .../furniture-sleep.json | 6 + .../furniture-storage.json | 29 +- .../furniture-surfaces.json | 11 +- .../furniture-terrains.json | 27 ++ .../furniture_and_terrain/terrain-doors.json | 28 +- .../terrain-floors_indoor.json | 99 ++-- .../terrain-manufactured.json | 7 + .../furniture_and_terrain/terrain-walls.json | 55 ++- doc/Looks-like hierarchy.txt | 432 ++++++++++++++++++ 28 files changed, 729 insertions(+), 168 deletions(-) create mode 100644 doc/Looks-like hierarchy.txt diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 8b1a5d4c3ae15..e50096df8c5ee 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -45,13 +45,13 @@ "type": "furniture", "id": "f_air_filter", "name": "central air filter", + "looks_like": "f_air_conditioner", "description": "Cleans out dust mites, smoke particles, and more!", "symbol": "#", "bgcolor": "white", "move_cost_mod": -1, "coverage": 50, "required_str": -1, - "looks_like": "f_air_conditioner", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -130,6 +130,7 @@ "type": "furniture", "id": "f_dryer", "name": "dryer", + "looks_like": "f_washer", "description": "'Dry your clothes!' would be what you'd do if electricity was running.", "symbol": "{", "bgcolor": "white", @@ -171,6 +172,7 @@ "id": "f_fridge", "name": "refrigerator", "symbol": "{", + "looks_like": "t_machinery_light", "description": "Freeze your food with the amazing science of electricity! Oh wait, none is flowing. Well, as long as you don't open it, maybe it'll stay cool for awhile.", "color": "light_cyan", "move_cost_mod": -1, @@ -216,6 +218,7 @@ "id": "f_glass_fridge", "name": "glass door fridge", "symbol": "{", + "looks_like": "f_fridge", "color": "light_cyan", "description": "Wow! See INTO your fridge before you open it and discover it's not working!", "move_cost_mod": -1, @@ -260,7 +263,7 @@ "type": "furniture", "id": "f_home_furnace", "name": "furnace", - "looks_like": "t_sewage_pipe", + "looks_like": "f_air_conditioner", "description": "A gas-powered forced-air central heating unit, with an internal fan to push the air through a building's air ducts and keep it warm.", "symbol": "0", "bgcolor": "white", @@ -302,6 +305,7 @@ "type": "furniture", "id": "f_washer", "name": "washing machine", + "looks_like": "f_sink", "description": "You could wash your dirty clothes if electricity was running.", "symbol": "{", "bgcolor": "white", @@ -344,6 +348,7 @@ "type": "furniture", "id": "f_oven", "name": "oven", + "looks_like": "t_machinery_light", "symbol": "#", "description": "Used for heating and cooking food with electricity. Doesn't look like it's working, although it still has parts. It might be safe to light a fire inside of it, if you had to.", "color": "dark_gray", @@ -384,6 +389,7 @@ "type": "furniture", "id": "f_bellows", "name": "blacksmith bellows", + "looks_like": "f_oven", "symbol": "#", "description": "Used for delivering air to increase the combustion and heat output of a forge. Doesn't look like it's working, although it still has parts.", "color": "dark_gray", @@ -418,6 +424,7 @@ "type": "furniture", "id": "f_drophammer", "name": "blacksmith drop hammer", + "looks_like": "f_oven", "symbol": "#", "description": "Used for fast production of metal items. Doesn't look like it's working, although it still has parts.", "color": "white", @@ -455,6 +462,7 @@ "type": "furniture", "id": "f_shredder", "name": "document shredder", + "looks_like": "f_oven", "description": "It's not all about hiding government secrets, sometimes you just want to stop identity theft.", "symbol": "H", "bgcolor": "white", @@ -496,7 +504,7 @@ { "type": "furniture", "id": "f_server", - "looks_like": "f_utility_shelf", + "looks_like": "f_rack", "name": "server stack", "description": "This is a big pile of computers. They're all turned off.", "symbol": ":", diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json index 28935f92c3872..6065d4cd7abd8 100644 --- a/data/json/furniture_and_terrain/furniture-barriers.json +++ b/data/json/furniture_and_terrain/furniture-barriers.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_barricade_road", "name": "road barricade", + "looks_like":"t_bars", "symbol": "#", "bgcolor": "yellow", "description": "A road barricade. For barricading roads.", @@ -96,6 +97,7 @@ "type": "furniture", "id": "f_sandbag_half", "name": "sandbag barricade", + "looks_like":"f_barricade_road", "symbol": "#", "bgcolor": "brown", "description": "A sandbag barricade, typically used for blocking bullets.", @@ -127,6 +129,7 @@ "type": "furniture", "id": "f_sandbag_wall", "name": "sandbag wall", + "looks_like":"f_barricade_road", "symbol": "#", "bgcolor": "brown", "move_cost_mod": -1, diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json index e4a2b4098c47c..cd1330ffebcd9 100644 --- a/data/json/furniture_and_terrain/furniture-decorative.json +++ b/data/json/furniture_and_terrain/furniture-decorative.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_bigmirror", "name": "standing mirror", + "looks_like":"f_statue", "symbol": "{", "description": "Lookin' good - is that blood?", "color": "white", @@ -24,6 +25,7 @@ "type": "furniture", "id": "f_bigmirror_b", "name": "broken standing mirror", + "looks_like":"f_bigmirror", "description": "You could look at yourself, if the mirror wasn't covered in cracks and fractures.", "symbol": "{", "color": "light_gray", @@ -43,25 +45,7 @@ "id": "f_bitts", "type": "furniture", "name": "bitts", - "description": "Paired vertical iron posts mounted on a wharf, pier or quay. They are used to secure mooring lines, ropes, hawsers, or cables.", - "symbol": "B", - "color": [ "light_gray" ], - "move_cost_mod": 2, - "coverage": 30, - "required_str": 0, - "bash": { - "str_min": 80, - "str_max": 200, - "sound": "metal screeching!", - "sound_fail": "clang!", - "items": [ { "item": "steel_chunk", "count": [ 5, 10 ] } ] - }, - "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT" ] - }, - { - "id": "f_bitts", - "type": "furniture", - "name": "bitts", + "looks_like":"f_rack", "description": "Paired vertical iron posts mounted on a wharf, pier or quay. They are used to secure mooring lines, ropes, hawsers, or cables.", "symbol": "B", "color": [ "light_gray" ], @@ -81,6 +65,7 @@ "type": "furniture", "id": "f_shackle", "name": "manacles", + "looks_like":"f_rack", "description": "Chain serfs in your dungeon. All you need now is an iron ball to chain to it.", "symbol": "8", "color": "light_gray", @@ -99,6 +84,7 @@ "type": "furniture", "id": "f_statue", "name": "statue", + "looks_like":"f_cupboard", "description": "A carved statue made of stone.", "symbol": "S", "color": "dark_gray", @@ -118,6 +104,7 @@ "type": "furniture", "id": "f_mannequin", "name": "mannequin", + "looks_like":"f_statue", "description": "Put clothes on it, talk to it. Who's around to judge you? Wait… did it just move?", "symbol": "@", "color": "brown", @@ -137,6 +124,7 @@ "type": "furniture", "id": "f_birdbath", "name": "birdbath", + "looks_like":"f_rack", "description": "A decorative cement birdbath and pedestal.", "symbol": "o", "color": "light_gray", @@ -155,6 +143,7 @@ "type": "furniture", "id": "f_rotary_clothesline", "name": "rotary clothes dryer line", + "looks_like":"f_rack_coat", "description": "A umbrella shaped clothes line mounted on a pole.", "symbol": "X", "color": "white", diff --git a/data/json/furniture_and_terrain/furniture-domestic_plants.json b/data/json/furniture_and_terrain/furniture-domestic_plants.json index c0d9c5e3f0be4..cff9c65e4d5a9 100644 --- a/data/json/furniture_and_terrain/furniture-domestic_plants.json +++ b/data/json/furniture_and_terrain/furniture-domestic_plants.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_indoor_plant", "name": "indoor plant", + "looks_like":"t_underbrush", "symbol": "^", "color": "green", "move_cost_mod": 2, @@ -39,6 +40,7 @@ "type": "furniture", "id": "f_indoor_plant_y", "name": "yellow indoor plant", + "looks_like":"f_indoor_plant", "description": "A variety of plant for decoration. It's yellow.", "symbol": "^", "color": "yellow", @@ -75,6 +77,7 @@ "type": "furniture", "id": "f_plant_harvest", "name": "harvestable plant", + "looks_like":"t_underbrush", "description": "This plant is ready for harvest. Examine it more closely to identify how to harvest the plant appropriately.", "symbol": "#", "color": "light_green", @@ -89,6 +92,7 @@ "type": "furniture", "id": "f_plant_mature", "name": "mature plant", + "looks_like":"t_underbrush", "description": "This plant has matured.", "symbol": "#", "color": "green", @@ -103,6 +107,7 @@ "type": "furniture", "id": "f_plant_seed", "name": "seed", + "looks_like":"t_underbrush", "description": "A humble planted seed. Actions are the seed of fate deeds grow into destiny.", "symbol": "^", "color": "brown", @@ -117,6 +122,7 @@ "type": "furniture", "id": "f_plant_seedling", "name": "seedling", + "looks_like":"t_underbrush", "description": "This plant is just getting started.", "symbol": "^", "color": "green", @@ -131,12 +137,12 @@ "type": "furniture", "id": "f_planter", "name": "planter", + "looks_like":"f_indoor_plant", "description": "A garden planter full of soil and slatted to allow adequate drainage. Can be used for planting crops.", "symbol": "^", "color": "green", "move_cost_mod": 1, "required_str": 10, - "looks_like": "t_dirtmound", "flags": [ "TRANSPARENT", "PLANTABLE", "FLAT", "MOUNTABLE" ], "deconstruct": { "items": [ diff --git a/data/json/furniture_and_terrain/furniture-eggs.json b/data/json/furniture_and_terrain/furniture-eggs.json index 3c93235d58e73..07dab7a1676ea 100644 --- a/data/json/furniture_and_terrain/furniture-eggs.json +++ b/data/json/furniture_and_terrain/furniture-eggs.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_egg_sackbw", "name": "spider egg sack", + "looks_like":"f_rubble", "description": "Much too large, off-white egg sack. Kind of icky. Something IS moving in there.", "symbol": "O", "color": "white", @@ -16,6 +17,7 @@ "type": "furniture", "id": "f_egg_sackcs", "name": "spider egg sack", + "looks_like":"f_egg_sackbw", "description": "Bulbous mass of spider eggs. More than kind of icky. Something IS moving in there.", "symbol": "O", "color": "white", @@ -29,6 +31,7 @@ "type": "furniture", "id": "f_egg_sackws", "name": "spider egg sack", + "looks_like":"egg_sackbw", "description": "A horrifyingly oversized egg sack. Something IS moving in there. If you're seeing this, you're already too close to it.", "symbol": "O", "color": "yellow", @@ -42,6 +45,7 @@ "type": "furniture", "id": "f_egg_sacke", "name": "ruptured egg sack", + "looks_like":"f_egg_sackbw", "description": "Super icky. Spider stuff's spilling out.", "symbol": "X", "color": "white", diff --git a/data/json/furniture_and_terrain/furniture-fakes.json b/data/json/furniture_and_terrain/furniture-fakes.json index 7bd3baa8d2c56..5fe2e11ecb2d4 100644 --- a/data/json/furniture_and_terrain/furniture-fakes.json +++ b/data/json/furniture_and_terrain/furniture-fakes.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_fake_bench_hands", "name": "fake workbench hands", + "looks_like":"f_no_item", "description": "This fake workbench holds the stats for working on a wielded item.", "symbol": "#", "color": "red", @@ -15,7 +16,7 @@ "//": "This furniture object also gets used as a fake workbench whenever a player crafts on the ground anywhere else.", "id": "f_ground_crafting_spot", "name": "ground crafting spot", - "looks_like": "tr_firewood_source", + "looks_like":"f_no_item", "description": "A cleared spot on the ground for crafting. Slower than using a workbench or holding a project in your hands, but readily available.", "symbol": "x", "color": "white", @@ -32,6 +33,7 @@ "id": "f_no_item", "//": "This is used in a hack to clear furniture with the keg iexamine of all items execept the stored liquid before usage.", "name": "seeing this is a bug", + "looks_like":"t_rock", "description": "Seeing this is a bug. If seen, please report and destroy.", "symbol": "#", "color": "black", diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json index e2b29e1989499..3e0e461f7f082 100644 --- a/data/json/furniture_and_terrain/furniture-fireplaces.json +++ b/data/json/furniture_and_terrain/furniture-fireplaces.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_fireplace", "name": "fireplace", + "looks_like":"f_oven", "symbol": "#", "description": "Ah. The relaxation of sitting in front of a fire as the world around you crumbles. Towards the End, you could also get this service on your television.", "bgcolor": "white", @@ -23,6 +24,7 @@ "type": "furniture", "id": "f_woodstove", "name": "wood stove", + "looks_like":"f_oven", "symbol": "#", "bgcolor": "red", "description": "Wood stove for heating and cooking. Much more efficient than an open flame.", @@ -45,6 +47,7 @@ "type": "furniture", "id": "f_brazier", "name": "brazier", + "looks_like":"f_oven", "description": "A raised metal dish in which to safely burn things.", "symbol": "#", "color": "red", @@ -74,7 +77,7 @@ "description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.", "symbol": "#", "color": "red", - "looks_like": "55gal_drum", + "looks_like": "f_brazier", "move_cost_mod": 2, "coverage": 35, "required_str": 8, @@ -101,7 +104,7 @@ "description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.", "symbol": "#", "color": "red", - "looks_like": "30gal_drum", + "looks_like": "f_brazier", "move_cost_mod": 2, "coverage": 35, "required_str": 8, @@ -121,6 +124,7 @@ "id": "f_firering", "type": "furniture", "name": "fire ring", + "looks_like":"f_brazier", "description": "A ring of stones to safely contain a fire.", "symbol": "#", "bgcolor": [ "white" ], diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json index afb23d342d625..7cf048bbee5af 100644 --- a/data/json/furniture_and_terrain/furniture-flora.json +++ b/data/json/furniture_and_terrain/furniture-flora.json @@ -17,6 +17,7 @@ "type": "furniture", "id": "f_dandelion", "name": "dandelion", + "looks_like": "t_underbrush", "description": "A common weed with a yellow flower. Produces seeds that get carried on the wind by thin, gray filaments.", "symbol": "f", "color": "yellow", @@ -48,7 +49,7 @@ "name": "tulip", "description": "A bright, colorful flower with petals forming a small cup at its top.", "symbol": "f", - "looks_like": "f_mutpoppy", + "looks_like": "f_dandelion", "color": "magenta", "move_cost_mod": 0, "required_str": -1, @@ -86,6 +87,7 @@ "type": "furniture", "id": "f_cattails", "name": "cattails", + "looks_like": "f_dandelion", "description": "This useful plant is available all year round. Many parts of the plant are edible.", "symbol": "i", "color": "brown", @@ -128,7 +130,7 @@ "id": "f_lily", "name": "lily", "description": "A pretty flower that comes in a variety of colors.", - "looks_like": "f_flower_tulip", + "looks_like": "f_dandelion", "symbol": "f", "color": "magenta", "move_cost_mod": 0, @@ -149,7 +151,7 @@ "id": "f_lotus", "name": "lotus", "description": "A lovely flower that grows on the surface of bodies of freshwater. Traditionally connected with many Eastern cultures.", - "looks_like": "f_lily", + "looks_like": "f_dandelion", "symbol": "f", "color": "yellow", "move_cost_mod": 0, @@ -184,6 +186,7 @@ "type": "furniture", "id": "f_lilypad", "name": "lilypad", + "looks_like": "f_dandelion", "description": "These lilypads don't look they'd support the weight of the things you've heard croaking in the swamp.", "symbol": "f", "color": "green", @@ -270,7 +273,7 @@ "symbol": "#", "description": "A sizable pile of leaves. You could sleep on it if you don't care about comfort or warmth.", "color": "brown", - "looks_like": "t_dirtpile", + "looks_like": "t_underbrush", "move_cost_mod": 3, "coverage": 35, "comfort": 1, diff --git a/data/json/furniture_and_terrain/furniture-fungal.json b/data/json/furniture_and_terrain/furniture-fungal.json index 9230b5ee032ef..a61c2448784be 100644 --- a/data/json/furniture_and_terrain/furniture-fungal.json +++ b/data/json/furniture_and_terrain/furniture-fungal.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_flower_marloss", "name": "marloss flower", + "looks_like": "f_dandelion", "description": "This flower is like the other flowers taken by the mushrooms, but its bulb is colored a brilliant cyan color, and it emits an aroma both overwhelming and… delicious?", "symbol": "f", "color": "cyan", @@ -16,6 +17,7 @@ "type": "furniture", "id": "f_flower_fungal", "name": "fungal flower", + "looks_like": "f_dandelion", "description": "This flower has been overgrown by gray, sinewy tendrils of fungus, and the color has leached from its petals and stem. It gently sways of its own volition.", "symbol": "f", "color": "dark_gray", @@ -29,6 +31,7 @@ "type": "furniture", "id": "f_fungal_mass", "name": "fungal mass", + "looks_like": "f_rubble", "description": "Thick ropes of mycal matter have covered the ground here completely. It's soft to the touch, but you sink into it, making moving across it difficult.", "symbol": "O", "bgcolor": "dark_gray", @@ -41,6 +44,7 @@ "type": "furniture", "id": "f_fungal_clump", "name": "fungal clump", + "looks_like": "f_fungal_mass", "description": "Alien mold and stems mingle tightly here, creating a sort of fungal bush.", "symbol": "#", "bgcolor": "light_gray", diff --git a/data/json/furniture_and_terrain/furniture-graves.json b/data/json/furniture_and_terrain/furniture-graves.json index 9602d4df9119d..0a7a664f083bb 100644 --- a/data/json/furniture_and_terrain/furniture-graves.json +++ b/data/json/furniture_and_terrain/furniture-graves.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_slab", "name": "stone slab", + "looks_like": "f_grave_stone", "description": "A flat slab of heavy stone.", "symbol": "n", "color": "dark_gray", @@ -23,6 +24,7 @@ "type": "furniture", "id": "f_grave_head", "name": "headstone", + "looks_like": "f_grave_stone", "description": "Keeps the bodies.", "symbol": "_", "color": "light_gray", @@ -42,6 +44,7 @@ "type": "furniture", "id": "f_grave_stone", "name": "gravestone", + "looks_like": "f_statue", "description": "Keeps the bodies. More fancy.", "symbol": "^", "color": "light_gray", @@ -62,6 +65,7 @@ "type": "furniture", "id": "f_grave_stone_old", "name": "worn gravestone", + "looks_like": "f_grave_stone", "description": "A worn-out gravestone.", "symbol": "^", "color": "dark_gray", @@ -81,6 +85,7 @@ "type": "furniture", "id": "f_grave_monument", "name": "obelisk", + "looks_like": "f_grave_stone", "description": "Monument to pride.", "symbol": "$", "color": "black_white", diff --git a/data/json/furniture_and_terrain/furniture-industrial.json b/data/json/furniture_and_terrain/furniture-industrial.json index 557b592f69b44..4edfb0b86589d 100644 --- a/data/json/furniture_and_terrain/furniture-industrial.json +++ b/data/json/furniture_and_terrain/furniture-industrial.json @@ -46,6 +46,7 @@ { "type": "furniture", "id": "f_chemical_mixer", + "looks_like": "f_oven", "description": "When chemicals need to be mixed in large quantities at just the right combinations and temperatures, this is the tool for the job.", "name": "chemical mixer", "symbol": "0", @@ -82,6 +83,7 @@ "type": "furniture", "id": "f_robotic_arm", "name": "robotic arm", + "looks_like": "t_machinery_light", "description": "Automation! Science! Industry! Make a better horse! This robot arm promises to do it all. Except it's currently unpowered. You could remove the casing and retrieve the electronics through disassembly.", "symbol": "&", "bgcolor": "yellow", diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json index ed7fe56116d92..736c508eab32a 100644 --- a/data/json/furniture_and_terrain/furniture-medical.json +++ b/data/json/furniture_and_terrain/furniture-medical.json @@ -50,7 +50,7 @@ "id": "f_autodoc_couch", "name": "Autodoc operation couch", "symbol": "H", - "looks_like": "f_sofa", + "looks_like": "f_bed", "description": "A plush red sofa made less comfortable by the medical machinery directly above it. It has a single leather strap on the right armrest.", "bgcolor": "red", "move_cost_mod": 2, @@ -405,13 +405,13 @@ "type": "furniture", "id": "f_HPLC", "name": "high performance liquid chromatographer", + "looks_like": "f_chemical_mixer", "description": "This high-tech tool would, with electricity and an experienced user, be a very useful way to separate chemicals in a liquid or aqueous phase based on their affinity to a solid state medium in a tube. In other words, it's a fancy way to separate things.", "symbol": ":", "color": "red_white", "move_cost_mod": -1, "coverage": 40, "required_str": 12, - "looks_like": "t_machinery_light", "flags": [ "TRANSPARENT" ], "deconstruct": { "items": [ @@ -450,13 +450,13 @@ "type": "furniture", "id": "f_GC", "name": "gas chromatographer", + "looks_like": "f_chemical_mixer", "description": "This high-tech tool would, with electricity and an experienced user, be a very useful way to separate chemicals in a gaseous phase based on their affinity to a solid state medium in a tube. In other words, it's a fancy way to separate things.", "symbol": ":", "color": "blue_white", "move_cost_mod": -1, "coverage": 40, "required_str": 18, - "looks_like": "t_machinery_old", "flags": [ "BLOCKSDOOR" ], "deconstruct": { "items": [ @@ -495,6 +495,7 @@ "type": "furniture", "id": "f_MS", "name": "mass spectrometer", + "looks_like": "f_chemical_mixer", "description": "Inside this thing is a carefully balanced set of electric field generators that can precisely separate ionized particles based on their charge-to-mass ratio, firing them into a detector that measures the exact mass of the particle hitting it. On the outside, it looks like a very boring white box.", "symbol": "-", "bgcolor": "white", @@ -502,7 +503,6 @@ "coverage": 45, "required_str": -1, "max_volume": 4000, - "looks_like": "t_machinery_heavy", "flags": [ "TRANSPARENT" ], "deconstruct": { "items": [ @@ -537,14 +537,14 @@ "type": "furniture", "id": "f_NMR", "name": "nuclear magnetic resonance spectrometer", - "description": "This is a giant electromagnet in a kind of sci-fi looking housing. Somehow it can be used to wiggle molecular bonds or something, and from there, look at the deepest inner workings of chemical structures! Magnets: how do they work?", + "looks_like": "f_chemical_mixer", + "description": "This is a giant electromagnet in a kind of sci-fi looking housing. Somehow it can be used to wiggle molecular bonds or something, and from there, look at the deepest inner workings of chemical structures! Fuckin' Magnets, how do they work?", "symbol": "M", "color": "white_cyan", "move_cost_mod": -1, "coverage": 65, "required_str": -1, "max_volume": 4000, - "looks_like": "t_machinery_heavy", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -578,12 +578,12 @@ "type": "furniture", "id": "f_electron_microscope", "name": "electron microscope", + "looks_like": "t_machinery_electronic", "description": "An enormous tool for using electron reflections off a surface to see what very tiny things look like. Amazing for taking gross pictures of bugs.", "symbol": "I", "bgcolor": "white", "move_cost_mod": -1, "required_str": -1, - "looks_like": "t_machinery_electronic", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -617,6 +617,7 @@ "type": "furniture", "id": "f_CTscan", "name": "CT scanner", + "looks_like": "t_machinery_electronic", "description": "This giant donut can take hundreds of x-rays in rapid sequence, making a really cool looking picture of all your innards that have varying degrees of radio-opacity.", "symbol": "o", "bgcolor": "white", @@ -624,7 +625,6 @@ "coverage": 65, "required_str": -1, "flags": [ "PLACE_ITEM", "CONTAINER" ], - "looks_like": "t_machinery_electronic", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -734,6 +734,7 @@ "type": "furniture", "id": "f_anesthetic", "name": "anesthetic machine", + "looks_like": "t_machinery_electronic", "description": "Keeping a person at just the right level of asleep to do surgery is hard. This machine helps an anesthesiologist keep the right mix of drugs and air to keep a patient asleep.", "symbol": "n", "color": "white_red", @@ -741,7 +742,6 @@ "coverage": 40, "required_str": 6, "flags": [ "BLOCKS_DOOR" ], - "looks_like": "f_standing_tank", "deconstruct": { "items": [ { "item": "glass_tube_small", "count": [ 6, 12 ] }, @@ -787,7 +787,7 @@ "coverage": 50, "required_str": 5, "flags": [ "BLOCKS_DOOR" ], - "looks_like": "f_standing_tank", + "looks_like": "t_machinery_electronic", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -831,7 +831,7 @@ "coverage": 35, "required_str": 4, "flags": [ "BLOCKS_DOOR" ], - "looks_like": "f_standing_tank", + "looks_like": "t_machinery_electronic", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -869,6 +869,7 @@ "id": "f_curtain", "name": "privacy curtain", "description": "No peeking!", + "looks_like": "t_curtains", "symbol": "|", "bgcolor": "white", "move_cost_mod": 2, @@ -876,7 +877,6 @@ "required_str": -1, "open": "f_curtain_open", "flags": [ "PLACE_ITEM" ], - "looks_like": "t_curtain", "deconstruct": { "items": [ { "item": "pipe", "count": [ 1, 2 ] }, @@ -899,7 +899,7 @@ { "type": "furniture", "id": "f_curtain_open", - "looks_like": "t_curtain_o", + "looks_like": "t_door_frame", "name": "open privacy curtain", "description": "Stop peeking!", "symbol": "N", diff --git a/data/json/furniture_and_terrain/furniture-migo.json b/data/json/furniture_and_terrain/furniture-migo.json index 8fc9bad0eb932..39e5541557f7f 100644 --- a/data/json/furniture_and_terrain/furniture-migo.json +++ b/data/json/furniture_and_terrain/furniture-migo.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_alien_tendril", "name": "glowing tendril", + "looks_like":"f_fungal_mass", "description": "A willowy tendril growing from the floor, gently waving back and forth. A faint illumination spills from it.", "symbol": "i", "color": "blue", @@ -17,6 +18,7 @@ "type": "furniture", "id": "f_alien_anemone", "name": "wafting anemone", + "looks_like":"f_alien_tendril", "description": "A fleshy white protuberance growing from the floor, with a cluster of tendrils pouring out of it. It looks almost exactly like a sea anemone, even waving gently as though in the water.", "symbol": "V", "color": "white", @@ -32,6 +34,7 @@ "type": "furniture", "id": "f_alien_gasper", "name": "gasping tube", + "looks_like":"f_alien_tendril", "description": "This is a meaty green stalactite with a thickened hide like that of a starfish, extending from the floor to the ceiling. In the center is a series of ports somewhat like mouths, from which pour bursts of a vile smelling gas.", "symbol": "{", "color": "green", @@ -47,6 +50,7 @@ "type": "furniture", "id": "f_alien_zapper", "name": "twitching frond", + "looks_like":"f_alien_tendril", "description": "A spine like the antenna of a moth juts from the ground, swaying gently in the air. Every so often, a cascade of energy arcs along it and discharges into the ceiling.", "symbol": "F", "color": "light_blue", @@ -62,6 +66,7 @@ "type": "furniture", "id": "f_alien_scar", "name": "scarred lump", + "looks_like":"f_alien_tendril", "description": "This is a pile of undentified twitching alien flesh, belching strange gases out of injured vessels.", "symbol": "{", "color": "green", @@ -77,6 +82,7 @@ "type": "furniture", "id": "f_alien_pod", "name": "slimy pod", + "looks_like":"f_egg_sackbw", "description": "This is a slick, translucent pod suspended on a thin stalk. It is covered in a thick mucus, obscuring whatever is floating in the gel-like substance inside.", "symbol": "0", "color": "magenta", @@ -90,6 +96,7 @@ "type": "furniture", "id": "f_alien_pod_organ", "name": "organ pod", + "looks_like":"f_alien_pod", "description": "This is a translucent pod suspended on a thin stalk. Inside you can see the dimly outlined shape of human organs, floating in some kind of preservative goo.", "symbol": "0", "color": "yellow", @@ -104,6 +111,7 @@ "type": "furniture", "id": "f_alien_pod_resin", "name": "resin pod", + "looks_like":"f_alien_pod", "description": "This is a translucent pod suspended on a thin stalk. Inside is a clean, clear resinous-looking fluid. You could fairly easily tear it from the stalk and take it with you.", "symbol": "0", "color": "light_blue", @@ -118,6 +126,7 @@ "type": "furniture", "id": "f_alien_table", "name": "fleshy altar", + "looks_like":"f_autodoc_couch", "description": "This pulsing protuberance juts from the floor, its sides covered in scaled, oozing skin. The surface is flat, but undulates softly. A handful of unidentifiable appendages reach from the sides, suggesting a sort of nightmarish living autodoc.", "symbol": "n", "color": "pink", diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json index 2a4f1b5f04970..80f542095d991 100644 --- a/data/json/furniture_and_terrain/furniture-plumbing.json +++ b/data/json/furniture_and_terrain/furniture-plumbing.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_bathtub", "name": "bathtub", + "looks_like":"f_sink", "symbol": "~", "description": "You could lay in and take a soothing bath, if there were running water. The plug is intact, so you could use it to store liquids.", "color": "white", @@ -29,6 +30,7 @@ "type": "furniture", "id": "f_shower", "name": "shower", + "looks_like":"f_bathtub", "symbol": "~", "description": "You would be able to clean yourself if water was running.", "color": "white", @@ -55,6 +57,7 @@ "type": "furniture", "id": "f_sink", "name": "sink", + "looks_like":"t_machinery_light", "symbol": "&", "description": "Emergency relief provider. Water isn't running, so it's basically useless.", "color": "white", @@ -78,6 +81,7 @@ "type": "furniture", "id": "f_toilet", "name": "toilet", + "looks_like":"f_bathtub", "symbol": "&", "color": "white", "description": "A porcelain throne. Emergency water source, from the tank, and provider of relief.", @@ -98,7 +102,7 @@ "type": "furniture", "id": "f_water_heater", "name": "water heater", - "looks_like": "f_standing_tank", + "looks_like": "f_air_conditioner", "description": "An insulated metal tank that holds water, kept to a temperature by a small gas flame.", "symbol": "0", "bgcolor": "white", diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json index 6993d6cc7fdcf..39e69d8c2c8d7 100644 --- a/data/json/furniture_and_terrain/furniture-recreation.json +++ b/data/json/furniture_and_terrain/furniture-recreation.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_exercise", "name": "exercise machine", + "looks_like":"f_chair", "symbol": "T", "description": "Typically used for, well, exercising. You're getting quite enough of that; running for your life.", "color": "dark_gray", @@ -35,6 +36,7 @@ "type": "furniture", "id": "f_ball_mach", "name": "ball machine", + "looks_like":"f_exercise", "description": "An unpowered machine that seems like it could've been used to launch various balls for different types of sports. It's only good for parts now if disassembled.", "symbol": "T", "color": "dark_gray", @@ -53,6 +55,7 @@ "type": "furniture", "id": "f_pool_table", "name": "pool table", + "looks_like":"f_table", "symbol": "#", "description": "A good-looking pool table. You wish you learned how to play.", "color": "green", @@ -86,6 +89,7 @@ "type": "furniture", "id": "f_dive_block", "name": "diving block", + "looks_like":"f_table", "description": "Jump! Jump! Dive!", "symbol": "O", "color": "light_gray", @@ -104,6 +108,7 @@ "type": "furniture", "id": "f_target", "name": "target", + "looks_like":"f_statue", "description": "A metal shooting target in the rough shape of a human.", "symbol": "@", "color": "black", @@ -123,6 +128,7 @@ "type": "furniture", "id": "f_arcade_machine", "name": "arcade machine", + "looks_like":"f_exercise", "description": "Play stupid games, win stupid prizes. That was the idea, anyway. Now, without power, it's just stupid. Smarter to disassemble for all kinds of useful electronic parts.", "symbol": "6", "color": "red", @@ -163,6 +169,7 @@ "type": "furniture", "id": "f_pinball_machine", "name": "pinball machine", + "looks_like":"f_exercise", "description": "Most underrated game of the 20th century. Press buttons so the ball doesn't go in the hole. It doesn't seem to be working without electricity. Could be disassembled for various electronic parts.", "symbol": "7", "color": "red", @@ -210,6 +217,7 @@ "type": "furniture", "id": "f_ergometer", "name": "ergometer", + "looks_like":"f_exercise", "description": "An rowing exercise machine. Without power, it can no longer help you with your workout. Might have useful electronic parts in it.", "symbol": "5", "color": "dark_gray", @@ -255,6 +263,7 @@ "type": "furniture", "id": "f_treadmill", "name": "treadmill", + "looks_like":"f_exercise", "description": "Used for training leg muscles. It'll be extra hard without power. Could be taken apart for its… parts.", "symbol": "L", "color": "dark_gray", @@ -290,7 +299,7 @@ "type": "furniture", "id": "f_punching_bag", "aliases": "f_floor_canvas", - "looks_like": "f_floor_canvas", + "looks_like": "f_canvas_floor", "name": "heavy punching bag", "description": "Punch Punch! Exercise those arms! Main selling point: it doesn't fight back!", "symbol": "0", @@ -315,6 +324,7 @@ "type": "furniture", "id": "f_piano", "name": "piano", + "looks_like":"f_table", "description": "The ol' ebony and ivory. Really classes up the place. You could take it apart if you wanted… you monster.", "symbol": "P", "color": "i_black", @@ -352,6 +362,7 @@ "type": "furniture", "id": "f_speaker_cabinet", "name": "speaker cabinet", + "looks_like":"f_rack", "description": "A cabinet loaded with 12-inch speakers, intended to help make various things loud. It can't serve its original purpose these days, but it could be disassembled for various electronic parts.", "symbol": "7", "color": "blue", diff --git a/data/json/furniture_and_terrain/furniture-roof.json b/data/json/furniture_and_terrain/furniture-roof.json index b9f6e25c30d33..6bb5a2f6236d3 100644 --- a/data/json/furniture_and_terrain/furniture-roof.json +++ b/data/json/furniture_and_terrain/furniture-roof.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_cellphone_booster", "name": "cell phone signal booster", + "looks_like":"t_machinery_electronic", "description": "A cell phone signal booster, it may be useful for parts now.", "symbol": ":", "color": "white", @@ -37,6 +38,7 @@ "type": "furniture", "id": "f_small_satelitte_dish", "name": "satellite dish", + "looks_like":"t_machinery_electronic", "description": "A small satellite dish for home entertainment.", "symbol": "(", "color": "light_gray", @@ -56,6 +58,7 @@ "type": "furniture", "id": "f_chimney", "name": "chimney crown", + "looks_like":"f_standing_tank", "description": "The top of a chimney, it looks sooty.", "symbol": "#", "color": "red", @@ -76,6 +79,7 @@ "type": "furniture", "id": "f_TV_antenna", "name": "TV antenna", + "looks_like":"t_machinery_electronic", "description": "The television antenna improved reception for televisions.", "symbol": "#", "color": "light_gray", @@ -101,6 +105,7 @@ "type": "furniture", "id": "f_vent_pipe", "name": "vent pipe", + "looks_like":"f_standing_tank", "description": "The plumbing vent pipe removes gas and odors from the building.", "symbol": "|", "color": "dark_gray", @@ -121,6 +126,7 @@ "type": "furniture", "id": "f_roof_turbine_vent", "name": "roof turbine vent", + "looks_like":"f_standing_tank", "description": "The turbine uses wind power to suck hot and humid air out of the attic.", "symbol": "&", "color": "light_gray", diff --git a/data/json/furniture_and_terrain/furniture-rural.json b/data/json/furniture_and_terrain/furniture-rural.json index db76bf183f21a..97ac17175f42a 100644 --- a/data/json/furniture_and_terrain/furniture-rural.json +++ b/data/json/furniture_and_terrain/furniture-rural.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_hay", "name": "hay", + "looks_like":"t_underbrush", "description": "A bale of hay. You could sleep on it, if desperate.", "symbol": "#", "bgcolor": "brown", @@ -24,6 +25,7 @@ "type": "furniture", "id": "f_woodchips", "name": "pile of woodchips", + "looks_like":"f_rubble", "symbol": "X", "description": "Pile of chipped wood pieces. You can move it with a shovel.", "color": "brown", diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json index c20d6dce42dd1..58a2b1e85871b 100644 --- a/data/json/furniture_and_terrain/furniture-seats.json +++ b/data/json/furniture_and_terrain/furniture-seats.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_bench", "name": "bench", + "looks_like":"f_chair", "symbol": "#", "description": "Hobo bed. Airy. Use at your own risk.", "color": "brown", @@ -27,6 +28,7 @@ "type": "furniture", "id": "f_armchair", "name": "arm chair", + "looks_like":"f_chair", "symbol": "H", "description": "A more comfortable way of sitting down.", "color": "green", @@ -89,6 +91,7 @@ "type": "furniture", "id": "f_chair", "name": "chair", + "looks_like":"f_cupboard", "symbol": "#", "description": "Sit down, have a drink.", "color": "brown", @@ -113,6 +116,7 @@ "type": "furniture", "id": "f_sofa", "name": "sofa", + "looks_like":"f_armchair", "symbol": "H", "description": "Lie down OR sit down! Perfect!", "bgcolor": "red", @@ -180,29 +184,5 @@ "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ], "max_volume": 3500, "deconstruct": { "items": [ { "item": "camp_chair", "count": 1 } ] } - }, - { - "type": "furniture", - "id": "f_bench", - "name": "bench", - "symbol": "#", - "description": "Hobo bed. Airy. Use at your own risk.", - "color": "brown", - "move_cost_mod": 1, - "coverage": 35, - "comfort": 1, - "floor_bedding_warmth": -1500, - "bonus_fire_warmth_feet": 1000, - "required_str": 5, - "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ], - "max_volume": 4000, - "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] }, - "bash": { - "str_min": 12, - "str_max": 40, - "sound": "smash!", - "sound_fail": "whump.", - "items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ] - } } ] diff --git a/data/json/furniture_and_terrain/furniture-signs.json b/data/json/furniture_and_terrain/furniture-signs.json index fd3c6d62dc145..06711c521508e 100644 --- a/data/json/furniture_and_terrain/furniture-signs.json +++ b/data/json/furniture_and_terrain/furniture-signs.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_bulletin", "name": "bulletin board", + "looks_like":"f_sign", "description": "A big, cork bulletin board capable of sporting various notices. Pin some notes for other survivors to read.", "symbol": "6", "color": "blue", @@ -28,27 +29,7 @@ "type": "furniture", "id": "f_sign", "name": "sign", - "symbol": "P", - "description": "Read it. Warnings ahead.", - "color": "brown", - "examine_action": "sign", - "move_cost_mod": 1, - "coverage": 35, - "required_str": -1, - "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SIGN" ], - "deconstruct": { "items": [ { "item": "2x4", "count": 3 }, { "item": "nail", "charges": [ 2, 5 ] } ] }, - "bash": { - "str_min": 6, - "str_max": 40, - "sound": "smash!", - "sound_fail": "whump.", - "items": [ { "item": "2x4", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 2, 4 ] }, { "item": "splinter", "count": 2 } ] - } - }, - { - "type": "furniture", - "id": "f_sign", - "name": "sign", + "looks_like":"f_counter", "symbol": "P", "description": "Read it. Warnings ahead.", "color": "brown", diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json index 4e527b9652f1c..55b159c70b216 100644 --- a/data/json/furniture_and_terrain/furniture-sleep.json +++ b/data/json/furniture_and_terrain/furniture-sleep.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_bed", "name": "bed", + "looks_like":"f_chair", "symbol": "#", "description": "This is a bed. A luxury in these times. Quite comfortable to sleep in.", "color": "magenta", @@ -32,6 +33,7 @@ "type": "furniture", "id": "f_bed_frame", "name": "bed frame", + "looks_like":"t_bars", "symbol": "#", "description": "This is an empty bed frame. With a mattress on it, it would be a nice place to sleep. Sleeping on it right now wouldn't be great.", "color": "brown", @@ -57,6 +59,7 @@ "type": "furniture", "id": "f_floor_mattress", "name": "mattress", + "looks_like":"f_bed", "description": "A comfortable mattress has been tossed on the floor for sleeping here. It's not quite as comfy as a real bed, but it's pretty close.", "symbol": "0", "color": "magenta", @@ -81,6 +84,7 @@ "type": "furniture", "id": "f_down_mattress", "name": "down mattress", + "looks_like":"f_floor_mattress", "description": "A comfortable feather down mattress has been tossed on the floor for sleeping here. It's not quite as comfy as a real bed, but it's pretty close.", "symbol": "0", "color": "magenta", @@ -105,6 +109,7 @@ "type": "furniture", "id": "f_makeshift_bed", "name": "makeshift bed", + "looks_like":"f_bed", "symbol": "#", "description": "Not as comfortable as a real bed, but it will suffice.", "color": "magenta", @@ -135,6 +140,7 @@ "type": "furniture", "id": "f_straw_bed", "name": "straw bed", + "looks_like":"f_bed", "symbol": "#", "description": "Kinda itches when you lay on it.", "color": "magenta", diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json index 10b1edf65da2a..a648b0a4797b4 100644 --- a/data/json/furniture_and_terrain/furniture-storage.json +++ b/data/json/furniture_and_terrain/furniture-storage.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_bookcase", "name": "bookcase", + "looks_like": "f_cupboard", "symbol": "{", "description": "Stores books. Y'know, those things. Who reads books anymore?", "color": "brown", @@ -59,6 +60,7 @@ "type": "furniture", "id": "f_coffin_c", "name": "coffin", + "looks_like": "f_crate_c", "description": "Holds the bodies of the countless killed in the Cataclysm.", "symbol": "0", "bgcolor": "brown", @@ -103,6 +105,7 @@ "type": "furniture", "id": "f_coffin_o", "name": "open coffin", + "looks_like": "f_crate_o", "description": "You can only hope you'll look good enough for one of these, when the time comes.", "symbol": "O", "bgcolor": "brown", @@ -136,6 +139,7 @@ "type": "furniture", "id": "f_crate_c", "name": "crate", + "looks_like": "f_cupboard", "description": "What's inside? Pry it open to find out! Or just smash it, but you might break the contents.", "symbol": "X", "bgcolor": "brown", @@ -170,6 +174,7 @@ "type": "furniture", "id": "f_crate_o", "name": "open crate", + "looks_like": "f_crate_c", "description": "What's inside? Look in it!", "symbol": "O", "bgcolor": "brown", @@ -193,6 +198,7 @@ "type": "furniture", "id": "f_cardboard_box", "name": "large cardboard box", + "looks_like": "f_crate_c", "symbol": "X", "description": "A large cardboard box: this could be used to store things, or as a hiding place.", "color": "brown", @@ -218,6 +224,7 @@ "type": "furniture", "id": "f_cupboard", "name": "cupboard", + "looks_like": "t_wall_wood", "symbol": "#", "description": "Store your cups.", "color": "blue", @@ -246,6 +253,7 @@ "type": "furniture", "id": "f_dresser", "name": "dresser", + "looks_like": "f_cupboard", "symbol": "{", "description": "Dress yourself for the zombie prom, or other occasions.", "color": "brown", @@ -270,7 +278,7 @@ "id": "f_glass_cabinet", "name": "glass front cabinet", "symbol": "[", - "looks_like": "f_display_rack", + "looks_like": "f_rack", "description": "A tall storage cabinet with a clear glass window.", "color": "light_gray", "move_cost_mod": -1, @@ -305,6 +313,7 @@ "type": "furniture", "id": "f_gunsafe_ml", "name": "gun safe", + "looks_like": "f_safe_c", "description": "Oooooohhhh. Shiny.", "symbol": "X", "color": "light_gray", @@ -330,6 +339,7 @@ "type": "furniture", "id": "f_gunsafe_mj", "name": "jammed gun safe", + "looks_like": "f_gunsafe_ml", "description": "Does it have guns in it? You won't find out. It's jammed.", "symbol": "X", "color": "light_gray", @@ -354,6 +364,7 @@ "type": "furniture", "id": "f_gun_safe_el", "name": "electronic gun safe", + "looks_like": "f_gunsafe_ml", "description": "Can you hack it open to get the firearms?", "symbol": "X", "color": "light_gray", @@ -379,6 +390,7 @@ "type": "furniture", "id": "f_locker", "name": "locker", + "looks_like": "f_cupboard", "symbol": "{", "description": "Usually used for storing equipment or items.", "color": "light_gray", @@ -412,6 +424,7 @@ "type": "furniture", "id": "f_mailbox", "name": "mailbox", + "looks_like": "f_cupboard", "symbol": "P", "description": "A metal box attached to the top of a wooden post. Mail delivery hasn't come for awhile. Doesn't look like it's coming again anytime soon.", "color": "light_gray", @@ -440,6 +453,7 @@ "type": "furniture", "id": "f_rack", "name": "display rack", + "looks_like": "f_cupboard", "description": "Display your items.", "symbol": "{", "color": "light_gray", @@ -472,13 +486,13 @@ "type": "furniture", "id": "f_rack_wood", "name": "wooden rack", + "looks_like": "f_rack", "symbol": "{", "description": "A simple wooden rack. Display your items on it.", "color": "brown", "move_cost_mod": -1, "coverage": 70, "required_str": 7, - "looks_like": "f_bookcase", "flags": [ "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "BLOCKSDOOR" ], "deconstruct": { "items": [ @@ -500,6 +514,7 @@ "type": "furniture", "id": "f_rack_coat", "name": "coat rack", + "looks_like": "f_rack", "description": "A hooked rack for hanging jackets and hats.", "symbol": "Y", "color": "brown", @@ -521,6 +536,7 @@ "type": "furniture", "id": "f_recycle_bin", "name": "recycle bin", + "looks_like": "f_trashcan", "description": "Stores items for recycling.", "symbol": "{", "color": "light_green", @@ -541,6 +557,7 @@ "type": "furniture", "id": "f_safe_c", "name": "safe", + "looks_like": "f_crate_c", "description": "Holds items. Securely.", "symbol": "X", "color": "light_gray", @@ -567,6 +584,7 @@ "type": "furniture", "id": "f_safe_l", "name": "safe", + "looks_like": "f_safe_c", "symbol": "X", "description": "What needs protection like this?", "color": "light_gray", @@ -592,6 +610,7 @@ "type": "furniture", "id": "f_safe_o", "name": "open safe", + "looks_like": "f_safe_c", "description": "Grab the firearms!", "symbol": "O", "color": "light_gray", @@ -617,6 +636,7 @@ "type": "furniture", "id": "f_trashcan", "name": "trash can", + "looks_like": "f_crate_c", "symbol": "&", "description": "One man's trash is another man's dinner.", "color": "light_cyan", @@ -727,6 +747,7 @@ "type": "furniture", "id": "f_wood_keg", "name": "wooden keg", + "looks_like": "f_crate_c", "description": "A keg made mostly of wood. Holds liquids, preferably alcoholic.", "symbol": "H", "color": "brown", @@ -764,6 +785,7 @@ "type": "furniture", "id": "f_displaycase", "name": "display case", + "looks_like": "f_rack", "description": "Display your stuff fancily and securely.", "symbol": "#", "color": "light_cyan", @@ -786,6 +808,7 @@ "type": "furniture", "id": "f_displaycase_b", "name": "broken display case", + "looks_like": "f_displaycase", "description": "Display your stuff. It'll get stolen.", "symbol": "#", "color": "light_gray", @@ -805,6 +828,7 @@ "type": "furniture", "id": "f_standing_tank", "name": "standing tank", + "looks_like": "f_oven", "description": "A large freestanding metal tank, useful for holding liquids.", "symbol": "O", "color": "light_gray", @@ -827,6 +851,7 @@ "type": "furniture", "id": "f_dumpster", "name": "dumpster", + "looks_like": "f_trashcan", "description": "Stores trash. Doesn't get picked up anymore. Note the smell.", "symbol": "{", "color": "green", diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json index 673529dfe9f0f..c31f936f2164c 100644 --- a/data/json/furniture_and_terrain/furniture-surfaces.json +++ b/data/json/furniture_and_terrain/furniture-surfaces.json @@ -3,6 +3,7 @@ "type": "furniture", "id": "f_counter", "name": "counter", + "looks_like": "f_cupboard", "description": "Affixed to the wall or found in kitchens or stores.", "symbol": "#", "color": "blue", @@ -28,6 +29,7 @@ "type": "furniture", "id": "f_counter_gate_c", "name": "closed counter gate", + "looks_like": "f_counter", "description": "A commercial quality swinging door made of wood that allows passage behind counters.", "symbol": "+", "color": "blue", @@ -50,6 +52,7 @@ "type": "furniture", "id": "f_counter_gate_o", "name": "open counter gate", + "looks_like": "f_counter_gate_c", "description": "A commercial quality swinging door made of wood that allows passage behind counters.", "symbol": ".", "color": "blue", @@ -71,6 +74,7 @@ "type": "furniture", "id": "f_desk", "name": "desk", + "looks_like": "f_counter", "symbol": "#", "description": "Sit down at it or work on it.", "color": "light_red", @@ -101,6 +105,7 @@ "type": "furniture", "id": "f_workbench", "name": "workbench", + "looks_like": "f_counter", "description": "A sturdy workbench built out of metal. It is perfect for crafting large and heavy things.", "symbol": "#", "color": "red", @@ -136,6 +141,7 @@ "type": "furniture", "id": "f_leather_tarp", "name": "leather tarp", + "looks_like": "f_fiber_mat", "description": "A large sheet of sewn leather that can be used instead of a picnic blanket, but it's more valuable as a butchery appliance as it does not soak in blood.", "symbol": "D", "bgcolor": "brown", @@ -158,6 +164,7 @@ "type": "furniture", "id": "f_plastic_groundsheet", "name": "plastic groundsheet", + "looks_like": "f_fiber_mat", "description": "A large sheet of thick plastic has been tossed on the ground here. It would be a useful place to do some butchery, perhaps.", "symbol": "D", "bgcolor": "light_blue", @@ -180,6 +187,7 @@ "type": "furniture", "id": "f_fiber_mat", "name": "fiber mat", + "looks_like": "t_floor", "description": "A large mat woven from fibrous material that can be used instead of a picnic blanket, but it's more valuable as a butchery appliance. Too thin to be a comfortable sleeping place.", "symbol": "Q", "bgcolor": "yellow", @@ -202,6 +210,7 @@ "type": "furniture", "id": "f_tourist_table", "name": "tourist table", + "looks_like": "f_table", "description": "Small metal folding table, ideal for off-road trips into the wild. Can be used as a workbench in a pinch.", "symbol": "#", "bgcolor": "light_gray", @@ -209,7 +218,6 @@ "coverage": 40, "required_str": -1, "deployed_item": "tourist_table", - "looks_like": "f_table", "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT", "FLAT_SURF" ], "deconstruct": { "items": [ { "item": "tourist_table", "count": 1 } ] }, "bash": { @@ -230,6 +238,7 @@ "type": "furniture", "id": "f_table", "name": "table", + "looks_like": "f_counter", "description": "Sit down when you eat!", "symbol": "#", "color": "red", diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index ad6e9dae3aa90..c84d82a50bf92 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -3,6 +3,7 @@ "id": "f_tatami", "type": "furniture", "name": "tatami mat", + "looks_like":"f_fiber_mat", "description": "A tatami is a type of mat used as a flooring material in traditional Japanese-style rooms.", "symbol": "#", "color": [ "brown" ], @@ -28,6 +29,7 @@ "type": "furniture", "id": "f_pillow_fort", "name": "pillow fort", + "looks_like":"f_bed", "symbol": "^", "description": "A comfy place to hide from the world. Not very defensible, though.", "color": "white", @@ -61,6 +63,7 @@ "type": "furniture", "id": "f_cardboard_fort", "name": "cardboard fort", + "looks_like":"f_pillow_fort", "symbol": "^", "description": "A fort built by tipping a cardboard box on its side, lining it with blankets, and partly weather sealing it with a plastic sheet.", "color": "brown", @@ -102,6 +105,7 @@ "type": "furniture", "id": "f_cardboard_wall", "name": "cardboard wall", + "looks_like":"t_paper", "symbol": "#", "bgcolor": "brown", "move_cost_mod": -1, @@ -197,6 +201,7 @@ "type": "furniture", "id": "f_canvas_floor", "name": "canvas floor", + "looks_like": "f_fiber_mat", "description": "Flooring made out of stretched, waterproof cloth. Helps keep the dirt out of the tent.", "symbol": "#", "color": "white", @@ -208,6 +213,7 @@ "type": "furniture", "id": "f_canvas_wall", "name": "canvas wall", + "looks_like": "t_wall", "description": "A wall made of stretched, waterproof cloth.", "symbol": "#", "color": "blue", @@ -228,6 +234,7 @@ "type": "furniture", "id": "f_large_canvas_wall", "name": "canvas wall", + "looks_like": "f_canvas_wall", "description": "A wall made of stretched, heavy-duty, waterproof cloth.", "symbol": "#", "color": "blue", @@ -249,6 +256,7 @@ "type": "furniture", "id": "f_canvas_door", "name": "canvas flap", + "looks_like":"t_curtains", "description": "This canvas flap door could be pulled aside.", "symbol": "+", "color": "blue", @@ -270,6 +278,7 @@ "type": "furniture", "id": "f_canvas_door_o", "name": "open canvas flap", + "looks_like":"t_door_frame", "description": "This canvas flap door has been pulled aside.", "symbol": ".", "color": "blue", @@ -290,6 +299,7 @@ "type": "furniture", "id": "f_large_canvas_door", "name": "canvas flap", + "looks_like": "f_canvas_door", "description": "This heavy canvas flap door could be pulled aside.", "symbol": "+", "color": "blue", @@ -312,6 +322,7 @@ "type": "furniture", "id": "f_large_canvas_door_o", "name": "open canvas flap", + "looks_like": "f_canvas_door_o", "description": "This heavy canvas flap door has been pulled aside.", "symbol": ".", "color": "blue", @@ -333,6 +344,7 @@ "type": "furniture", "id": "f_groundsheet", "name": "groundsheet", + "looks_like": "f_fiber_mat", "description": "This plastic groundsheet could keep you dry.", "symbol": ";", "color": "green", @@ -355,6 +367,7 @@ "type": "furniture", "id": "f_large_groundsheet", "name": "groundsheet", + "looks_like": "f_groundsheet", "description": "This large plastic groundsheet could keep you dry.", "symbol": ";", "color": "green", @@ -375,6 +388,7 @@ "type": "furniture", "id": "f_center_groundsheet", "name": "groundsheet", + "looks_like": "f_groundsheet", "description": "This plastic groundsheet could keep you dry.", "symbol": ";", "color": "green", @@ -398,6 +412,7 @@ "type": "furniture", "id": "f_fema_groundsheet", "name": "groundsheet", + "looks_like": "f_groundsheet", "description": "This plastic government-issue groundsheet could keep you dry, but was made by the lowest bidder.", "symbol": ";", "color": "green", @@ -417,6 +432,7 @@ "type": "furniture", "id": "f_skin_wall", "name": "animalskin wall", + "looks_like": "t_wall_rammed_earth", "symbol": "#", "description": "Wall made out of animal skin. Either an amazing or horrifying sight.", "color": "brown", @@ -437,6 +453,7 @@ "type": "furniture", "id": "f_skin_door", "name": "animalskin flap", + "looks_like": "t_door_curtain_c", "description": "This animal skin flap could be pulled aside.", "symbol": "+", "color": "white", @@ -458,6 +475,7 @@ "type": "furniture", "id": "f_skin_door_o", "name": "open animalskin flap", + "looks_like": "t_door_curtain_o", "description": "This animal skin flap has been pulled aside.", "symbol": ".", "color": "white", @@ -478,6 +496,7 @@ "type": "furniture", "id": "f_skin_groundsheet", "name": "animalskin floor", + "looks_like": "f_leather_tarp", "description": "This animal skin groundsheet could keep you dry.", "symbol": ";", "color": "brown", @@ -500,6 +519,7 @@ "type": "furniture", "id": "f_rubble", "name": "pile of rubble", + "looks_like": "t_rock_floor", "symbol": "^", "description": "Pile of various metals, bricks, and other building materials. You could clear it with a shovel.", "color": "light_gray", @@ -524,6 +544,7 @@ "type": "furniture", "id": "f_rubble_rock", "name": "pile of rocky rubble", + "looks_like": "f_rubble", "description": "Pile of rocks. Useless?", "symbol": "^", "color": "dark_gray", @@ -548,6 +569,7 @@ "type": "furniture", "id": "f_rubble_landfill", "name": "pile of trashy rubble", + "looks_like": "f_rubble", "description": "Trash topped with dirt and grass, it smells gross, but another man's trash…", "symbol": "#", "color": "green", @@ -572,6 +594,7 @@ "type": "furniture", "id": "f_wreckage", "name": "metal wreckage", + "looks_like": "f_rubble", "description": "Pile of various bent and twisted metals.", "symbol": "#", "color": "cyan", @@ -597,6 +620,7 @@ "type": "furniture", "id": "f_ash", "name": "pile of ash", + "looks_like": "f_rubble", "symbol": "#", "description": "Some ash, from wood or possibly bodies.", "color": "light_gray", @@ -609,6 +633,7 @@ "type": "furniture", "id": "f_boulder_small", "name": "small boulder", + "looks_like": "f_rubble", "description": "Blocking your path. Should be easy to move. It can be used as a primitive anvil.", "symbol": "o", "color": "dark_gray", @@ -629,6 +654,7 @@ "type": "furniture", "id": "f_boulder_medium", "name": "medium boulder", + "looks_like": "f_boulder_small", "description": "Blocking your path. It'll be a struggle to move. It can be used as a primitive anvil.", "symbol": "0", "color": "dark_gray", @@ -649,6 +675,7 @@ "type": "furniture", "id": "f_boulder_large", "name": "large boulder", + "looks_like": "f_boulder_small", "description": "Now how are you going to move this?", "symbol": "O", "color": "dark_gray", diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json index 62358e2d8ce97..1bc6f3c971d18 100644 --- a/data/json/furniture_and_terrain/terrain-doors.json +++ b/data/json/furniture_and_terrain/terrain-doors.json @@ -203,6 +203,7 @@ "type": "terrain", "id": "t_door_c", "name": "closed wood door", + "looks_like": "t_wall", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too.", "symbol": "+", "color": "brown", @@ -280,7 +281,7 @@ "name": "closed wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too.", "symbol": "+", - "looks_like": "t_door_c", + "looks_like": "t_door_lab_c", "color": "brown", "move_cost": 0, "coverage": 95, @@ -318,7 +319,7 @@ "name": "closed wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too.", "symbol": "+", - "looks_like": "t_door_c", + "looks_like": "t_door_lab_c", "color": "brown", "move_cost": 0, "coverage": 95, @@ -356,7 +357,7 @@ "name": "closed wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too.", "symbol": "+", - "looks_like": "t_door_c", + "looks_like": "t_door_lab_c", "color": "brown", "move_cost": 0, "coverage": 95, @@ -394,7 +395,7 @@ "name": "closed wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too.", "symbol": "+", - "looks_like": "t_door_c", + "looks_like": "t_door_lab_c", "color": "brown", "move_cost": 0, "coverage": 95, @@ -432,7 +433,7 @@ "name": "open wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too. This one is wide open.", "symbol": "'", - "looks_like": "t_door_o", + "looks_like": "t_door_lab_o", "color": "brown", "move_cost": 2, "roof": "t_flat_roof", @@ -469,7 +470,7 @@ "name": "open wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too. This one is wide open.", "symbol": "'", - "looks_like": "t_door_o", + "looks_like": "t_door_lab_o", "color": "brown", "move_cost": 2, "roof": "t_flat_roof", @@ -506,7 +507,7 @@ "name": "open wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too. This one is wide open.", "symbol": "'", - "looks_like": "t_door_o", + "looks_like": "t_door_lab_o", "color": "brown", "move_cost": 2, "roof": "t_flat_roof", @@ -543,7 +544,7 @@ "name": "open wood door", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too. This one is wide open.", "symbol": "'", - "looks_like": "t_door_o", + "looks_like": "t_door_lab_o", "color": "brown", "move_cost": 2, "roof": "t_flat_roof", @@ -1163,6 +1164,7 @@ "type": "terrain", "id": "t_door_o", "name": "open wood door", + "looks_like": "t_wall", "description": "A standard wooden door that doesn't look very resilient. It'd probably burn easily, too. This one is wide open.", "symbol": "'", "color": "brown", @@ -1646,7 +1648,7 @@ "name": "empty door frame", "description": "An empty door frame made from two by fours and nails. A variety of doors could be constructed here.", "symbol": ".", - "looks_like": "t_floor", + "looks_like": "t_door_c", "color": "brown", "move_cost": 2, "roof": "t_flat_roof", @@ -1784,7 +1786,7 @@ "name": "boarded up damaged door", "description": "A boarded up wooden door, except some of the planks are fractured or coming loose. Without repairs, it could be broken down easily.", "symbol": "#", - "looks_like": "t_door_b", + "looks_like": "t_door_boarded", "color": "brown", "move_cost": 0, "coverage": 95, @@ -1868,7 +1870,7 @@ "name": "boarded up damaged reinforced door", "description": "A battered and torn reinforced door with planks bursting from the joints. The boarded up two by fours are fragmented and in pieces, this doesn't look like an easy repair.", "symbol": "#", - "looks_like": "t_door_b", + "looks_like": "t_door_boarded", "color": "brown", "move_cost": 0, "coverage": 95, @@ -1896,7 +1898,7 @@ "name": "boarded up damaged door with peephole", "description": "A wrecked door made of ordinary wood, except this one has a peephole. Although it's been covered up in planks, the peephole was damaged and can't be used to see through.", "symbol": "#", - "looks_like": "t_door_boarded_damaged", + "looks_like": "t_door_boarded", "color": "brown", "move_cost": 0, "coverage": 95, @@ -1971,7 +1973,7 @@ "type": "terrain", "id": "t_secretdoor_metal_o", "name": "open secret door", - "looks_like": "t_mdoor_frame", + "looks_like": "t_door_metal_o", "description": "This apparently normal segment of metal wall has opened to reveal a secret passage.", "symbol": "'", "color": "cyan", diff --git a/data/json/furniture_and_terrain/terrain-floors_indoor.json b/data/json/furniture_and_terrain/terrain-floors_indoor.json index 39d1835e8f84b..16224f197fe52 100644 --- a/data/json/furniture_and_terrain/terrain-floors_indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors_indoor.json @@ -3,6 +3,7 @@ "type": "terrain", "id": "t_thconc_floor", "name": "concrete floor", + "looks_like": "t_floor", "description": "A bare and cold concrete floor with matching roof, could still insulate from the outdoors but roof collapse is possible if supporting walls are broken down.", "symbol": ".", "color": "cyan", @@ -26,10 +27,10 @@ "type": "terrain", "id": "t_thconc_y", "name": "concrete floor", + "looks_like": "t_thconc_floor", "description": "A bare and cold concrete floor with a streak of yellow paint, could still insulate from the outdoors but roof collapse is possible if supporting walls are broken down.", "symbol": ".", "color": "yellow", - "looks_like": "t_wall_y", "move_cost": 2, "roof": "t_flat_roof", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ], @@ -50,6 +51,7 @@ "type": "terrain", "id": "t_thconc_floor_olight", "name": "concrete floor, overhead light", + "looks_like": "t_utility_light", "description": "A bare and cold concrete floor with a still-functioning light attached to the ceiling above.", "symbol": ".", "color": "white", @@ -72,6 +74,7 @@ "type": "terrain", "id": "t_ov_smreb_cage", "name": "small rebar roof cage", + "looks_like": "t_reb_cage", "description": "A series of structural support crafted from rebar in order to allow the pouring of concrete for a more stable floor and roof.", "symbol": ".", "color": "dark_gray", @@ -91,6 +94,7 @@ "type": "terrain", "id": "t_strconc_floor", "name": "reinforced concrete floor", + "looks_like": "t_thconc_floor", "description": "Extremely resilient floor made from carefully placed rebar and poured concrete, capable of providing protection from the elements. As for the matching roof, it still requires supporting walls, otherwise it may very well cave in.", "symbol": ".", "color": "cyan", @@ -114,6 +118,7 @@ "type": "terrain", "id": "t_ov_reb_cage", "name": "rebar roof cage", + "looks_like": "t_metal_floor", "description": "A network of architecturally sound rebar in order to support a floor and roof, looks like it's missing the poured concrete.", "symbol": ".", "color": "dark_gray", @@ -132,6 +137,7 @@ "type": "terrain", "id": "t_strconc_floor_halfway", "name": "half-built reinforced concrete floor", + "looks_like": "t_thconc_floor", "description": "Unfinished series of rebar and poured concrete; the floor hasn't been smoothed and the roof isn't quite filled in yet.", "symbol": ".", "color": "cyan", @@ -154,6 +160,7 @@ "type": "terrain", "id": "t_rock_floor", "name": "rock floor", + "looks_like": "t_rock", "description": "A relatively flat area of rock and stone. Looks stable enough to be mined with the proper mining gear.", "symbol": ".", "color": "light_gray", @@ -166,6 +173,7 @@ "type": "terrain", "id": "t_metal_floor", "name": "metal floor", + "looks_like": "t_floor", "description": "High-quality and tough checkered flooring to reduce risk of slips and falls, with a matching roof.", "symbol": ".", "color": "light_cyan", @@ -189,6 +197,7 @@ "type": "terrain", "id": "t_floor", "name": "floor", + "looks_like": "t_rock_floor", "description": "Interlocking wooden tiles that are more than likely treated against fire, with wooden posts and beams supporting a roof.", "symbol": ".", "color": "cyan", @@ -208,6 +217,7 @@ "type": "terrain", "id": "t_floor_primitive", "name": "primitive floor", + "looks_like": "t_floor", "description": "Timber floor and supports, holding up a sod roof.", "symbol": ".", "color": "brown", @@ -231,6 +241,7 @@ "type": "terrain", "id": "t_scrap_floor", "name": "simple metal floor", + "looks_like": "t_metal_floor", "description": "A crudely welded together floor of metal with steel trusses and supporting girders.", "symbol": ".", "color": "cyan", @@ -250,6 +261,7 @@ "type": "terrain", "id": "t_floor_waxed", "name": "waxed floor", + "looks_like": "t_floor", "description": "Hardwood flooring that has been treated with chemicals to improve slip resistance and sliding, commonly for recreational sports.", "symbol": ".", "color": [ "light_red" ], @@ -269,6 +281,7 @@ "type": "terrain", "id": "t_dirtfloor", "name": "dirt floor", + "looks_like": "t_floor", "description": "Floor consisting of finely mixed earth that has been tamped down.", "symbol": ".", "color": "brown", @@ -288,6 +301,7 @@ "type": "terrain", "id": "t_dirtfloor_thatchroof", "name": "dirt floor", + "looks_like": "t_dirtfloor", "description": "Floor consisting of finely mixed earth that has been tamped down, with thatched roof above it.", "symbol": ".", "color": "brown", @@ -307,6 +321,7 @@ "type": "terrain", "id": "t_grate", "name": "metal grate", + "looks_like": "t_metal_floor", "description": "A type of walkway that can be used as protective covering over drains or even used as a filter.", "symbol": "#", "color": "dark_gray", @@ -317,6 +332,7 @@ "type": "terrain", "id": "t_utility_light", "name": "utility light", + "looks_like": "t_thconc_floor", "description": "An industrial flood light set up to illuminate the surroundings. Smashing it doesn't seem like it'd produce any worthwhile salvage.", "symbol": ".", "color": "white", @@ -337,6 +353,7 @@ "type": "terrain", "id": "t_floor_wax", "name": "wax floor", + "looks_like": "t_floor_waxed", "description": "A floor section made entirely out of wax.", "symbol": ".", "color": "yellow", @@ -347,6 +364,7 @@ "type": "terrain", "id": "t_elevator", "name": "elevator", + "looks_like": "t_metal_floor", "description": "The interior section of an elevator.", "symbol": ".", "color": "magenta", @@ -358,6 +376,7 @@ "type": "terrain", "id": "t_floor_red", "name": "red floor", + "looks_like": "t_linoleum_white", "description": "A red section of flooring.", "symbol": ".", "color": "red", @@ -368,6 +387,7 @@ "type": "terrain", "id": "t_floor_green", "name": "green floor", + "looks_like": "t_linoleum_white", "description": "A green section of flooring.", "symbol": ".", "color": "green", @@ -378,6 +398,7 @@ "type": "terrain", "id": "t_floor_blue", "name": "blue floor", + "looks_like": "t_linoleum_white", "description": "A blue section of flooring.", "symbol": ".", "color": "blue", @@ -388,10 +409,10 @@ "type": "terrain", "id": "t_carpet_concrete", "name": "industrial carpet", + "looks_like": "t_floor", "description": "Firm, low-pile, high-durability carpet in a neutral gray color, for laying down on bare concrete.", "symbol": ".", "color": "light_gray", - "looks_like": "t_carpet_red", "move_cost": 2, "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG" ], "bash": { @@ -414,7 +435,7 @@ "description": "Firm, low-pile, totally non-flammable carpet in a neutral cream color, with an insulation layer beneath.", "symbol": ".", "color": "white", - "looks_like": "t_carpet_yellow", + "looks_like": "t_carpet_concrete", "move_cost": 2, "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG" ], "bash": { @@ -434,6 +455,7 @@ "type": "terrain", "id": "t_carpet_red", "name": "red carpet", + "looks_like": "t_carpet_concrete", "description": "Soft red carpet.", "symbol": ".", "color": "red", @@ -453,6 +475,7 @@ "type": "terrain", "id": "t_carpet_yellow", "name": "yellow carpet", + "looks_like": "t_carpet_concrete", "description": "Soft yellow carpet.", "symbol": ".", "color": "yellow", @@ -472,6 +495,7 @@ "type": "terrain", "id": "t_carpet_green", "name": "green carpet", + "looks_like": "t_carpet_concrete", "description": "Soft green carpet.", "symbol": ".", "color": "green", @@ -491,6 +515,7 @@ "type": "terrain", "id": "t_carpet_purple", "name": "purple carpet", + "looks_like": "t_carpet_concrete", "description": "Soft purple carpet.", "symbol": ".", "color": "magenta", @@ -510,6 +535,7 @@ "type": "terrain", "id": "t_linoleum_white", "name": "linoleum tile", + "looks_like": "t_floor", "description": "A section of flooring made out of a tough, rubbery material. Colored a simple white.", "symbol": ".", "color": "white", @@ -529,6 +555,7 @@ "type": "terrain", "id": "t_linoleum_gray", "name": "linoleum tile", + "looks_like": "t_linoleum_white", "roof": "t_flat_roof", "description": "A section of flooring made out of a tough, gray, rubbery material.", "symbol": ".", @@ -548,6 +575,7 @@ "id": "t_floor_waxed_y", "type": "terrain", "name": "painted waxed floor", + "looks_like": "t_floor_waxed", "description": "This section of wax flooring has been painted.", "symbol": ".", "color": [ "yellow" ], @@ -566,7 +594,7 @@ { "type": "terrain", "id": "t_rad_platform", - "looks_like": "t_blue_floor", + "looks_like": "t_floor_blue", "name": "radiation platform", "description": "A dual purpose platform that serves as a containment, and as a device that exposes items places on in to the radioactive source, by temporarily hoisting the radioactive material stored within. Operated from external console.", "symbol": "0", @@ -616,69 +644,16 @@ "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 40 ] } ] } }, - { - "id": "t_floor_waxed_y", - "type": "terrain", - "name": "painted waxed floor", - "description": "This section of wax flooring has been painted.", - "symbol": ".", - "color": [ "yellow" ], - "move_cost": 2, - "roof": "t_flat_roof", - "bash": { - "str_min": 50, - "str_max": 400, - "str_min_supported": 100, - "ter_set": "t_null", - "sound": "SMASH!", - "items": [ { "item": "wax", "count": [ 1, 3 ] } ] - }, - "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ] - }, - { - "type": "terrain", - "id": "t_rad_platform", - "looks_like": "t_blue_floor", - "name": "radiation platform", - "description": "A dual purpose platform that serves as a containment, and as a device that exposes items places on in to the radioactive source, by temporarily hoisting the radioactive material stored within. Operated from external console.", - "symbol": "0", - "color": "light_blue", - "move_cost": 100, - "flags": [ "TRANSPARENT", "REDUCE_SCENT", "PERMEABLE" ], - "bash": { - "str_min": 50, - "str_max": 400, - "ter_set": "t_pit", - "sound": "metal screeching!", - "sound_fail": "clang!", - "items": [ - { "item": "scrap", "count": [ 4, 16 ] }, - { "item": "steel_chunk", "count": [ 1, 6 ] }, - { "item": "cobalt_60", "charges": [ 1, 5 ] }, - { "item": "lead", "charges": [ 12, 18 ] } - ] - }, - "deconstruct": { - "ter_set": "t_pit", - "items": [ - { "item": "cable", "charges": [ 8, 16 ] }, - { "item": "cobalt_60", "charges": [ 2, 10 ] }, - { "item": "scrap", "count": [ 8, 16 ] }, - { "item": "sheet_metal", "count": [ 5, 10 ] }, - { "item": "lead", "count": [ 12, 18 ] } - ] - } - }, { "type": "terrain", "id": "t_dirt_underground", + "looks_like": "t_dirtfloor", "//": "for caverns and other natural underground formations.", "name": "dirt", "description": "It's dirt. Looks like some fine soil for tillage. Could also be dug out for construction projects.", "symbol": ".", "color": "brown", "move_cost": 2, - "looks_like": "t_dirt", "roof": "t_rock_roof", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD", "PLOWABLE", "DIGGABLE" ], "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true } @@ -687,11 +662,11 @@ "type": "terrain", "id": "t_sand_underground", "name": "sand", + "looks_like": "t_dirtfloor", "//": "for caverns and other natural underground formations.", "description": "A large area of fine sand that could be useful in a number of ways, if it was extracted properly.", "symbol": ".", "color": "yellow", - "looks_like": "t_sand", "move_cost": 3, "roof": "t_rock_roof", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "DIGGABLE" ], @@ -702,7 +677,7 @@ "id": "t_mud_underground", "//": "for caverns and other natural underground formations.", "name": "mud", - "looks_like": "t_dirt", + "looks_like": "t_dirtfloor", "description": "An area of wet, slick mud.", "symbol": ".", "color": "brown", @@ -716,7 +691,7 @@ "id": "t_moss_underground", "name": "moss", "//": "for caverns and other natural underground formations.", - "looks_like": "t_grass", + "looks_like": "t_dirtfloor", "roof": "t_rock_roof", "description": "Moist spongy moss.", "symbol": ".", @@ -729,6 +704,7 @@ "type": "terrain", "id": "t_clay_underground", "name": "clay", + "looks_like": "t_dirtfloor", "//": "for caverns and other natural underground formations.", "description": "A field full of malleable clay, suitable for kiln firing if it was extracted properly.", "symbol": ".", @@ -742,6 +718,7 @@ "type": "terrain", "id": "t_claymound_underground", "name": "mound of clay", + "looks_like": "t_dirtfloor", "description": "A mound of clay soil.", "//": "for caverns and other natural underground formations.", "symbol": "#", diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index 9ca43b3d249cc..cbfd46097069b 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -260,6 +260,7 @@ "type": "terrain", "id": "t_radio_tower", "name": "radio tower", + "looks_like": "t_machinery_light", "description": "This is the structure of a radio transmission tower.", "symbol": "&", "color": "light_gray", @@ -1046,6 +1047,7 @@ "type": "terrain", "id": "t_machinery_light", "name": "light machinery", + "looks_like": "t_wall_metal", "description": "Assorted light machinery. You could scavenge it for parts.", "symbol": "$", "color": "dark_gray", @@ -1090,6 +1092,7 @@ "type": "terrain", "id": "t_machinery_heavy", "name": "heavy machinery", + "looks_like": "t_wall_metal", "description": "Assorted heavy machinery. You could scavenge it for parts.", "symbol": "%", "color": "light_gray", @@ -1140,6 +1143,7 @@ "type": "terrain", "id": "t_machinery_old", "name": "old machinery", + "looks_like": "t_wall_metal", "description": "Assorted old machinery. You could scavenge it for parts.", "symbol": "&", "color": "brown", @@ -1188,6 +1192,7 @@ "type": "terrain", "id": "t_machinery_electronic", "name": "electronic machinery", + "looks_like": "t_machinery_light", "description": "Assorted electronic machinery. You could scavenge it for parts.", "symbol": "$", "color": "yellow", @@ -1243,6 +1248,7 @@ "id": "t_milking_machine", "type": "terrain", "name": "milking machine", + "looks_like": "t_machinery_light", "description": "A machine used in the dairy industry to milk cows.", "symbol": "%", "color": [ "light_gray" ], @@ -1273,6 +1279,7 @@ "id": "t_bulk_tank", "type": "terrain", "name": "bulk tank", + "looks_like": "f_standing_tank", "description": "A heavy, high capacity tank.", "symbol": "O", "color": [ "light_gray" ], diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json index 6710f0dc0850f..7afc0c14a8ece 100644 --- a/data/json/furniture_and_terrain/terrain-walls.json +++ b/data/json/furniture_and_terrain/terrain-walls.json @@ -15,6 +15,7 @@ "id": "t_wall", "aliases": [ "t_wall_h", "t_wall_v" ], "name": "wall", + "looks_like": "t_rock", "description": "The stereotypical wall with wooden support structure filled with insulation and drywalled. Paint job is the all too common and neutral off-white or cream color, it could use more vibrant paint. Appears as though the material is still flammable.", "symbol": "LINE_OXOX", "color": "light_gray", @@ -35,6 +36,7 @@ "type": "terrain", "id": "t_wall_half", "name": "half-built wall", + "looks_like": "t_wall", "description": "An incomplete wall of refined wood, dotted with carefully placed nails to provide proper support. It requires some more two by fours and nails before it'd be considered a suitable wall.", "symbol": "#", "color": "light_red", @@ -63,7 +65,7 @@ "name": "pony wall", "description": "A short divider wall with wooden support structure with drywall. Paint job is the all too common and neutral off-white or cream color. Appears as though the material is flammable.", "symbol": "LINE_OXOX", - "looks_like": "f_counter", + "looks_like": "t_wall_half", "color": "light_gray", "move_cost": 0, "coverage": 60, @@ -95,6 +97,7 @@ "id": "t_wall_r", "aliases": [ "t_wall_h_r", "t_wall_v_r" ], "name": "red wall", + "looks_like": "t_wall_w", "description": "Wall painted red.", "symbol": "LINE_OXOX", "color": "red", @@ -116,6 +119,7 @@ "id": "t_wall_w", "aliases": [ "t_wall_h_w", "t_wall_v_w" ], "name": "white wall", + "looks_like": "t_wall", "description": "Wall painted white.", "symbol": "LINE_OXOX", "color": "white", @@ -137,6 +141,7 @@ "id": "t_wall_b", "aliases": [ "t_wall_h_b", "t_wall_v_b" ], "name": "blue wall", + "looks_like": "t_wall_w", "description": "Wall painted blue.", "symbol": "LINE_OXOX", "color": "blue", @@ -158,6 +163,7 @@ "id": "t_wall_g", "aliases": [ "t_wall_h_g", "t_wall_v_g" ], "name": "green wall", + "looks_like": "t_wall_w", "description": "Wall painted green.", "symbol": "LINE_OXOX", "color": "green", @@ -179,6 +185,7 @@ "id": "t_wall_y", "aliases": [ "t_wall_h_y", "t_wall_v_y" ], "name": "yellow wall", + "looks_like": "t_wall_w", "description": "Wall painted yellow.", "symbol": "LINE_OXOX", "color": "yellow", @@ -200,6 +207,7 @@ "id": "t_wall_P", "aliases": [ "t_wall_h_P", "t_wall_v_P" ], "name": "pink wall", + "looks_like": "t_wall_w", "description": "Wall painted pink.", "symbol": "LINE_OXOX", "color": "pink", @@ -220,6 +228,7 @@ "id": "t_wall_p", "aliases": [ "t_wall_h_p", "t_wall_v_p" ], "name": "purple wall", + "looks_like": "t_wall_w", "description": "Wall painted purple.", "symbol": "LINE_OXOX", "color": "magenta", @@ -240,6 +249,7 @@ "type": "terrain", "id": "t_brick_wall_halfway", "name": "half-built brick wall", + "looks_like": "t_wall_half", "description": "Half of a brick wall, looks like it still requires some more resources and effort before being considered a real wall.", "symbol": "#", "color": "brown", @@ -259,6 +269,7 @@ "type": "terrain", "id": "t_brick_wall", "name": "brick wall", + "looks_like": "t_wall", "description": "A solid brick wall, sturdy enough to support a roof with enough walls and keep out any unwanted visitors.", "symbol": "LINE_OXOX", "color": "brown", @@ -280,6 +291,7 @@ "type": "terrain", "id": "t_rock_wall", "name": "stone wall", + "looks_like": "t_wall", "description": "A sturdy stone wall.", "symbol": "LINE_OXOX", "color": "light_gray", @@ -301,6 +313,7 @@ "type": "terrain", "id": "t_rock_wall_half", "name": "half-built stone wall", + "looks_like": "t_wall_half", "description": "Half of a sturdy stone wall. Some work still needs to be done before this stone wall is complete.", "symbol": "#", "color": "light_gray", @@ -321,6 +334,7 @@ "type": "terrain", "id": "t_rock_smooth", "name": "smoothed rock", + "looks_like": "t_rock_wall", "description": "A block of stone that's been smoothed and shaped, commonly granite or marble for funerary chapels and mausoleums.", "symbol": "LINE_OXOX", "//": "use pillars, 't_column', as a compliment.", @@ -385,6 +399,7 @@ "id": "t_concrete_wall", "aliases": [ "t_concrete_h", "t_concrete_v" ], "name": "concrete wall", + "looks_like": "t_wall", "description": "An aesthetically pleasing design with simple lines, this type of concrete was used with a weaker chemical mixture in order to have faster setting times. Not ideal for multi-story buildings, but still capable of supporting a roof.", "symbol": "LINE_OXOX", "color": "dark_gray", @@ -406,6 +421,7 @@ "id": "t_wall_metal", "aliases": [ "t_wall_metal_h", "t_wall_metal_v" ], "name": "metal wall", + "looks_like": "t_wall", "description": "An industrially fabricated thick sheet carefully positioned and joined seamlessly with perimeter sealant, this wall is capable of resisting extreme elements as well as hostile forces. Blast load rated and extremely fire-retardant, breaching will require specialized tools or industrial vehicles.", "symbol": "LINE_OXOX", "color": "cyan", @@ -430,6 +446,7 @@ "type": "terrain", "id": "t_sconc_wall", "name": "simple concrete wall", + "looks_like": "t_concrete_wall", "description": "A durable and uniform concrete wall, quite drab without decoration. More than capable of supporting a roof, as well as keeping out most anything, save for vehicles.", "symbol": "LINE_OXOX", "color": "light_gray", @@ -451,6 +468,7 @@ "type": "terrain", "id": "t_sconc_wall_halfway", "name": "half-built simple concrete wall", + "looks_like": "t_wall_half", "description": "A partially poured concrete wall that could probably keep anything behind it quite safe if it were finished.", "symbol": "*", "color": "light_gray", @@ -471,6 +489,7 @@ "type": "terrain", "id": "t_strconc_wall", "name": "reinforced concrete wall", + "looks_like": "t_concrete_wall", "description": "An extremely resilient wall, filled with concrete and rebar. Best suited for supporting multi-level buildings, only serious explosives and high-speed impacts would be capable of damaging this wall.", "symbol": "LINE_OXOX", "color": "light_gray", @@ -492,6 +511,7 @@ "type": "terrain", "id": "t_strconc_wall_halfway", "name": "half-built reinforced concrete wall", + "looks_like": "t_wall_half", "description": "Poured concrete with methodically placed rebar sticking out, which isn't practical for supporting roofs or shelter. It appears to need more resources before being considered complete.", "symbol": "*", "color": "light_gray", @@ -512,6 +532,7 @@ "type": "terrain", "id": "t_reb_cage", "name": "rebar cage", + "looks_like": "t_bars", "description": "A structural support system made of rebar that appears to be the early stages of a reinforced concrete wall, just missing the poured concrete.", "symbol": "#", "color": "dark_gray", @@ -531,6 +552,7 @@ "type": "terrain", "id": "t_scrap_wall", "name": "simple metal wall", + "looks_like": "t_wall_metal", "description": "A relatively simple wall made of scraped together metal. It's still capable of blocking intruders and supporting a roof with adjacent walls.", "symbol": "LINE_OXOX", "color": "dark_gray", @@ -552,6 +574,7 @@ "type": "terrain", "id": "t_scrap_wall_halfway", "name": "half-built simple metal wall", + "looks_like": "t_wall_half", "description": "A partially built makeshift wall of metal that could potentially support a roof if it were completed.", "symbol": "#", "color": "dark_gray", @@ -571,6 +594,7 @@ "type": "terrain", "id": "t_wall_wood", "name": "wooden wall", + "looks_like": "t_wall", "description": "A finished wall of planks and support beams, capable of supporting an upper level or roof. Still highly flammable.", "symbol": "LINE_OXOX", "color": "light_red", @@ -597,6 +621,7 @@ "type": "terrain", "id": "t_wall_wood_chipped", "name": "chipped wood wall", + "looks_like": "t_wall_wood", "description": "A wall of aligned two by fours that's starting to crack and break open. Some cut wood and a number of nails could patch this up quick.", "symbol": "LINE_OXOX", "color": "light_red", @@ -622,6 +647,7 @@ "type": "terrain", "id": "t_wall_wood_broken", "name": "broken wood wall", + "looks_like": "t_wall_wood", "description": "A number of planks are missing and the structure is beginning to sag and fall apart. It's going to need quite a bit of work to repair this wall.", "symbol": "&", "color": "light_red", @@ -646,6 +672,7 @@ "type": "terrain", "id": "t_wall_log_half", "name": "half-built log wall", + "looks_like": "t_wall_half", "description": "A half-constructed wall of notched logs that interlock to provide stability. Needs a few more logs to hold up a roof. Looks flammable.", "symbol": "#", "color": "brown", @@ -666,6 +693,7 @@ "type": "terrain", "id": "t_wall_log", "name": "log wall", + "looks_like": "t_wall_wood", "description": "A tall wall of timber suitable for housing and insulating from the weather. Quite flammable.", "symbol": "LINE_OXOX", "color": "brown", @@ -687,6 +715,7 @@ "type": "terrain", "id": "t_wall_log_chipped", "name": "chipped log wall", + "looks_like": "t_wall_log", "description": "A moderately damaged wall, could probably be patched up with some planks and nails.", "symbol": "LINE_OXOX", "color": "brown", @@ -707,6 +736,7 @@ "type": "terrain", "id": "t_wall_log_broken", "name": "broken log wall", + "looks_like": "t_wall_log", "description": "A destroyed wood wall, with only a supporting log left, ready to collapse. Looks repairable if the damage was replaced and patched together with nails and planks.", "symbol": "&", "color": "brown", @@ -725,6 +755,7 @@ "type": "terrain", "id": "t_palisade", "name": "palisade wall", + "looks_like": "t_wall_log", "description": "An age-old type of fortification consisting of hefty lumber staked into the ground and cabled together.", "symbol": "#", "color": "brown", @@ -744,6 +775,7 @@ "id": "t_wall_wattle", "type": "terrain", "name": "wattle-and-daub wall", + "looks_like": "t_wall", "description": "A relatively primitive wall made by daubing together a lattice of wooden strips using some combination of wet soil, clay, sand, animal dung and straw.", "symbol": "LINE_OXOX", "color": [ "light_red" ], @@ -764,6 +796,7 @@ "id": "t_wall_wattle_broken", "type": "terrain", "name": "broken wattle-and-daub wall", + "looks_like": "t_wall_wattle", "description": "This wattle-and-daub wall section has been destroyed, leaving mostly just frame, and is barely held together.", "symbol": "&", "color": [ "light_red" ], @@ -782,6 +815,7 @@ "id": "t_wall_wattle_half", "type": "terrain", "name": "half-built wattle-and-daub wall", + "looks_like": "t_wall_half", "description": "This wattle-and-daub wall has some of the wooden strip lattice in place, and still requires the rest of the lattice and supporting wet compound to be filled in.", "symbol": "#", "color": [ "light_red" ], @@ -827,6 +861,7 @@ "type": "terrain", "id": "t_wall_rammed_earth", "name": "rammed earth wall", + "looks_like": "t_wall", "description": "A solid wall of compressed dirt, sturdy enough to support a roof with enough walls and keep out some unwanted visitors.", "symbol": "LINE_OXOX", "color": "brown", @@ -869,6 +904,7 @@ "id": "t_wall_glass", "aliases": [ "t_wall_glass_h", "t_wall_glass_v" ], "name": "glass wall", + "looks_like": "t_wall", "description": "A barrier made of glass, it's nothing complicated, and looks extremely fragile. Some contain glass break sensors or window sensors that trigger if the glass is tampered.", "symbol": "LINE_OXOX", "color": "light_cyan", @@ -892,6 +928,7 @@ "id": "t_wall_glass_alarm", "aliases": [ "t_wall_glass_h_alarm", "t_wall_glass_v_alarm" ], "name": "glass wall", + "looks_like": "t_wall_glass", "description": "A barrier made of glass, it's nothing complicated, and looks extremely fragile. Some contain glass break sensors or window sensors that trigger if the glass is tampered.", "symbol": "LINE_OXOX", "color": "light_cyan", @@ -960,6 +997,7 @@ "id": "t_reinforced_glass", "aliases": [ "t_reinforced_glass_h", "t_reinforced_glass_v" ], "name": "reinforced glass", + "looks_like": "t_wall_glass", "description": "A thicker pane of glass with thin metal wires embedded throughout, strengthening the structural properties. Still weaker than other types of walls, and not made to support a roof either.", "symbol": "LINE_OXOX", "color": "light_cyan", @@ -981,6 +1019,7 @@ "type": "terrain", "id": "t_reinforced_glass_shutter", "name": "reinforced glass with closed shutters", + "looks_like": "t_wall_metal", "description": "A secondary layer of protection over reinforced glass, these metal shutters are typically used to ward off criminals or protect against damage from extreme weather. Looks like it can only be opened from the inside. Even with the installed shutters, it isn't feasible in supporting a roof.", "symbol": "LINE_OXOX", "color": "light_gray", @@ -1007,6 +1046,7 @@ "type": "terrain", "id": "t_reinforced_glass_shutter_open", "name": "reinforced glass with open shutters", + "looks_like": "t_reinforced_glass", "description": "Hanging metal shutters that haven't been deployed, exposing the reinforced glass. It appears as though the metal shutters can only be activated from the inside.", "symbol": "LINE_OXOX", "color": "light_cyan", @@ -1033,6 +1073,7 @@ "type": "terrain", "id": "t_bars", "name": "metal bars", + "looks_like": "t_wall_metal", "description": "Thick, heavy bars from the floor to the ceiling, interlaced wall to wall. Not made to support roofs, but great for blocking paths.", "examine_action": "bars", "symbol": "\"", @@ -1056,6 +1097,7 @@ "type": "terrain", "id": "t_paper", "name": "paper wall", + "looks_like": "t_wall", "description": "A huge wall of pulpy mass that has been salvaged from nearby buildings, covered in sticky wasp saliva. Whatever structure was underneath has been reformed and long gone. You could smash it down effortlessly.", "symbol": "#", "color": "white", @@ -1076,6 +1118,7 @@ "type": "terrain", "id": "t_root_wall", "name": "root wall", + "looks_like": "t_wall_rammed_earth", "description": "A dirt wall covered with roots.", "symbol": "#", "color": "brown", @@ -1096,6 +1139,7 @@ "type": "terrain", "id": "t_wax", "name": "wax wall", + "looks_like": "t_paper", "description": "A wall made entirely out of wax.", "symbol": "#", "color": "yellow", @@ -1116,6 +1160,7 @@ "type": "terrain", "id": "t_rock", "name": "solid rock", + "looks_like": "t_wall", "description": "It's solid rock, could be full of all kinds of interesting things. Best grab your pickaxe or equivalent digging implement, and strike the earth!", "symbol": "#", "color": "white", @@ -1144,6 +1189,7 @@ "type": "terrain", "id": "t_rock_red", "name": "red stone", + "looks_like": "t_wall_r", "description": "A red stone.", "symbol": "#", "color": "red", @@ -1163,6 +1209,7 @@ "type": "terrain", "id": "t_rock_green", "name": "green stone", + "looks_like": "t_wall_g", "description": "A green stone.", "symbol": "#", "color": "green", @@ -1182,6 +1229,7 @@ "type": "terrain", "id": "t_rock_blue", "name": "blue stone", + "looks_like": "t_wall_b", "description": "A blue stone.", "symbol": "#", "color": "blue", @@ -1201,6 +1249,7 @@ "type": "terrain", "id": "t_little_column", "name": "little column", + "looks_like": "t_column", "description": "A small support column.", "symbol": "1", "color": "light_gray", @@ -1220,6 +1269,7 @@ "type": "terrain", "id": "t_column_halfway", "name": "half-built column", + "looks_like": "t_little_column", "description": "An empty wooden frame in the shape of a column, built around a concrete and rebar foundation. It isn't capable of supporting roofs or shelter, and appears to need more resources before being considered complete.", "symbol": "*", "color": "light_gray", @@ -1239,6 +1289,7 @@ "type": "terrain", "id": "t_column", "name": "column", + "looks_like": "t_concrete_wall", "description": "A concrete column.", "symbol": "1", "color": "light_gray", @@ -1258,6 +1309,7 @@ "type": "terrain", "id": "t_support_l", "name": "large metal support", + "looks_like": "t_bars", "description": "A heavy-duty metal support beam.", "symbol": "T", "color": "light_gray", @@ -1291,6 +1343,7 @@ "type": "terrain", "id": "t_support_s", "name": "small metal support", + "looks_like": "t_bars", "description": "A metal support beam.", "symbol": "l", "color": "light_gray", diff --git a/doc/Looks-like hierarchy.txt b/doc/Looks-like hierarchy.txt new file mode 100644 index 0000000000000..07bc55be3b6a9 --- /dev/null +++ b/doc/Looks-like hierarchy.txt @@ -0,0 +1,432 @@ +t_underbrush + f_indoor_plant + f_indoor_plant_y + f_planter + f_plant_harvest + f_planter_harvest + f_plant_mature + f_planter_mature + f_plant_seed + f_planter_seed + f_plant_seedling + f_planter_seedling + f_hay + f_leaves_pile + f_dandelion + f_mutpoppy + f_chamomile + f_flower_tulip + f_flower_spurge + f_cattails + f_black_eyed_susan + f_lily + f_lotus + f_sunflower + f_lilypad + f_bluebell + f_dahlia + f_chicory + f_datura + f_flower_marloss + f_flower_fungal +f_no_item + f_fake_bench_hands + f_ground_crafting_spot + +*** +t_rock + t_wall + t_door_c + t_door_locked + t_door_boarded + t_door_boarded_damaged + t_door_boarded_peep + t_door_boarded_damaged_peep + t_rdoor_boarded + t_rdoor_boarded_damaged + t_rdoor_boarded_damaged_peep + t_door_locked_interior + t_door_locked_alarm + t_door_b + t_door_b_peep + t_rdoor_b + t_door_lab_b + t_door_white_b + t_door_gray_b + t_door_red_b + t_door_green_b + t_door_frame + t_door_white_frame + t_door_gray_frame + t_door_red_frame + t_door_green_frame + t_door_lab_frame + t_mdoor_frame + t_m_frame + t_mdoor_lab_frame + t_door_curtain_o + f_skin_door_o + f_canvas_door_o + f_beaded_door_o + f_large_canvas_door_o + f_curtain_open + t_door_c_peep + t_door_locked_peep + t_rdoor_c + t_door_lab_c + t_door_white_c + t_door_gray_c + t_door_red_c + t_door_green_c + t_door_metal_c + t_door_metal_locked + t_door_bar_locked + t_door_metal_pickable + t_door_bar_c + t_door_metal_c_peep + t_door_metal_lab_c + t_door_glass_c + t_reinforced_door_glass_c + t_reinforced_door_glass_lab_c + t_ballistic_door_glass_c + t_laminated_door_glass_c + t_door_glass_lab_c + t_door_glass_frosted_c + t_door_glass_frosted_lab_c + t_door_glass_red_c + t_door_glass_green_c + t_door_glass_white_c + t_door_glass_gray_c + t_door_makeshift_c + t_door_o + t_door_lab_o + t_door_white_o + t_door_gray_o + t_door_red_o + t_door_green_o + t_door_o_peep + t_rdoor_o + t_door_makeshift_o + t_door_metal_o + t_door_bar_o + t_door_metal_o_peep + t_door_metal_lab_o + t_secretdoor_metal_o + t_door_glass_o + t_reinforced_door_glass_o + t_reinforced_door_glass_lab_o + t_ballistic_door_glass_o + t_laminated_door_glass_o + t_door_glass_lab_o + t_door_glass_frosted_o + t_door_glass_frosted_lab_o + t_door_glass_red_o + t_door_glass_green_o + t_door_glass_white_o + t_door_glass_gray_o + t_wall_w + t_wall_b + t_rock_blue + t_wall_r + t_rock_red + t_wall_g + t_rock_green + t_wall_y + t_wall_p + t_wall_P + t_brick_wall + t_adobe_brick_wall + f_canvas_wall + f_large_canvas_wall + t_rock_wall + t_rock_smooth + t_concrete_wall + t_sconc_wall + t_strconc_wall + t_column + t_little_column + t_column_halfway + t_wall_metal + t_scrap_wall + t_junk_wall + t_bars + t_reb_cage + f_barricade_road + f_lane + f_sandbag_wall + f_earthbag_wall + f_sandbag_half + f_earthbag_half + f_bed_frame + t_support_l + t_support_s + t_reinforced_glass_shutter + t_secretdoor_metal_c + t_machinery_light + f_air_conditioner + f_air_filter + f_home_furnace + f_water_heater + f_water_purifier + f_fridge + f_glass_fridge + f_shaker + f_sample_freezer + f_oven + f_dishwasher + f_fireplace + f_woodstove + f_bellows + f_drophammer + f_brazier + f_55gal_firebarrel + f_30gal_firebarrel + f_firering + f_chemical_mixer + f_HPLC + f_GC + f_MS + f_NMR + f_sink + f_washer + f_dryer + f_autoclave + f_autoclave_full + f_bathtub + f_toilet + f_shower + f_eyewash + f_standing_tank + f_chimney + f_vent_pipe + f_roof_turbine_vent + t_bulk_tank + f_robotic_arm + f_robotic_assembler + f_autodoc + t_milking_machine + t_radio_tower + f_satellite + t_machinery_electronic + f_electron_microscope + f_CTscan + f_MRI + f_anesthetic + f_dialysis + f_ventilator + f_cellphone_booster + f_small_satelitte_dish + f_TV_antenna + t_machinery_heavy + t_machinery_old + t_wall_wood + f_cupboard + f_chair + f_bench + f_armchair + f_sofa + f_seat_airplane + f_stool + f_camp_chair + f_bed + f_floor_mattress + f_down_mattress + f_makeshift_bed + f_straw_bed + f_autodoc_couch + f_alien_table + f_scan_bed + f_pillow_fort + f_cardboard_fort + f_exercise + f_ball_mach + f_arcade_machine + f_pinball_machine + f_ergometer + f_treadmill + f_crate_c + f_crate_o + f_coffin_c + f_coffin_o + f_safe_c + f_safe_l + f_safe_o + f_gunsafe_ml + f_gunsafe_mj + f_gun_safe_el + f_trashcan + f_recycle_bin + f_dumpster + f_wood_keg + f_cardboard_box + f_locker + f_bookcase + f_entertainment_center + f_dresser + f_wardrobe + f_mailbox + f_rack + f_rack_wood + f_rack_coat + f_rotary_clothesline + f_floor_lamp + f_IV_pole + f_glass_cabinet + f_utility_shelf + f_server + f_birdbath + f_shackle + f_bitts + f_filing_cabinet + f_displaycase + f_displaycase_b + f_speaker_cabinet + f_counter + f_counter_gate_c + f_counter_gate_o + f_desk + f_table + f_coffee_table + f_tourist_table + f_pool_table + f_dive_block + f_piano + f_sign + f_bulletin + f_sign_warning + f_lab_bench + f_fume_hood + f_statue + f_mannequin + f_bigmirror + f_bigmirror_b + f_grave_stone + f_grave_head + f_slab + f_grave_stone_old + f_grave_monument + f_target + t_wall_log + t_wall_log_chipped + t_wall_log_broken + t_palisade + t_wall_wood_chipped + t_wall_wood_broken + t_wall_wattle + t_wall_wattle_broken + t_wall_rammed_earth + t_root_wall + f_skin_wall + t_wall_glass + t_wall_glass_alarm + t_reinforced_glass + t_laminated_glass + t_ballistic_glass + t_reinforced_glass_shutter_open + t_paper + t_wax + f_cardboard_wall + t_wall_half + t_ponywall + t_brick_wall_halfway + t_adobe_brick_wall_halfway + t_rock_wall_half + t_sconc_wall_halfway + t_strconc_wall_halfway + t_scrap_wall_halfway + t_junk_palisade + t_wall_log_half + t_wall_wattle_half +t_rock_floor + t_floor + f_fiber_mat + f_plastic_groundsheet + f_leather_tarp + f_skin_groundsheet + f_leaves_pile + f_tatami + f_canvas_floor + f_punching_bag + f_groundsheet + f_large_groundsheet + f_center_groundsheet + f_fema_groundsheet + t_thconc_floor + t_thconc_y + t_strconc_floor + t_strconc_floor_halfway + t_utility_light + t_thconc_floor_olight + t_metal_floor + t_grate + t_ov_reb_cage + t_ov_smreb_cage + t_scrap_floor + t_junk_floor + t_elevator + t_floor_primitive + t_floor_waxed + t_floor_waxed_y + t_floor_wax + t_dirtfloor + t_dirtfloor_thatchroof + t_dirt_underground + t_sand_underground + t_mud_underground + t_moss_underground + t_clay_underground + t_claymound_underground + t_linoleum_white + t_linoleum_gray + t_floor_red + t_floor_green + t_floor_blue + t_rad_platform + t_carpet_concrete + t_carpet_metal + t_carpet_red + t_carpet_yellow + t_carpet_green + t_carpet_purple + f_rubble + f_woodchips + f_rubble_rock + f_rubble_landfill + f_wreckage + f_ash + f_boulder_small + f_boulder_medium + f_boulder_large + f_egg_sackbw + f_egg_sackcs + f_egg_sackws + f_egg_sacke + f_alien_pod + f_alien_pod_organ + f_alien_pod_resin + f_fungal_mass + f_fungal_clump + f_alien_tendril + f_alien_anemone + f_alien_gasper + f_alien_zapper + f_alien_scar + +*** + +*t_rock looks_like t_rock_floor* +*t_rock_floor looks_like t_rock* + +*** +f_solar_unit +t_water_sh + f_swamp_gas +t_moss + f_fog +t_curtains + f_curtain + t_door_curtain_c + f_skin_door + f_canvas_door + f_beaded_door + f_large_canvas_door From f97a674a1f7ce3285d50ef4b8c2209240e780d89 Mon Sep 17 00:00:00 2001 From: AMurkin <1931904+AMurkin@users.noreply.github.com> Date: Thu, 7 Nov 2019 08:53:49 +0400 Subject: [PATCH 2/3] format --- .../furniture-barriers.json | 6 ++--- .../furniture-decorative.json | 16 +++++++------- .../furniture-domestic_plants.json | 14 ++++++------ .../furniture_and_terrain/furniture-eggs.json | 8 +++---- .../furniture-fakes.json | 6 ++--- .../furniture-fireplaces.json | 8 +++---- .../furniture_and_terrain/furniture-migo.json | 18 +++++++-------- .../furniture-plumbing.json | 8 +++---- .../furniture-recreation.json | 22 +++++++++---------- .../furniture_and_terrain/furniture-roof.json | 12 +++++----- .../furniture-rural.json | 4 ++-- .../furniture-seats.json | 8 +++---- .../furniture-signs.json | 4 ++-- .../furniture-sleep.json | 12 +++++----- .../furniture-terrains.json | 12 +++++----- 15 files changed, 79 insertions(+), 79 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json index 6065d4cd7abd8..77f7efee60e43 100644 --- a/data/json/furniture_and_terrain/furniture-barriers.json +++ b/data/json/furniture_and_terrain/furniture-barriers.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_barricade_road", "name": "road barricade", - "looks_like":"t_bars", + "looks_like": "t_bars", "symbol": "#", "bgcolor": "yellow", "description": "A road barricade. For barricading roads.", @@ -97,7 +97,7 @@ "type": "furniture", "id": "f_sandbag_half", "name": "sandbag barricade", - "looks_like":"f_barricade_road", + "looks_like": "f_barricade_road", "symbol": "#", "bgcolor": "brown", "description": "A sandbag barricade, typically used for blocking bullets.", @@ -129,7 +129,7 @@ "type": "furniture", "id": "f_sandbag_wall", "name": "sandbag wall", - "looks_like":"f_barricade_road", + "looks_like": "f_barricade_road", "symbol": "#", "bgcolor": "brown", "move_cost_mod": -1, diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json index cd1330ffebcd9..57e5b3c14520c 100644 --- a/data/json/furniture_and_terrain/furniture-decorative.json +++ b/data/json/furniture_and_terrain/furniture-decorative.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_bigmirror", "name": "standing mirror", - "looks_like":"f_statue", + "looks_like": "f_statue", "symbol": "{", "description": "Lookin' good - is that blood?", "color": "white", @@ -25,7 +25,7 @@ "type": "furniture", "id": "f_bigmirror_b", "name": "broken standing mirror", - "looks_like":"f_bigmirror", + "looks_like": "f_bigmirror", "description": "You could look at yourself, if the mirror wasn't covered in cracks and fractures.", "symbol": "{", "color": "light_gray", @@ -45,7 +45,7 @@ "id": "f_bitts", "type": "furniture", "name": "bitts", - "looks_like":"f_rack", + "looks_like": "f_rack", "description": "Paired vertical iron posts mounted on a wharf, pier or quay. They are used to secure mooring lines, ropes, hawsers, or cables.", "symbol": "B", "color": [ "light_gray" ], @@ -65,7 +65,7 @@ "type": "furniture", "id": "f_shackle", "name": "manacles", - "looks_like":"f_rack", + "looks_like": "f_rack", "description": "Chain serfs in your dungeon. All you need now is an iron ball to chain to it.", "symbol": "8", "color": "light_gray", @@ -84,7 +84,7 @@ "type": "furniture", "id": "f_statue", "name": "statue", - "looks_like":"f_cupboard", + "looks_like": "f_cupboard", "description": "A carved statue made of stone.", "symbol": "S", "color": "dark_gray", @@ -104,7 +104,7 @@ "type": "furniture", "id": "f_mannequin", "name": "mannequin", - "looks_like":"f_statue", + "looks_like": "f_statue", "description": "Put clothes on it, talk to it. Who's around to judge you? Wait… did it just move?", "symbol": "@", "color": "brown", @@ -124,7 +124,7 @@ "type": "furniture", "id": "f_birdbath", "name": "birdbath", - "looks_like":"f_rack", + "looks_like": "f_rack", "description": "A decorative cement birdbath and pedestal.", "symbol": "o", "color": "light_gray", @@ -143,7 +143,7 @@ "type": "furniture", "id": "f_rotary_clothesline", "name": "rotary clothes dryer line", - "looks_like":"f_rack_coat", + "looks_like": "f_rack_coat", "description": "A umbrella shaped clothes line mounted on a pole.", "symbol": "X", "color": "white", diff --git a/data/json/furniture_and_terrain/furniture-domestic_plants.json b/data/json/furniture_and_terrain/furniture-domestic_plants.json index cff9c65e4d5a9..dba6e2d13b0ca 100644 --- a/data/json/furniture_and_terrain/furniture-domestic_plants.json +++ b/data/json/furniture_and_terrain/furniture-domestic_plants.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_indoor_plant", "name": "indoor plant", - "looks_like":"t_underbrush", + "looks_like": "t_underbrush", "symbol": "^", "color": "green", "move_cost_mod": 2, @@ -40,7 +40,7 @@ "type": "furniture", "id": "f_indoor_plant_y", "name": "yellow indoor plant", - "looks_like":"f_indoor_plant", + "looks_like": "f_indoor_plant", "description": "A variety of plant for decoration. It's yellow.", "symbol": "^", "color": "yellow", @@ -77,7 +77,7 @@ "type": "furniture", "id": "f_plant_harvest", "name": "harvestable plant", - "looks_like":"t_underbrush", + "looks_like": "t_underbrush", "description": "This plant is ready for harvest. Examine it more closely to identify how to harvest the plant appropriately.", "symbol": "#", "color": "light_green", @@ -92,7 +92,7 @@ "type": "furniture", "id": "f_plant_mature", "name": "mature plant", - "looks_like":"t_underbrush", + "looks_like": "t_underbrush", "description": "This plant has matured.", "symbol": "#", "color": "green", @@ -107,7 +107,7 @@ "type": "furniture", "id": "f_plant_seed", "name": "seed", - "looks_like":"t_underbrush", + "looks_like": "t_underbrush", "description": "A humble planted seed. Actions are the seed of fate deeds grow into destiny.", "symbol": "^", "color": "brown", @@ -122,7 +122,7 @@ "type": "furniture", "id": "f_plant_seedling", "name": "seedling", - "looks_like":"t_underbrush", + "looks_like": "t_underbrush", "description": "This plant is just getting started.", "symbol": "^", "color": "green", @@ -137,7 +137,7 @@ "type": "furniture", "id": "f_planter", "name": "planter", - "looks_like":"f_indoor_plant", + "looks_like": "f_indoor_plant", "description": "A garden planter full of soil and slatted to allow adequate drainage. Can be used for planting crops.", "symbol": "^", "color": "green", diff --git a/data/json/furniture_and_terrain/furniture-eggs.json b/data/json/furniture_and_terrain/furniture-eggs.json index 07dab7a1676ea..f65b8e2adbe78 100644 --- a/data/json/furniture_and_terrain/furniture-eggs.json +++ b/data/json/furniture_and_terrain/furniture-eggs.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_egg_sackbw", "name": "spider egg sack", - "looks_like":"f_rubble", + "looks_like": "f_rubble", "description": "Much too large, off-white egg sack. Kind of icky. Something IS moving in there.", "symbol": "O", "color": "white", @@ -17,7 +17,7 @@ "type": "furniture", "id": "f_egg_sackcs", "name": "spider egg sack", - "looks_like":"f_egg_sackbw", + "looks_like": "f_egg_sackbw", "description": "Bulbous mass of spider eggs. More than kind of icky. Something IS moving in there.", "symbol": "O", "color": "white", @@ -31,7 +31,7 @@ "type": "furniture", "id": "f_egg_sackws", "name": "spider egg sack", - "looks_like":"egg_sackbw", + "looks_like": "egg_sackbw", "description": "A horrifyingly oversized egg sack. Something IS moving in there. If you're seeing this, you're already too close to it.", "symbol": "O", "color": "yellow", @@ -45,7 +45,7 @@ "type": "furniture", "id": "f_egg_sacke", "name": "ruptured egg sack", - "looks_like":"f_egg_sackbw", + "looks_like": "f_egg_sackbw", "description": "Super icky. Spider stuff's spilling out.", "symbol": "X", "color": "white", diff --git a/data/json/furniture_and_terrain/furniture-fakes.json b/data/json/furniture_and_terrain/furniture-fakes.json index 5fe2e11ecb2d4..5c66fefb28839 100644 --- a/data/json/furniture_and_terrain/furniture-fakes.json +++ b/data/json/furniture_and_terrain/furniture-fakes.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_fake_bench_hands", "name": "fake workbench hands", - "looks_like":"f_no_item", + "looks_like": "f_no_item", "description": "This fake workbench holds the stats for working on a wielded item.", "symbol": "#", "color": "red", @@ -16,7 +16,7 @@ "//": "This furniture object also gets used as a fake workbench whenever a player crafts on the ground anywhere else.", "id": "f_ground_crafting_spot", "name": "ground crafting spot", - "looks_like":"f_no_item", + "looks_like": "f_no_item", "description": "A cleared spot on the ground for crafting. Slower than using a workbench or holding a project in your hands, but readily available.", "symbol": "x", "color": "white", @@ -33,7 +33,7 @@ "id": "f_no_item", "//": "This is used in a hack to clear furniture with the keg iexamine of all items execept the stored liquid before usage.", "name": "seeing this is a bug", - "looks_like":"t_rock", + "looks_like": "t_rock", "description": "Seeing this is a bug. If seen, please report and destroy.", "symbol": "#", "color": "black", diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json index 3e0e461f7f082..5676bba5894d9 100644 --- a/data/json/furniture_and_terrain/furniture-fireplaces.json +++ b/data/json/furniture_and_terrain/furniture-fireplaces.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_fireplace", "name": "fireplace", - "looks_like":"f_oven", + "looks_like": "f_oven", "symbol": "#", "description": "Ah. The relaxation of sitting in front of a fire as the world around you crumbles. Towards the End, you could also get this service on your television.", "bgcolor": "white", @@ -24,7 +24,7 @@ "type": "furniture", "id": "f_woodstove", "name": "wood stove", - "looks_like":"f_oven", + "looks_like": "f_oven", "symbol": "#", "bgcolor": "red", "description": "Wood stove for heating and cooking. Much more efficient than an open flame.", @@ -47,7 +47,7 @@ "type": "furniture", "id": "f_brazier", "name": "brazier", - "looks_like":"f_oven", + "looks_like": "f_oven", "description": "A raised metal dish in which to safely burn things.", "symbol": "#", "color": "red", @@ -124,7 +124,7 @@ "id": "f_firering", "type": "furniture", "name": "fire ring", - "looks_like":"f_brazier", + "looks_like": "f_brazier", "description": "A ring of stones to safely contain a fire.", "symbol": "#", "bgcolor": [ "white" ], diff --git a/data/json/furniture_and_terrain/furniture-migo.json b/data/json/furniture_and_terrain/furniture-migo.json index 39e5541557f7f..136d921b4497d 100644 --- a/data/json/furniture_and_terrain/furniture-migo.json +++ b/data/json/furniture_and_terrain/furniture-migo.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_alien_tendril", "name": "glowing tendril", - "looks_like":"f_fungal_mass", + "looks_like": "f_fungal_mass", "description": "A willowy tendril growing from the floor, gently waving back and forth. A faint illumination spills from it.", "symbol": "i", "color": "blue", @@ -18,7 +18,7 @@ "type": "furniture", "id": "f_alien_anemone", "name": "wafting anemone", - "looks_like":"f_alien_tendril", + "looks_like": "f_alien_tendril", "description": "A fleshy white protuberance growing from the floor, with a cluster of tendrils pouring out of it. It looks almost exactly like a sea anemone, even waving gently as though in the water.", "symbol": "V", "color": "white", @@ -34,7 +34,7 @@ "type": "furniture", "id": "f_alien_gasper", "name": "gasping tube", - "looks_like":"f_alien_tendril", + "looks_like": "f_alien_tendril", "description": "This is a meaty green stalactite with a thickened hide like that of a starfish, extending from the floor to the ceiling. In the center is a series of ports somewhat like mouths, from which pour bursts of a vile smelling gas.", "symbol": "{", "color": "green", @@ -50,7 +50,7 @@ "type": "furniture", "id": "f_alien_zapper", "name": "twitching frond", - "looks_like":"f_alien_tendril", + "looks_like": "f_alien_tendril", "description": "A spine like the antenna of a moth juts from the ground, swaying gently in the air. Every so often, a cascade of energy arcs along it and discharges into the ceiling.", "symbol": "F", "color": "light_blue", @@ -66,7 +66,7 @@ "type": "furniture", "id": "f_alien_scar", "name": "scarred lump", - "looks_like":"f_alien_tendril", + "looks_like": "f_alien_tendril", "description": "This is a pile of undentified twitching alien flesh, belching strange gases out of injured vessels.", "symbol": "{", "color": "green", @@ -82,7 +82,7 @@ "type": "furniture", "id": "f_alien_pod", "name": "slimy pod", - "looks_like":"f_egg_sackbw", + "looks_like": "f_egg_sackbw", "description": "This is a slick, translucent pod suspended on a thin stalk. It is covered in a thick mucus, obscuring whatever is floating in the gel-like substance inside.", "symbol": "0", "color": "magenta", @@ -96,7 +96,7 @@ "type": "furniture", "id": "f_alien_pod_organ", "name": "organ pod", - "looks_like":"f_alien_pod", + "looks_like": "f_alien_pod", "description": "This is a translucent pod suspended on a thin stalk. Inside you can see the dimly outlined shape of human organs, floating in some kind of preservative goo.", "symbol": "0", "color": "yellow", @@ -111,7 +111,7 @@ "type": "furniture", "id": "f_alien_pod_resin", "name": "resin pod", - "looks_like":"f_alien_pod", + "looks_like": "f_alien_pod", "description": "This is a translucent pod suspended on a thin stalk. Inside is a clean, clear resinous-looking fluid. You could fairly easily tear it from the stalk and take it with you.", "symbol": "0", "color": "light_blue", @@ -126,7 +126,7 @@ "type": "furniture", "id": "f_alien_table", "name": "fleshy altar", - "looks_like":"f_autodoc_couch", + "looks_like": "f_autodoc_couch", "description": "This pulsing protuberance juts from the floor, its sides covered in scaled, oozing skin. The surface is flat, but undulates softly. A handful of unidentifiable appendages reach from the sides, suggesting a sort of nightmarish living autodoc.", "symbol": "n", "color": "pink", diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json index 80f542095d991..c1ee3a19e7d0c 100644 --- a/data/json/furniture_and_terrain/furniture-plumbing.json +++ b/data/json/furniture_and_terrain/furniture-plumbing.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_bathtub", "name": "bathtub", - "looks_like":"f_sink", + "looks_like": "f_sink", "symbol": "~", "description": "You could lay in and take a soothing bath, if there were running water. The plug is intact, so you could use it to store liquids.", "color": "white", @@ -30,7 +30,7 @@ "type": "furniture", "id": "f_shower", "name": "shower", - "looks_like":"f_bathtub", + "looks_like": "f_bathtub", "symbol": "~", "description": "You would be able to clean yourself if water was running.", "color": "white", @@ -57,7 +57,7 @@ "type": "furniture", "id": "f_sink", "name": "sink", - "looks_like":"t_machinery_light", + "looks_like": "t_machinery_light", "symbol": "&", "description": "Emergency relief provider. Water isn't running, so it's basically useless.", "color": "white", @@ -81,7 +81,7 @@ "type": "furniture", "id": "f_toilet", "name": "toilet", - "looks_like":"f_bathtub", + "looks_like": "f_bathtub", "symbol": "&", "color": "white", "description": "A porcelain throne. Emergency water source, from the tank, and provider of relief.", diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json index 39e69d8c2c8d7..550d10beea61f 100644 --- a/data/json/furniture_and_terrain/furniture-recreation.json +++ b/data/json/furniture_and_terrain/furniture-recreation.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_exercise", "name": "exercise machine", - "looks_like":"f_chair", + "looks_like": "f_chair", "symbol": "T", "description": "Typically used for, well, exercising. You're getting quite enough of that; running for your life.", "color": "dark_gray", @@ -36,7 +36,7 @@ "type": "furniture", "id": "f_ball_mach", "name": "ball machine", - "looks_like":"f_exercise", + "looks_like": "f_exercise", "description": "An unpowered machine that seems like it could've been used to launch various balls for different types of sports. It's only good for parts now if disassembled.", "symbol": "T", "color": "dark_gray", @@ -55,7 +55,7 @@ "type": "furniture", "id": "f_pool_table", "name": "pool table", - "looks_like":"f_table", + "looks_like": "f_table", "symbol": "#", "description": "A good-looking pool table. You wish you learned how to play.", "color": "green", @@ -89,7 +89,7 @@ "type": "furniture", "id": "f_dive_block", "name": "diving block", - "looks_like":"f_table", + "looks_like": "f_table", "description": "Jump! Jump! Dive!", "symbol": "O", "color": "light_gray", @@ -108,7 +108,7 @@ "type": "furniture", "id": "f_target", "name": "target", - "looks_like":"f_statue", + "looks_like": "f_statue", "description": "A metal shooting target in the rough shape of a human.", "symbol": "@", "color": "black", @@ -128,7 +128,7 @@ "type": "furniture", "id": "f_arcade_machine", "name": "arcade machine", - "looks_like":"f_exercise", + "looks_like": "f_exercise", "description": "Play stupid games, win stupid prizes. That was the idea, anyway. Now, without power, it's just stupid. Smarter to disassemble for all kinds of useful electronic parts.", "symbol": "6", "color": "red", @@ -169,7 +169,7 @@ "type": "furniture", "id": "f_pinball_machine", "name": "pinball machine", - "looks_like":"f_exercise", + "looks_like": "f_exercise", "description": "Most underrated game of the 20th century. Press buttons so the ball doesn't go in the hole. It doesn't seem to be working without electricity. Could be disassembled for various electronic parts.", "symbol": "7", "color": "red", @@ -217,7 +217,7 @@ "type": "furniture", "id": "f_ergometer", "name": "ergometer", - "looks_like":"f_exercise", + "looks_like": "f_exercise", "description": "An rowing exercise machine. Without power, it can no longer help you with your workout. Might have useful electronic parts in it.", "symbol": "5", "color": "dark_gray", @@ -263,7 +263,7 @@ "type": "furniture", "id": "f_treadmill", "name": "treadmill", - "looks_like":"f_exercise", + "looks_like": "f_exercise", "description": "Used for training leg muscles. It'll be extra hard without power. Could be taken apart for its… parts.", "symbol": "L", "color": "dark_gray", @@ -324,7 +324,7 @@ "type": "furniture", "id": "f_piano", "name": "piano", - "looks_like":"f_table", + "looks_like": "f_table", "description": "The ol' ebony and ivory. Really classes up the place. You could take it apart if you wanted… you monster.", "symbol": "P", "color": "i_black", @@ -362,7 +362,7 @@ "type": "furniture", "id": "f_speaker_cabinet", "name": "speaker cabinet", - "looks_like":"f_rack", + "looks_like": "f_rack", "description": "A cabinet loaded with 12-inch speakers, intended to help make various things loud. It can't serve its original purpose these days, but it could be disassembled for various electronic parts.", "symbol": "7", "color": "blue", diff --git a/data/json/furniture_and_terrain/furniture-roof.json b/data/json/furniture_and_terrain/furniture-roof.json index 6bb5a2f6236d3..be4e00a3d4ba6 100644 --- a/data/json/furniture_and_terrain/furniture-roof.json +++ b/data/json/furniture_and_terrain/furniture-roof.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_cellphone_booster", "name": "cell phone signal booster", - "looks_like":"t_machinery_electronic", + "looks_like": "t_machinery_electronic", "description": "A cell phone signal booster, it may be useful for parts now.", "symbol": ":", "color": "white", @@ -38,7 +38,7 @@ "type": "furniture", "id": "f_small_satelitte_dish", "name": "satellite dish", - "looks_like":"t_machinery_electronic", + "looks_like": "t_machinery_electronic", "description": "A small satellite dish for home entertainment.", "symbol": "(", "color": "light_gray", @@ -58,7 +58,7 @@ "type": "furniture", "id": "f_chimney", "name": "chimney crown", - "looks_like":"f_standing_tank", + "looks_like": "f_standing_tank", "description": "The top of a chimney, it looks sooty.", "symbol": "#", "color": "red", @@ -79,7 +79,7 @@ "type": "furniture", "id": "f_TV_antenna", "name": "TV antenna", - "looks_like":"t_machinery_electronic", + "looks_like": "t_machinery_electronic", "description": "The television antenna improved reception for televisions.", "symbol": "#", "color": "light_gray", @@ -105,7 +105,7 @@ "type": "furniture", "id": "f_vent_pipe", "name": "vent pipe", - "looks_like":"f_standing_tank", + "looks_like": "f_standing_tank", "description": "The plumbing vent pipe removes gas and odors from the building.", "symbol": "|", "color": "dark_gray", @@ -126,7 +126,7 @@ "type": "furniture", "id": "f_roof_turbine_vent", "name": "roof turbine vent", - "looks_like":"f_standing_tank", + "looks_like": "f_standing_tank", "description": "The turbine uses wind power to suck hot and humid air out of the attic.", "symbol": "&", "color": "light_gray", diff --git a/data/json/furniture_and_terrain/furniture-rural.json b/data/json/furniture_and_terrain/furniture-rural.json index 97ac17175f42a..e23f5d20ee963 100644 --- a/data/json/furniture_and_terrain/furniture-rural.json +++ b/data/json/furniture_and_terrain/furniture-rural.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_hay", "name": "hay", - "looks_like":"t_underbrush", + "looks_like": "t_underbrush", "description": "A bale of hay. You could sleep on it, if desperate.", "symbol": "#", "bgcolor": "brown", @@ -25,7 +25,7 @@ "type": "furniture", "id": "f_woodchips", "name": "pile of woodchips", - "looks_like":"f_rubble", + "looks_like": "f_rubble", "symbol": "X", "description": "Pile of chipped wood pieces. You can move it with a shovel.", "color": "brown", diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json index 58a2b1e85871b..8bcd1efc2ca1b 100644 --- a/data/json/furniture_and_terrain/furniture-seats.json +++ b/data/json/furniture_and_terrain/furniture-seats.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_bench", "name": "bench", - "looks_like":"f_chair", + "looks_like": "f_chair", "symbol": "#", "description": "Hobo bed. Airy. Use at your own risk.", "color": "brown", @@ -28,7 +28,7 @@ "type": "furniture", "id": "f_armchair", "name": "arm chair", - "looks_like":"f_chair", + "looks_like": "f_chair", "symbol": "H", "description": "A more comfortable way of sitting down.", "color": "green", @@ -91,7 +91,7 @@ "type": "furniture", "id": "f_chair", "name": "chair", - "looks_like":"f_cupboard", + "looks_like": "f_cupboard", "symbol": "#", "description": "Sit down, have a drink.", "color": "brown", @@ -116,7 +116,7 @@ "type": "furniture", "id": "f_sofa", "name": "sofa", - "looks_like":"f_armchair", + "looks_like": "f_armchair", "symbol": "H", "description": "Lie down OR sit down! Perfect!", "bgcolor": "red", diff --git a/data/json/furniture_and_terrain/furniture-signs.json b/data/json/furniture_and_terrain/furniture-signs.json index 06711c521508e..d5f1d2cd60d76 100644 --- a/data/json/furniture_and_terrain/furniture-signs.json +++ b/data/json/furniture_and_terrain/furniture-signs.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_bulletin", "name": "bulletin board", - "looks_like":"f_sign", + "looks_like": "f_sign", "description": "A big, cork bulletin board capable of sporting various notices. Pin some notes for other survivors to read.", "symbol": "6", "color": "blue", @@ -29,7 +29,7 @@ "type": "furniture", "id": "f_sign", "name": "sign", - "looks_like":"f_counter", + "looks_like": "f_counter", "symbol": "P", "description": "Read it. Warnings ahead.", "color": "brown", diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json index 55b159c70b216..d403a8afadde8 100644 --- a/data/json/furniture_and_terrain/furniture-sleep.json +++ b/data/json/furniture_and_terrain/furniture-sleep.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_bed", "name": "bed", - "looks_like":"f_chair", + "looks_like": "f_chair", "symbol": "#", "description": "This is a bed. A luxury in these times. Quite comfortable to sleep in.", "color": "magenta", @@ -33,7 +33,7 @@ "type": "furniture", "id": "f_bed_frame", "name": "bed frame", - "looks_like":"t_bars", + "looks_like": "t_bars", "symbol": "#", "description": "This is an empty bed frame. With a mattress on it, it would be a nice place to sleep. Sleeping on it right now wouldn't be great.", "color": "brown", @@ -59,7 +59,7 @@ "type": "furniture", "id": "f_floor_mattress", "name": "mattress", - "looks_like":"f_bed", + "looks_like": "f_bed", "description": "A comfortable mattress has been tossed on the floor for sleeping here. It's not quite as comfy as a real bed, but it's pretty close.", "symbol": "0", "color": "magenta", @@ -84,7 +84,7 @@ "type": "furniture", "id": "f_down_mattress", "name": "down mattress", - "looks_like":"f_floor_mattress", + "looks_like": "f_floor_mattress", "description": "A comfortable feather down mattress has been tossed on the floor for sleeping here. It's not quite as comfy as a real bed, but it's pretty close.", "symbol": "0", "color": "magenta", @@ -109,7 +109,7 @@ "type": "furniture", "id": "f_makeshift_bed", "name": "makeshift bed", - "looks_like":"f_bed", + "looks_like": "f_bed", "symbol": "#", "description": "Not as comfortable as a real bed, but it will suffice.", "color": "magenta", @@ -140,7 +140,7 @@ "type": "furniture", "id": "f_straw_bed", "name": "straw bed", - "looks_like":"f_bed", + "looks_like": "f_bed", "symbol": "#", "description": "Kinda itches when you lay on it.", "color": "magenta", diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index c84d82a50bf92..323660ba9afc0 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -3,7 +3,7 @@ "id": "f_tatami", "type": "furniture", "name": "tatami mat", - "looks_like":"f_fiber_mat", + "looks_like": "f_fiber_mat", "description": "A tatami is a type of mat used as a flooring material in traditional Japanese-style rooms.", "symbol": "#", "color": [ "brown" ], @@ -29,7 +29,7 @@ "type": "furniture", "id": "f_pillow_fort", "name": "pillow fort", - "looks_like":"f_bed", + "looks_like": "f_bed", "symbol": "^", "description": "A comfy place to hide from the world. Not very defensible, though.", "color": "white", @@ -63,7 +63,7 @@ "type": "furniture", "id": "f_cardboard_fort", "name": "cardboard fort", - "looks_like":"f_pillow_fort", + "looks_like": "f_pillow_fort", "symbol": "^", "description": "A fort built by tipping a cardboard box on its side, lining it with blankets, and partly weather sealing it with a plastic sheet.", "color": "brown", @@ -105,7 +105,7 @@ "type": "furniture", "id": "f_cardboard_wall", "name": "cardboard wall", - "looks_like":"t_paper", + "looks_like": "t_paper", "symbol": "#", "bgcolor": "brown", "move_cost_mod": -1, @@ -256,7 +256,7 @@ "type": "furniture", "id": "f_canvas_door", "name": "canvas flap", - "looks_like":"t_curtains", + "looks_like": "t_curtains", "description": "This canvas flap door could be pulled aside.", "symbol": "+", "color": "blue", @@ -278,7 +278,7 @@ "type": "furniture", "id": "f_canvas_door_o", "name": "open canvas flap", - "looks_like":"t_door_frame", + "looks_like": "t_door_frame", "description": "This canvas flap door has been pulled aside.", "symbol": ".", "color": "blue", From 7797c6eeefa9d0a530b814e9da20e072ac57afee Mon Sep 17 00:00:00 2001 From: XygenSS Date: Mon, 11 Nov 2019 14:47:46 +0900 Subject: [PATCH 3/3] Resolve feedbacks Fixed nonsense looks_like entries based on feedback. --- .../furniture-appliances.json | 2 +- .../furniture-decorative.json | 4 +- .../furniture-domestic_plants.json | 2 +- .../furniture_and_terrain/furniture-eggs.json | 2 +- .../furniture-fakes.json | 4 +- .../furniture-fireplaces.json | 4 +- .../furniture-flora.json | 8 +- .../furniture-fungal.json | 2 +- .../furniture-medical.json | 16 +-- .../furniture_and_terrain/furniture-migo.json | 4 +- .../furniture-plumbing.json | 4 +- doc/Looks-like hierarchy.txt | 122 ++++++++++-------- 12 files changed, 94 insertions(+), 80 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index e50096df8c5ee..2cc8e13931d99 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -504,7 +504,7 @@ { "type": "furniture", "id": "f_server", - "looks_like": "f_rack", + "looks_like": "f_utility_shelf", "name": "server stack", "description": "This is a big pile of computers. They're all turned off.", "symbol": ":", diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json index 57e5b3c14520c..e8aea0629df52 100644 --- a/data/json/furniture_and_terrain/furniture-decorative.json +++ b/data/json/furniture_and_terrain/furniture-decorative.json @@ -84,7 +84,7 @@ "type": "furniture", "id": "f_statue", "name": "statue", - "looks_like": "f_cupboard", + "looks_like": "f_mannequin", "description": "A carved statue made of stone.", "symbol": "S", "color": "dark_gray", @@ -124,7 +124,7 @@ "type": "furniture", "id": "f_birdbath", "name": "birdbath", - "looks_like": "f_rack", + "looks_like": "f_sink", "description": "A decorative cement birdbath and pedestal.", "symbol": "o", "color": "light_gray", diff --git a/data/json/furniture_and_terrain/furniture-domestic_plants.json b/data/json/furniture_and_terrain/furniture-domestic_plants.json index dba6e2d13b0ca..46ee204ae33e7 100644 --- a/data/json/furniture_and_terrain/furniture-domestic_plants.json +++ b/data/json/furniture_and_terrain/furniture-domestic_plants.json @@ -137,7 +137,7 @@ "type": "furniture", "id": "f_planter", "name": "planter", - "looks_like": "f_indoor_plant", + "looks_like": "t_dirtmound", "description": "A garden planter full of soil and slatted to allow adequate drainage. Can be used for planting crops.", "symbol": "^", "color": "green", diff --git a/data/json/furniture_and_terrain/furniture-eggs.json b/data/json/furniture_and_terrain/furniture-eggs.json index f65b8e2adbe78..a76a0ba4dc405 100644 --- a/data/json/furniture_and_terrain/furniture-eggs.json +++ b/data/json/furniture_and_terrain/furniture-eggs.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_egg_sackbw", "name": "spider egg sack", - "looks_like": "f_rubble", + "looks_like": "egg_sackcs", "description": "Much too large, off-white egg sack. Kind of icky. Something IS moving in there.", "symbol": "O", "color": "white", diff --git a/data/json/furniture_and_terrain/furniture-fakes.json b/data/json/furniture_and_terrain/furniture-fakes.json index 5c66fefb28839..64f952d45d842 100644 --- a/data/json/furniture_and_terrain/furniture-fakes.json +++ b/data/json/furniture_and_terrain/furniture-fakes.json @@ -16,7 +16,7 @@ "//": "This furniture object also gets used as a fake workbench whenever a player crafts on the ground anywhere else.", "id": "f_ground_crafting_spot", "name": "ground crafting spot", - "looks_like": "f_no_item", + "looks_like": "tr_firewood_source", "description": "A cleared spot on the ground for crafting. Slower than using a workbench or holding a project in your hands, but readily available.", "symbol": "x", "color": "white", @@ -33,7 +33,7 @@ "id": "f_no_item", "//": "This is used in a hack to clear furniture with the keg iexamine of all items execept the stored liquid before usage.", "name": "seeing this is a bug", - "looks_like": "t_rock", + "looks_like": "f_fake_bench_hands", "description": "Seeing this is a bug. If seen, please report and destroy.", "symbol": "#", "color": "black", diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json index 5676bba5894d9..853beaa2a8ee5 100644 --- a/data/json/furniture_and_terrain/furniture-fireplaces.json +++ b/data/json/furniture_and_terrain/furniture-fireplaces.json @@ -77,7 +77,7 @@ "description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.", "symbol": "#", "color": "red", - "looks_like": "f_brazier", + "looks_like": "55gal_drum", "move_cost_mod": 2, "coverage": 35, "required_str": 8, @@ -104,7 +104,7 @@ "description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.", "symbol": "#", "color": "red", - "looks_like": "f_brazier", + "looks_like": "30gal_drum", "move_cost_mod": 2, "coverage": 35, "required_str": 8, diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json index 7cf048bbee5af..6372931611375 100644 --- a/data/json/furniture_and_terrain/furniture-flora.json +++ b/data/json/furniture_and_terrain/furniture-flora.json @@ -49,7 +49,7 @@ "name": "tulip", "description": "A bright, colorful flower with petals forming a small cup at its top.", "symbol": "f", - "looks_like": "f_dandelion", + "looks_like": "f_mutpoppy", "color": "magenta", "move_cost_mod": 0, "required_str": -1, @@ -130,7 +130,7 @@ "id": "f_lily", "name": "lily", "description": "A pretty flower that comes in a variety of colors.", - "looks_like": "f_dandelion", + "looks_like": "f_flower_tulip", "symbol": "f", "color": "magenta", "move_cost_mod": 0, @@ -151,7 +151,7 @@ "id": "f_lotus", "name": "lotus", "description": "A lovely flower that grows on the surface of bodies of freshwater. Traditionally connected with many Eastern cultures.", - "looks_like": "f_dandelion", + "looks_like": "f_lily", "symbol": "f", "color": "yellow", "move_cost_mod": 0, @@ -273,7 +273,7 @@ "symbol": "#", "description": "A sizable pile of leaves. You could sleep on it if you don't care about comfort or warmth.", "color": "brown", - "looks_like": "t_underbrush", + "looks_like": "t_dirtpile", "move_cost_mod": 3, "coverage": 35, "comfort": 1, diff --git a/data/json/furniture_and_terrain/furniture-fungal.json b/data/json/furniture_and_terrain/furniture-fungal.json index a61c2448784be..0a5cfc50b8c9b 100644 --- a/data/json/furniture_and_terrain/furniture-fungal.json +++ b/data/json/furniture_and_terrain/furniture-fungal.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_flower_marloss", "name": "marloss flower", - "looks_like": "f_dandelion", + "looks_like": "f_flower_fungal", "description": "This flower is like the other flowers taken by the mushrooms, but its bulb is colored a brilliant cyan color, and it emits an aroma both overwhelming and… delicious?", "symbol": "f", "color": "cyan", diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json index 736c508eab32a..08db1dfc1664d 100644 --- a/data/json/furniture_and_terrain/furniture-medical.json +++ b/data/json/furniture_and_terrain/furniture-medical.json @@ -50,7 +50,7 @@ "id": "f_autodoc_couch", "name": "Autodoc operation couch", "symbol": "H", - "looks_like": "f_bed", + "looks_like": "f_sofa", "description": "A plush red sofa made less comfortable by the medical machinery directly above it. It has a single leather strap on the right armrest.", "bgcolor": "red", "move_cost_mod": 2, @@ -405,7 +405,7 @@ "type": "furniture", "id": "f_HPLC", "name": "high performance liquid chromatographer", - "looks_like": "f_chemical_mixer", + "looks_like": "t_machinery_light", "description": "This high-tech tool would, with electricity and an experienced user, be a very useful way to separate chemicals in a liquid or aqueous phase based on their affinity to a solid state medium in a tube. In other words, it's a fancy way to separate things.", "symbol": ":", "color": "red_white", @@ -450,7 +450,7 @@ "type": "furniture", "id": "f_GC", "name": "gas chromatographer", - "looks_like": "f_chemical_mixer", + "looks_like": "t_machinery_old", "description": "This high-tech tool would, with electricity and an experienced user, be a very useful way to separate chemicals in a gaseous phase based on their affinity to a solid state medium in a tube. In other words, it's a fancy way to separate things.", "symbol": ":", "color": "blue_white", @@ -495,7 +495,7 @@ "type": "furniture", "id": "f_MS", "name": "mass spectrometer", - "looks_like": "f_chemical_mixer", + "looks_like": "t_machinery_heavy", "description": "Inside this thing is a carefully balanced set of electric field generators that can precisely separate ionized particles based on their charge-to-mass ratio, firing them into a detector that measures the exact mass of the particle hitting it. On the outside, it looks like a very boring white box.", "symbol": "-", "bgcolor": "white", @@ -537,7 +537,7 @@ "type": "furniture", "id": "f_NMR", "name": "nuclear magnetic resonance spectrometer", - "looks_like": "f_chemical_mixer", + "looks_like": "t_machinery_heavy", "description": "This is a giant electromagnet in a kind of sci-fi looking housing. Somehow it can be used to wiggle molecular bonds or something, and from there, look at the deepest inner workings of chemical structures! Fuckin' Magnets, how do they work?", "symbol": "M", "color": "white_cyan", @@ -734,7 +734,7 @@ "type": "furniture", "id": "f_anesthetic", "name": "anesthetic machine", - "looks_like": "t_machinery_electronic", + "looks_like": "f_standing_tank", "description": "Keeping a person at just the right level of asleep to do surgery is hard. This machine helps an anesthesiologist keep the right mix of drugs and air to keep a patient asleep.", "symbol": "n", "color": "white_red", @@ -787,7 +787,7 @@ "coverage": 50, "required_str": 5, "flags": [ "BLOCKS_DOOR" ], - "looks_like": "t_machinery_electronic", + "looks_like": "f_standing_tank", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -831,7 +831,7 @@ "coverage": 35, "required_str": 4, "flags": [ "BLOCKS_DOOR" ], - "looks_like": "t_machinery_electronic", + "looks_like": "f_standing_tank", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, diff --git a/data/json/furniture_and_terrain/furniture-migo.json b/data/json/furniture_and_terrain/furniture-migo.json index 136d921b4497d..f0a5b4445d68a 100644 --- a/data/json/furniture_and_terrain/furniture-migo.json +++ b/data/json/furniture_and_terrain/furniture-migo.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_alien_tendril", "name": "glowing tendril", - "looks_like": "f_fungal_mass", + "looks_like": "f_flower_fungal", "description": "A willowy tendril growing from the floor, gently waving back and forth. A faint illumination spills from it.", "symbol": "i", "color": "blue", @@ -126,7 +126,7 @@ "type": "furniture", "id": "f_alien_table", "name": "fleshy altar", - "looks_like": "f_autodoc_couch", + "looks_like": "f_fungal_mass", "description": "This pulsing protuberance juts from the floor, its sides covered in scaled, oozing skin. The surface is flat, but undulates softly. A handful of unidentifiable appendages reach from the sides, suggesting a sort of nightmarish living autodoc.", "symbol": "n", "color": "pink", diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json index c1ee3a19e7d0c..e1d2d8a480fe6 100644 --- a/data/json/furniture_and_terrain/furniture-plumbing.json +++ b/data/json/furniture_and_terrain/furniture-plumbing.json @@ -57,7 +57,7 @@ "type": "furniture", "id": "f_sink", "name": "sink", - "looks_like": "t_machinery_light", + "looks_like": "f_bathtub", "symbol": "&", "description": "Emergency relief provider. Water isn't running, so it's basically useless.", "color": "white", @@ -102,7 +102,7 @@ "type": "furniture", "id": "f_water_heater", "name": "water heater", - "looks_like": "f_air_conditioner", + "looks_like": "f_standing_tank", "description": "An insulated metal tank that holds water, kept to a temperature by a small gas flame.", "symbol": "0", "bgcolor": "white", diff --git a/doc/Looks-like hierarchy.txt b/doc/Looks-like hierarchy.txt index 07bc55be3b6a9..5639df93c4c75 100644 --- a/doc/Looks-like hierarchy.txt +++ b/doc/Looks-like hierarchy.txt @@ -1,7 +1,6 @@ t_underbrush f_indoor_plant f_indoor_plant_y - f_planter f_plant_harvest f_planter_harvest f_plant_mature @@ -11,15 +10,15 @@ t_underbrush f_plant_seedling f_planter_seedling f_hay - f_leaves_pile f_dandelion f_mutpoppy + f_flower_tulip + f_lily + f_lotus f_chamomile - f_flower_tulip f_flower_spurge f_cattails f_black_eyed_susan - f_lily f_lotus f_sunflower f_lilypad @@ -27,10 +26,13 @@ t_underbrush f_dahlia f_chicory f_datura - f_flower_marloss f_flower_fungal -f_no_item - f_fake_bench_hands + f_flower_marloss + f_alien_tendril + +t_dirtmound + f_planter +tr_firewood_source f_ground_crafting_spot *** @@ -163,11 +165,10 @@ t_rock t_reinforced_glass_shutter t_secretdoor_metal_c t_machinery_light + f_HPLC f_air_conditioner f_air_filter f_home_furnace - f_water_heater - f_water_purifier f_fridge f_glass_fridge f_shaker @@ -179,28 +180,21 @@ t_rock f_bellows f_drophammer f_brazier - f_55gal_firebarrel - f_30gal_firebarrel f_firering f_chemical_mixer - f_HPLC f_GC f_MS f_NMR - f_sink - f_washer - f_dryer - f_autoclave - f_autoclave_full - f_bathtub - f_toilet - f_shower - f_eyewash f_standing_tank f_chimney f_vent_pipe f_roof_turbine_vent t_bulk_tank + f_anesthetic + f_dialysis + f_ventilator + f_water_heater + f_water_purifier f_robotic_arm f_robotic_assembler f_autodoc @@ -211,20 +205,23 @@ t_rock f_electron_microscope f_CTscan f_MRI - f_anesthetic f_dialysis f_ventilator f_cellphone_booster f_small_satelitte_dish f_TV_antenna t_machinery_heavy + f_MS + f_NMR t_machinery_old + f_GC t_wall_wood f_cupboard f_chair f_bench f_armchair f_sofa + f_autodoc_couch f_seat_airplane f_stool f_camp_chair @@ -233,8 +230,6 @@ t_rock f_down_mattress f_makeshift_bed f_straw_bed - f_autodoc_couch - f_alien_table f_scan_bed f_pillow_fort f_cardboard_fort @@ -273,8 +268,7 @@ t_rock f_IV_pole f_glass_cabinet f_utility_shelf - f_server - f_birdbath + f_server f_shackle f_bitts f_filing_cabinet @@ -296,16 +290,6 @@ t_rock f_sign_warning f_lab_bench f_fume_hood - f_statue - f_mannequin - f_bigmirror - f_bigmirror_b - f_grave_stone - f_grave_head - f_slab - f_grave_stone_old - f_grave_monument - f_target t_wall_log t_wall_log_chipped t_wall_log_broken @@ -340,17 +324,17 @@ t_rock t_rock_floor t_floor f_fiber_mat - f_plastic_groundsheet - f_leather_tarp - f_skin_groundsheet - f_leaves_pile - f_tatami - f_canvas_floor - f_punching_bag - f_groundsheet - f_large_groundsheet - f_center_groundsheet - f_fema_groundsheet + f_plastic_groundsheet + f_leather_tarp + f_skin_groundsheet + f_leaves_pile + f_tatami + f_canvas_floor + f_punching_bag + f_groundsheet + f_large_groundsheet + f_center_groundsheet + f_fema_groundsheet t_thconc_floor t_thconc_y t_strconc_floor @@ -397,20 +381,50 @@ t_rock_floor f_boulder_small f_boulder_medium f_boulder_large - f_egg_sackbw - f_egg_sackcs - f_egg_sackws - f_egg_sacke - f_alien_pod - f_alien_pod_organ - f_alien_pod_resin f_fungal_mass f_fungal_clump + f_alien_table f_alien_tendril f_alien_anemone f_alien_gasper f_alien_zapper f_alien_scar +f_statue > f_mannequin + f_mannequin + f_bigmirror + f_bigmirror_b + f_grave_stone + f_grave_head + f_slab + f_grave_stone_old + f_grave_monument + f_target +f_egg_sackbw > egg_sackcs + f_egg_sackcs + f_egg_sackws + f_egg_sacke + f_alien_pod + f_alien_pod_organ + f_alien_pod_resin +f_no_item > f_fake_bench_hands + f_fake_bench_hands + f_ground_crafting_spot +55gal_drum + f_55gal_firebarrel +30gal_drum + f_30gal_firebarrel +t_dirtpile + f_leaves_pile +f_sink > f_bathtub + f_birdbath + f_washer + f_dryer + f_autoclave + f_autoclave_full + f_bathtub + f_toilet + f_shower + f_eyewash ***