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.

Sign up for GitHub

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

Base camp reorganization #45572

Merged
merged 17 commits into from
Sep 22, 2021
Merged

Base camp reorganization #45572

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5ae246f
reorganized to support expansion
PatrikLundell Nov 22, 2020
036b6a8
reorganized to support expansion
PatrikLundell Nov 22, 2020
f231595
removed sentences that shouldn't be there
PatrikLundell Nov 23, 2020
13ca402
fixed log stable appearing as kitchen construction
PatrikLundell Nov 26, 2020
305a9ed
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
PatrikLundell Dec 5, 2020
46c344c
Reworked to push expansions back to the top level + doc
PatrikLundell Dec 5, 2020
a7c6896
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
PatrikLundell Dec 11, 2020
9a0fe3f
testing disallows base name recipe changes
PatrikLundell Dec 12, 2020
23ee5da
removal of characters in middle of token managed to offend secret jso…
PatrikLundell Dec 12, 2020
b4d80d4
'resolved' conflict
PatrikLundell Jan 11, 2021
32bb236
Adjusted to #46278
PatrikLundell Jan 11, 2021
be98676
incorporated some old reverse conflict changes
PatrikLundell Jan 12, 2021
2580515
merged with experimental
PatrikLundell Aug 15, 2021
3d4894f
reorganized the stuff added while this PR was suspended
PatrikLundell Aug 15, 2021
306b767
reorganized the stuff added while this PR was suspended
PatrikLundell Aug 15, 2021
6613d2a
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
PatrikLundell Aug 17, 2021
253e222
resolved conflict
PatrikLundell Sep 20, 2021
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
0 ...r_firestation_1/modular_firestation1.json → ...r_firestation_1/modular_firestation1.json
View file
Open in desktop
File renamed without changes.
0 ...tion_1/modular_firestation_walls_all.json → ...tion_1/modular_firestation_walls_all.json
View file
Open in desktop
File renamed without changes.
0 ...apgen/basecamps/modular_field_common.json → ...r_hub/version_1/modular_field_common.json
View file
Open in desktop
File renamed without changes.
0 ...gen/basecamps/modular_field_defenses.json → ...hub/version_1/modular_field_defenses.json
View file
Open in desktop
File renamed without changes.
0 ...n/mapgen/basecamps/modular_field_log.json → ...ular_hub/version_1/modular_field_log.json
View file
Open in desktop
File renamed without changes.
0 ...mapgen/basecamps/modular_field_metal.json → ...ar_hub/version_1/modular_field_metal.json
View file
Open in desktop
File renamed without changes.
0 ...n/basecamps/modular_field_migo_resin.json → ...b/version_1/modular_field_migo_resin.json
View file
Open in desktop
File renamed without changes.
0 ...basecamps/modular_field_rammed_earth.json → ...version_1/modular_field_rammed_earth.json
View file
Open in desktop
File renamed without changes.
0 .../mapgen/basecamps/modular_field_rock.json → ...lar_hub/version_1/modular_field_rock.json
View file
Open in desktop
File renamed without changes.
0 .../mapgen/basecamps/modular_field_tent.json → ...lar_hub/version_1/modular_field_tent.json
View file
Open in desktop
File renamed without changes.
0 ...n/mapgen/basecamps/modular_field_wad.json → ...ular_hub/version_1/modular_field_wad.json
View file
Open in desktop
File renamed without changes.
0 .../mapgen/basecamps/modular_field_wood.json → ...lar_hub/version_1/modular_field_wood.json
View file
Open in desktop
File renamed without changes.
427 changes: 0 additions & 427 deletions ...son/mapgen/basecamps/primitive_field.json → ...odular_hub/version_1/primitive_field.json
View file
Open in desktop

Large diffs are not rendered by default.

