-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
- Loading branch information
Showing
50 changed files
with
1,424 additions
and
390 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_common.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| [ | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "fbmsw_0", | ||
| "object": { | ||
| "mapgensize": [ 6, 6 ], | ||
| "rows": [ | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " " | ||
| ], | ||
| "palettes": [ "fbmsw_wood_palette" ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "update_mapgen_id": "faction_base_saltworks_0", | ||
| "method": "json", | ||
| "object": { "place_nested": [ { "chunks": [ "fbmsw_0" ], "x": 15, "y": 3 } ] } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "fbmsw_brewery1_still", | ||
| "object": { | ||
| "mapgensize": [ 7, 7 ], | ||
| "rows": [ | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " ^ ", | ||
| " # ", | ||
| " s tr ", | ||
| " " | ||
| ], | ||
| "palettes": [ "fbmsw_wad_palette" ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "update_mapgen_id": "fbmsw_brewery1_southwest", | ||
| "method": "json", | ||
| "object": { "place_nested": [ { "chunks": [ "fbmsw_brewery1_still" ], "x": 3, "y": 14 } ] } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "fbmsw_brewery2_kegs", | ||
| "object": { | ||
| "mapgensize": [ 7, 7 ], | ||
| "rows": [ | ||
| " ", | ||
| " H r ", | ||
| " ", | ||
| " ", | ||
| " H ", | ||
| " H ", | ||
| " " | ||
| ], | ||
| "palettes": [ "fbmsw_wad_palette" ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "update_mapgen_id": "fbmsw_brewery2_southwest", | ||
| "method": "json", | ||
| "object": { "place_nested": [ { "chunks": [ "fbmsw_brewery2_kegs" ], "x": 3, "y": 14 } ] } | ||
| } | ||
| ] |
108 changes: 108 additions & 0 deletions
108
data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_log.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| [ | ||
| { | ||
| "type": "palette", | ||
| "id": "fbmsw_log_palette", | ||
| "terrain": { | ||
| ".": "t_floor_primitive", | ||
| "b": "t_floor_primitive", | ||
| "r": "t_floor_primitive", | ||
| "t": "t_floor_primitive", | ||
| "#": "t_floor_primitive", | ||
| "H": "t_floor_primitive", | ||
| "^": "t_floor_primitive", | ||
| "s": "t_floor_primitive", | ||
| "~": "t_swater_sh", | ||
| "o": "t_window_no_curtains", | ||
| "w": "t_wall_log", | ||
| "+": "t_door_c" | ||
| }, | ||
| "furniture": { | ||
| "b": "f_bench", | ||
| "r": "f_rack", | ||
| "t": "f_table", | ||
| "#": "f_stool", | ||
| "c": "f_counter", | ||
| "H": "f_wood_keg", | ||
| "O": "f_fvat_empty", | ||
| "^": "f_still", | ||
| "s": "f_woodstove" | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "update_mapgen_id": "faction_base_saltworks_0", | ||
| "method": "json", | ||
| "object": { "place_nested": [ { "chunks": [ "fbmsw_0" ], "x": 15, "y": 3 } ] } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "fbmsw_saltpan_log", | ||
| "object": { | ||
| "mapgensize": [ 7, 7 ], | ||
| "rows": [ | ||
| "wwwowww", | ||
| "w.....w", | ||
| "w.c.c.w", | ||
| "o.~t~.o", | ||
| "w.~#~.w", | ||
| "w.....w", | ||
| "www+www" | ||
| ], | ||
| "palettes": [ "fbmsw_log_palette" ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "update_mapgen_id": "fbmsw_saltpan_log_northeast", | ||
| "method": "json", | ||
| "object": { "place_nested": [ { "chunks": [ "fbmsw_saltpan_log" ], "x": 14, "y": 3 } ] } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "fbmsw_shack_log", | ||
| "object": { | ||
| "mapgensize": [ 6, 6 ], | ||
| "rows": [ | ||
| " ", | ||
| " woww", | ||
| " wwrrw", | ||
| " +..to", | ||
| " orrrw", | ||
| " wwoww" | ||
| ], | ||
| "palettes": [ "fbmsw_log_palette" ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "update_mapgen_id": "fbmsw_shack_log_southeast", | ||
| "method": "json", | ||
| "object": { "place_nested": [ { "chunks": [ "fbmsw_shack_log" ], "x": 15, "y": 15 } ] } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "fbmsw_brewery0_log", | ||
| "object": { | ||
| "mapgensize": [ 7, 7 ], | ||
| "rows": [ | ||
| "wwwwwww", | ||
| "w.rrr.w", | ||
| "oH....+", | ||
| "wO....w", | ||
| "o.....w", | ||
| "w.....w", | ||
| "wwwwwww" | ||
| ], | ||
| "palettes": [ "fbmsw_log_palette" ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "update_mapgen_id": "fbmsw_brewery0_log_southwest", | ||
| "method": "json", | ||
| "object": { "place_nested": [ { "chunks": [ "fbmsw_brewery0_log" ], "x": 3, "y": 14 } ] } | ||
| } | ||
| ] |
Oops, something went wrong.