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

Smoother rivers connections on overmaps edges #3178

Merged
merged 3 commits into from
Sep 20, 2023
Merged

Smoother rivers connections on overmaps edges #3178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7418c2
Improved rivers polishing on overmaps edges
Vollch Sep 18, 2023
fb8b30f
Renamed polish_rivers
Vollch Sep 19, 2023
fec57a4
Added swamp fallback for nonexistent river_nes map
Vollch Sep 20, 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
193 changes: 102 additions & 91 deletions src/overmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ void overmap::generate( const overmap *north, const overmap *east,
place_specials( enabled_specials );
place_forest_trailheads();

polish_river();
polish_rivers( north, east, south, west );

// TODO: there is no reason we can't generate the sublevels in one pass
// for that matter there is no reason we can't as we add the entrance ways either
Expand Down Expand Up @@ -3972,15 +3972,6 @@ void overmap::connect_closest_points( const std::vector<point_om_omt> &points, i
}
}

void overmap::polish_river()
{
for( int x = 0; x < OMAPX; x++ ) {
for( int y = 0; y < OMAPY; y++ ) {
good_river( { x, y, 0 } );
}
}
}

// Changes neighboring empty rock to partial rock
void overmap::chip_rock( const tripoint_om_omt &p )
{
Expand Down Expand Up @@ -4020,95 +4011,115 @@ bool overmap::check_overmap_special_type( const overmap_special_id &id,
return found_id->second == id;
}

void overmap::good_river( const tripoint_om_omt &p )
void overmap::polish_rivers( const overmap *north, const overmap *east, const overmap *south,
const overmap *west )
{
if( !is_ot_match( "river", ter( p ), ot_match_type::prefix ) ) {
return;
}
if( ( p.x() == 0 ) || ( p.x() == OMAPX - 1 ) ) {
if( !is_river_or_lake( ter( p + point_north ) ) ) {
ter_set( p, oter_id( "river_north" ) );
} else if( !is_river_or_lake( ter( p + point_south ) ) ) {
ter_set( p, oter_id( "river_south" ) );
} else {
ter_set( p, oter_id( "river_center" ) );
}
return;
}
if( ( p.y() == 0 ) || ( p.y() == OMAPY - 1 ) ) {
if( !is_river_or_lake( ter( p + point_west ) ) ) {
ter_set( p, oter_id( "river_west" ) );
} else if( !is_river_or_lake( ter( p + point_east ) ) ) {
ter_set( p, oter_id( "river_east" ) );
} else {
ter_set( p, oter_id( "river_center" ) );
}
return;
}
if( is_river_or_lake( ter( p + point_west ) ) ) {
if( is_river_or_lake( ter( p + point_north ) ) ) {
if( is_river_or_lake( ter( p + point_south ) ) ) {
if( is_river_or_lake( ter( p + point_east ) ) ) {
// River on N, S, E, W;
// but we might need to take a "bite" out of the corner
if( !is_river_or_lake( ter( p + point_north_west ) ) ) {
ter_set( p, oter_id( "river_c_not_nw" ) );
} else if( !is_river_or_lake( ter( p + point_north_east ) ) ) {
ter_set( p, oter_id( "river_c_not_ne" ) );
} else if( !is_river_or_lake( ter( p + point_south_west ) ) ) {
ter_set( p, oter_id( "river_c_not_sw" ) );
} else if( !is_river_or_lake( ter( p + point_south_east ) ) ) {
ter_set( p, oter_id( "river_c_not_se" ) );
for( int x = 0; x < OMAPX; x++ ) {
for( int y = 0; y < OMAPY; y++ ) {
const tripoint_om_omt p = { x, y, 0 };

if( !is_ot_match( "river", ter( p ), ot_match_type::prefix ) ) {
continue;
}

// For ungenerated overmaps we're assuming that terra incognita is covered by water, and leaving polishing to its mapgen
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything from this line and to the end of the loop should really be extracted into a separate function.
good_river was a terrible name, but something like polish_river_tile(x,y,north,south,east,west) simply begs to exist here.
Usually the less nested ifs and fors there are in a function, the more readable it is.

bool water_north = y != 0 ? is_river_or_lake( ter( { x, y - 1, 0} ) ) :
north != nullptr ? is_river_or_lake( north->ter( { x, OMAPY - 1, 0 } ) ) : true;
bool water_west = x != 0 ? is_river_or_lake( ter( { x - 1, y, 0} ) ) :
west != nullptr ? is_river_or_lake( west->ter( { OMAPX - 1, y, 0 } ) ) : true;
bool water_south = y != OMAPY - 1 ? is_river_or_lake( ter( { x, y + 1, 0} ) ) :
south != nullptr ? is_river_or_lake( south->ter( { x, 0, 0 } ) ) : true;
bool water_east = x != OMAPX - 1 ? is_river_or_lake( ter( { x + 1, y, 0} ) ) :
east != nullptr ? is_river_or_lake( east->ter( { 0, y, 0 } ) ) : true;

if( water_west ) {
if( water_north ) {
if( water_south ) {
if( water_east ) {
// River on N, S, E, W;
// but we might need to take a "bite" out of the corner
if( ( x > 0 && y > 0 &&
!is_river_or_lake( ter( { x - 1, y - 1, 0} ) ) ) ||
( x > 0 && y == 0 && north != nullptr &&
!is_river_or_lake( north->ter( { x - 1, OMAPY - 1, 0} ) ) ) ||
( x == 0 && y > 0 && west != nullptr &&
!is_river_or_lake( west->ter( { OMAPX - 1, y - 1, 0} ) ) )
) {
Comment on lines +4041 to +4047
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there an easy way to extract these checks into some function, or closure, that would take x and y and decide for which of the 5 overmaps, and at what point, to call the ter method?

ter_set( p, oter_id( "river_c_not_nw" ) );
} else if( ( x < OMAPX - 1 && y > 0 &&
!is_river_or_lake( ter( { x + 1, y - 1, 0} ) ) ) ||
( x < OMAPX - 1 && y == 0 && north != nullptr &&
!is_river_or_lake( north->ter( { x + 1, OMAPY - 1, 0 } ) ) ) ||
( x == OMAPX - 1 && y > 0 && east != nullptr &&
!is_river_or_lake( east->ter( { 0, y - 1, 0 } ) ) )
) {
ter_set( p, oter_id( "river_c_not_ne" ) );
} else if( ( x > 0 && y < OMAPY - 1 &&
!is_river_or_lake( ter( { x - 1, y + 1, 0} ) ) ) ||
( x > 0 && y == OMAPY - 1 && south != nullptr &&
!is_river_or_lake( south->ter( { x - 1, 0, 0} ) ) ) ||
( x == 0 && y < OMAPY - 1 && west != nullptr &&
!is_river_or_lake( west->ter( { OMAPX - 1, y + 1, 0} ) ) )
) {
ter_set( p, oter_id( "river_c_not_sw" ) );
} else if( ( x < OMAPX - 1 && y < OMAPY - 1 &&
!is_river_or_lake( ter( { x + 1, y + 1, 0} ) ) ) ||
( x < OMAPX - 1 && y == OMAPY - 1 && south != nullptr &&
!is_river_or_lake( south->ter( { x + 1, 0, 0 } ) ) ) ||
( x == OMAPX - 1 && y < OMAPY - 1 && east != nullptr &&
!is_river_or_lake( east->ter( { 0, y + 1, 0 } ) ) )
) {
ter_set( p, oter_id( "river_c_not_se" ) );
} else {
ter_set( p, oter_id( "river_center" ) );
}
} else {
ter_set( p, oter_id( "river_east" ) );
}
} else {
ter_set( p, oter_id( "river_center" ) );
if( water_east ) {
ter_set( p, oter_id( "river_south" ) );
} else {
ter_set( p, oter_id( "river_se" ) );
}
}
} else {
ter_set( p, oter_id( "river_east" ) );
if( water_south ) {
if( water_east ) {
ter_set( p, oter_id( "river_north" ) );
} else {
ter_set( p, oter_id( "river_ne" ) );
}
} else { // Means it's swampy
ter_set( p, oter_id( "forest_water" ) );
}
}
} else {
if( is_river_or_lake( ter( p + point_east ) ) ) {
ter_set( p, oter_id( "river_south" ) );
} else {
ter_set( p, oter_id( "river_se" ) );
}
}
} else {
if( is_river_or_lake( ter( p + point_south ) ) ) {
if( is_river_or_lake( ter( p + point_east ) ) ) {
ter_set( p, oter_id( "river_north" ) );
if( water_north ) {
if( water_south ) {
if( water_east ) {
ter_set( p, oter_id( "river_west" ) );
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
}
} else {
if( water_east ) {
ter_set( p, oter_id( "river_sw" ) );
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
}
}
} else {
ter_set( p, oter_id( "river_ne" ) );
}
} else {
if( is_river_or_lake( ter( p + point_east ) ) ) { // Means it's swampy
ter_set( p, oter_id( "forest_water" ) );
}
}
}
} else {
if( is_river_or_lake( ter( p + point_north ) ) ) {
if( is_river_or_lake( ter( p + point_south ) ) ) {
if( is_river_or_lake( ter( p + point_east ) ) ) {
ter_set( p, oter_id( "river_west" ) );
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
}
} else {
if( is_river_or_lake( ter( p + point_east ) ) ) {
ter_set( p, oter_id( "river_sw" ) );
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
}
}
} else {
if( is_river_or_lake( ter( p + point_south ) ) ) {
if( is_river_or_lake( ter( p + point_east ) ) ) {
ter_set( p, oter_id( "river_nw" ) );
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
if( water_south ) {
if( water_east ) {
ter_set( p, oter_id( "river_nw" ) );
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
}
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
}
}
} else { // Should never happen
ter_set( p, oter_id( "forest_water" ) );
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/overmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ class overmap
const tripoint_om_omt &location ) const;
void chip_rock( const tripoint_om_omt &p );

void polish_river();
void good_river( const tripoint_om_omt &p );
void polish_rivers( const overmap *north, const overmap *east, const overmap *south,
const overmap *west );

om_direction::type random_special_rotation( const overmap_special &special,
const tripoint_om_omt &p, bool must_be_unexplored ) const;
Expand Down
Loading