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

Adding More Furniture #35272

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bc4cddf
Adding More Furniture
WhaleyWhaley Nov 3, 2019
6d5542a
Linting
WhaleyWhaley Nov 3, 2019
f0b5b60
Fixing Typos and Color Misnaming
WhaleyWhaley Nov 3, 2019
a5d7b06
Removing "count" definitions
WhaleyWhaley Nov 3, 2019
6161666
Added Furniture to a select few Homes and Businesses
WhaleyWhaley Nov 3, 2019
53bfb8e
Update data/json/furniture_and_terrain/furniture-appliances.json
WhaleyWhaley Nov 3, 2019
ed75981
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
39f7099
Update data/json/snippets/snippets.json
WhaleyWhaley Nov 3, 2019
ff48342
Update data/json/items/generic.json
WhaleyWhaley Nov 3, 2019
c58d085
Update data/json/snippets/snippets.json
WhaleyWhaley Nov 3, 2019
b02b274
Update data/json/snippets/snippets.json
WhaleyWhaley Nov 3, 2019
f0a91c8
Update data/json/furniture_and_terrain/furniture-seats.json
WhaleyWhaley Nov 3, 2019
d9c063d
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
e3e7cd1
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
84481f4
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
94344d2
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
2ae55d8
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
8452013
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
20298ab
Update data/json/furniture_and_terrain/furniture-seats.json
WhaleyWhaley Nov 3, 2019
1660661
Merge branch 'master' into testbranch
I-am-Erk Dec 16, 2019
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
21 changes: 21 additions & 0 deletions data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -605,5 +605,26 @@
{ "item": "steel_chunk", "count": 3 }
]
}
},
{
"type": "furniture",
"id": "f_charcoal_grill",
"name": "charcoal grill",
"symbol": "R",
"description": "A staple of the American backyard. A simple metal container on legs built to hold charcoal for grilling.",
"color": "light_gray",
"move_cost_mod": 2,
"coverage": 40,
"required_str": 3,
"examine_action": "fireplace",
"flags": [ "TRANSPARENT", "MOUNTABLE", "PLACE_ITEM", "CONTAINER", "FIRE_CONTAINER", "BASHABLE" ],
"deconstruct": { "items": [ { "item": "scrap", "count": 3 }, { "item": "pipe", "charges": [ 3, 4 ] } ] },
"bash": {
"str_min": 6,
"str_max": 40,
"sound": "smash!",
"sound_fail": "whump.",
"items": [ { "item": "scrap", "count": [ 1, 3 ] }, { "item": "pipe", "charges": [ 1, 4 ] } ]
}
}
]
294 changes: 294 additions & 0 deletions data/json/furniture_and_terrain/furniture-decorative.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,299 @@
{ "item": "pipe", "count": [ 0, 1 ] }
]
}
},
{
"type": "furniture",
"id": "f_sandwich_board",
"name": "sandwich board",
"symbol": "^",
"description": "Read it. Deals Ahead.",
"looks_like": "f_sign",
"color": "brown",
"examine_action": "sign",
"move_cost_mod": 1,
"coverage": 40,
"required_str": 3,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SIGN" ],
"deconstruct": { "items": [ { "item": "2x4", "count": 3 }, { "item": "nail", "charges": [ 4, 6 ] } ] },
"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_flamingo_decor",
"name": "flamingo decoration",
"symbol": "%",
"description": "Classy or trashy? You decide.",
"color": "pink",
"move_cost_mod": 1,
"coverage": 10,
"required_str": -1,
"deployed_item": "decorative_flamingo",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH" ],
"bash": {
"str_min": 5,
"str_max": 16,
"sound": "thump!",
"sound_fail": "whack!",
"items": [ { "item": "plastic_chunk", "count": [ 1, 3 ] } ]
}
},
{
"type": "furniture",
"id": "f_birdfeeder",
"name": "bird feeder",
"description": "A small hanging bird feeder with a stake.",
"symbol": "T",
"color": "light_gray",
"move_cost_mod": -1,
"required_str": -1,
"flags": [ "PLACE_ITEM", "TRANSPARENT" ],
"bash": {
"str_min": 10,
"str_max": 40,
"sound": "smash!",
"sound_fail": "thump.",
"items": [
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "pipe", "count": [ 1, 2 ] },
{ "item": "wire", "charges": [ 1, 2 ] }
]
}
},
{
"type": "furniture",
"id": "f_traffic_cone",
"name": "traffic cone",
"description": "A small traffic cone.",
"symbol": "^",
"color": "red",
"move_cost_mod": 1,
"required_str": 1,
"flags": [ "TRANSPARENT", "SHORT" ],
"bash": {
"str_min": 5,
"str_max": 40,
"sound": "whump!",
"sound_fail": "thump.",
"items": [ { "item": "plastic_chunk", "count": [ 1, 2 ] } ]
}
},
{
"type": "furniture",
"id": "f_taxidermy_bear",
"name": "bear taxidermy statue",
"description": "A large taxidermied bear.",
"symbol": "B",
"color": "brown",
"move_cost_mod": -1,
"required_str": 15,
"flags": [ "BASHABLE", "FLAMMABLE_ASH" ],
"bash": {
"str_min": 8,
"str_max": 40,
"sound": "Crack!",
"sound_fail": "thump.",
"items": [
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "leather", "count": [ 1, 2 ] },
{ "item": "wire", "charges": [ 1, 1 ] }
]
}
},
{
"type": "furniture",
"id": "f_foodperson_cutout",
"name": "foodperson cutout",
"symbol": "8",
"description": "A large life-size cutout of FoodPerson.",
"color": "white",
"move_cost_mod": 2,
"coverage": 80,
"required_str": 1,
"flags": [ "FLAMMABLE_ASH", "ORGANIC", "SIGN" ],
"deconstruct": { "items": [ { "item": "paper", "charges": 15 } ] },
"bash": {
"str_min": 5,
"str_max": 40,
"sound": "smash!",
"sound_fail": "whump.",
"items": [ { "item": "paper", "charges": [ 5, 15 ] } ]
}
},
{
"type": "furniture",
"id": "f_fish_bowl",
"name": "fishbowl with fish",
"symbol": "O",
"description": "A large round bowl with a live goldfish in it.",
"color": "blue",
"move_cost_mod": 7,
"coverage": 10,
"required_str": 3,
"deconstruct": { "items": [ { "item": "fishbowl", "count": 1 } ] },
"max_volume": 6000,
"deployed_item": "fishbowl_filled",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "BASHABLE" ],
"bash": {
"str_min": 2,
"str_max": 15,
"sound": "plink!",
"sound_fail": "clink.",
"items": [ { "item": "glass_shard", "charges": [ 2, 5 ] } ]
}
},
{
"type": "furniture",
"id": "f_dollhouse",
"name": "dollhouse",
"symbol": "A",
"description": "A well-made scale home for dolls.",
"color": "white",
"move_cost_mod": 2,
"coverage": 30,
"required_str": 3,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE" ],
"deconstruct": { "items": [ { "item": "wood_panel", "count": 2 }, { "item": "nail", "charges": [ 4, 6 ] } ] },
"bash": {
"str_min": 4,
"str_max": 20,
"sound": "smash!",
"sound_fail": "whump.",
"items": [
{ "item": "wood_panel", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 2, 4 ] },
{ "item": "splinter", "count": 2 }
]
}
},
{
"type": "furniture",
"id": "f_huge_teddy_bear",
"name": "huge teddy bear",
"symbol": "&",
"description": "An enormous stuffed teddy bear.",
"color": "brown",
"move_cost_mod": 2,
"coverage": 65,
"required_str": 5,
"comfort": 2,
"floor_bedding_warmth": 500,
"bonus_fire_warmth_feet": 1000,
"deployed_item": "huge_teddy_bear",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CAN_SIT", "ORGANIC" ],
"bash": {
"str_min": 5,
"str_max": 16,
"sound": "thump!",
"sound_fail": "whack!",
"items": [ { "item": "rag", "count": [ 15, 25 ] }, { "item": "cotton_ball", "charges": [ 1, 5 ] } ]
}
},
{
"type": "furniture",
"id": "f_drumset",
"name": "drum set",
"description": "A full-size drum set.",
"symbol": "%",
"color": "white",
"move_cost_mod": 2,
"coverage": 60,
"required_str": 14,
"flags": [ "BASHABLE" ],
"bash": {
"str_min": 12,
"str_max": 40,
"sound": "BUMP!",
"sound_fail": "Ba-dum Tss.",
"items": [ { "item": "scrap", "count": [ 1, 4 ] } ]
}
},
{
"type": "furniture",
"id": "f_tv_tray",
"name": "tv tray",
"symbol": "T",
"description": "A small plastic table made of thin metal and plastic. Perfect for eating TV dinners in front of the tube, if there were anything on the air. Fold to carry.",
"color": "light_gray",
"move_cost_mod": 1,
"coverage": 10,
"required_str": 1,
"deployed_item": "folded_tv_tray",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "FLAT_SURF", "PLACE_ITEM", "SHORT", "BASHABLE" ],
"bash": {
"str_min": 5,
"str_max": 16,
"sound": "thump!",
"sound_fail": "whack!",
"items": [ { "item": "plastic_chunk", "count": [ 1, 3 ] } ]
}
},
{
"type": "furniture",
"id": "f_litterbox",
"name": "litterbox",
"symbol": "_",
"description": "A litterbox for cats to go to the bathroom in.",
"color": "white",
"move_cost_mod": 1,
"coverage": 5,
"required_str": 2,
"deployed_item": "litterbox",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM" ],
"bash": {
"str_min": 5,
"str_max": 16,
"sound": "thump!",
"sound_fail": "whack!",
"items": [ { "item": "plastic_chunk", "count": [ 1, 2 ] } ]
}
},
{
"type": "furniture",
"id": "f_postal_box",
"name": "postal box",
"description": "A big blue box you put mail in.",
"symbol": "&",
"color": "blue",
"move_cost_mod": 2,
"coverage": 60,
"required_str": 14,
"flags": [ "BASHABLE" ],
"bash": {
"str_min": 10,
"str_max": 40,
"sound": "Clang!",
"sound_fail": "Ding.",
"items": [ { "item": "steel_chunk", "count": [ 1, 2 ] } ]
}
},
{
"type": "furniture",
"id": "f_fire_hydrant",
"name": "fire hydrant",
"description": "A fire hydrant. Firefighters used to use these as a source of water to fight fires.",
"symbol": "&",
"color": "red",
"move_cost_mod": 2,
"required_str": -1,
"flags": [ "BASHABLE", "SHORT" ],
"bash": {
"str_min": 25,
"str_max": 40,
"sound": "Clang!",
"sound_fail": "Ding.",
"items": [ { "item": "steel_chunk", "count": [ 1, 2 ] } ]
}
}
]
Loading