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

Jump to bottom

Fix order template #210

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Fix order template #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8416c
Uniquely name barren water in terrain
jt-traub Aug 21, 2024
64d30b9
Fix bug where a passed-through hex showed up in order template
jt-traub Sep 17, 2024
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
2 changes: 1 addition & 1 deletion gamedata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4978,7 +4978,7 @@ static TerrainType td[] = {
{-1,-1,-1},
0,-1,-1,-1,
0,{-1,-1,-1,-1,-1,-1}},
{"ocean", "ocean", "barrenocean", '-', R_OCEAN,
{"deadwater", "deadwater", "barrenocean", '-', R_OCEAN,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change is actually already in master.. it will merge cleanly. Github is just confused because I froze the NO v7 stable branch and am merging from a branch off of that onto master. The only real change in this commit is the change on line 900 in text_report_generator.cpp

TerrainType::BARREN | TerrainType::FLYINGMOUNTS | TerrainType::ANNIHILATED,
0,0,0,1,
{{-1,0,0},{-1,0,0},{-1,0,0},{-1,0,0},
Expand Down
6 changes: 5 additions & 1 deletion text_report_generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ const map<const string, const array<string, 2>> TextReportGenerator::terrain_fil
{ "barren", {
" * * ",
" * * " }
},
{ "deadwater", {
" ~ ~ ",
" ~ ~ " }
}
};

Expand Down Expand Up @@ -893,7 +897,7 @@ void TextReportGenerator::output_template(ostream& f, const json& report, int te
if (report.contains("regions") && !report["regions"].empty()) {
for(const auto& region : report["regions"]) {
// Only output the region template if you have actual units in the region.
if (region.contains("present")) output_region_template(f, region, template_type, show_region_depth);
if (region.value("present", false)) output_region_template(f, region, template_type, show_region_depth);
}
}
f << "\n#end\n\n";
Expand Down