0 ...dular_shelter/modular_shelter_common.json → ...dular_shelter/modular_shelter_common.json
View file
Open in desktop
File renamed without changes.
0 .../modular_shelter/modular_shelter_log.json → .../modular_shelter/modular_shelter_log.json
View file
Open in desktop
File renamed without changes.
0 ...modular_shelter/modular_shelter_rock.json → ...modular_shelter/modular_shelter_rock.json
View file
Open in desktop
File renamed without changes.
0 ...lar_shelter/modular_shelter_standard.json → ...lar_shelter/modular_shelter_standard.json
View file
Open in desktop
File renamed without changes.
0 .../modular_shelter/modular_shelter_wad.json → .../modular_shelter/modular_shelter_wad.json
View file
Open in desktop
File renamed without changes.
0 ...modular_shelter/modular_shelter_wood.json → ...modular_shelter/modular_shelter_wood.json
View file
Open in desktop
File renamed without changes.
0 ...r_shelter_1/modular_shelter_1_common.json → ...r_shelter_1/modular_shelter_1_common.json
View file
Open in desktop
File renamed without changes.
0 ...ular_shelter_1/modular_shelter_1_log.json → ...ular_shelter_1/modular_shelter_1_log.json
View file
Open in desktop
File renamed without changes.
0 ...lar_shelter_1/modular_shelter_1_rock.json → ...lar_shelter_1/modular_shelter_1_rock.json
View file
Open in desktop
File renamed without changes.
0 ...shelter_1/modular_shelter_1_standard.json → ...shelter_1/modular_shelter_1_standard.json
View file
Open in desktop
File renamed without changes.
0 ...ular_shelter_1/modular_shelter_1_wad.json → ...ular_shelter_1/modular_shelter_1_wad.json
View file
Open in desktop
File renamed without changes.
0 ...lar_shelter_1/modular_shelter_1_wood.json → ...lar_shelter_1/modular_shelter_1_wood.json
View file
Open in desktop
File renamed without changes.
0 ...r_shelter_2/modular_shelter_2_common.json → ...r_shelter_2/modular_shelter_2_common.json
View file
Open in desktop
File renamed without changes.
0 ...ular_shelter_2/modular_shelter_2_log.json → ...ular_shelter_2/modular_shelter_2_log.json
View file
Open in desktop
File renamed without changes.
0 ...lar_shelter_2/modular_shelter_2_rock.json → ...lar_shelter_2/modular_shelter_2_rock.json
View file
Open in desktop
File renamed without changes.
0 ...shelter_2/modular_shelter_2_standard.json → ...shelter_2/modular_shelter_2_standard.json
View file
Open in desktop
File renamed without changes.
0 ...ular_shelter_2/modular_shelter_2_wad.json → ...ular_shelter_2/modular_shelter_2_wad.json
View file
Open in desktop
File renamed without changes.
0 ...lar_shelter_2/modular_shelter_2_wood.json → ...lar_shelter_2/modular_shelter_2_wood.json
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions data/json/mapgen/basecamps/expansion/expansion_palette.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"type": "palette",
"id": "fbm_expansion_palette",
"terrain": { ",": "t_dirt" },
"furniture": { }
}
]
25 changes: 25 additions & 0 deletions data/json/mapgen/basecamps/expansion/modular_canteen/modular_canteen_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbm_expansion_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_canteen_0",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_0" ], "x": 10, "y": 10 } ] }
}
]
6 changes: 3 additions & 3 deletions ...dular_canteen/modular_canteen_common.json → ...een/version_1/modular_canteen_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_0",
"nested_mapgen_id": "fbmk_1",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
Expand All @@ -48,9 +48,9 @@
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_canteen_0",
"update_mapgen_id": "fbmk_1",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_0" ], "x": 10, "y": 10 } ] }
"object": { "place_nested": [ { "chunks": [ "fbmk_1" ], "x": 10, "y": 10 } ] }
},
{
"type": "mapgen",
Expand Down
0 .../modular_canteen/modular_canteen_log.json → ...anteen/version_1/modular_canteen_log.json
View file
Open in desktop
File renamed without changes.
0 ...odular_canteen/modular_canteen_metal.json → ...teen/version_1/modular_canteen_metal.json
View file
Open in desktop
File renamed without changes.
0 ...r_canteen/modular_canteen_migo_resin.json → ...version_1/modular_canteen_migo_resin.json
View file
Open in desktop
File renamed without changes.
0 ...canteen/modular_canteen_rammed_earth.json → ...rsion_1/modular_canteen_rammed_earth.json
View file
Open in desktop
File renamed without changes.
0 ...modular_canteen/modular_canteen_rock.json → ...nteen/version_1/modular_canteen_rock.json
View file
Open in desktop
File renamed without changes.
0 .../modular_canteen/modular_canteen_wad.json → ...anteen/version_1/modular_canteen_wad.json
View file
Open in desktop
File renamed without changes.
0 ...modular_canteen/modular_canteen_wood.json → ...nteen/version_1/modular_canteen_wood.json
View file
Open in desktop
File renamed without changes.
25 changes: 25 additions & 0 deletions data/json/mapgen/basecamps/expansion/modular_farm/modular_farm_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmf_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbm_expansion_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_farm_0",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmf_0" ], "x": 10, "y": 10 } ] }
}
]
189 changes: 189 additions & 0 deletions data/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "bc_prim_farm_long_fields",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
"mmmmmm",
"mmmmmm",
" ",
" ",
" "
],
"palettes": [ "acidia_camp_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "bc_prim_farm_short_fields",
"object": { "mapgensize": [ 2, 2 ], "rows": [
"mm",
"mm"
], "palettes": [ "acidia_camp_palette" ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "bc_prim_farm_0",
"object": {
"mapgensize": [ 13, 13 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" U___U ",
" _____ ",
" _____ ",
" _____ ",
" _____ ",
" "
],
"palettes": [ "acidia_camp_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "bc_prim_farm_2",
"object": {
"mapgensize": [ 13, 13 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" *,,,* ",
" ,''', ",
" ,''H, ",
" *'HH* ",
" ***** ",
" "
],
"palettes": [ "acidia_camp_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "bc_prim_farm_3",
"object": {
"mapgensize": [ 13, 13 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" *+* ",
" * * ",
" * * ",
" ",
" ",
" "
],
"palettes": [ "acidia_camp_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "bc_prim_farm_4",
"object": {
"mapgensize": [ 13, 13 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ***+** ",
" *c''u ",
" wc''' ",
" *c'cc ",
" wc''' ",
" *c'cc ",
" ****** "
],
"palettes": [ "acidia_camp_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmf_1",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "bc_prim_farm_0" ], "x": 1, "y": 10 } ] }
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_field_camp_farm_1",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 0 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 0 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 0 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 3 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 3 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 3 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 6 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 6 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 6 }
]
}
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_field_camp_farm_2",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "bc_prim_farm_2" ], "x": 1, "y": 10 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 1, "y": 6 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 9, "y": 6 },
{ "chunks": [ "bc_prim_farm_long_fields" ], "x": 17, "y": 6 }
]
}
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_field_camp_farm_3",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "bc_prim_farm_3" ], "x": 1, "y": 10 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 14 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 14 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 14 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 16 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 16 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 16 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 18 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 18 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 18 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 15, "y": 20 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 18, "y": 20 },
{ "chunks": [ "bc_prim_farm_short_fields" ], "x": 21, "y": 20 }
]
}
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_field_camp_farm_4",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "bc_prim_farm_4" ], "x": 1, "y": 10 } ] }
}
]
25 changes: 25 additions & 0 deletions data/json/mapgen/basecamps/expansion/modular_garage/modular_garage_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmg_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbm_expansion_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_garage_0",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmg_0" ], "x": 10, "y": 10 } ] }
}
]
Loading