Skip to content

Issue #293 - Min barb distance #851

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

Merged
TomWerner merged 3 commits into from
Jan 6, 2026
Merged

Issue #293 - Min barb distance #851

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fad3c3
Added logic to place player spawns 5-10+ tiles
zack-the-coding-actuary Jan 5, 2026
c8a3465
Reversed order of choosing player spawns and barb spawns.
zack-the-coding-actuary Jan 5, 2026
8016f0d
Whitespace formatting
zack-the-coding-actuary Jan 5, 2026
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
13 changes: 11 additions & 2 deletions C7Engine/MapGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,19 @@ public static GameMap GenerateMap(WorldCharacteristics wc) {
// for resources.
AddBonusGrasslands(wc, gameMap);

// Step 10: Add barb camps. We do this towards the end to make sure
// Step 10: Place player starting locations
// Placing this before barb camps so barbs don't spawn <5 tiles away from players
// Tried placing barbs then players, but caused all players to spawn together
DetermineStartingLocations(wc, gameMap);

// Step 11: Add barb camps. We do this towards the end to make sure
// that we don't have barb camps on top of resources.
// Previously step 10
AddBarbarianCamps(wc, gameMap);

// TODO: Goody huts, barbarian camps.

DetermineStartingLocations(wc, gameMap);


// Last step: Assign the terrain file and image ids to each tile so
// we know which texture to use when displaying them.
Expand Down Expand Up @@ -1339,6 +1345,9 @@ private static bool IsValidForBarbarianCamp(WorldCharacteristics wc, GameMap m,
}
}

// No barbarian camps less than 6 tiles away from a player
if (m.startingLocations.Any(x => t.distanceTo(x) < 6)) return false;

return true;
}

Expand Down