mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-09 11:28:06 +00:00
store & reference pattern by name (#1766)
## Description: Store pattern by name instead of value. The worker replaces the pattern name with it's base64 when joining. This ensures the client & server are never out of sync after patterns are updated. * removed resizeObserver on the territory modal, it was causing some race conditions, and the modal is not resizable so it's unnecessary. * Moved PatternSchema to CosmeticSchema ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I have read and accepted the CLA agreement (only required once). ## Please put your Discord username so you can be contacted if a bug or regression is found: evan
This commit is contained in:
@@ -21,6 +21,7 @@ import "./components/baseComponents/Modal";
|
||||
import "./components/Difficulties";
|
||||
import { DifficultyDescription } from "./components/Difficulties";
|
||||
import "./components/Maps";
|
||||
import { getCosmetics } from "./Cosmetics";
|
||||
import { FlagInput } from "./FlagInput";
|
||||
import { JoinLobbyEvent } from "./Main";
|
||||
import { UsernameInput } from "./UsernameInput";
|
||||
@@ -401,7 +402,7 @@ export class SinglePlayerModal extends LitElement {
|
||||
: this.disabledUnits.filter((u) => u !== unit);
|
||||
}
|
||||
|
||||
private startGame() {
|
||||
private async startGame() {
|
||||
// If random map is selected, choose a random map now
|
||||
if (this.useRandomMap) {
|
||||
this.selectedMap = this.getRandomMap();
|
||||
@@ -424,6 +425,10 @@ export class SinglePlayerModal extends LitElement {
|
||||
if (!flagInput) {
|
||||
console.warn("Flag input element not found");
|
||||
}
|
||||
const patternName = this.userSettings.getSelectedPatternName();
|
||||
const pattern = patternName
|
||||
? (await getCosmetics())?.patterns[patternName]
|
||||
: undefined;
|
||||
this.dispatchEvent(
|
||||
new CustomEvent("join-lobby", {
|
||||
detail: {
|
||||
@@ -439,7 +444,7 @@ export class SinglePlayerModal extends LitElement {
|
||||
flagInput.getCurrentFlag() === "xx"
|
||||
? ""
|
||||
: flagInput.getCurrentFlag(),
|
||||
pattern: this.userSettings.getSelectedPattern(),
|
||||
pattern: pattern?.pattern,
|
||||
},
|
||||
],
|
||||
config: {
|
||||
|
||||
Reference in New Issue
Block a user