Skip to content

Commit

Permalink
VVH to support finite unknown remotenesses
Browse files Browse the repository at this point in the history
  • Loading branch information
@cameroncheung00
cameroncheung00 committed Oct 20, 2023
1 parent ceb2bbd commit 2193667
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 40 deletions.
6 changes: 3 additions & 3 deletions src/components/units/GameBody/AppGameBodyStatisticsMessage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<p v-if="!isPuzzleGame && currentPositionValue === 'draw'">
<b class="uni-turn-1">{{ currentLeftPlayerName }}</b> and
<b class="uni-turn-2">{{ currentRightPlayerName }}</b> are in a
<mark :class="`uni-${currentPositionValue}`">draw</mark>!
<mark :class="`uni-${currentPositionValue}`">draw</mark>.
</p>
<p v-else-if="!isPuzzleGame && currentPositionValue === 'unsolved'">
<b :class="`uni-turn-${currentTurn}`">{{ currentPlayerName }}</b>'s
Expand All @@ -13,8 +13,8 @@
<p v-else-if="!isPuzzleGame">
<b :class="`uni-turn-${currentTurn}`">{{ currentPlayerName }}</b> should
<mark :class="`uni-${currentPositionValue}`">{{ currentPositionValue }}</mark>
the game in {{ currentRemoteness }}
move<span v-if="currentRemoteness !== 1">s</span>. {{ mexStr }}
the game<span v-if="currentRemoteness != -100"> in {{ currentRemoteness }}
move<span v-if="currentRemoteness !== 1">s</span></span>. {{ mexStr }}
</p>
<p v-else>
<b :class="`uni-turn-${currentTurn}`">{{ currentPlayerName }}</b> should
Expand Down
121 changes: 105 additions & 16 deletions src/components/units/VVH/AppGameVvhBody.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,25 @@
<text class="draw-symbol" :x="isPuzzleGame ? gridLeft : chartWidth / 2"
:y="gridTop - xCoordinateHeight / 2"
dominant-baseline="middle"
text-anchor="middle">D</text>
text-anchor="middle">{{ isPuzzleGame ? 'F' : 'D' }}</text>
<text class="draw-symbol" :x="isPuzzleGame ? gridLeft : chartWidth / 2"
:y="gridBottom + xCoordinateHeight / 2"
dominant-baseline="middle"
text-anchor="middle">D</text>
text-anchor="middle">{{ isPuzzleGame ? 'F' : 'D' }}</text>

<!-- Remoteness Coordinates -->
<template v-for="(_, remoteness) in Math.max(5, maximumRemoteness) + 1"
<template v-for="(_, remoteness) in Math.max(0, adjustedMaximumRemoteness) + 1"
:key="remoteness">
<!-- Top Left -->
<text class="remoteness-coordinate"
v-if="!isPuzzleGame &&remoteness % xInterval === 0"
v-if="!isPuzzleGame && remoteness % xInterval === 0"
:x="gridLeft + remoteness * columnWidth"
:y="gridTop - xCoordinateHeight / 2"
dominant-baseline="middle"
text-anchor="middle">
{{ remoteness }}
</text>
<!-- Top Right -->
<text class="remoteness-coordinate"
v-if="remoteness % xInterval === 0"
:x="gridRight - remoteness * columnWidth"
Expand All @@ -104,6 +106,7 @@
text-anchor="middle">
{{ remoteness }}
</text>
<!-- Bottom Left -->
<text class="remoteness-coordinate"
v-if="!isPuzzleGame && remoteness % xInterval === 0"
:x="gridLeft + remoteness * columnWidth"
Expand All @@ -112,6 +115,7 @@
text-anchor="middle">
{{ remoteness }}
</text>
<!-- Bottom Right -->
<text class="remoteness-coordinate"
v-if="remoteness % xInterval === 0"
:x="gridRight - remoteness * columnWidth"
Expand All @@ -121,8 +125,33 @@
{{ remoteness }}
</text>
</template>
<!-- Unknown Remoteness Remoteness Coordinates -->
<template v-if="finiteUnknownRemotenessExists">
<text class="remoteness-coordinate"
v-if="!isPuzzleGame"
:x="gridLeft + maximumRemoteness * columnWidth"
:y="gridTop - xCoordinateHeight / 2"
dominant-baseline="middle"
text-anchor="middle">?</text>
<text class="remoteness-coordinate"
:x="gridRight - maximumRemoteness * columnWidth"
:y="gridTop - xCoordinateHeight / 2"
dominant-baseline="middle"
text-anchor="middle">?</text>
<text class="remoteness-coordinate"
v-if="!isPuzzleGame"
:x="gridLeft + maximumRemoteness * columnWidth"
:y="gridBottom + xCoordinateHeight / 2"
dominant-baseline="middle"
text-anchor="middle">?</text>
<text class="remoteness-coordinate"
:x="gridRight - maximumRemoteness * columnWidth"
:y="gridBottom + xCoordinateHeight / 2"
dominant-baseline="middle"
text-anchor="middle">?</text>
</template>

