diff --git a/.github/workflows/incrementVersionAndChangelog.mjs b/.github/workflows/incrementVersionAndChangelog.mjs index 682c19a383..27d9f3c818 100644 --- a/.github/workflows/incrementVersionAndChangelog.mjs +++ b/.github/workflows/incrementVersionAndChangelog.mjs @@ -1,6 +1,7 @@ import {Octokit} from "@octokit/rest"; import fs from "fs"; -// To be run from the main Unciv repo directory + +// To be run from the root of the Unciv repo (node .github/workflows/incrementVersionAndChangelog.mjs) // Summarizes and adds the summary to the changelog.md file // Meant to be run from a Github action as part of the preparation for version rollout @@ -65,8 +66,7 @@ async function parseCommits() { } ); - Object.entries(ownerToCommits).forEach(entry => { - const [author, commits] = entry; + Object.entries(ownerToCommits).forEach((author,commits) => { if (commits.length === 1) { commitSummary += "\n\n" + commits[0] + " - By " + author; } else { diff --git a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt index 8d9a5f7979..3e2e6f66d5 100644 --- a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt +++ b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt @@ -404,7 +404,7 @@ class MapUnit : IsPartOfGameInfoSerialization { isCivilian() -> false baseUnit.movesLikeAirUnits -> false isEmbarked() -> false - hasUnique(UniqueType.NoDefensiveTerrainBonus) -> false + hasUnique(UniqueType.NoDefensiveTerrainBonus, checkCivInfoUniques = true) -> false ignoreAlreadyFortified -> true isFortified() -> false else -> true