From efacd4946e834f1fe35787ced122cec4ca142438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Wed, 30 Sep 2026 22:54:21 +0500 Subject: [PATCH] Companions: clear error when no template characters exist; requests made while stopped are created after the next start Co-Authored-By: Claude Sonnet 5.5 --- crates/coa-core/src/error.rs | 9 +++++++++ crates/coa-core/src/ra.rs | 5 ++++- src-tauri/src/lib.rs | 18 ++++++++++++++++++ src/i18n/locales/de.ts | 6 +++++- src/i18n/locales/en.ts | 6 +++++- src/i18n/locales/es.ts | 6 +++++- src/i18n/locales/fr.ts | 6 +++++- src/i18n/locales/ru.ts | 6 +++++- 8 files changed, 56 insertions(+), 6 deletions(-) diff --git a/crates/coa-core/src/error.rs b/crates/coa-core/src/error.rs index 8be23ed..277f85a 100644 --- a/crates/coa-core/src/error.rs +++ b/crates/coa-core/src/error.rs @@ -24,6 +24,8 @@ pub enum Error { PackageNotPublished(String), #[error("download server unreachable: {0}")] NetworkUnreachable(String), + #[error("the bot module found no level 80 template characters")] + CompanionTemplatesMissing, #[error("invalid values: {}", .0.iter().map(|f| format!("{}: {}", f.key, f.message)).collect::>().join("; "))] Validation(Vec), } @@ -52,6 +54,7 @@ pub enum ErrorCode { PathRejected, PackageNotPublished, NetworkUnreachable, + CompanionTemplatesMissing, Unknown, } @@ -142,6 +145,11 @@ impl ErrorCode { "Check your internet connection and try again.", &[Retry, ShowDetails], ), + ErrorCode::CompanionTemplatesMissing => ( + "Companions have nothing to be copied from yet", + "New companions are copied from level 80 characters of each class. Create one level 80 character per class on any account except the console account, then try again.", + &[ShowDetails], + ), ErrorCode::Unknown => ("Something went wrong", "See the technical details.", &[ShowDetails]), }; Human { code: self, title, message, actions } @@ -157,6 +165,7 @@ impl Error { Error::Validation(_) => ErrorCode::InvalidConfigValue, Error::PackageNotPublished(_) => ErrorCode::PackageNotPublished, Error::NetworkUnreachable(_) => ErrorCode::NetworkUnreachable, + Error::CompanionTemplatesMissing => ErrorCode::CompanionTemplatesMissing, _ => ErrorCode::Unknown, } } diff --git a/crates/coa-core/src/ra.rs b/crates/coa-core/src/ra.rs index e590e09..d7a01b3 100644 --- a/crates/coa-core/src/ra.rs +++ b/crates/coa-core/src/ra.rs @@ -91,18 +91,21 @@ impl Ra { } } - /// Ask the bot module to create `count` leveling bots (throttled by the module itself). Only a number is sent. /// World update timing from the server's own `server info` report (mean/median/percentiles of the last 500 updates). pub fn performance(&mut self) -> Result> { let out = self.command("server info")?; Ok(parse_server_info(&out)) } + /// Ask the bot module to create `count` leveling bots (throttled by the module itself). Only a number is sent. pub fn spawn_bots(&mut self, count: u32) -> Result { if !(1..=2000).contains(&count) { return Err(Error::Invalid("Choose between 1 and 2000 companions.".into())); } let out = self.command(&format!("botcmd spawnleveled {count}"))?; + if out.to_lowercase().contains("no usable template characters") { + return Err(Error::CompanionTemplatesMissing); + } Ok(out.lines().last().unwrap_or("").to_string()) } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 29c7c9b..9dc8ed6 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -204,6 +204,22 @@ async fn start_server(state: State<'_, AppState>, id: String) -> std::result::Re let out = run_verb(&state, id.clone(), Verb::StartAll).await?; if out.ok { if let Ok(root) = path_of(&state, &id) { + // Companions requested while the server was stopped are created now (once; a failure is only logged). + let r = root.clone(); + let _ = tauri::async_runtime::spawn_blocking(move || -> Result<()> { + let pending = meta_dir(&r)?.join("companions.pending.json"); + if let Ok(v) = coa_core::fsx::read_json::(&pending) { + let _ = std::fs::remove_file(&pending); + let n = v["count"].as_u64().unwrap_or(0) as u32; + if n > 0 { + if let Err(e) = Ra::connect(&r).and_then(|mut ra| ra.spawn_bots(n)) { + tracing::warn!("pending companions were not created: {e}"); + } + } + } + Ok(()) + }) + .await; let _ = tauri::async_runtime::spawn_blocking(move || meta_dir(&root).and_then(|m| coa_core::friends::reapply(&root, &m))).await; } } @@ -547,6 +563,8 @@ async fn add_companions(state: State<'_, AppState>, id: String, count: u32) -> s let spawned = if o.world.state == coa_core::process::ServiceState::Running { Some(Ra::connect(&root)?.spawn_bots(count)?) } else { + // The server is stopped: creating bots needs it running, so remember the request and do it after the next start. + coa_core::fsx::atomic_write_json(&meta.join("companions.pending.json"), &serde_json::json!({ "count": count }))?; None }; tracing::info!(count, spawned = spawned.is_some(), "companions requested"); diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts index 0b2c841..d326bdc 100644 --- a/src/i18n/locales/de.ts +++ b/src/i18n/locales/de.ts @@ -174,7 +174,7 @@ const de: Partial> = { "comp.addPlain": "Begleiter hinzufügen", "comp.stoppedHint": "Der Server ist gestoppt: Sie werden beim nächsten Start erstellt.", "comp.spawned": "{n} Begleiter werden erstellt. Sie erscheinen nach und nach in den nächsten Minuten.", - "comp.saved": "Gespeichert. {n} Begleiter melden sich beim Serverstart an.", + "comp.saved": "Gespeichert. {n} Begleiter werden beim Serverstart erstellt.", // Client "client.title": "Spielclient", @@ -506,6 +506,10 @@ const de: Partial> = { "overview.tickLag": "Ruckelt", "overview.tickDetail": "durchschnittlich {mean} ms pro Tick · 95 % unter {p95} ms · Spitze {max} ms", "overview.tickHint": "Wie schnell der Weltserver läuft. Über 20 Ticks pro Sekunde fühlt sich das Spiel flüssig an, unter 10 ruckelt es.", + + // Companions start + "err.companion_templates_missing.title": "Begleiter haben noch keine Vorlage zum Kopieren", + "err.companion_templates_missing.message": "Neue Begleiter werden von Charakteren der Stufe 80 jeder Klasse kopiert. Erstelle pro Klasse einen Charakter der Stufe 80 auf einem beliebigen Konto außer dem Konsolenkonto und versuche es erneut.", }; export default de; diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts index 5dcb7d0..d1e1b84 100644 --- a/src/i18n/locales/en.ts +++ b/src/i18n/locales/en.ts @@ -174,7 +174,7 @@ const en = { "comp.addPlain": "Add companions", "comp.stoppedHint": "The server is stopped: they will be created the next time it runs.", "comp.spawned": "Creating {n} companions. They appear gradually over the next minutes.", - "comp.saved": "Saved. {n} companions will log in when the server starts.", + "comp.saved": "Saved. {n} companions will be created when the server starts.", // Client "client.title": "Game client", @@ -506,6 +506,10 @@ const en = { "overview.tickLag": "Lagging", "overview.tickDetail": "average {mean} ms per tick · 95% under {p95} ms · peak {max} ms", "overview.tickHint": "How fast the world server runs. Above 20 ticks per second the game feels smooth; below 10 it lags.", + + // Companions start + "err.companion_templates_missing.title": "Companions have nothing to be copied from yet", + "err.companion_templates_missing.message": "New companions are copied from level 80 characters of each class. Create one level 80 character per class on any account except the console account, then try again.", } as const; export default en; diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts index e33a7f3..ff2fb74 100644 --- a/src/i18n/locales/es.ts +++ b/src/i18n/locales/es.ts @@ -174,7 +174,7 @@ const es: Partial> = { "comp.addPlain": "Añadir compañeros", "comp.stoppedHint": "El servidor está detenido: se crearán la próxima vez que se inicie.", "comp.spawned": "Creando {n} compañeros. Aparecerán gradualmente durante los próximos minutos.", - "comp.saved": "Guardado. {n} compañeros iniciarán sesión cuando se inicie el servidor.", + "comp.saved": "Guardado. Se crearán {n} compañeros cuando se inicie el servidor.", // Client "client.title": "Cliente del juego", @@ -506,6 +506,10 @@ const es: Partial> = { "overview.tickLag": "Con retrasos", "overview.tickDetail": "media de {mean} ms por tick · 95 % por debajo de {p95} ms · pico de {max} ms", "overview.tickHint": "Qué tan rápido funciona el servidor del mundo. Por encima de 20 ticks por segundo el juego va fluido; por debajo de 10 se retrasa.", + + // Companions start + "err.companion_templates_missing.title": "Los compañeros aún no tienen nada de lo que copiarse", + "err.companion_templates_missing.message": "Los compañeros nuevos se copian de personajes de nivel 80 de cada clase. Crea un personaje de nivel 80 por clase en cualquier cuenta salvo la de la consola y vuelve a intentarlo.", }; export default es; diff --git a/src/i18n/locales/fr.ts b/src/i18n/locales/fr.ts index 551ef81..47fdcba 100644 --- a/src/i18n/locales/fr.ts +++ b/src/i18n/locales/fr.ts @@ -174,7 +174,7 @@ const fr: Partial> = { "comp.addPlain": "Ajouter des compagnons", "comp.stoppedHint": "Le serveur est arrêté : ils seront créés au prochain démarrage.", "comp.spawned": "Création de {n} compagnons. Ils apparaissent progressivement dans les prochaines minutes.", - "comp.saved": "Enregistré. {n} compagnons se connecteront au démarrage du serveur.", + "comp.saved": "Enregistré. {n} compagnons seront créés au démarrage du serveur.", // Client "client.title": "Client du jeu", @@ -506,6 +506,10 @@ const fr: Partial> = { "overview.tickLag": "Saccadé", "overview.tickDetail": "en moyenne {mean} ms par tick · 95 % sous {p95} ms · pic {max} ms", "overview.tickHint": "La vitesse du serveur de monde. Au-dessus de 20 ticks par seconde le jeu est fluide, sous 10 il saccade.", + + // Companions start + "err.companion_templates_missing.title": "Les compagnons n’ont encore rien à copier", + "err.companion_templates_missing.message": "Les nouveaux compagnons sont copiés à partir de personnages de niveau 80 de chaque classe. Créez un personnage de niveau 80 par classe sur un compte quelconque, hors le compte de la console, puis réessayez.", }; export default fr; diff --git a/src/i18n/locales/ru.ts b/src/i18n/locales/ru.ts index 5d1113b..726ab07 100644 --- a/src/i18n/locales/ru.ts +++ b/src/i18n/locales/ru.ts @@ -174,7 +174,7 @@ const ru: Partial> = { "comp.addPlain": "Добавить компаньонов", "comp.stoppedHint": "Сервер остановлен: компаньоны будут созданы при следующем запуске.", "comp.spawned": "Создаю компаньонов: {n}. Они появятся постепенно в течение нескольких минут.", - "comp.saved": "Сохранено. Компаньоны ({n}) войдут в игру при запуске сервера.", + "comp.saved": "Сохранено. Компаньоны ({n}) будут созданы при запуске сервера.", // Client "client.title": "Клиент игры", @@ -506,6 +506,10 @@ const ru: Partial> = { "overview.tickLag": "Лагает", "overview.tickDetail": "в среднем {mean} мс на тик · 95% быстрее {p95} мс · пик {max} мс", "overview.tickHint": "Как быстро работает игровой сервер. Выше 20 тиков в секунду игра идёт плавно, ниже 10 — лагает.", + + // Companions start + "err.companion_templates_missing.title": "Пока не из чего создавать компаньонов", + "err.companion_templates_missing.message": "Новые компаньоны копируются с персонажей 80 уровня каждого класса. Создайте по одному персонажу 80 уровня на каждый класс на любой учётной записи, кроме консольной, и повторите попытку.", }; export default ru;