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

Base camp expansion canteen metal (6/8) #51902

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
223c9dd
Fixed base camp bb handling of multi line entries
PatrikLundell Nov 13, 2020
83ac1b4
addressed signed/unsigned complaint
PatrikLundell Nov 13, 2020
b3ad5c8
Moved comments
PatrikLundell Nov 13, 2020
11cc452
style corrections
PatrikLundell Nov 14, 2020
ba1a4cd
astyle did something
PatrikLundell Nov 14, 2020
1e17c19
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Nov 27, 2020
29606a2
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Dec 8, 2020
d4ece47
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Dec 17, 2020
08b78c5
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Feb 9, 2021
d86e09a
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Aug 15, 2021
1bff306
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Aug 15, 2021
f4515a0
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Aug 26, 2021
1468f11
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Aug 29, 2021
c603817
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Sep 23, 2021
d362304
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
PatrikLundell Sep 24, 2021
8041d10
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
PatrikLundell Sep 24, 2021
61b6b5c
Added second canteen base camp expansion
PatrikLundell Sep 24, 2021
3c1eb83
astyle
PatrikLundell Sep 24, 2021
80d3ef7
astyle
PatrikLundell Sep 24, 2021
2452b1c
canteen 2 made from rock
PatrikLundell Sep 25, 2021
a0a9030
canteen 2 from rammed earth
PatrikLundell Sep 26, 2021
14bf151
canteen 2 in mo-go resin
PatrikLundell Sep 26, 2021
c28fbe0
canteen 2 in metal
PatrikLundell Sep 26, 2021
1c1f572
chef't -> chef's
PatrikLundell Sep 26, 2021
b23b6ab
resolved 'conflict' of correction vs incorrect version
PatrikLundell Sep 27, 2021
bc69e1e
Adding log as building material for canteen 2
PatrikLundell Sep 27, 2021
d7f689d
removed files belonging to different branch
PatrikLundell Sep 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -0,0 +1,170 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_2_room_metal",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"wvw+wvw",
"......w",
"......v",
" ",
" ",
" ",
" "
],
"palettes": [ "fbmk_2_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmk_2_metal",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_2_room_metal" ], "x": 9, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_2_room_2_metal",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
" ",
" ",
" ",
"w.....+",
"......v",
"......w",
"w+wwwww"
],
"palettes": [ "fbmk_2_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmk_2_2_metal",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_2_room_2_metal" ], "x": 9, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_2_smoking_area_metal",
"object": {
"mapgensize": [ 5, 5 ],
"rows": [
"w,,,w",
"v,,,,",
"+,,,,",
"v,,,,",
"w,,,w"
],
"palettes": [ "fbmk_2_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmk_2_smoking_area_metal",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_2_smoking_area_metal" ], "x": 15, "y": 18 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_2_pantry_metal",
"object": {
"mapgensize": [ 9, 9 ],
"rows": [
"wwwwwwwww",
"w........",
"w........",
"w........",
"w........",
"w........",
"wwwwwwwww",
" ",
" "
],
"palettes": [ "fbmk_2_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmk_2_pantry_metal",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_2_pantry_metal" ], "x": 0, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_2_dining_1_metal",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
".....w ",
".....v ",
"..... ",
"..... ",
"..... ",
"..... ",
"wwvw+ "
],
"palettes": [ "fbmk_2_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmk_2_dining_1_metal",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_2_dining_1_metal" ], "x": 10, "y": 16 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_2_dining_2_metal",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
".... ",
".... ",
".... ",
".... ",
".... ",
".... ",
"wwvw "
],
"palettes": [ "fbmk_2_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmk_2_dining_2_metal",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_2_dining_2_metal" ], "x": 6, "y": 16 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmk_2_brewery_metal",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"w....w ",
"w....w ",
"w....+ ",
"w....w ",
"w....w ",
"w....w ",
"wwwwvw "
],
"palettes": [ "fbmk_2_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmk_2_brewery_metal",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmk_2_brewery_metal" ], "x": 0, "y": 16 } ] }
}
]
Expand Up @@ -102,7 +102,7 @@
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_well",
"description": "We should build a well. This will make cooking more convenient and provides water to support a chef't garden.",
"description": "We should build a well. This will make cooking more convenient and provides water to support a chef's garden.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
Expand Down
@@ -0,0 +1,191 @@
[
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_room_1_metal",
"description": "Let's start building the kitchen metal walls.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
"never_learn": true,
"construction_blueprint": "fbmk_2_metal",
"blueprint_name": "build the metal kitchen",
"blueprint_requires": [ { "id": "fbmk_2" } ],
"blueprint_provides": [ { "id": "fbmk_2_center" } ],
"blueprint_excludes": [ { "id": "fbmk_2_center" } ],
"flags": [
"MAP_MIRROR_HORIZONTAL_IF_N",
"MAP_ROTATE_90_IF_NE",
"MAP_MIRROR_HORIZONTAL_IF_E",
"MAP_ROTATE_90_IF_E",
"MAP_ROTATE_180_IF_SE",
"MAP_MIRROR_HORIZONTAL_IF_S",
"MAP_ROTATE_180_IF_S",
"MAP_ROTATE_270_IF_SW",
"MAP_MIRROR_HORIZONTAL_IF_W",
"MAP_ROTATE_270_IF_W"
]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_room_2_center_metal",
"description": "Let's finish the kitchen metal walls.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
"never_learn": true,
"construction_blueprint": "fbmk_2_2_metal",
"blueprint_name": "finish the metal kitchen",
"blueprint_requires": [ { "id": "fbmk_2_center" } ],
"blueprint_provides": [ { "id": "fbmk_2_center_2" } ],
"blueprint_excludes": [ { "id": "fbmk_2_center_2" } ],
"flags": [
"MAP_MIRROR_HORIZONTAL_IF_N",
"MAP_ROTATE_90_IF_NE",
"MAP_MIRROR_HORIZONTAL_IF_E",
"MAP_ROTATE_90_IF_E",
"MAP_ROTATE_180_IF_SE",
"MAP_MIRROR_HORIZONTAL_IF_S",
"MAP_ROTATE_180_IF_S",
"MAP_ROTATE_270_IF_SW",
"MAP_MIRROR_HORIZONTAL_IF_W",
"MAP_ROTATE_270_IF_W"
]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_smoking_area_metal",
"description": "Let's get this metal smoking area covered to protect the workers from the weather.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
"never_learn": true,
"construction_blueprint": "fbmk_2_smoking_area_metal",
"blueprint_name": "build a metal roofed area for smoking racks",
"blueprint_requires": [ { "id": "fbmk_2_center_2" } ],
"blueprint_provides": [ { "id": "fbmk_2_smoking_area" } ],
"blueprint_excludes": [ { "id": "fbmk_2_smoking_area" } ],
"flags": [
"MAP_MIRROR_HORIZONTAL_IF_N",
"MAP_ROTATE_90_IF_NE",
"MAP_MIRROR_HORIZONTAL_IF_E",
"MAP_ROTATE_90_IF_E",
"MAP_ROTATE_180_IF_SE",
"MAP_MIRROR_HORIZONTAL_IF_S",
"MAP_ROTATE_180_IF_S",
"MAP_ROTATE_270_IF_SW",
"MAP_MIRROR_HORIZONTAL_IF_W",
"MAP_ROTATE_270_IF_W"
]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_pantry_metal",
"description": "Let's build a metal wall pantry beside of the kitchen.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
"never_learn": true,
"construction_blueprint": "fbmk_2_pantry_metal",
"blueprint_name": "build a metal pantry",
"blueprint_requires": [ { "id": "fbmk_2_center_2" } ],
"blueprint_provides": [ { "id": "fbmk_2_pantry_room" } ],
"blueprint_excludes": [ { "id": "fbmk_2_pantry_room" } ],
"flags": [
"MAP_MIRROR_HORIZONTAL_IF_N",
"MAP_ROTATE_90_IF_NE",
"MAP_MIRROR_HORIZONTAL_IF_E",
"MAP_ROTATE_90_IF_E",
"MAP_ROTATE_180_IF_SE",
"MAP_MIRROR_HORIZONTAL_IF_S",
"MAP_ROTATE_180_IF_S",
"MAP_ROTATE_270_IF_SW",
"MAP_MIRROR_HORIZONTAL_IF_W",
"MAP_ROTATE_270_IF_W"
]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_dining_1_metal",
"description": "Let's build the first metal part of the dining hall.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
"never_learn": true,
"construction_blueprint": "fbmk_2_dining_1_metal",
"blueprint_name": "build first dining metal section",
"blueprint_requires": [ { "id": "fbmk_2_smoking_area" } ],
"blueprint_provides": [ { "id": "fbmk_2_dining_1" } ],
"blueprint_excludes": [ { "id": "fbmk_2_dining_1" } ],
"flags": [
"MAP_MIRROR_HORIZONTAL_IF_N",
"MAP_ROTATE_90_IF_NE",
"MAP_MIRROR_HORIZONTAL_IF_E",
"MAP_ROTATE_90_IF_E",
"MAP_ROTATE_180_IF_SE",
"MAP_MIRROR_HORIZONTAL_IF_S",
"MAP_ROTATE_180_IF_S",
"MAP_ROTATE_270_IF_SW",
"MAP_MIRROR_HORIZONTAL_IF_W",
"MAP_ROTATE_270_IF_W"
]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_dining_2_metal",
"description": "Let's build the second metal part of the dining hall.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
"never_learn": true,
"construction_blueprint": "fbmk_2_dining_2_metal",
"blueprint_name": "build second dining metal section",
"blueprint_requires": [ { "id": "fbmk_2_dining_1" } ],
"blueprint_provides": [ { "id": "fbmk_2_dining_2" } ],
"blueprint_excludes": [ { "id": "fbmk_2_dining_2" } ],
"flags": [
"MAP_MIRROR_HORIZONTAL_IF_N",
"MAP_ROTATE_90_IF_NE",
"MAP_MIRROR_HORIZONTAL_IF_E",
"MAP_ROTATE_90_IF_E",
"MAP_ROTATE_180_IF_SE",
"MAP_MIRROR_HORIZONTAL_IF_S",
"MAP_ROTATE_180_IF_S",
"MAP_ROTATE_270_IF_SW",
"MAP_MIRROR_HORIZONTAL_IF_W",
"MAP_ROTATE_270_IF_W"
]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "fbmk_2_brewery_metal",
"description": "Let's build a the metal brewery.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
"never_learn": true,
"construction_blueprint": "fbmk_2_brewery_metal",
"blueprint_name": "build metal brewery",
"blueprint_requires": [ { "id": "fbmk_2" } ],
"blueprint_provides": [ { "id": "fbmk_2_brewery" } ],
"blueprint_excludes": [ { "id": "fbmk_2_brewery" } ],
"flags": [
"MAP_MIRROR_HORIZONTAL_IF_N",
"MAP_ROTATE_90_IF_NE",
"MAP_MIRROR_HORIZONTAL_IF_E",
"MAP_ROTATE_90_IF_E",
"MAP_ROTATE_180_IF_SE",
"MAP_MIRROR_HORIZONTAL_IF_S",
"MAP_ROTATE_180_IF_S",
"MAP_ROTATE_270_IF_SW",
"MAP_MIRROR_HORIZONTAL_IF_W",
"MAP_ROTATE_270_IF_W"
]
}
]