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 mansion basecamp #49241

Merged
merged 6 commits into from
Jun 18, 2021
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
3 changes: 2 additions & 1 deletion data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@
{ "item": "cable", "charges": [ 1, 3 ] },
{ "item": "pilot_light", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_oven"
},
{
"type": "furniture",
Expand Down
33 changes: 22 additions & 11 deletions data/json/furniture_and_terrain/furniture-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,8 @@
{ "item": "element", "count": [ 10, 25 ] },
{ "item": "scrap", "count": [ 12, 16 ] }
]
}
},
"crafting_pseudo_item": "fake_arc_furnace"
},
{
"type": "furniture",
Expand Down Expand Up @@ -534,7 +535,8 @@
{ "item": "plastic_chunk", "count": [ 4, 14 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_drill_press"
},
{
"type": "furniture",
Expand Down Expand Up @@ -572,7 +574,8 @@
{ "item": "plastic_chunk", "count": [ 4, 14 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_tablesaw"
},
{
"type": "furniture",
Expand Down Expand Up @@ -610,7 +613,8 @@
{ "item": "plastic_chunk", "count": [ 4, 14 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_mitresaw"
},
{
"type": "furniture",
Expand Down Expand Up @@ -647,7 +651,8 @@
{ "item": "plastic_chunk", "count": [ 4, 14 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_bandsaw"
},
{
"type": "furniture",
Expand Down Expand Up @@ -684,7 +689,8 @@
{ "item": "plastic_chunk", "count": [ 4, 14 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_router_table"
},
{
"type": "furniture",
Expand Down Expand Up @@ -721,7 +727,8 @@
{ "item": "plastic_chunk", "count": [ 4, 14 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_planer"
},
{
"type": "furniture",
Expand Down Expand Up @@ -758,7 +765,8 @@
{ "item": "plastic_chunk", "count": [ 4, 14 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_jointer"
},
{
"type": "furniture",
Expand Down Expand Up @@ -795,7 +803,8 @@
{ "item": "chain", "count": [ 0, 1 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_hydraulic_press"
},
{
"type": "furniture",
Expand Down Expand Up @@ -829,7 +838,8 @@
{ "item": "pipe", "count": [ 0, 4 ] },
{ "item": "motor_small", "count": 1 }
]
}
},
"crafting_pseudo_item": "fake_power_lathe"
},
{
"type": "furniture",
Expand Down Expand Up @@ -872,7 +882,8 @@
{ "item": "e_scrap", "count": [ 5, 10 ] },
{ "item": "plastic_chunk", "count": [ 0, 2 ] }
]
}
},
"crafting_pseudo_item": "fake_air_compressor"
},
{
"type": "furniture",
Expand Down
80 changes: 80 additions & 0 deletions data/json/items/fake.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,5 +172,85 @@
"sub": "char_smoker",
"max_charges": 2000,
"flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
},
{
"id": "fake_power_tool",
"type": "TOOL",
"copy-from": "fake_item",
"name": { "str": "fake power tool" },
"ammo": [ "battery" ],
"flags": [ "ALLOWS_REMOTE_USE", "PSEUDO", "USE_UPS" ]
},
{
"id": "fake_arc_furnace",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "electric arc furnace" }
},
{
"id": "fake_drill_press",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "drill press" }
},
{
"id": "fake_tablesaw",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "tablesaw" }
},
{
"id": "fake_mitresaw",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "mitresaw" }
},
{
"id": "fake_bandsaw",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "bandsaw" }
},
{
"id": "fake_router_table",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "router table" }
},
{
"id": "fake_planer",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "planer" }
},
{
"id": "fake_jointer",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "jointer" }
},
{
"id": "fake_hydraulic_press",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "hydraulic press" }
},
{
"id": "fake_power_lathe",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "power lathe" }
},
{
"id": "fake_air_compressor",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "air compressor" }
},
{
"id": "fake_oven",
"type": "TOOL",
"copy-from": "fake_power_tool",
"name": { "str": "oven" }
}
]
62 changes: 62 additions & 0 deletions data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+1",
"method": "json",
"object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 9, "y": 9 } ] }
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+1_radio",
"method": "json",
"object": {
"set": [
{ "point": "terrain", "id": "t_radio_tower", "x": 8, "y": 9 },
{ "point": "terrain", "id": "t_radio_controls", "x": 8, "y": 10 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_mansion_+1_prefarm",
"object": {
"mapgensize": [ 12, 12 ],
"rows": [
"dddd dddd",
"d d",
"d d",
"d d",
" ",
" ",
" ",
" ",
"d d",
"d d",
"d d",
"dddd dddd"
],
"terrain": { "d": "t_dirt" }
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+1_farm",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmc_mansion_+1_prefarm" ], "x": 6, "y": 6 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 6, "y": 5 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 13, "y": 5 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 1, "y": 17 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 6, "y": 17 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 1, "y": 20 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 6, "y": 20 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 13, "y": 17 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 18, "y": 17 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 13, "y": 20 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 18, "y": 20 }
]
}
}
]
19 changes: 19 additions & 0 deletions data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+2",
"method": "json",
"object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 18, "y": 6 } ] }
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+2_radio",
"method": "json",
"object": {
"set": [
{ "point": "terrain", "id": "t_radio_tower", "x": 12, "y": 0 },
{ "point": "terrain", "id": "t_radio_controls", "x": 12, "y": 1 }
]
}
}
]
19 changes: 19 additions & 0 deletions data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+3",
"method": "json",
"object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 17, "y": 20 } ] }
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+3_radio",
"method": "json",
"object": {
"set": [
{ "point": "terrain", "id": "t_radio_tower", "x": 6, "y": 0 },
{ "point": "terrain", "id": "t_radio_controls", "x": 6, "y": 1 }
]
}
}
]
49 changes: 49 additions & 0 deletions data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
[
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+4",
"method": "json",
"object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 9, "y": 2 } ] }
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+4_radio",
"method": "json",
"object": {
"set": [
{ "point": "terrain", "id": "t_radio_tower", "x": 9, "y": 0 },
{ "point": "terrain", "id": "t_radio_controls", "x": 9, "y": 1 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_mansion_+4_prefarm",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"dddddd",
"dddddd",
"dddddd",
"dddddd",
" ",
" "
],
"terrain": { "d": "t_dirt" }
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_mansion_+4_farm",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmc_mansion_+4_prefarm" ], "x": 4, "y": 10 },
{ "chunks": [ "fbmc_mansion_+4_prefarm" ], "x": 14, "y": 10 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 4, "y": 11 },
{ "chunks": [ "fbmc_mansion_farm_field" ], "x": 15, "y": 11 }
]
}
}
]
34 changes: 34 additions & 0 deletions data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_common.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_mansion_farm_field",
"object": {
"mapgensize": [ 5, 5 ],
"rows": [
"fffff",
"fffff",
" ",
" ",
" "
],
"terrain": { "f": "t_dirtmound" }
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_mansion_farm_field_thin",
"object": {
"mapgensize": [ 5, 5 ],
"rows": [
"fffff",
" ",
" ",
" ",
" "
],
"terrain": { "f": "t_dirtmound" }
}
}
]
Loading