Keep Atomics penalties on original targets after alliance changes
This commit is contained in:
1 parent
1f38f12beb
commit
4bf6cfc875
15 files changed
+303
-181
No files matched your search
+1
-4
@@ -23,7 +23,6 @@ import { fremenBetrayalBotActions } from './nexus-fremen-betrayal-options';
|
||||
import { ecazInquiryBotActions } from './nexus-ecaz-inquiry-options';
|
||||
import { nexusEcazDukeBotActions } from './nexus-ecaz-duke-options';
|
||||
import { ecazBetrayalOffer } from './nexus-ecaz-betrayal';
|
||||
import { atomicsAllianceChangeBlocked } from './moritani-atomics';
|
||||
import { fremenBetrayalOffer } from './nexus-fremen-betrayal';
|
||||
import { ECAZ_START_FORCES, ECAZ_START_LOCATIONS, quoteEcazStartingForces } from './ecaz-setup';
|
||||
import { choamPowerAction, choamPowerBotPlay } from './choam-power-options';
|
||||
@@ -2993,15 +2992,13 @@ function policyActions(g: GameView): Action[] {
|
||||
const offer = g.players.find(
|
||||
(player) => player.id !== me.id &&
|
||||
g.allianceOffers[player.id] === me.id &&
|
||||
!atomicsAllianceChangeBlocked(g.moritaniAtomics, me.id, player.id) &&
|
||||
!g.homeworldAllianceBlocks?.[player.id],
|
||||
);
|
||||
if (offer) return [{ type: 'alliance', target: offer.id }];
|
||||
if (level > 0 && !g.ready.includes(me.id) && !g.allianceOffers[me.id]) {
|
||||
const target = g.players.find(
|
||||
(player) => player.id !== me.id &&
|
||||
!player.ally && !g.homeworldAllianceBlocks?.[player.id] &&
|
||||
!atomicsAllianceChangeBlocked(g.moritaniAtomics, me.id, player.id),
|
||||
!player.ally && !g.homeworldAllianceBlocks?.[player.id],
|
||||
);
|
||||
if (target) return [{ type: 'alliance', target: target.id }];
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user