From c345acd4172c46af82d0fff739a816a548ba4d75 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Sat, 4 Feb 2023 18:48:41 -0800 Subject: [PATCH 1/4] Update Units::isFortControlled Add check for `agitated_wilderness_creature`. --- library/modules/Units.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index abb35b9e0..bc20cec8e 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -175,7 +175,8 @@ bool Units::isFortControlled(df::unit *unit) if (unit->flags2.bits.visitor || unit->flags2.bits.visitor_uninvited || unit->flags2.bits.underworld || - unit->flags2.bits.resident) + unit->flags2.bits.resident || + unit->flags2.bits.agitated_wilderness_creature) return false; return unit->civ_id != -1 && unit->civ_id == plotinfo->civ_id; From 0f78509328a4b3ac10808d76084b46090d8aeb87 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Sat, 4 Feb 2023 19:29:37 -0800 Subject: [PATCH 2/4] agitated_wilderness_creature is in unit->flags4 --- library/modules/Units.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index bc20cec8e..f2311d677 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -176,7 +176,7 @@ bool Units::isFortControlled(df::unit *unit) unit->flags2.bits.visitor_uninvited || unit->flags2.bits.underworld || unit->flags2.bits.resident || - unit->flags2.bits.agitated_wilderness_creature) + unit->flags4.bits.agitated_wilderness_creature) return false; return unit->civ_id != -1 && unit->civ_id == plotinfo->civ_id; From 35c87dfe11ae89ba3f3359b688426bdac8814346 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Sun, 5 Feb 2023 12:05:22 -0800 Subject: [PATCH 3/4] Update changelog.txt --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index e0b749a51..6bb01df4e 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## New Plugins ## Fixes +- `Units::isFortControlled`: Account for agitated wildlife ## Misc Improvements - `automelt`: is now more resistent to savegame corruption From 8253505e4f07f6d09a0ce21884277e7a14a3998b Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Sun, 5 Feb 2023 12:07:54 -0800 Subject: [PATCH 4/4] Update changelog.txt --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 6bb01df4e..ea140f451 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,7 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## New Plugins ## Fixes -- `Units::isFortControlled`: Account for agitated wildlife +- ``Units::isFortControlled``: Account for agitated wildlife ## Misc Improvements - `automelt`: is now more resistent to savegame corruption