<!-- Move Coordinates -->
<!-- Move Coordinates (Move Names) -->
<template v-if="currentValuedRoundId >= 2">
<template v-for="roundNumber in currentValuedRoundId - 1"
:key="roundNumber">
Expand Down Expand Up @@ -193,9 +222,6 @@
</template>
</template>

<!-- Grid Base -->
<rect id="grid-base" :x="gridLeft" :y="gridTop" :width="gridWidth" :height="gridHeight" />

<!-- Round Rows -->
<template v-if="currentValuedRoundId >= 1">
<template v-for="roundNumber in currentValuedRoundId" :key="roundNumber">
Expand Down Expand Up @@ -469,7 +495,7 @@

<!-- Link from Current Position Value to Next Moves' Position Value -->
<template v-if="showNextMoves && currentValuedRounds[currentValuedRoundId]">
<template v-for="nextMove in currentValuedRounds[currentValuedRoundId].position.availableMoves">
<template v-for="nextMove in currentValuedRounds[currentValuedRoundId].position.availableMoves" :key="nextMove">
<template v-if="currentValuedRounds[currentValuedRoundId].position.positionValue === 'draw'">
<template v-if="nextMove.moveValue === 'draw'">
<line :class="`${nextMove.moveValue} link`"
Expand Down Expand Up @@ -770,7 +796,7 @@
</div>
<div class="meter">
<p class="label">Remoteness Interval</p>
<VueSlider v-model="xInterval" :min="1" :max="maximumRemoteness" :tooltip="'active'" />
<VueSlider v-model="xInterval" :min="1" :max="Math.max(5, adjustedMaximumRemoteness)" :tooltip="'active'" />
</div>
</div>
</div>
Expand All @@ -781,6 +807,7 @@
import { actionTypes, useStore } from "../../../scripts/plugins/store";
import VueSlider from "vue-slider-component";
import "vue-slider-component/theme/default.css";
import { Rounds } from "../../../scripts/gamesmanUni/types";
const store = useStore();
Expand All @@ -798,15 +825,77 @@
const currentRoundId = computed(() => store.getters.currentRoundId);
const currentPositionValue = computed(() => store.getters.currentPositionValue);
const currentRounds = computed(() => store.getters.currentRounds);
const currentValuedRounds = computed(() =>
currentRounds.value.filter(round => round.position.positionValue !== "unsolved")
);
const currentFirstPlayerTurn = computed(() => store.getters.currentMatch.round.firstPlayerTurn);
// need to get max remoteness and whether there are unknown finites.
const getMaximumRemoteness = computed(() => {
const remotenesses = new Set<number>();
var finiteUnknownRemotenessExists = false;
var infiniteNonDrawRemotenessExists = false;
for (let roundId = 1; roundId <= store.getters.currentRoundId; roundId++) {
const position = currentRounds.value[roundId].position;
if (position.positionValue !== "draw" && position.positionValue !== "unsolved") {
if (position.remoteness == -100) { // FINITE UNKNOWN
finiteUnknownRemotenessExists = true;
} else if (position.remoteness == -200) { // INFINITY
infiniteNonDrawRemotenessExists = true;
} else {
remotenesses.add(Number(position.remoteness));
}
}
if (options.value.showNextMoves) {
for (const move in position.availableMoves) {
const moveObj = position.availableMoves[move]
if (moveObj.positionValue !== "draw" && moveObj.positionValue !== "unsolved") {
if (moveObj.remoteness == -100) { // FINITE UNKNOWN
finiteUnknownRemotenessExists = true;
} else if (moveObj.remoteness == -200) { // INFINITY
infiniteNonDrawRemotenessExists = true;
} else {
remotenesses.add(Number(moveObj.remoteness));
}
}
}
}
}
remotenesses.add(0); // So that max doesn't error if list is empty
var maxRemoteness = Math.max(...remotenesses);
if (finiteUnknownRemotenessExists) {
maxRemoteness += 1;
}
return [maxRemoteness, finiteUnknownRemotenessExists, infiniteNonDrawRemotenessExists];
});
const maximumRemoteness = computed(() => Number(getMaximumRemoteness.value[0]));
const finiteUnknownRemotenessExists = computed(() => Boolean(getMaximumRemoteness.value[1]));
const infiniteNonDrawRemotenessExists = computed(() => Boolean(getMaximumRemoteness.value[2]));
const adjustedMaximumRemoteness = computed(() => finiteUnknownRemotenessExists.value ? maximumRemoteness.value - 1 : maximumRemoteness.value);
const currentValuedRounds = computed(() => {
var copy = JSON.parse(JSON.stringify(currentRounds.value)) as Rounds;
for (const round of copy) {
if (round.position.positionValue !== "unsolved") {
if (round.position.remoteness == -100) {
round.position.remoteness = maximumRemoteness.value;
}
for (const move in round.position.availableMoves) {
const moveObj = round.position.availableMoves[move]
if (moveObj.remoteness == -100) {
moveObj.remoteness = maximumRemoteness.value;
}
}
}
}
return copy.filter(round => round.position.positionValue !== "unsolved");
});
const currentValuedRoundId = computed(() =>
Math.max(0, currentRoundId.value - currentRounds.value.length + currentValuedRounds.value.length)
);
const currentFirstPlayerTurn = computed(() => store.getters.currentMatch.round.firstPlayerTurn);
const maximumRemoteness = computed(() => store.getters.maximumRemoteness(1, store.getters.currentRoundId));
const isEndOfMatch = computed(() => store.getters.isEndOfMatch);
const winningDirectionHeight = ref(2);
Expand All @@ -820,7 +909,7 @@
const yCoordinateWidth = ref(5);
const chartWidth = ref(50);
const columnCount = computed(() => (isPuzzleGame.value ? 1 : 2) * (Math.max(5, maximumRemoteness.value) + 1));
const columnCount = computed(() => (isPuzzleGame.value ? 1 : 2) * (Math.max(1, maximumRemoteness.value) + 1));
const gridWidth = computed(() => chartWidth.value - 2 * yCoordinateWidth.value);
const columnWidth = computed(() => gridWidth.value / columnCount.value);
const gridLeft = computed(() => yCoordinateWidth.value);
Expand Down
17 changes: 0 additions & 17 deletions src/scripts/gamesmanUni/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,23 +271,6 @@ const loadVariant = async (app: Types.App, payload: { gameType: string; gameId:
};
};

