Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-22 07:33:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

IPVGO: Balance and improvements for offline bonus time cycles (#1356)

Browse Source
This commit is contained in:
Michael Ficocelli 2024-06-05 22:39:22 -04:00 committed by GitHub
parent 463d4cdb1d
commit 481938a2fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Go/boardAnalysis/goAI.ts
View File

@ -28,7 +28,7 @@ let currentTurnResolver: (() => void) | null = null;
/** /**
* Retrieves a move from the current faction in response to the player's move * Retrieves a move from the current faction in response to the player's move
*/ */
export function makeAIMove(boardState: BoardState): Promise<Play> { export function makeAIMove(boardState: BoardState, useOfflineCycles = true): Promise<Play> {
// If AI is already taking their turn, return the existing turn. // If AI is already taking their turn, return the existing turn.
if (isAiThinking) { if (isAiThinking) {
return Go.nextTurn; return Go.nextTurn;
@ -43,7 +43,8 @@ export function makeAIMove(boardState: BoardState): Promise<Play> {
} }
// If an AI is in use, find the faction's move in response, and resolve the Go.nextTurn promise once it is found and played. // If an AI is in use, find the faction's move in response, and resolve the Go.nextTurn promise once it is found and played.
else { else {
Go.nextTurn = getMove(boardState, GoColor.white, Go.currentGame.ai).then(async (play): Promise<Play> => { Go.nextTurn = getMove(boardState, GoColor.white, Go.currentGame.ai, useOfflineCycles).then(
async (play): Promise<Play> => {
if (boardState !== Go.currentGame) return play; //Stale game if (boardState !== Go.currentGame) return play; //Stale game
// Handle AI passing // Handle AI passing
@ -57,7 +58,7 @@ export function makeAIMove(boardState: BoardState): Promise<Play> {
} }
// Handle AI making a move // Handle AI making a move
await waitCycle(); await waitCycle(useOfflineCycles);
const aiUpdatedBoard = makeMove(boardState, play.x, play.y, GoColor.white); const aiUpdatedBoard = makeMove(boardState, play.x, play.y, GoColor.white);
// Handle the AI breaking. This shouldn't ever happen. // Handle the AI breaking. This shouldn't ever happen.
@ -67,7 +68,8 @@ export function makeAIMove(boardState: BoardState): Promise<Play> {
} }
return play; return play;
}); },
);
} }
// Once the AI moves (or the player playing as white with No AI moves), // Once the AI moves (or the player playing as white with No AI moves),
@ -112,9 +114,10 @@ export async function getMove(
boardState: BoardState, boardState: BoardState,
player: GoColor, player: GoColor,
opponent: GoOpponent, opponent: GoOpponent,
useOfflineCycles = true,
rngOverride?: number, rngOverride?: number,
): Promise<Play & { type: GoPlayType.move | GoPlayType.pass }> { ): Promise<Play & { type: GoPlayType.move | GoPlayType.pass }> {
await waitCycle(); await waitCycle(useOfflineCycles);
const rng = new WHRNG(rngOverride || Player.totalPlaytime); const rng = new WHRNG(rngOverride || Player.totalPlaytime);
const smart = isSmart(opponent, rng.random()); const smart = isSmart(opponent, rng.random());
const moves = getMoveOptions(boardState, player, rng.random(), smart); const moves = getMoveOptions(boardState, player, rng.random(), smart);
@ -142,7 +145,7 @@ export async function getMove(
.filter((point) => evaluateIfMoveIsValid(boardState, point.x, point.y, player, false)); .filter((point) => evaluateIfMoveIsValid(boardState, point.x, point.y, player, false));
const chosenMove = moveOptions[Math.floor(rng.random() * moveOptions.length)]; const chosenMove = moveOptions[Math.floor(rng.random() * moveOptions.length)];
await waitCycle(); await waitCycle(useOfflineCycles);
if (chosenMove) { if (chosenMove) {
//console.debug(`Non-priority move chosen: ${chosenMove.x} ${chosenMove.y}`); //console.debug(`Non-priority move chosen: ${chosenMove.x} ${chosenMove.y}`);
@ -817,9 +820,9 @@ export function sleep(ms: number): Promise<void> {
* Spend some time waiting to allow the UI & CSS to render smoothly * Spend some time waiting to allow the UI & CSS to render smoothly
* If bonus time is available, significantly decrease the length of the wait * If bonus time is available, significantly decrease the length of the wait
*/ */
function waitCycle(): Promise<void> { function waitCycle(useOfflineCycles = true): Promise<void> {
if (Go.storedCycles > 0) { if (useOfflineCycles && Go.storedCycles > 0) {
Go.storedCycles -= 1; Go.storedCycles -= 2;
return sleep(40); return sleep(40);
} }
return sleep(200); return sleep(200);

2
src/Go/ui/GoGameboardWrapper.tsx
View File

@ -115,7 +115,7 @@ export function GoGameboardWrapper({ showInstructions }: GoGameboardWrapperProps
return; return;
} }
const move = await makeAIMove(boardState); const move = await makeAIMove(boardState, false);
if (move.type === GoPlayType.pass) { if (move.type === GoPlayType.pass) {
SnackbarEvents.emit(`The opponent passes their turn; It is now your turn to move.`, ToastVariant.WARNING, 4000); SnackbarEvents.emit(`The opponent passes their turn; It is now your turn to move.`, ToastVariant.WARNING, 4000);

2
test/jest/Go/goAI.test.ts
View File

@ -31,7 +31,7 @@ describe("Go AI tests", () => {
it("prioritizes eye creation moves for Illuminati", async () => { it("prioritizes eye creation moves for Illuminati", async () => {
const board = ["...O...", "OOOO...", ".......", ".......", ".......", ".......", "......."]; const board = ["...O...", "OOOO...", ".......", ".......", ".......", ".......", "......."];
const boardState = boardStateFromSimpleBoard(board, GoOpponent.Daedalus); const boardState = boardStateFromSimpleBoard(board, GoOpponent.Daedalus);
const move = await getMove(boardState, GoColor.white, GoOpponent.Daedalus, 0); const move = await getMove(boardState, GoColor.white, GoOpponent.Daedalus, false, 0);
expect([move.x, move.y]).toEqual([0, 1]); expect([move.x, move.y]).toEqual([0, 1]);
}); });