Skip to content

feat: attack enemy #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thirdlf03 merged 1 commit into from
Dec 21, 2025
Merged

feat: attack enemy #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions apps/frontend/src/features/chess/compomemt/ChessPieces.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,11 @@ async function MoveCommand(
command: VoiceInput | null,
startAnimation: (id: number, from: Position, to: Position) => void,
turn: string,
setTextLocation: (text: string, x: number, y: number, z: number) => void
setTextLocation: (text: string, x: number, y: number, z: number) => void,
changeTurn: () => void
): Promise<Piece[]> {
const [pieceID, toPosition] = LinkVoiceAndId(pieces, command, turn);
let attack = true;

if (pieceID === -1 || !toPosition) return pieces;
if (!command) return [];
Expand All @@ -235,6 +237,7 @@ async function MoveCommand(
);
console.log(response);
setTextLocation(response.reason, piece.position.x!, piece.position.y!, piece.position.z! + 2);
attack = response.attack;
command.to = response.to;
};

Expand All @@ -245,17 +248,40 @@ async function MoveCommand(
return [];
}

return pieces.map((piece) => {
if (piece.id === pieceID) {
// アニメーション開始
startAnimation(piece.id, piece.position, newToPosition);
console.log(piece);
// 移動先に敵の駒がいるかチェック
const targetPiece = pieces.find(
(p) =>
p.exist &&
p.position.x === newToPosition.x &&
p.position.y === newToPosition.y &&
p.position.z === newToPosition.z &&
p.color !== piece.color
);

// 敵の駒がいて、attackがfalseの場合は移動しない
if (targetPiece && !attack) {
console.log("attackがfalseのため移動しません");
changeTurn();
return pieces;
}

return pieces.map((p) => {
if (p.id === pieceID) {
startAnimation(p.id, p.position, newToPosition);
return {
...p,
position: newToPosition,
};
}
// 敵の駒がいて、attackがtrueの場合は倒す
if (targetPiece && p.id === targetPiece.id && attack) {
console.log("駒を倒しました:", p);
return {
...piece,
position: toPosition,
...p,
exist: false,
};
}
return piece;
return p;
});
}

Expand All @@ -264,7 +290,7 @@ const ChessPieces = ({ command }: { command: VoiceInput | null }) => {
const { startAnimation } = useAnimationStore();
const { setTextLocation } = useTextLocationStore();
const initialized = useRef(false);
const { turn } = useTurnStore();
const { turn, change: changeTurn } = useTurnStore();

useEffect(() => {
if (initialized.current) return;
Expand Down Expand Up @@ -302,7 +328,8 @@ const ChessPieces = ({ command }: { command: VoiceInput | null }) => {
command,
startAnimation,
turn,
setTextLocation
setTextLocation,
changeTurn
);
console.log("turn確認", command);
setPieces(newPieces);
Expand All @@ -311,7 +338,7 @@ const ChessPieces = ({ command }: { command: VoiceInput | null }) => {
}, [command, startAnimation, setTextLocation]);
return (
<>
{pieces.map((piece) => (
{pieces.filter((piece) => piece.exist).map((piece) => (
<ChooseFromSixPieces key={piece.id} piece={piece} />
))}
</>
Expand Down