export const getMaximumRemoteness = (app: Types.App, payload: { from: number; to: number }) => {
const remotenesses = new Set<number>();
remotenesses.add(5); // In case all involved positions are draw, 5 shall be the default maximum remoteness.
for (let roundId = payload.from; roundId <= payload.to; roundId++) {
const round = app.currentMatch.rounds[roundId];
if (round.position.positionValue !== "draw") remotenesses.add(round.position.remoteness);
if (app.options.showNextMoves) {
for (const availableMove in round.position.availableMoves) {
if (round.position.availableMoves[availableMove].positionValue !== "draw") {
remotenesses.add(round.position.availableMoves[availableMove].remoteness);
}
}
}
}
return Math.max(...remotenesses);
};

export const isEndOfMatch = (app: Types.App) =>
!app.currentMatch.round.position.remoteness ||
!Object.keys(app.currentMatch.round.position.availableMoves).length;
Expand Down
4 changes: 0 additions & 4 deletions src/scripts/plugins/store/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ type Getters = {
(gameType: string, gameId: string, variantId: string) => ImageAutoGUIData;
isEndOfMatch(state: State): boolean;
locale(state: State): string;
maximumRemoteness(state: State): (from: number, to: number) => number;
moveHistory(state: State): string;
onePlayerGameAPI(state: State): string;
position(state: State):
Expand Down Expand Up @@ -168,9 +167,6 @@ const getters: Vuex.GetterTree<State, State> & Getters = {
GMU.isEndOfMatch(state.app),
locale: (state: State) =>
state.app.preferences.locale,
maximumRemoteness: (state: State) =>
(from: number, to: number) =>
GMU.getMaximumRemoteness(state.app, { from, to }),
moveHistory: (state: State) =>
state.app.currentMatch.moveHistory,
onePlayerGameAPI: (state: State) =>
Expand Down

0 comments on commit 2193667

Please sign in to comment.