Skip to content

Commit 2fa282b

Browse files
kevingranadekevingranade
authored
Merge pull request #78419 from harakka/yeet_salt
Remove salt water from swamps
2 parents 425c066 + 9733dae commit 2fa282b

File tree

10 files changed

+261
-265
lines changed

10 files changed

+261
-265
lines changed

‎data/json/furniture_and_terrain/terrain-manufactured.json

+2
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,7 @@
802802
{
803803
"type": "terrain",
804804
"id": "t_salt_water_pump",
805+
"//": "After #78419 this can no longer be constructed, but is left in for old save compatibility",
805806
"name": "salt water pump",
806807
"looks_like": "t_water_pump",
807808
"description": "A water pump connected to a pipe supplying it with salt water. Not good to drink, but it has other uses.",
@@ -1404,6 +1405,7 @@
14041405
{
14051406
"type": "terrain",
14061407
"id": "t_covered_salt_water_well",
1408+
"//": "After #78419 this can no longer be constructed, but is left in for old save compatibility",
14071409
"name": "covered salt water well",
14081410
"description": "A deep well, collecting salt water from a surrounding swamp. You won't be able to get any water unless you add some mechanism for drawing it up to the surface.",
14091411
"symbol": "#",

‎data/json/mapgen/map_extras/wilderness.json

-222
Original file line numberDiff line numberDiff line change
@@ -548,228 +548,6 @@
548548
"terrain": { " ": "t_tree_willow" }
549549
}
550550
},
551-
{
552-
"type": "mapgen",
553-
"method": "json",
554-
"nested_mapgen_id": "pond_saltwater_shallow",
555-
"object": {
556-
"mapgensize": [ 1, 1 ],
557-
"rows": [ " " ],
558-
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
559-
"terrain": { " ": "t_swater_sh" },
560-
"furniture": { " ": [ "f_region_water_plant", [ "f_null", 10 ] ] }
561-
}
562-
},
563-
{
564-
"type": "mapgen",
565-
"method": "json",
566-
"nested_mapgen_id": "pond_saltwater_deep",
567-
"object": {
568-
"mapgensize": [ 1, 1 ],
569-
"rows": [ " " ],
570-
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
571-
"terrain": { " ": "t_swater_dp" },
572-
"furniture": { " ": [ "f_region_water_plant", [ "f_null", 10 ] ] }
573-
}
574-
},
575-
{
576-
"type": "mapgen",
577-
"method": "json",
578-
"update_mapgen_id": "mx_pond_swamp",
579-
"object": {
580-
"rows": [
581-
" ",
582-
" ",
583-
" ???????????????? ",
584-
" ??????????????????? ",
585-
" ?**]]]]]*]***]]]]?? ",
586-
" ???**************]?? ",
587-
" ???*************]]?? ",
588-
" ????***[[[*******]?? ",
589-
" ???***[[[[[[[[**]]?? ",
590-
" ???***[[[[[[[[**]]?? ",
591-
" ???***[[[~~~[[**]]?? ",
592-
" ??****[[[~~~[[***]?? ",
593-
" ??]***[[~~~~[[***]?? ",
594-
" ??]***[[~~~~[[**]]?? ",
595-
" ??]***[[~[[[[[**]]?? ",
596-
" ??]***[[[[[[[[**]]?? ",
597-
" ??]*****[[******]]?? ",
598-
" ??]**************]?? ",
599-
" ??]**************]?? ",
600-
" ????]??]]]]]]]]]]]?? ",
601-
" ????????]]]???????? ",
602-
" ????????????????? ",
603-
" ",
604-
" "
605-
],
606-
"nested": {
607-
" ": {
608-
"chunks": [
609-
[ "pond_saltwater_shallow", 3 ],
610-
[ "pond_saltwater_deep", 2 ],
611-
[ "pond_dirt", 4 ],
612-
[ "pond_grass", 6 ],
613-
[ "pond_shrub", 1 ],
614-
[ "pond_underbrush", 1 ],
615-
[ "pond_tree", 1 ],
616-
[ "pond_tree_willow", 1 ],
617-
[ "pond_tree_young", 1 ],
618-
[ "pond_rocks", 1 ]
619-
]
620-
},
621-
"*": {
622-
"chunks": [
623-
[ "pond_saltwater_shallow", 8 ],
624-
[ "pond_dirt", 1 ],
625-
[ "pond_grass", 1 ],
626-
[ "pond_underbrush", 1 ],
627-
[ "pond_tree_willow", 1 ],
628-
[ "pond_rocks", 1 ]
629-
]
630-
},
631-
"?": {
632-
"chunks": [
633-
[ "pond_saltwater_shallow", 3 ],
634-
[ "pond_dirt", 5 ],
635-
[ "pond_grass", 6 ],
636-
[ "pond_shrub", 1 ],
637-
[ "pond_tree", 1 ],
638-
[ "pond_tree_willow", 1 ],
639-
[ "pond_tree_young", 1 ],
640-
[ "pond_rocks", 1 ]
641-
]
642-
},
643-
"[": {
644-
"chunks": [ [ "pond_saltwater_deep", 4 ], [ "pond_saltwater_shallow", 4 ], [ "pond_underbrush", 1 ], [ "pond_rocks", 1 ] ]
645-
},
646-
"]": {
647-
"chunks": [
648-
[ "pond_saltwater_shallow", 8 ],
649-
[ "pond_dirt", 1 ],
650-
[ "pond_grass", 1 ],
651-
[ "pond_tree_willow", 1 ],
652-
[ "pond_rocks", 1 ]
653-
]
654-
},
655-
"~": {
656-
"chunks": [
657-
[ "pond_saltwater_deep", 8 ],
658-
[ "pond_dirt", 1 ],
659-
[ "pond_grass", 1 ],
660-
[ "pond_tree_willow", 1 ],
661-
[ "pond_underbrush", 1 ],
662-
[ "pond_rocks", 1 ]
663-
]
664-
}
665-
},
666-
"furniture": { "~": "f_clear", "*": "f_clear", "[": "f_clear", "]": "f_clear", "?": "f_clear", " ": "f_clear" },
667-
"place_monsters": [
668-
{ "monster": "GROUP_SAFE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 5, "density": 0.5 },
669-
{ "monster": "GROUP_FISH", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 10, "repeat": [ 1, 2 ], "density": 0.5 },
670-
{ "monster": "GROUP_SWAMP", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 5, "density": 0.5 }
671-
]
672-
}
673-
},
674-
{
675-
"type": "mapgen",
676-
"method": "json",
677-
"update_mapgen_id": "mx_pond_swamp_2",
678-
"object": {
679-
"rows": [
680-
" ",
681-
" ?? ",
682-
" ??? ",
683-
" ???? ? ",
684-
" ????? ",
685-
" ]]]**]]]] ",
686-
" ]]*****]]] ",
687-
" ]***[******] ",
688-
" ]]***[[[[****] ",
689-
" ]]***[[[[*****] ",
690-
" ?**[[~~~~[****]] ",
691-
" ]**[[~~~~[****]] ",
692-
" ]]***[~~~~[***]]] ",
693-
" ]]***[~~~~[[]]] ",
694-
" ]]****[[[[**]??? ",
695-
" ]]***[[***]]??? ",
696-
" ]]]]*****]] ? ? ",
697-
" ??]]****] ",
698-
" ** ",
699-
" ",
700-
" ",
701-
" ",
702-
" ",
703-
" "
704-
],
705-
"nested": {
706-
" ": {
707-
"chunks": [
708-
[ "pond_saltwater_shallow", 3 ],
709-
[ "pond_saltwater_deep", 2 ],
710-
[ "pond_dirt", 4 ],
711-
[ "pond_grass", 6 ],
712-
[ "pond_shrub", 1 ],
713-
[ "pond_underbrush", 1 ],
714-
[ "pond_tree", 1 ],
715-
[ "pond_tree_willow", 1 ],
716-
[ "pond_tree_young", 1 ],
717-
[ "pond_rocks", 1 ]
718-
]
719-
},
720-
"*": {
721-
"chunks": [
722-
[ "pond_saltwater_shallow", 8 ],
723-
[ "pond_dirt", 1 ],
724-
[ "pond_grass", 1 ],
725-
[ "pond_underbrush", 1 ],
726-
[ "pond_tree_willow", 1 ],
727-
[ "pond_rocks", 1 ]
728-
]
729-
},
730-
"?": {
731-
"chunks": [
732-
[ "pond_saltwater_shallow", 3 ],
733-
[ "pond_dirt", 5 ],
734-
[ "pond_grass", 6 ],
735-
[ "pond_shrub", 1 ],
736-
[ "pond_tree", 1 ],
737-
[ "pond_tree_willow", 1 ],
738-
[ "pond_tree_young", 1 ],
739-
[ "pond_rocks", 1 ]
740-
]
741-
},
742-
"[": {
743-
"chunks": [ [ "pond_saltwater_deep", 4 ], [ "pond_saltwater_shallow", 4 ], [ "pond_underbrush", 1 ], [ "pond_rocks", 1 ] ]
744-
},
745-
"]": {
746-
"chunks": [
747-
[ "pond_saltwater_shallow", 8 ],
748-
[ "pond_dirt", 1 ],
749-
[ "pond_grass", 1 ],
750-
[ "pond_tree_willow", 1 ],
751-
[ "pond_rocks", 1 ]
752-
]
753-
},
754-
"~": {
755-
"chunks": [
756-
[ "pond_saltwater_deep", 8 ],
757-
[ "pond_dirt", 1 ],
758-
[ "pond_grass", 1 ],
759-
[ "pond_tree_willow", 1 ],
760-
[ "pond_underbrush", 1 ],
761-
[ "pond_rocks", 1 ]
762-
]
763-
}
764-
},
765-
"furniture": { "~": "f_clear", "*": "f_clear", "[": "f_clear", "]": "f_clear", "?": "f_clear", " ": "f_clear" },
766-
"place_monsters": [
767-
{ "monster": "GROUP_SAFE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 5, "density": 0.5 },
768-
{ "monster": "GROUP_FISH", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 10, "repeat": [ 1, 2 ], "density": 0.5 },
769-
{ "monster": "GROUP_SWAMP", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 5, "density": 0.5 }
770-
]
771-
}
772-
},
773551
{
774552
"type": "mapgen",
775553
"method": "json",

‎data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_salt_water_pipe.json renamed to ‎data/json/obsoletion_and_migration_0.I/obsolete_recipe_modular_workshop_salt_water_pipe.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[
22
{
3+
"//00": "OBSOLETION NOTE: when this file is deleted, C++ faction camp code from #55026 that generates pipelines can also be deleted.",
34
"type": "recipe",
45
"activity_level": "MODERATE_EXERCISE",
56
"result": "fbmw_2_salt_water_pipe_swamp",
@@ -14,7 +15,7 @@
1415
"//1": "coded to be picked up by code specific to this functionality. Also note that the non orthogonal orientations",
1516
"//2": "use the blueprint faction_expansion_salt_water_pipe_swamp_NE instead.",
1617
"blueprint_name": "salt water pipe construction",
17-
"blueprint_requires": [ { "id": "fbmw_2" } ],
18+
"blueprint_requires": [ { "id": "nonexistent_id_to_hide_construction" } ],
1819
"blueprint_provides": [ { "id": "fbmw_2_salt_water_pipe_swamp" } ],
1920
"blueprint_excludes": [ { "id": "fbmw_2_salt_water_pipe_swamp" } ],
2021
"//3": "1 salt water well, 4 pits, and filling up 3 pits (the last one is for the well). 6 h, 40 m * 3, 30 m * 4, 150 m * 4",

‎data/json/mapgen/basecamps/expansion/salt_water_pipe.json renamed to ‎data/json/obsoletion_and_migration_0.I/obsolete_salt_water_pipe.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[
22
{
3+
"//00": "OBSOLETION NOTE: when this file is deleted, C++ faction camp code from #55026 that generates pipelines can also be deleted.",
34
"type": "mapgen",
45
"update_mapgen_id": "faction_expansion_salt_water_pipe_swamp_N",
56
"//": "Hard coded name for a map that's used to implement the salt water pipe functionality",

‎data/json/overmap/map_extras.json

-17
Original file line numberDiff line numberDiff line change
@@ -382,23 +382,6 @@
382382
"min_max_zlevel": [ 0, 0 ],
383383
"flags": [ "CLASSIC", "WATER" ]
384384
},
385-
{
386-
"id": "mx_pond_swamp",
387-
"type": "map_extra",
388-
"name": { "str": "bog" },
389-
"description": "Small bog is here.",
390-
"generator": { "generator_method": "update_mapgen", "generator_id": "mx_pond_swamp" },
391-
"min_max_zlevel": [ 0, 0 ],
392-
"flags": [ "CLASSIC", "WATER" ]
393-
},
394-
{
395-
"id": "mx_pond_swamp_2",
396-
"type": "map_extra",
397-
"copy-from": "mx_pond_swamp",
398-
"generator": { "generator_method": "update_mapgen", "generator_id": "mx_pond_swamp_2" },
399-
"min_max_zlevel": [ 0, 0 ],
400-
"flags": [ "CLASSIC", "WATER" ]
401-
},
402385
{
403386
"id": "mx_trees",
404387
"type": "map_extra",

‎data/json/regional_map_settings.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -530,12 +530,7 @@
530530
"clear_types": false,
531531
"types": { "t_trunk": 1, "f_boulder_small": 2, "f_boulder_medium": 1 }
532532
},
533-
"water": {
534-
"sequence": 3,
535-
"chance": 2,
536-
"clear_types": false,
537-
"types": { "t_swater_sh": 6, "t_swater_dp": 1, "t_water_murky": 12 }
538-
}
533+
"water": { "sequence": 3, "chance": 2, "clear_types": false, "types": { "t_water_sh": 6, "t_water_dp": 1, "t_water_murky": 12 } }
539534
},
540535
"clear_terrain_furniture": false,
541536
"terrain_furniture": { "t_water_murky": { "chance": 2, "clear_furniture": false, "furniture": { "f_region_water_plant": 1 } } }
@@ -628,8 +623,6 @@
628623
"chance": 20,
629624
"extras": {
630625
"mx_pond": 240,
631-
"mx_pond_swamp": 240,
632-
"mx_pond_swamp_2": 240,
633626
"mx_spider": 200,
634627
"mx_clay_deposit": 140,
635628
"mx_knotweed_patch": 140,

‎data/mods/TropiCataclysm/tropical_regional_map_settings.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -515,12 +515,7 @@
515515
"clear_types": false,
516516
"types": { "t_trunk": 1, "f_boulder_small": 2, "f_boulder_medium": 1 }
517517
},
518-
"water": {
519-
"sequence": 3,
520-
"chance": 2,
521-
"clear_types": false,
522-
"types": { "t_swater_sh": 6, "t_swater_dp": 1, "t_water_murky": 12 }
523-
}
518+
"water": { "sequence": 3, "chance": 2, "clear_types": false, "types": { "t_water_sh": 6, "t_water_dp": 1, "t_water_murky": 12 } }
524519
},
525520
"clear_terrain_furniture": false,
526521
"terrain_furniture": { "t_water_murky": { "chance": 2, "clear_furniture": false, "furniture": { "f_region_water_plant": 1 } } }
@@ -613,8 +608,6 @@
613608
"chance": 20,
614609
"extras": {
615610
"mx_pond": 240,
616-
"mx_pond_swamp": 240,
617-
"mx_pond_swamp_2": 240,
618611
"mx_spider": 200,
619612
"mx_clay_deposit": 140,
620613
"mx_knotweed_patch": 140,

0 commit comments

Comments
 (0)