mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-06 13:33:55 -07:00
gameboard fixes
This commit is contained in:
parent
88489ea2eb
commit
f534cd79b7
86 changed files with 4249 additions and 2145 deletions
|
|
@ -6,6 +6,9 @@ import { GameSelectors, useAppSelector } from '@app/store';
|
|||
export interface DeckSelectDialog {
|
||||
deckText: string;
|
||||
setDeckText: (v: string) => void;
|
||||
fileName: string | null;
|
||||
handleFilePicked: (file: File | null) => void;
|
||||
validationError: string | null;
|
||||
deckHash: string;
|
||||
isReady: boolean;
|
||||
canSubmit: boolean;
|
||||
|
|
@ -14,12 +17,28 @@ export interface DeckSelectDialog {
|
|||
handleToggleReady: () => void;
|
||||
}
|
||||
|
||||
const INVALID_COD_MESSAGE = 'Not a valid Cockatrice deck (.cod) file';
|
||||
|
||||
function validateCodXml(xml: string): boolean {
|
||||
if (xml.length === 0) {
|
||||
return false;
|
||||
}
|
||||
const doc = new DOMParser().parseFromString(xml, 'application/xml');
|
||||
if (doc.getElementsByTagName('parsererror').length > 0) {
|
||||
return false;
|
||||
}
|
||||
return doc.documentElement?.tagName === 'cockatrice_deck';
|
||||
}
|
||||
|
||||
export function useDeckSelectDialog(gameId: number | undefined): DeckSelectDialog {
|
||||
const webClient = useWebClient();
|
||||
const localPlayer = useAppSelector((state) =>
|
||||
gameId != null ? GameSelectors.getLocalPlayer(state, gameId) : undefined,
|
||||
);
|
||||
const [deckText, setDeckText] = useState('');
|
||||
const [deckText, setDeckTextState] = useState('');
|
||||
const [fileXml, setFileXml] = useState<string | null>(null);
|
||||
const [fileName, setFileName] = useState<string | null>(null);
|
||||
const [validationError, setValidationError] = useState<string | null>(null);
|
||||
|
||||
const deckHash = localPlayer?.properties.deckHash ?? '';
|
||||
const isReady = localPlayer?.properties.readyStart ?? false;
|
||||
|
|
@ -27,14 +46,53 @@ export function useDeckSelectDialog(gameId: number | undefined): DeckSelectDialo
|
|||
// Guard Submit/Ready on having a local player — today the deckSelectOpen
|
||||
// predicate in Game.tsx implies one, but the dialog mounts before the
|
||||
// Event_GameJoined echo populates players during reconnect.
|
||||
const canSubmit = hasLocalPlayer && deckText.trim().length > 0;
|
||||
const canSubmit =
|
||||
hasLocalPlayer && (fileXml != null || deckText.trim().length > 0);
|
||||
const canToggleReady = hasLocalPlayer && deckHash.length > 0;
|
||||
|
||||
const setDeckText = (value: string) => {
|
||||
setDeckTextState(value);
|
||||
if (fileXml != null) {
|
||||
setFileXml(null);
|
||||
setFileName(null);
|
||||
}
|
||||
if (validationError != null) {
|
||||
setValidationError(null);
|
||||
}
|
||||
};
|
||||
|
||||
const handleFilePicked = (file: File | null) => {
|
||||
if (file == null) {
|
||||
setFileXml(null);
|
||||
setFileName(null);
|
||||
setValidationError(null);
|
||||
return;
|
||||
}
|
||||
const reader = new FileReader();
|
||||
reader.onload = () => {
|
||||
const contents = typeof reader.result === 'string' ? reader.result : '';
|
||||
setFileXml(contents);
|
||||
setFileName(file.name);
|
||||
setDeckTextState('');
|
||||
setValidationError(null);
|
||||
};
|
||||
reader.onerror = () => {
|
||||
setValidationError('Could not read the selected file');
|
||||
};
|
||||
reader.readAsText(file);
|
||||
};
|
||||
|
||||
const handleSubmitDeck = () => {
|
||||
if (!canSubmit || gameId == null) {
|
||||
return;
|
||||
}
|
||||
webClient.request.game.deckSelect(gameId, { deck: deckText.trim() });
|
||||
const xml = fileXml ?? deckText.trim();
|
||||
if (!validateCodXml(xml)) {
|
||||
setValidationError(INVALID_COD_MESSAGE);
|
||||
return;
|
||||
}
|
||||
setValidationError(null);
|
||||
webClient.request.game.deckSelect(gameId, { deck: xml });
|
||||
};
|
||||
|
||||
const handleToggleReady = () => {
|
||||
|
|
@ -47,6 +105,9 @@ export function useDeckSelectDialog(gameId: number | undefined): DeckSelectDialo
|
|||
return {
|
||||
deckText,
|
||||
setDeckText,
|
||||
fileName,
|
||||
handleFilePicked,
|
||||
validationError,
|
||||
deckHash,
|
||||
isReady,
|
||||
canSubmit,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue