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

feat(port, content): freshwater research station #3762

Merged
merged 7 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions data/json/furniture_and_terrain/furniture-decorative.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,26 @@
},
"flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT" ]
},
{
"id": "f_cleat",
"type": "furniture",
"name": "cleat",
"description": "A small horn cleat with two “horns” extending parallel to the deck or the axis of the spar, and resembling a small anvil. They are used to secure mooring lines, ropes, and similar.",
"symbol": "B",
"color": "light_gray",
"looks_like": "f_bitts",
"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": [ 1, 3 ] } ]
},
"flags": [ "TRANSPARENT", "SHORT" ]
},
{
"type": "furniture",
"id": "f_shackle",
Expand Down
51 changes: 51 additions & 0 deletions data/json/furniture_and_terrain/furniture-industrial.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,56 @@
{ "item": "scrap", "count": [ 120, 240 ] }
]
}
},
{
"type": "furniture",
"id": "f_control_station",
"name": "control station",
"description": "Assorted electronic interfaces and screens. You could scavenge it for parts.",
"symbol": "$",
"color": "yellow",
"looks_like": "t_machinery_electronic",
"move_cost_mod": 8,
"coverage": 55,
"required_str": -1,
"flags": [ "TRANSPARENT", "BASHABLE", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"items": [
{ "item": "wire", "count": [ 1, 3 ] },
{ "item": "pipe", "count": [ 1, 2 ] },
{ "item": "steel_chunk", "count": [ 1, 4 ] },
{ "item": "processor", "count": 1 },
{ "item": "RAM", "count": [ 1, 4 ] },
{ "item": "cable", "charges": [ 1, 4 ] },
{ "item": "small_lcd_screen", "count": 1 },
{ "item": "e_scrap", "count": [ 5, 10 ] },
{ "item": "circuit", "count": [ 3, 8 ] },
{ "item": "power_supply", "count": [ 1, 3 ] },
{ "item": "amplifier", "count": [ 1, 3 ] },
{ "item": "plastic_chunk", "count": [ 2, 8 ] },
{ "item": "scrap", "count": [ 1, 5 ] }
]
},
"bash": {
"str_min": 10,
"str_max": 80,
"sound": "clang!",
"sound_fail": "ting.",
"items": [
{ "item": "wire", "prob": 40 },
{ "item": "pipe", "prob": 40 },
{ "item": "steel_chunk", "prob": 40 },
{ "item": "processor", "prob": 40 },
{ "item": "RAM", "count": [ 1, 2 ] },
{ "item": "cable", "charges": [ 1, 2 ] },
{ "item": "small_lcd_screen", "prob": 40 },
{ "item": "e_scrap", "count": [ 3, 8 ] },
{ "item": "circuit", "count": [ 1, 3 ] },
{ "item": "power_supply", "prob": 40 },
{ "item": "amplifier", "prob": 40 },
{ "item": "plastic_chunk", "count": [ 2, 8 ] },
{ "item": "scrap", "count": [ 3, 8 ] }
]
}
}
]
127 changes: 127 additions & 0 deletions data/json/furniture_and_terrain/furniture-storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -979,5 +979,132 @@
{ "item": "splinter", "count": [ 1, 20 ] }
]
}
},
{
"type": "furniture",
"id": "f_metal_crate_r",
"name": "riveted metal crate",
"looks_like": "f_metal_crate_c",
"description": "This huge box is made of a dull metal, riveted together. There is no obvious opening mechanism, and the rivets don't match any of your tools. The only way in would be to smash it.",
"//": "To-do: There should be an exodii riveting tool that can convert this to f_metal_crate_c",
"symbol": "X",
"color": "light_gray",
"move_cost_mod": 5,
"coverage": 80,
"required_str": 12,
"max_volume": "1000 L",
"flags": [ "CONTAINER", "SEALED", "BLOCKSDOOR", "MOUNTABLE" ],
"bash": {
"str_min": 30,
"str_max": 150,
"sound_fail": "clang!",
"items": [
{ "item": "scrap", "count": [ 8, 12 ] },
{ "item": "pipe", "count": [ 0, 3 ] },
{ "item": "sheet_metal", "count": [ 0, 3 ] },
{ "item": "sheet_metal_small", "count": [ 2, 10 ] }
]
}
},
{
"type": "furniture",
"id": "f_metal_crate_c",
"name": "sealed metal crate",
"looks_like": "t_crate_c",
"description": "This is a huge, tightly sealed storage crate made from welded and riveted sheet metal. The sealing mechanism is too tight to open bare-handed and would need some kind of prying instrument to release.",
"symbol": "X",
"color": "light_gray",
"move_cost_mod": 5,
"coverage": 80,
"required_str": 12,
"max_volume": "1000 L",
"flags": [ "CONTAINER", "SEALED", "BLOCKSDOOR", "MOUNTABLE", "FLAT_SURF" ],
"bash": {
"str_min": 30,
"str_max": 150,
"sound_fail": "clang!",
"items": [
{ "item": "scrap", "count": [ 8, 12 ] },
{ "item": "pipe", "count": [ 0, 3 ] },
{ "item": "sheet_metal", "count": [ 0, 3 ] },
{ "item": "sheet_metal_small", "count": [ 2, 10 ] }
]
}
},
{
"type": "furniture",
"id": "f_metal_crate_o",
"name": "open metal crate",
"looks_like": "f_metal_crate_c",
"description": "This large metal crate’s lid is unsealed, and hinges open easily to reveal a number of storage shelves inside. Once open, the side panels also swing wider for easy access.",
"symbol": "X",
"color": "light_gray",
"move_cost_mod": 5,
"coverage": 80,
"required_str": 12,
"max_volume": "1000 L",
"flags": [ "CONTAINER", "PLACE_ITEM", "NO_SIGHT", "HIDE_PLACE", "BLOCKSDOOR", "MOUNTABLE" ],
"bash": {
"str_min": 30,
"str_max": 150,
"sound_fail": "clang!",
"items": [
{ "item": "scrap", "count": [ 8, 12 ] },
{ "item": "pipe", "count": [ 0, 3 ] },
{ "item": "sheet_metal", "count": [ 0, 3 ] },
{ "item": "sheet_metal_small", "count": [ 2, 10 ] }
]
}
},
{
"type": "furniture",
"id": "f_chest",
"description": "A sealed wooden storage container. Lacking any labels, it could hold just about anything inside. It has a simple metal latch.",
"name": "wooden chest",
"symbol": "X",
"color": "white",
"move_cost_mod": -1,
"coverage": 60,
"required_str": 12,
"looks_like": "f_crate_c",
"flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "SHORT" ],
"deconstruct": {
"items": [ { "item": "wood_panel", "count": 5 }, { "item": "hinge", "count": 2 }, { "item": "nail", "charges": [ 6, 10 ] } ]
},
"bash": {
"str_min": 12,
"str_max": 40,
"sound": "smash!",
"sound_fail": "wham!",
"items": [ { "item": "2x4", "count": [ 1, 5 ] }, { "item": "hinge", "count": 2 }, { "item": "nail", "charges": [ 2, 10 ] } ]
}
},
{
"type": "furniture",
"id": "f_foot_locker",
"name": "metal foot locker",
"description": "An metal stoarge box, capable of holding any number of things. The lid has has a small lock.",
"symbol": "O",
"color": "white",
"move_cost_mod": -1,
"coverage": 60,
"required_str": 10,
"looks_like": "f_crate_c",
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "SHORT" ],
"deconstruct": {
"items": [ { "item": "sheet_metal_small", "count": 6 }, { "item": "lock", "count": 1 }, { "item": "hinge", "charges": 2 } ]
},
"bash": {
"str_min": 12,
"str_max": 40,
"sound": "smash!",
"sound_fail": "wham!",
"items": [
{ "item": "sheet_metal_small", "count": [ 2, 4 ] },
{ "item": "lock", "count": [ 0, 1 ] },
{ "item": "scrap", "count": [ 2, 6 ] },
{ "item": "hinge", "charges": 2 }
]
}
}
]
113 changes: 113 additions & 0 deletions data/json/furniture_and_terrain/terrain-bridges-docks.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,5 +216,118 @@
"ter_set": "t_water_dp",
"items": [ { "item": "rock", "count": [ 4, 20 ] }, { "item": "rebar", "count": [ 10, 20 ] } ]
}
},
{
"type": "terrain",
"id": "t_metal_dock",
"name": "dock",
"description": "A metal platform held by a support made of concrete set into the ground.",
"symbol": "8",
"looks_like": "t_metal_floor",
"color": "light_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT" ],
"deconstruct": {
"ter_set": "t_water_sh",
"items": [ { "item": "scrap", "charges": [ 3, 6 ] }, { "item": "sheet_metal", "count": 2 } ]
},
"bash": {
"str_min": 20,
"str_max": 80,
"sound": "smash!",
"sound_fail": "whump!",
"ter_set": "t_water_moving_sh",
"items": [ { "item": "sheet_metal", "count": 2, "prob": 35 }, { "item": "scrap", "count": [ 2, 4 ] } ]
}
},
{
"type": "terrain",
"id": "t_concrete_dock_deep_pile",
"name": "deep dock pile",
"description": "A sturdy pile made of poured concrete extending all the way to the riverbed. A metal frame will be required to support a surface.",
"looks_like": "t_concrete_wall",
"symbol": "|",
"color": "light_gray",
"move_cost": 8,
"flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "FISHABLE" ],
"deconstruct": {
"ter_set": "t_water_moving_dp",
"items": [ { "item": "rebar", "count": [ 4, 6 ] }, { "item": "rock", "count": [ 6, 10 ] } ]
},
"bash": {
"str_min": 50,
"str_max": 120,
"sound": "smash!",
"sound_fail": "whump!",
"ter_set": "t_water_moving_dp",
"items": [
{ "item": "rock", "count": [ 6, 10 ] },
{ "item": "rebar", "count": [ 2, 4 ] },
{ "item": "scrap", "count": [ 2, 4 ] }
]
}
},
{
"type": "terrain",
"id": "t_metal_dock_deep_frame",
"name": "deep dock frame",
"description": "A metal frame secured atop a concrete pile. Adding a metal surface will make this into a proper dock section.",
"symbol": "#",
"color": "light_gray",
"move_cost": 6,
"flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "TINY", "AUTO_WALL_SYMBOL", "UNSTABLE" ],
"deconstruct": { "ter_set": "t_concrete_dock_deep_pile", "items": [ { "item": "spike", "count": 8 }, { "item": "pipe", "count": 4 } ] },
"looks_like": "t_sconc_wall_halfway",
"bash": {
"str_min": 12,
"str_max": 100,
"sound": "clang!",
"sound_fail": "smash!",
"ter_set": "t_concrete_dock_deep_pile",
"items": [ { "item": "pipe", "count": 4, "prob": 25 }, { "item": "scrap", "count": [ 4, 8 ] } ]
}
},
{
"type": "terrain",
"id": "t_metal_dock_deep",
"name": "deep dock",
"description": "A metal platform held by a tall metal pile that extends to the riverbed. Very sturdy, and likely to outlast you.",
"symbol": "8",
"color": "light_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT" ],
"deconstruct": {
"ter_set": "t_metal_dock_deep_frame",
"items": [ { "item": "nail", "charges": [ 12, 24 ] }, { "item": "sheet_metal", "count": 4 } ]
},
"looks_like": "t_grate",
"bash": {
"str_min": 20,
"str_max": 100,
"sound": "clang!",
"sound_fail": "clang!",
"ter_set": "t_concrete_dock_deep_pile",
"items": [ { "item": "sheet_metal", "count": 4, "prob": 25 }, { "item": "scrap", "count": [ 8, 16 ] } ]
}
},
{
"type": "terrain",
"id": "t_metal_pontoon_dp",
"name": "metal floating dock",
"description": "A floating temporary dock, anchored to keep it from drifting away.",
"looks_like": "t_grate",
"symbol": "8",
"color": "light_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT" ],
"deconstruct": { "ter_set": "t_water_dp", "items": [ { "item": "sheet_metal", "count": [ 2, 4 ] }, { "item": "scrap", "count": 8 } ] },
"bash": {
"str_min": 20,
"str_max": 80,
"sound": "clang!",
"sound_fail": "clang!",
"ter_set": "t_water_dp",
"items": [ { "item": "sheet_metal", "count": 2, "prob": 25 }, { "item": "scrap", "count": [ 2, 4 ] } ]
}
}
]
44 changes: 44 additions & 0 deletions data/json/furniture_and_terrain/terrain-doors.json
Original file line number Diff line number Diff line change
Expand Up @@ -2509,5 +2509,49 @@
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_frosted_lab_c",
"copy-from": "t_door_glass_lab_o"
},
{
"type": "terrain",
"id": "t_door_metal_bulkhead_c",
"name": "closed bulkhead door",
"description": "An extremely resilient door of cast metal, it is watertight and opened using the fly wheel.",
"symbol": "+",
"looks_like": "t_door_metal_c",
"color": "light_gray",
"move_cost": 0,
"coverage": 95,
"roof": "t_metal_flat_roof",
"flags": [ "NOITEM", "DOOR", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ],
"open": "t_door_metal_bulkhead_o",
"bash": {
"str_min": 80,
"str_max": 250,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_mdoor_frame",
"items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ]
}
},
{
"type": "terrain",
"id": "t_door_metal_bulkhead_o",
"name": "open bulkhead door",
"description": "An extremely resilient door of cast metal, it is watertight and opened using the fly wheel.",
"symbol": "+",
"looks_like": "t_door_metal_o",
"color": "light_gray",
"move_cost": 2,
"coverage": 95,
"roof": "t_metal_flat_roof",
"flags": [ "NOITEM", "DOOR", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ],
"close": "t_door_metal_bulkhead_c",
"bash": {
"str_min": 80,
"str_max": 250,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_mdoor_frame",
"items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ]
}
}
]
Loading
Loading