From e0bcb54a4bb3275dc08f11b20665179a8e5014d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20W=C3=A4rmedal?= Date: Sat, 22 Jun 2024 13:51:03 +0200 Subject: [PATCH] Change: Allow bribing local authority when other company has exclusive rights (#12763) --- src/town_cmd.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 1e80040a66..870f34ced5 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -3575,8 +3575,17 @@ TownActions GetMaskOfTownActions(CompanyID cid, const Town *t) for (uint i = 0; i != lengthof(_town_action_costs); i++) { const TownActions cur = (TownActions)(1 << i); - /* Is the company not able to bribe ? */ - if (cur == TACT_BRIBE && (!_settings_game.economy.bribe || t->ratings[cid] >= RATING_BRIBE_MAXIMUM)) continue; + /* Is the company prohibited from bribing ? */ + if (cur == TACT_BRIBE) { + /* Company can't bribe if setting is disabled */ + if (!_settings_game.economy.bribe) continue; + /* Company can bribe if another company has exclusive transport rights, + * or its standing with the town is less than outstanding. */ + if (t->ratings[cid] >= RATING_BRIBE_MAXIMUM) { + if (t->exclusivity == _current_company) continue; + if (t->exclusive_counter == 0) continue; + } + } /* Is the company not able to buy exclusive rights ? */ if (cur == TACT_BUY_RIGHTS && (!_settings_game.economy.exclusive_rights || t->exclusive_counter != 0)) continue;