Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "looks_like" to all furniture and terrain #35371

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -496,7 +504,7 @@
{
"type": "furniture",
"id": "f_server",
"looks_like": "f_utility_shelf",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"looks_like": "f_rack",
"name": "server stack",
"description": "This is a big pile of computers. They're all turned off.",
"symbol": ":",
Expand Down
3 changes: 3 additions & 0 deletions data/json/furniture_and_terrain/furniture-barriers.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -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.",
Expand Down Expand Up @@ -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,
Expand Down
27 changes: 8 additions & 19 deletions data/json/furniture_and_terrain/furniture-decorative.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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" ],
Expand All @@ -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",
Expand All @@ -99,6 +84,7 @@
"type": "furniture",
"id": "f_statue",
"name": "statue",
"looks_like": "f_cupboard",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"description": "A carved statue made of stone.",
"symbol": "S",
"color": "dark_gray",
Expand All @@ -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",
Expand All @@ -137,6 +124,7 @@
"type": "furniture",
"id": "f_birdbath",
"name": "birdbath",
"looks_like": "f_rack",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"description": "A decorative cement birdbath and pedestal.",
"symbol": "o",
"color": "light_gray",
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "furniture",
"id": "f_indoor_plant",
"name": "indoor plant",
"looks_like": "t_underbrush",
"symbol": "^",
"color": "green",
"move_cost_mod": 2,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -131,12 +137,12 @@
"type": "furniture",
"id": "f_planter",
"name": "planter",
"looks_like": "f_indoor_plant",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"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": [
Expand Down
4 changes: 4 additions & 0 deletions data/json/furniture_and_terrain/furniture-eggs.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "furniture",
"id": "f_egg_sackbw",
"name": "spider egg sack",
"looks_like": "f_rubble",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"description": "Much too large, off-white egg sack. Kind of icky. Something IS moving in there.",
"symbol": "O",
"color": "white",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion data/json/furniture_and_terrain/furniture-fakes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"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",
Expand All @@ -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",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"description": "Seeing this is a bug. If seen, please report and destroy.",
"symbol": "#",
"color": "black",
Expand Down
8 changes: 6 additions & 2 deletions data/json/furniture_and_terrain/furniture-fireplaces.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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.",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"move_cost_mod": 2,
"coverage": 35,
"required_str": 8,
Expand All @@ -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",
XygenSS marked this conversation as resolved.
Show resolved Hide resolved
"move_cost_mod": 2,
"coverage": 35,
"required_str": 8,
Expand All @@ -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" ],
Expand Down
Loading