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

[Innawoods] - Added mutable stream #67065

Merged
merged 9 commits into from
Jul 24, 2023
Merged

[Innawoods] - Added mutable stream #67065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e659c9
Create misc_palettes.json
SandwichPie Jul 21, 2023
8102215
Create overmap_terrain_stream.json
SandwichPie Jul 21, 2023
4338dc2
Moved misplaced file
SandwichPie Jul 21, 2023
0c8a438
Added mapgen for new map element
SandwichPie Jul 21, 2023
404cf3b
Create stream_mutable.json
SandwichPie Jul 21, 2023
89379e5
Update data/mods/innawood/overmap/overmap_terrarin/overmap_terrain_st…
SandwichPie Jul 21, 2023
5aa184c
Update overmap_terrain_stream.json
SandwichPie Jul 21, 2023
2415e70
Update stream.json
SandwichPie Jul 21, 2023
20e9445
Update stream.json
SandwichPie Jul 21, 2023
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
255 changes: 255 additions & 0 deletions data/mods/innawood/mapgen/stream.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
[
{
"om_terrain": "stream",
"type": "mapgen",
"method": "json",
"weight": 1,
"object": {
"fill_ter": "t_region_groundcover",
"fallback_predecessor_mapgen": "field",
"rows": [
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 "
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "stream_palette" ],
"place_monster": [
{ "group": "GROUP_FOREST", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 25 },
{ "group": "GROUP_DOMESTIC", "x": 10, "y": 10, "pack_size": [ 1, 2 ], "chance": 3 }
]
}
},
{
"om_terrain": "stream",
"type": "mapgen",
"method": "json",
"weight": 10,
"object": {
"fill_ter": "t_region_groundcover",
"fallback_predecessor_mapgen": "field",
"rows": [
" 22211~~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~11222 ",
" 22211~~11222 ",
" 22211~~11222 "
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "stream_palette" ],
"place_monster": [
{ "group": "GROUP_FOREST", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 25 },
{ "group": "GROUP_DOMESTIC", "x": 10, "y": 10, "pack_size": [ 1, 2 ], "chance": 3 }
]
}
},
{
"om_terrain": "stream_end",
"type": "mapgen",
"method": "json",
"object": {
"fill_ter": "t_region_groundcover",
"fallback_predecessor_mapgen": "field",
"rows": [
" 222111222 ",
" 22211-11222 ",
" 22211----11222 ",
" 22211---------11222 ",
"22211------------11222 ",
"22211-------------11222 ",
" 22211------------11222 ",
"22211--------------11222",
"22211--------------11222",
"22211------------11222 ",
" 22211-------11222 ",
" 22211----11222 ",
" 22211~~~11222 ",
" 22211~~~11222 ",
" 22211~~11222 ",
" 22211~~~~11222 ",
" 22211~~~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 "
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "stream_palette" ],
"terrain": { "-": "t_water_sh" },
"place_monster": [
{ "group": "GROUP_FOREST", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 10 },
{ "group": "GROUP_FISH", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 50 },
{ "group": "GROUP_DOMESTIC", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 20 }
]
}
},
{
"om_terrain": "stream_corner",
"type": "mapgen",
"method": "json",
"weight": 1,
"object": {
"fill_ter": "t_region_groundcover",
"fallback_predecessor_mapgen": "field",
"rows": [
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~~11222 ",
" 22211~~11222 ",
"22 22211~~11222 ",
"222 22211~~~11222 ",
"2222222111~~11222 ",
"11222211111~~11222 ",
"1111111~1111~~11222 ",
"~~111~~~~111~~11222 ",
"~~~~~~~1~~111~~11222 ",
"11~~~1111~~~~~11222 ",
"211~1122211~~11222 ",
"22111222221111222 ",
"2221222222211222 ",
" 22222 222222 ",
" 222 2222 ",
" 2 22 ",
" ",
" ",
" ",
" "
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "stream_palette" ],
"place_monster": [
{ "group": "GROUP_FOREST", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 25 },
{ "group": "GROUP_DOMESTIC", "x": 10, "y": 10, "pack_size": [ 1, 2 ], "chance": 3 }
]
}
},
{
"om_terrain": "stream_corner",
"type": "mapgen",
"method": "json",
"weight": 10,
"object": {
"fill_ter": "t_region_groundcover",
"fallback_predecessor_mapgen": "field",
"rows": [
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~11222 ",
" 22211~~~11222 ",
" 22211~~11222 ",
"22 22 22211~~~11222 ",
"2222222222 22211~~~1122",
"222222222222 22211~~112",
"11222211222222222211~~11",
"11111111112222222211~~11",
"~~1111~~1111222222211~~1",
"~~~~~~~~~~1111121111~~~1",
"11~~~111~~~~1111111~~~11",
"11111111111~~~~11~~~1112",
"2211122211111~~~~~~11122",
"222222222221111~~111222 ",
"22222222222221111112222 ",
" 222 22222221122222 ",
" 222222222 ",
" 222222 ",
" 22 ",
" ",
" "
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "stream_palette" ],
"place_monster": [
{ "group": "GROUP_FOREST", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 25 },
{ "group": "GROUP_DOMESTIC", "x": 10, "y": 10, "pack_size": [ 1, 2 ], "chance": 3 }
]
}
},
{
"om_terrain": "stream_corner",
"type": "mapgen",
"method": "json",
"weight": 50,
"object": {
"fill_ter": "t_region_groundcover",
"fallback_predecessor_mapgen": "field",
"rows": [
" 22211~~11222 ",
" 22211~~~11222 ",
" 22211~11222 ",
" 222211~11222 ",
" 222211~~11222 ",
"22211~~~11222 ",
"2211~~11222 ",
"11~~~11222 ",
"1~~11222 ",
"11~~11222 ",
"1~~~11222 ",
"~~~11222 ",
"~~11222 ",
"111222 ",
"11222 ",
"2222 ",
"222 ",
"22 ",
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "stream_palette" ],
"place_monster": [
{ "group": "GROUP_FOREST", "x": 10, "y": 10, "pack_size": [ 1, 6 ], "chance": 25 },
{ "group": "GROUP_DOMESTIC", "x": 10, "y": 10, "pack_size": [ 1, 2 ], "chance": 3 }
]
}
}
]
36 changes: 36 additions & 0 deletions data/mods/innawood/mapgen_palettes/misc_palettes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[
{
"type": "palette",
"id": "stream_palette",
"terrain": {
" ": "t_null",
"~": "t_water_moving_sh",
"1": [
[ "t_null", 100 ],
[ "t_sand", 1 ],
[ "t_clay", 4 ],
[ "t_grass_long", 900 ],
[ "t_region_shrub_forest", 20 ],
[ "t_region_tree_forest", 20 ]
],
"2": [ [ "t_null", 150 ], [ "t_grass_long", 10 ], [ "t_region_shrub_forest", 1 ], [ "t_region_tree_forest", 1 ] ]
},
"furniture": {
" ": "f_null",
"1": [
[ "f_null", 800 ],
[ "f_region_weed", 10 ],
[ "f_boulder_small", 3 ],
[ "f_boulder_medium", 2 ],
[ "f_boulder_large", 1 ]
],
"2": [
[ "f_null", 1400 ],
[ "f_region_weed", 10 ],
[ "f_boulder_small", 3 ],
[ "f_boulder_medium", 2 ],
[ "f_boulder_large", 1 ]
]
}
}
]
47 changes: 47 additions & 0 deletions data/mods/innawood/overmap/overmap_mutable/stream_mutable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[
{
"type": "overmap_special",
"id": "stream_mutable",
"subtype": "mutable",
"locations": [ "field", "forest", "swamp" ],
"occurrences": [ 1, 1 ],
"flags": [ "WILDERNESS" ],
"check_for_locations_area": [ { "type": [ "field", "forest" ], "from": [ 1, 1, 0 ], "to": [ -1, -1, 0 ] } ],
"joins": [ "stream_to_stream", "stream_to_east", "stream_to_west" ],
"overmaps": {
"stream_body": { "overmap": "stream_north", "north": "stream_to_stream", "south": "stream_to_stream" },
"stream_bend_e": { "overmap": "stream_corner_east", "north": "stream_to_stream", "east": "stream_to_west" },
"stream_bend_w": { "overmap": "stream_corner_north", "north": "stream_to_stream", "west": "stream_to_east" },
"stream_bend_start_e": { "overmap": "stream_north", "north": "stream_to_stream", "south": "stream_to_east" },
"stream_bend_start_w": { "overmap": "stream_north", "north": "stream_to_stream", "south": "stream_to_west" },
"stream_corner_e": { "overmap": "stream_corner_north", "north": "stream_to_stream", "west": "stream_to_stream" },
"stream_corner_w": { "overmap": "stream_corner_east", "north": "stream_to_stream", "east": "stream_to_stream" },
"stream_end_n": { "overmap": "stream_end_north", "south": "stream_to_stream" },
"stream_end_s": { "overmap": "stream_end_south", "north": "stream_to_stream" },
"stream_end_bend_en": { "overmap": "stream_end_north", "south": "stream_to_west" },
"stream_end_bend_es": { "overmap": "stream_end_south", "north": "stream_to_west" },
"stream_end_bend_wn": { "overmap": "stream_end_north", "south": "stream_to_east" },
"stream_end_bend_ws": { "overmap": "stream_end_south", "north": "stream_to_east" }
},
"root": "stream_body",
"phases": [
[
{ "overmap": "stream_body", "weight": 100 },
{ "overmap": "stream_bend_start_e", "weight": 1 },
{ "overmap": "stream_bend_start_w", "weight": 1 },
{ "overmap": "stream_bend_e", "weight": 120 },
{ "overmap": "stream_bend_w", "weight": 120 },
{ "overmap": "stream_corner_e", "weight": 1 },
{ "overmap": "stream_corner_w", "weight": 1 }
],
[
{ "overmap": "stream_end_n", "max": 1 },
{ "overmap": "stream_end_s", "max": 1 },
{ "overmap": "stream_end_bend_en", "max": 1 },
{ "overmap": "stream_end_bend_es", "max": 1 },
{ "overmap": "stream_end_bend_wn", "max": 1 },
{ "overmap": "stream_end_bend_ws", "max": 1 }
]
]
}
]
11 changes: 11 additions & 0 deletions data/mods/innawood/overmap/overmap_terrarin/overmap_terrain_stream.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"type": "overmap_terrain",
"id": [ "stream", "stream_end", "stream_corner" ],
"copy-from": "generic_open_land",
"name": "stream",
"sym": ".",
"color": "light_blue",
"flags": [ "REQUIRES_PREDECESSOR" ]
}
]