diff options
Diffstat (limited to 'diplomacy/web/src/gui/utils')
| -rw-r--r-- | diplomacy/web/src/gui/utils/load_game_from_disk.js | 158 | ||||
| -rw-r--r-- | diplomacy/web/src/gui/utils/province.js | 18 | ||||
| -rw-r--r-- | diplomacy/web/src/gui/utils/saveGameToDisk.js | 16 |
3 files changed, 122 insertions, 70 deletions
diff --git a/diplomacy/web/src/gui/utils/load_game_from_disk.js b/diplomacy/web/src/gui/utils/load_game_from_disk.js index ca49aa0..a65e1df 100644 --- a/diplomacy/web/src/gui/utils/load_game_from_disk.js +++ b/diplomacy/web/src/gui/utils/load_game_from_disk.js @@ -1,83 +1,101 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see <https://www.gnu.org/licenses/>. +// ============================================================================== import $ from "jquery"; import {STRINGS} from "../../diplomacy/utils/strings"; import {Game} from "../../diplomacy/engine/game"; -export function loadGameFromDisk(onLoad, onError) { - const input = $(document.createElement('input')); - input.attr("type", "file"); - input.trigger('click'); - input.change(event => { - const file = event.target.files[0]; - if (!file.name.match(/\.json$/i)) { - onError(`Invalid JSON filename ${file.name}`); - return; - } - const reader = new FileReader(); - reader.onload = () => { - const savedData = JSON.parse(reader.result); - const gameObject = {}; - gameObject.game_id = `(local) ${savedData.id}`; - gameObject.map_name = savedData.map; - gameObject.rules = savedData.rules; - gameObject.state_history = {}; - gameObject.message_history = {}; - gameObject.order_history = {}; - gameObject.result_history = {}; +export function loadGameFromDisk() { + return new Promise((onLoad, onError) => { + const input = $(document.createElement('input')); + input.attr("type", "file"); + input.trigger('click'); + input.change(event => { + const file = event.target.files[0]; + if (!file.name.match(/\.json$/i)) { + onError(`Invalid JSON filename ${file.name}`); + return; + } + const reader = new FileReader(); + reader.onload = () => { + const savedData = JSON.parse(reader.result); + const gameObject = {}; + gameObject.game_id = `(local) ${savedData.id}`; + gameObject.map_name = savedData.map; + gameObject.rules = savedData.rules; + gameObject.state_history = {}; + gameObject.message_history = {}; + gameObject.order_history = {}; + gameObject.result_history = {}; - // Load all saved phases (expect the latest one) to history fields. - for (let i = 0; i < savedData.phases.length - 1; ++i) { - const savedPhase = savedData.phases[i]; - const gameState = savedPhase.state; - const phaseOrders = savedPhase.orders || {}; - const phaseResults = savedPhase.results || {}; - const phaseMessages = {}; - if (savedPhase.messages) { - for (let message of savedPhase.messages) { - phaseMessages[message.time_sent] = message; + // Load all saved phases (expect the latest one) to history fields. + for (let i = 0; i < savedData.phases.length - 1; ++i) { + const savedPhase = savedData.phases[i]; + const gameState = savedPhase.state; + const phaseOrders = savedPhase.orders || {}; + const phaseResults = savedPhase.results || {}; + const phaseMessages = {}; + if (savedPhase.messages) { + for (let message of savedPhase.messages) { + phaseMessages[message.time_sent] = message; + } } + if (!gameState.name) + gameState.name = savedPhase.name; + gameObject.state_history[gameState.name] = gameState; + gameObject.message_history[gameState.name] = phaseMessages; + gameObject.order_history[gameState.name] = phaseOrders; + gameObject.result_history[gameState.name] = phaseResults; } - if (!gameState.name) - gameState.name = savedPhase.name; - gameObject.state_history[gameState.name] = gameState; - gameObject.message_history[gameState.name] = phaseMessages; - gameObject.order_history[gameState.name] = phaseOrders; - gameObject.result_history[gameState.name] = phaseResults; - } - // Load latest phase separately and use it later to define the current game phase. - const latestPhase = savedData.phases[savedData.phases.length - 1]; - const latestGameState = latestPhase.state; - const latestPhaseOrders = latestPhase.orders || {}; - const latestPhaseResults = latestPhase.results || {}; - const latestPhaseMessages = {}; - if (latestPhase.messages) { - for (let message of latestPhase.messages) { - latestPhaseMessages[message.time_sent] = message; + // Load latest phase separately and use it later to define the current game phase. + const latestPhase = savedData.phases[savedData.phases.length - 1]; + const latestGameState = latestPhase.state; + const latestPhaseOrders = latestPhase.orders || {}; + const latestPhaseResults = latestPhase.results || {}; + const latestPhaseMessages = {}; + if (latestPhase.messages) { + for (let message of latestPhase.messages) { + latestPhaseMessages[message.time_sent] = message; + } } - } - if (!latestGameState.name) - latestGameState.name = latestPhase.name; - // TODO: NB: What is latest phase in loaded JSON contains order results? Not sure if it is well handled. - gameObject.result_history[latestGameState.name] = latestPhaseResults; + if (!latestGameState.name) + latestGameState.name = latestPhase.name; + // TODO: NB: What if latest phase in loaded JSON contains order results? Not sure if it is well handled. + gameObject.result_history[latestGameState.name] = latestPhaseResults; - gameObject.messages = []; - gameObject.role = STRINGS.OBSERVER_TYPE; - gameObject.status = STRINGS.COMPLETED; - gameObject.timestamp_created = 0; - gameObject.deadline = 0; - gameObject.n_controls = 0; - gameObject.registration_password = ''; - const game = new Game(gameObject); + gameObject.messages = []; + gameObject.role = STRINGS.OBSERVER_TYPE; + gameObject.status = STRINGS.COMPLETED; + gameObject.timestamp_created = 0; + gameObject.deadline = 0; + gameObject.n_controls = 0; + gameObject.registration_password = ''; + const game = new Game(gameObject); - // Set game current phase and state using latest phase found in JSON file. - game.setPhaseData({ - name: latestGameState.name, - state: latestGameState, - orders: latestPhaseOrders, - messages: latestPhaseMessages - }); - onLoad(game); - }; - reader.readAsText(file); + // Set game current phase and state using latest phase found in JSON file. + game.setPhaseData({ + name: latestGameState.name, + state: latestGameState, + orders: latestPhaseOrders, + messages: latestPhaseMessages + }); + onLoad(game); + }; + reader.readAsText(file); + }); }); } diff --git a/diplomacy/web/src/gui/utils/province.js b/diplomacy/web/src/gui/utils/province.js index fe54a82..8e26c4b 100644 --- a/diplomacy/web/src/gui/utils/province.js +++ b/diplomacy/web/src/gui/utils/province.js @@ -114,4 +114,22 @@ export class Province { isWater() { return this.type === ProvinceType.WATER; } + + _id(id) { + return `_${id.toLowerCase()}`; + } + + getID(identifiers) { + let id = this._id(this.name); + if (!identifiers[id]) { + for (let alias of this.aliases) { + id = this._id(alias); + if (identifiers[id]) + break; + } + } + if (!identifiers[id] && this.isCoast()) + id = this.parent.getID(identifiers); + return id; + } } diff --git a/diplomacy/web/src/gui/utils/saveGameToDisk.js b/diplomacy/web/src/gui/utils/saveGameToDisk.js index aae69a4..3b7ff48 100644 --- a/diplomacy/web/src/gui/utils/saveGameToDisk.js +++ b/diplomacy/web/src/gui/utils/saveGameToDisk.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see <https://www.gnu.org/licenses/>. +// ============================================================================== export function saveGameToDisk(game, onError) { if (game.client) { game.client.save() |