diff --git a/README.md b/README.md index 3fea435..5ea1373 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,14 @@ no console, no config files, no database tools. Tauri 2 + Rust + React. into **UPDATE**. Updates are authenticated (Ed25519), back up first, keep files you changed and can be rolled back. * **Backups.** Characters, accounts and settings on demand, automatically before every update; verify and restore from the app. -* **CoA / Wildcard realms.** Choose the active realm on Overview. A server build with Wildcard support is required; +* **CoA / Wildcard / Warcraft Reborn realms.** Choose the active realm on Overview. A server build supporting the selected realm is required; the first switch copies world data and creates an empty character database. Accounts are shared, characters and module settings are separate, and only one world runs. Switching a running server saves characters and restarts it. The closed client's saved realm follows this selection and is checked again before PLAY. If the client is open, the change is applied on the next launch through the Manager. - CoA companions are unavailable on Wildcard; other optional modules are experimental. Backups include both realms, - and database updates apply to both. - See [realm profiles and validation](docs/WILDCARD.md). + Bots are unavailable on Wildcard and Warcraft Reborn; other optional modules are experimental. Backups and + database updates include every created realm. Simultaneous startup supports CoA + Wildcard only. + See [realm profiles and validation](docs/WILDCARD.md) and [Warcraft Reborn](docs/WARCRAFT-REBORN.md). * **Companions (bots).** Fill the world with level-appropriate bots, see progress, stop spawning, take them offline, despawn N to relieve the server, and choose how many log in at server start. * **Realmlist switcher.** Keep named realmlists (for example *Solo* and *PTR*) and switch the game client between them from a diff --git a/changelog.d/20261021-warcraft-reborn-realm.md b/changelog.d/20261021-warcraft-reborn-realm.md new file mode 100644 index 0000000..8053b29 --- /dev/null +++ b/changelog.d/20261021-warcraft-reborn-realm.md @@ -0,0 +1,7 @@ +--- +area: manager +type: added +audience: admins +title: Warcraft Reborn can now be created and selected as a separate realm +--- +Warcraft Reborn has separate characters and settings, shares accounts, and is included in backups, updates and database checks. A server build with Warcraft Reborn support is required. diff --git a/crates/coa-core/src/backup.rs b/crates/coa-core/src/backup.rs index 503a70c..ca3314c 100644 --- a/crates/coa-core/src/backup.rs +++ b/crates/coa-core/src/backup.rs @@ -301,10 +301,11 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt let realm = crate::realms::state(root)?; let mut databases: Vec<(String, &str)> = wanted_databases(kind).iter() .map(|name| Ok((name.to_string(), realm.active.schema(name)?))).collect::>()?; - if realm.wildcard_created && kind != Kind::Config { - let other = if realm.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa }; - databases.push((format!("{}-characters", other.name()), other.schema("characters")?)); - if kind == Kind::Full { databases.push((format!("{}-world", other.name()), other.schema("world")?)); } + if kind != Kind::Config { + for other in realm.modes().into_iter().filter(|m| *m != realm.active) { + databases.push((format!("{}-characters", other.name()), other.schema("characters")?)); + if kind == Kind::Full { databases.push((format!("{}-world", other.name()), other.schema("world")?)); } + } } if kind != Kind::Config && with_database(root, |db| db.schema_exists("acore_playerbots"))? { databases.push(("playerbots".into(), "acore_playerbots")); diff --git a/crates/coa-core/src/client.rs b/crates/coa-core/src/client.rs index 855e5ae..fc5e2ae 100644 --- a/crates/coa-core/src/client.rs +++ b/crates/coa-core/src/client.rs @@ -69,6 +69,7 @@ fn sync_realm_when_closed(client: &Path, meta: &Path, mode: crate::realms::Mode, let realm = match mode { crate::realms::Mode::Coa => "Conquest of Azeroth", crate::realms::Mode::Wildcard => "Wildcard", + crate::realms::Mode::Reborn => "Warcraft Reborn", }; let new = realm_config(&old, realm); if new == old { return Ok(true); } @@ -344,6 +345,8 @@ mod tests { assert_eq!(fs::read_dir(backup_dir(&meta)).unwrap().count(), 1); assert!(sync_realm(&c, &meta, crate::realms::Mode::Wildcard).unwrap()); assert_eq!(fs::read(c.join("WTF/Config.wtf")).unwrap(), original); + assert!(sync_realm(&c, &meta, crate::realms::Mode::Reborn).unwrap()); + assert_eq!(fs::read(c.join("WTF/Config.wtf")).unwrap(), b"SET sound 1\r\nSET realmName \"Warcraft Reborn\"\r\n"); } #[test] diff --git a/crates/coa-core/src/db.rs b/crates/coa-core/src/db.rs index aace309..983655c 100644 --- a/crates/coa-core/src/db.rs +++ b/crates/coa-core/src/db.rs @@ -73,6 +73,7 @@ pub const SCHEMAS: [(&str, &str); 3] = [("characters", "acore_characters"), ("au pub fn schema_of(kind: &str) -> Result<&'static str> { if kind == "playerbots" { return Ok("acore_playerbots"); } if let Some(kind) = kind.strip_prefix("wildcard-") { return crate::realms::Mode::Wildcard.schema(kind); } + if let Some(kind) = kind.strip_prefix("reborn-") { return crate::realms::Mode::Reborn.schema(kind); } if let Some(kind) = kind.strip_prefix("coa-") { return crate::realms::Mode::Coa.schema(kind); } SCHEMAS.iter().find(|(k, _)| *k == kind).map(|(_, s)| *s).ok_or_else(|| Error::Invalid(format!("unknown database {kind}"))) } @@ -124,10 +125,10 @@ impl Db { pub fn realm(&self) -> crate::realms::Mode { self.realm } pub fn realm_schema<'a>(&self, name: &'a str) -> &'a str { - if self.realm == crate::realms::Mode::Wildcard { + if self.realm != crate::realms::Mode::Coa { match name { - "acore_world" => "acore_world_wildcard", - "acore_characters" => "acore_characters_wildcard", + "acore_world" => self.realm.schema("world").unwrap(), + "acore_characters" => self.realm.schema("characters").unwrap(), _ => name, } } else { name } @@ -294,7 +295,7 @@ impl Db { if !ident_ok(schema) { return Err(Error::Invalid("bad schema name".into())); } - if self.realm == crate::realms::Mode::Wildcard { + if self.realm != crate::realms::Mode::Coa { let sql = std::fs::read_to_string(file)?; self.query(&format!("SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci; USE `{schema}`;\n{sql}"))?; return Ok(()); @@ -411,8 +412,8 @@ fn route_sql(sql: &str, realm: crate::realms::Mode) -> String { } else if bytes[i].is_ascii_alphanumeric() || bytes[i] == b'_' { while i < bytes.len() && (bytes[i].is_ascii_alphanumeric() || bytes[i] == b'_') { i += 1; } out.push_str(match &sql[start..i] { - "acore_world" => "acore_world_wildcard", - "acore_characters" => "acore_characters_wildcard", + "acore_world" => realm.schema("world").unwrap(), + "acore_characters" => realm.schema("characters").unwrap(), other => other, }); } else { @@ -434,6 +435,14 @@ mod realm_tests { #[cfg(test)] mod tests { + #[test] + fn reborn_sql_routes_only_database_identifiers() { + use crate::realms::Mode; + let sql = "SELECT * FROM `acore_characters`.characters WHERE name='acore_world'; -- acore_world\nSELECT * FROM acore_world.items; SELECT * FROM acore_world_wildcard.items;"; + assert_eq!(super::route_sql(sql, Mode::Reborn), "SELECT * FROM `acore_characters_reborn`.characters WHERE name='acore_world'; -- acore_world\nSELECT * FROM acore_world_reborn.items; SELECT * FROM acore_world_wildcard.items;"); + assert_eq!(super::schema_of("reborn-characters").unwrap(), "acore_characters_reborn"); + assert_eq!(super::schema_of("reborn-auth").unwrap(), "acore_auth"); + } use super::*; use std::ffi::OsStr; diff --git a/crates/coa-core/src/docker/lifecycle.rs b/crates/coa-core/src/docker/lifecycle.rs index 1bd135c..ef9e5dc 100644 --- a/crates/coa-core/src/docker/lifecycle.rs +++ b/crates/coa-core/src/docker/lifecycle.rs @@ -824,6 +824,10 @@ mod tests { let wild = database_env(&s, true, crate::realms::Mode::Wildcard); assert_eq!(get(&wild, "AC_WORLD_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_world_wildcard"); assert_eq!(get(&wild, "AC_CHARACTER_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_characters_wildcard"); + let reborn = database_env(&s, true, crate::realms::Mode::Reborn); + assert_eq!(get(&reborn, "AC_WORLD_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_world_reborn"); + assert_eq!(get(&reborn, "AC_CHARACTER_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_characters_reborn"); + assert_eq!(get(&reborn, "AC_LOGIN_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_auth"); // Accounts are shared by both realms; the auth server never sees the others. assert_eq!(get(&wild, "AC_LOGIN_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_auth"); let auth = database_env(&s, false, crate::realms::Mode::Wildcard); diff --git a/crates/coa-core/src/migrations.rs b/crates/coa-core/src/migrations.rs index 245348a..a57c36d 100644 --- a/crates/coa-core/src/migrations.rs +++ b/crates/coa-core/src/migrations.rs @@ -82,8 +82,8 @@ impl Store for Db { let connection = self.clone().for_realm(crate::realms::Mode::Coa); let world = self.realm_schema("acore_world"); let characters = self.realm_schema("acore_characters"); - let other = if self.realm() == crate::realms::Mode::Coa { "acore_world_wildcard" } else { "acore_world" }; - let schemas: std::collections::BTreeSet<_> = [world, characters, other, AUTH_LEDGER_SCHEMA].into_iter().collect(); + let others: Vec<_> = [crate::realms::Mode::Coa, crate::realms::Mode::Wildcard, crate::realms::Mode::Reborn].into_iter().filter(|m| *m != self.realm()).map(|m| m.schema("world").unwrap()).collect(); + let schemas: std::collections::BTreeSet<_> = [world, characters, AUTH_LEDGER_SCHEMA].into_iter().chain(others.iter().copied()).collect(); let catalog = connection.query(&format!("SELECT table_schema,table_name FROM information_schema.tables WHERE table_schema IN ('{}') AND table_name IN ('updates','{LEDGER_TABLE}') AND table_type='BASE TABLE';", schemas.into_iter().collect::>().join("','")))?; let available: std::collections::BTreeSet<_> = catalog.lines().filter_map(|line| line.split_once('\t')).collect(); let text = |expression: &str| format!("CONVERT({expression} USING utf8mb4) COLLATE utf8mb4_bin"); @@ -93,7 +93,7 @@ impl Store for Db { queries.push(format!("SELECT 'core','{kind}',{},REPEAT('0',64),'applied',1,'' FROM `{schema}`.`updates` WHERE BINARY RIGHT(name,4)='.sql'",text("LEFT(name,CHAR_LENGTH(name)-4)"))); } } - for (origin, schema, filter) in [("local",world,""), ("other",other," WHERE `db` IN ('auth','coa-auth','wildcard-auth')"), ("shared",AUTH_LEDGER_SCHEMA,"")] { + for (origin, schema, filter) in [("local",world,""), ("shared",AUTH_LEDGER_SCHEMA,"")].into_iter().chain(others.iter().map(|schema| ("other", *schema, " WHERE `db` IN ('auth','coa-auth','wildcard-auth','reborn-auth')"))) { if available.contains(&(schema, LEDGER_TABLE)) { queries.push(format!("SELECT '{origin}',{},{},{},{},`baseline`,{} FROM `{schema}`.`{LEDGER_TABLE}`{filter}",text("`db`"),text("`id`"),text("`sha256`"),text("`status`"),text("COALESCE(HEX(`error`),'')"))); } diff --git a/crates/coa-core/src/modules.rs b/crates/coa-core/src/modules.rs index f5b8606..10be4e2 100644 --- a/crates/coa-core/src/modules.rs +++ b/crates/coa-core/src/modules.rs @@ -139,7 +139,7 @@ fn installed_module_commits(root: &Path) -> BTreeMap { fn list_in(cat: &[Entry], root: &Path) -> Vec { let installed_commits = installed_module_commits(root); - let wildcard = crate::realms::state(root).map(|s| s.active == crate::realms::Mode::Wildcard).unwrap_or(true); + let wildcard = crate::realms::state(root).map(|s| s.active != crate::realms::Mode::Coa).unwrap_or(true); cat.iter() .cloned() .map(|e| { diff --git a/crates/coa-core/src/multiworld.rs b/crates/coa-core/src/multiworld.rs index 15fcfca..9aa12cb 100644 --- a/crates/coa-core/src/multiworld.rs +++ b/crates/coa-core/src/multiworld.rs @@ -28,6 +28,7 @@ fn copy_tree(from: &Path, to: &Path) -> Result<()> { pub fn set_enabled(main: &Path, enabled: bool) -> Result { if enabled && !cfg!(windows) { return Err(Error::Invalid("Simultaneous realms currently require Windows.".into())); } if enabled { + if realms::state(main)?.active == Mode::Reborn { return Err(Error::Invalid("Simultaneous startup supports CoA and Wildcard. Select one of these realms first.".into())); } if !realms::view(main)?.supported { return Err(Error::Invalid("Update the server to a build with Wildcard support first.".into())); } secondary_launcher(&fs::read_to_string(main.join("Scripts/manage.py"))?)?; } diff --git a/crates/coa-core/src/realms.rs b/crates/coa-core/src/realms.rs index 2885433..b0b0171 100644 --- a/crates/coa-core/src/realms.rs +++ b/crates/coa-core/src/realms.rs @@ -18,13 +18,15 @@ pub enum Mode { #[default] Coa, Wildcard, + Reborn, } impl Mode { pub fn name(self) -> &'static str { - match self { Self::Coa => "coa", Self::Wildcard => "wildcard" } + match self { Self::Coa => "coa", Self::Wildcard => "wildcard", Self::Reborn => "reborn" } } - pub fn realm_id(self) -> u32 { if self == Self::Coa { 1 } else { 2 } } + pub fn realm_id(self) -> u32 { match self { Self::Coa => 1, Self::Wildcard => 2, Self::Reborn => 3 } } + pub fn label(self) -> &'static str { match self { Self::Coa => "Conquest of Azeroth", Self::Wildcard => "Wildcard", Self::Reborn => "Warcraft Reborn" } } pub fn schema(self, kind: &str) -> Result<&'static str> { match (self, kind) { (_, "auth") => Ok("acore_auth"), @@ -32,6 +34,8 @@ impl Mode { (Self::Coa, "world") => Ok("acore_world"), (Self::Wildcard, "characters") => Ok("acore_characters_wildcard"), (Self::Wildcard, "world") => Ok("acore_world_wildcard"), + (Self::Reborn, "characters") => Ok("acore_characters_reborn"), + (Self::Reborn, "world") => Ok("acore_world_reborn"), _ => Err(Error::Invalid("Unknown realm database.".into())), } } @@ -42,6 +46,8 @@ pub struct RealmState { pub active: Mode, pub wildcard_created: bool, #[serde(default)] + pub reborn_created: bool, + #[serde(default)] pub simultaneous: bool, #[serde(default)] pub secondary_world_port: Option, @@ -49,10 +55,21 @@ pub struct RealmState { pub secondary_ra_port: Option, } +impl RealmState { + pub fn created(&self, mode: Mode) -> bool { match mode { Mode::Coa => true, Mode::Wildcard => self.wildcard_created, Mode::Reborn => self.reborn_created } } + pub fn modes(&self) -> Vec { + let mut modes = vec![self.active]; + modes.extend([Mode::Coa, Mode::Wildcard, Mode::Reborn].into_iter().filter(|m| *m != self.active && self.created(*m))); + modes + } +} + #[derive(Debug, Serialize)] pub struct View { pub active: Mode, pub wildcard_created: bool, + pub reborn_created: bool, + pub reborn_supported: bool, pub supported: bool, pub recovery_pending: bool, pub simultaneous: bool, @@ -74,14 +91,15 @@ fn world_binary(root: &Path) -> std::path::PathBuf { pub fn view(root: &Path) -> Result { let s = state(root)?; // Inspect the binary itself; templates or an old log cannot prove installed support. - let supported = fs::read(world_binary(root))? - .windows(b"Wildcard synergy settings".len()).any(|w| w == b"Wildcard synergy settings"); - Ok(View { active: s.active, wildcard_created: s.wildcard_created, supported, recovery_pending: root.join(JOURNAL).exists(), simultaneous: s.simultaneous, secondary_world_port: s.secondary_world_port, secondary_running: crate::multiworld::is_running(root) }) + let binary = fs::read(world_binary(root))?; + let reborn_supported = binary.windows(b"Warcraft Reborn class spells are unavailable".len()).any(|w| w == b"Warcraft Reborn class spells are unavailable"); + let supported = binary.windows(b"Wildcard synergy settings".len()).any(|w| w == b"Wildcard synergy settings"); + Ok(View { active: s.active, wildcard_created: s.wildcard_created, reborn_created: s.reborn_created, reborn_supported, supported, recovery_pending: root.join(JOURNAL).exists(), simultaneous: s.simultaneous, secondary_world_port: s.secondary_world_port, secondary_running: crate::multiworld::is_running(root) }) } pub fn guard_module(root: &Path, id: &str) -> Result<()> { - if state(root)?.active == Mode::Wildcard && matches!(id, "companions" | "playerbots") { - return Err(Error::Invalid("CoA companion class mechanics have not been validated for Wildcard. This module is unavailable on this realm.".into())); + if state(root)?.active != Mode::Coa && matches!(id, "companions" | "playerbots") { + return Err(Error::Invalid("Bot class mechanics have not been validated for this realm. This module is unavailable on this realm.".into())); } Ok(()) } @@ -145,6 +163,24 @@ fn wildcard_configs(mut files: Files) -> Result { for (key, value) in [("CoaBots.Enable", "0"), ("CoaBots.AutoLoginOnStartup", "0")] { set(&mut files, "Core/configs/modules/mod_coa_playerbots.conf", key, value)?; } + set(&mut files, "Core/configs/modules/playerbots.conf", "AiPlayerbot.Enabled", "0")?; + Ok(files) +} + +fn reborn_configs(mut files: Files) -> Result { + for (key, value) in [ + ("CoA.ClassModel", "\"wcr\""), ("CoA.GameModeMask", "0"), + ("CoA.MapClass10ToWarrior", "0"), ("CoA.RealmType", "\"live\""), + ("CoA.ClientBooleanConfigs", "\"\""), + ] { set(&mut files, "Core/configs/modules/coa.conf", key, value)?; } + set(&mut files, "Core/configs/modules/mod-coa-challenges.conf", "CoAChallenges.GameModes.Realm", "\"\"")?; + for path in ["Settings/worldserver.conf.template", "Core/configs/worldserver.conf"] { + if files.contains_key(path) { set(&mut files, path, "RealmID", "3")?; } + } + for (key, value) in [("CoaBots.Enable", "0"), ("CoaBots.AutoLoginOnStartup", "0")] { + set(&mut files, "Core/configs/modules/mod_coa_playerbots.conf", key, value)?; + } + set(&mut files, "Core/configs/modules/playerbots.conf", "AiPlayerbot.Enabled", "0")?; Ok(files) } @@ -169,15 +205,15 @@ pub fn recover(root: &Path) -> Result<()> { Ok(()) } -fn create_databases(root: &Path) -> Result<()> { +fn create_databases(root: &Path, mode: Mode) -> Result<()> { crate::backup::with_database(root, |_| { let db = Db::from_repack(root, Account::Admin)?.for_realm(Mode::Coa); - if db.query("SELECT COUNT(*) FROM acore_auth.realmlist WHERE id=2;")? != "0" { - return Err(Error::Invalid("Realm ID 2 is already in use. Its settings were left intact.".into())); + if db.query(&format!("SELECT COUNT(*) FROM acore_auth.realmlist WHERE id={};", mode.realm_id()))? != "0" { + return Err(Error::Invalid(format!("Realm ID {} is already in use. Its settings were left intact.", mode.realm_id()))); } for kind in ["world", "characters"] { let source = Mode::Coa.schema(kind)?; - let dest = Mode::Wildcard.schema(kind)?; + let dest = mode.schema(kind)?; if db.schema_exists(dest)? { return Err(Error::Invalid(format!("Database {dest} already exists. It was left intact; inspect it before creating a realm."))); } @@ -185,7 +221,7 @@ fn create_databases(root: &Path) -> Result<()> { return Err(Error::Invalid("Realm creation does not support databases with routines, triggers or views.".into())); } } - for (kind, tables) in crate::schema_check::WILDCARD_TABLES { + for (kind, tables) in crate::schema_check::WILDCARD_TABLES.iter().filter(|_| mode == Mode::Wildcard) { let schema = crate::db::schema_of(kind)?; let present = db.tables(schema)?; let missing: Vec<_> = tables.iter().filter(|table| !present.iter().any(|p| p == **table)).copied().collect(); @@ -211,9 +247,11 @@ fn create_databases(root: &Path) -> Result<()> { if db.tables("acore_world")?.iter().any(|t| t == "coa_manager_migrations") { db.query(&format!("CREATE TABLE IF NOT EXISTS `{stage_world}`.coa_manager_migrations LIKE acore_world.coa_manager_migrations;"))?; } - db.query("CREATE DATABASE acore_world_wildcard CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; CREATE DATABASE acore_characters_wildcard CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")?; + let world = mode.schema("world")?; + let characters = mode.schema("characters")?; + db.query(&format!("CREATE DATABASE `{world}` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; CREATE DATABASE `{characters}` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"))?; let mut renames = Vec::new(); - for (stage, dest) in [(&stage_world, "acore_world_wildcard"), (&stage_chars, "acore_characters_wildcard")] { + for (stage, dest) in [(&stage_world, world), (&stage_chars, characters)] { for table in db.tables(stage)? { if !crate::db::valid_identifier(&table) { return Err(Error::Invalid("Unsupported table name.".into())); } renames.push(format!("`{stage}`.`{table}` TO `{dest}`.`{table}`")); @@ -223,7 +261,7 @@ fn create_databases(root: &Path) -> Result<()> { for host in db.query("SELECT host FROM mysql.user WHERE user='acore';")?.lines() { let host = hex::encode(host.as_bytes()); // Host names are trusted database data, but still quote them through a hex SQL literal. - db.query(&format!("SET @host=CONVERT(UNHEX('{host}') USING utf8mb4); SET @grant=CONCAT('GRANT ALL ON acore_world_wildcard.* TO ', QUOTE('acore'), '@', QUOTE(@host)); PREPARE realm_grant FROM @grant; EXECUTE realm_grant; DEALLOCATE PREPARE realm_grant; SET @grant=CONCAT('GRANT ALL ON acore_characters_wildcard.* TO ', QUOTE('acore'), '@', QUOTE(@host)); PREPARE realm_grant FROM @grant; EXECUTE realm_grant; DEALLOCATE PREPARE realm_grant;"))?; + db.query(&format!("SET @host=CONVERT(UNHEX('{host}') USING utf8mb4); SET @grant=CONCAT('GRANT ALL ON {world}.* TO ', QUOTE('acore'), '@', QUOTE(@host)); PREPARE realm_grant FROM @grant; EXECUTE realm_grant; DEALLOCATE PREPARE realm_grant; SET @grant=CONCAT('GRANT ALL ON {characters}.* TO ', QUOTE('acore'), '@', QUOTE(@host)); PREPARE realm_grant FROM @grant; EXECUTE realm_grant; DEALLOCATE PREPARE realm_grant;"))?; } db.query(&format!("DROP DATABASE `{stage_world}`; DROP DATABASE `{stage_chars}`;"))?; fs::remove_file(&dump)?; @@ -242,14 +280,22 @@ pub fn select(root: &Path, mode: Mode) -> Result { if mode == Mode::Wildcard && !view(root)?.supported { return Err(Error::Invalid("Update the server to a build with Wildcard support first.".into())); } + if mode == Mode::Reborn && !view(root)?.reborn_supported { + return Err(Error::Invalid("Update the server to a build with Warcraft Reborn support first.".into())); + } + if s.simultaneous && mode != s.active { + return Err(Error::Invalid("Disable simultaneous startup before switching realms.".into())); + } // Verify launcher support before creating databases or changing the selected realm. prepare_launcher(root)?; let before = configs(root)?; fsx::atomic_write_json(&snapshot(root, s.active), &before)?; - if mode == Mode::Wildcard && !s.wildcard_created { - fsx::atomic_write_json(&snapshot(root, mode), &wildcard_configs(before.clone())?)?; - create_databases(root)?; - s.wildcard_created = true; + if !s.created(mode) { + let base = if s.active == Mode::Coa { before.clone() } else { fsx::read_json(&snapshot(root, Mode::Coa))? }; + let files = match mode { Mode::Wildcard => wildcard_configs(base)?, Mode::Reborn => reborn_configs(base)?, Mode::Coa => unreachable!() }; + fsx::atomic_write_json(&snapshot(root, mode), &files)?; + create_databases(root, mode)?; + match mode { Mode::Wildcard => s.wildcard_created = true, Mode::Reborn => s.reborn_created = true, Mode::Coa => {} } fsx::atomic_write_json(&root.join(STATE), &s)?; } let target: Files = fsx::read_json(&snapshot(root, mode))?; @@ -305,25 +351,48 @@ const LAUNCHER_REALM_REPLACEMENTS: &[(&str, &str)] = &[ const LAUNCHER_REALM_INSERT: &str = "# coa-manager-realm-profiles-v1\ndef coa_realm():\n path = ROOT / 'Settings/realm-profile.json'\n return json.loads(path.read_text(encoding='utf-8')).get('active', 'coa') if path.exists() else 'coa'\n\ndef coa_realm_id():\n return 2 if coa_realm() == 'wildcard' else 1\n\ndef coa_realm_name():\n return 'Wildcard' if coa_realm() == 'wildcard' else 'Conquest of Azeroth'\n\n"; +fn launcher_insert() -> String { + LAUNCHER_REALM_INSERT.replace("profiles-v1", "profiles-v2") + .replace("return 2 if", "return 3 if coa_realm() == 'reborn' else 2 if") + .replace("return 'Wildcard' if", "return 'Warcraft Reborn' if coa_realm() == 'reborn' else 'Wildcard' if") +} + +fn launcher_replacements() -> Vec<(&'static str, String)> { + LAUNCHER_REALM_REPLACEMENTS.iter().map(|(from, to)| (*from, to + .replace("\"acore_world_wildcard\" if", "\"acore_world_reborn\" if coa_realm() == 'reborn' else \"acore_world_wildcard\" if") + .replace("\"acore_characters_wildcard\" if", "\"acore_characters_reborn\" if coa_realm() == 'reborn' else \"acore_characters_wildcard\" if"))).collect() +} + pub(crate) fn patch_launcher(source: &str) -> Result { - if source.contains("# coa-manager-realm-profiles-v1") { return Ok(source.into()); } + if source.contains("# coa-manager-realm-profiles-v2") { return Ok(source.into()); } + if source.contains("# coa-manager-realm-profiles-v1") { + let original = unpatch_launcher(source).ok_or_else(|| Error::Invalid("Unrecognised realm launcher patch.".into()))?; + return patch_launcher(&original); + } let mut out = source.to_string(); - for &(from, to) in LAUNCHER_REALM_REPLACEMENTS { + for (from, to) in launcher_replacements() { if !out.contains(from) { return Err(Error::Invalid("This launcher does not support realm profiles. Update the server package first.".into())); } - out = out.replace(from, to); + out = out.replace(from, &to); } // Insert before the entry point so ROOT, json and functions are all defined when called. let marker = "if __name__ == \"__main__\":"; if !out.contains(marker) { return Err(Error::Invalid("Unrecognised server launcher entry point.".into())); } - Ok(out.replace(marker, &format!("{LAUNCHER_REALM_INSERT}{marker}"))) + Ok(out.replace(marker, &format!("{}{marker}", launcher_insert()))) } /// Reverse only our exact realm transformation; callers must verify the recovered original hash. pub(crate) fn unpatch_launcher(source: &str) -> Option { - if !source.contains(LAUNCHER_REALM_INSERT) { return None; } - let mut original = source.replacen(LAUNCHER_REALM_INSERT, "", 1); - for &(from, to) in LAUNCHER_REALM_REPLACEMENTS { original = original.replace(to, from); } - patch_launcher(&original).ok().filter(|patched| patched == source).map(|_| original) + let (insert, replacements) = if source.contains(&launcher_insert()) { + (launcher_insert(), launcher_replacements()) + } else if source.contains(LAUNCHER_REALM_INSERT) { + (LAUNCHER_REALM_INSERT.into(), LAUNCHER_REALM_REPLACEMENTS.iter().map(|(a,b)| (*a, b.to_string())).collect()) + } else { return None; }; + let mut original = source.replacen(&insert, "", 1); + for (from, to) in &replacements { original = original.replace(to, from); } + let mut check = original.clone(); + for (from, to) in &replacements { check = check.replace(from, to); } + check = check.replace("if __name__ == \"__main__\":", &format!("{insert}if __name__ == \"__main__\":")); + (check == source).then_some(original) } pub fn before_start(root: &Path) -> Result<()> { @@ -332,23 +401,36 @@ pub fn before_start(root: &Path) -> Result<()> { if !root.join(STATE).exists() { return Ok(()); } prepare_launcher(root)?; if s.simultaneous && !view(root)?.supported { return Err(Error::Invalid("The installed server build does not support simultaneous Wildcard startup.".into())); } + if s.simultaneous && s.active == Mode::Reborn { return Err(Error::Invalid("Simultaneous startup supports CoA and Wildcard only.".into())); } if s.simultaneous { fsx::atomic_write_json(&snapshot(root, s.active), &configs(root)?)?; } - if s.active == Mode::Wildcard { - if !view(root)?.supported { return Err(Error::Invalid("The installed server build does not support Wildcard.".into())); } + if s.active == Mode::Reborn && !view(root)?.reborn_supported { return Err(Error::Invalid("The installed server build does not support Warcraft Reborn.".into())); } + if s.active != Mode::Coa { + if s.active == Mode::Wildcard && !view(root)?.supported { return Err(Error::Invalid("The installed server build does not support Wildcard.".into())); } let path = root.join("Core/configs/modules/mod_coa_playerbots.conf"); let mut conf = ConfFile::parse_bytes(&fs::read(&path)?)?; conf.set("CoaBots.Enable", "0", &[]); fsx::atomic_write(&path, conf.to_text().as_bytes())?; + let path = root.join("Core/configs/modules/playerbots.conf"); + let bytes = if path.exists() { fs::read(&path)? } else { b"[worldserver]\n".to_vec() }; + let mut conf = ConfFile::parse_bytes(&bytes)?; + conf.set("AiPlayerbot.Enabled", "0", &[]); + fsx::atomic_write(&path, conf.to_text().as_bytes())?; } Ok(()) } pub fn setup_realmlist(root: &Path) -> Result<()> { let s = state(root)?; - if !root.join(STATE).exists() || !s.wildcard_created { return Ok(()); } - let db = Db::from_repack(root, Account::Admin)?; + if !root.join(STATE).exists() { return Ok(()); } + let db = Db::from_repack(root, Account::Admin)?.for_realm(Mode::Coa); let port = layout::read_ports(root).world; - db.query(&format!("INSERT INTO acore_auth.realmlist (id,name,address,localAddress,localSubnetMask,port,icon,flag,timezone,gamebuild) SELECT 2,'Wildcard',address,localAddress,localSubnetMask,{port},icon,2,timezone,gamebuild FROM acore_auth.realmlist WHERE id=1 ON DUPLICATE KEY UPDATE port={port}; UPDATE acore_auth.realmlist SET flag=2 WHERE id IN (1,2) AND id<>{};", s.active.realm_id()))?; + for mode in s.modes().into_iter().filter(|m| *m != Mode::Coa) { + let id = mode.realm_id(); + let name = mode.label(); + db.query(&format!("INSERT INTO acore_auth.realmlist (id,name,address,localAddress,localSubnetMask,port,icon,flag,timezone,gamebuild) SELECT {id},'{name}',address,localAddress,localSubnetMask,{port},icon,2,timezone,gamebuild FROM acore_auth.realmlist WHERE id=1 ON DUPLICATE KEY UPDATE port={port};"))?; + } + let ids = s.modes().iter().map(|m| m.realm_id().to_string()).collect::>().join(","); + db.query(&format!("UPDATE acore_auth.realmlist SET flag=2 WHERE id IN ({ids}) AND id<>{};", s.active.realm_id()))?; if s.simultaneous { let second = s.secondary_world_port.ok_or_else(|| Error::Invalid("Second realm port is missing.".into()))?; let (coa, wildcard) = if s.active == Mode::Coa { (port, second) } else { (second, port) }; @@ -361,6 +443,66 @@ pub fn setup_realmlist(root: &Path) -> Result<()> { mod tests { use super::*; + #[test] + fn legacy_states_and_all_created_realms_are_enumerated_once() { + let legacy: RealmState = serde_json::from_str(r#"{"active":"wildcard","wildcard_created":true}"#).unwrap(); + assert!(!legacy.reborn_created); + assert_eq!(legacy.modes(), [Mode::Wildcard, Mode::Coa]); + let all = RealmState { active: Mode::Reborn, wildcard_created: true, reborn_created: true, ..Default::default() }; + assert_eq!(all.modes(), [Mode::Reborn, Mode::Coa, Mode::Wildcard]); + assert_eq!(serde_json::to_string(&Mode::Reborn).unwrap(), "\"reborn\""); + assert_eq!(Mode::Reborn.realm_id(), 3); + assert_eq!(Mode::Reborn.schema("auth").unwrap(), "acore_auth"); + } + + #[test] + fn reborn_has_its_own_settings_and_restores_the_coa_profile() { + let t = tempfile::tempdir().unwrap(); + let mut coa = Files::new(); + coa.insert("Core/configs/modules/coa.conf".into(), b"[worldserver]\nCoA.ClassModel = coa\nCoA.GameModeMask = 0\n".to_vec()); + coa.insert("Settings/worldserver.conf.template".into(), b"[worldserver]\nRealmID = 1\n".to_vec()); + coa.insert("Core/configs/modules/playerbots.conf".into(), b"[worldserver]\nAiPlayerbot.Enabled = 1\n".to_vec()); + let reborn = reborn_configs(coa.clone()).unwrap(); + let conf = ConfFile::parse_bytes(&reborn["Core/configs/modules/coa.conf"]).unwrap(); + assert_eq!(conf.get("CoA.ClassModel"), Some("\"wcr\"")); + assert_eq!(conf.get("CoA.GameModeMask"), Some("0")); + assert_eq!(ConfFile::parse_bytes(&reborn["Settings/worldserver.conf.template"]).unwrap().get("RealmID"), Some("3")); + assert_eq!(ConfFile::parse_bytes(&reborn["Core/configs/modules/playerbots.conf"]).unwrap().get("AiPlayerbot.Enabled"), Some("0")); + write_configs(t.path(), &reborn).unwrap(); + write_configs(t.path(), &coa).unwrap(); + assert_eq!(configs(t.path()).unwrap(), coa); + fsx::atomic_write_json(&t.path().join(STATE), &RealmState { active: Mode::Reborn, reborn_created: true, ..Default::default() }).unwrap(); + assert!(guard_module(t.path(), "companions").is_err()); + assert!(guard_module(t.path(), "playerbots").is_err()); + assert!(guard_module(t.path(), "content-scaling").is_ok()); + } + + #[test] + fn reborn_support_requires_the_new_code_in_the_installed_binary() { + let t = tempfile::tempdir().unwrap(); + fsx::atomic_write(&t.path().join("Core/worldserver.exe"), b"Wildcard synergy settings").unwrap(); + assert!(!view(t.path()).unwrap().reborn_supported); + fsx::atomic_write(&t.path().join("Core/worldserver.exe"), b"Warcraft Reborn class spells are unavailable").unwrap(); + let v = view(t.path()).unwrap(); + assert!(v.reborn_supported); + assert!(!v.supported); + } + + #[test] + fn old_launcher_upgrades_and_both_patch_versions_are_reversible() { + let original = "(\"WorldDatabaseInfo\", \"acore_world\")\n(\"CharacterDatabaseInfo\", \"acore_characters\")\nSET name='AzerothCore',address=\nWHERE id=1;\nmysql(\"UPDATE acore_auth.realmlist SET flag=0\nif __name__ == \"__main__\":\n"; + let mut old = original.to_string(); + for (from, to) in LAUNCHER_REALM_REPLACEMENTS { old = old.replace(from, to); } + old = old.replace("if __name__ == \"__main__\":", &format!("{LAUNCHER_REALM_INSERT}if __name__ == \"__main__\":")); + assert_eq!(unpatch_launcher(&old).as_deref(), Some(original)); + let new = patch_launcher(&old).unwrap(); + assert!(new.contains("acore_world_reborn")); + assert!(new.contains("return 3 if coa_realm() == 'reborn'")); + assert!(new.contains("return 'Warcraft Reborn' if")); + assert_eq!(patch_launcher(&new).unwrap(), new); + assert_eq!(unpatch_launcher(&new).as_deref(), Some(original)); + } + #[test] fn a_docker_server_is_checked_for_wildcard_support_in_its_own_binary() { let d = tempfile::tempdir().unwrap(); diff --git a/crates/coa-core/src/repair.rs b/crates/coa-core/src/repair.rs index 7c92dff..6bd1de3 100644 --- a/crates/coa-core/src/repair.rs +++ b/crates/coa-core/src/repair.rs @@ -24,8 +24,7 @@ pub fn check(root: &Path, dir: &Path) -> Result> { let (_, meta) = MetaDir::open(dir)?; let m = installed_manifest(&meta, dir)?; let checks = crate::backup::with_database(root, |db| { - let mut modes = vec![crate::realms::Mode::Coa]; - if crate::realms::state(root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); } + let modes = crate::realms::state(root)?.modes(); let mut checks = Vec::new(); for mode in modes { let db = db.clone().for_realm(mode); diff --git a/crates/coa-core/src/update.rs b/crates/coa-core/src/update.rs index 29e94ba..ba32429 100644 --- a/crates/coa-core/src/update.rs +++ b/crates/coa-core/src/update.rs @@ -894,8 +894,7 @@ impl RepackEnv<'_> { if manifest.migrations.is_empty() { return Ok(Some(0)); } let count = |db: &crate::db::Db| -> Result { let realms = crate::realms::state(self.root)?; - let mut modes = vec![realms.active]; - if realms.wildcard_created { modes.push(if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa }); } + let modes = realms.modes(); let mut count = 0; for (index, mode) in modes.into_iter().enumerate() { let list: Vec<_> = manifest.migrations.iter().filter(|m| index == 0 || !crate::migrations::shared_auth(&m.db)).cloned().collect(); @@ -976,8 +975,7 @@ impl Env for RepackEnv<'_> { } } crate::backup::with_database(self.root, |db| { - let mut modes = vec![crate::realms::Mode::Coa]; - if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); } + let modes = crate::realms::state(self.root)?.modes(); for mode in modes { if let Some(problem) = crate::schema_check::check_with_report(&db.clone().for_realm(mode), self.root)?.first() { if crate::docker::is_docker(self.root) { @@ -1065,8 +1063,7 @@ impl RepackEnv<'_> { use crate::process::{observe, ServiceState}; let identities = crate::backup::with_database(self.root, |db| { if check_schema { - let mut modes = vec![crate::realms::Mode::Coa]; - if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); } + let modes = crate::realms::state(self.root)?.modes(); for mode in modes { if let Some(p) = crate::schema_check::check_with_report(&db.clone().for_realm(mode), self.root)?.first() { return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", mode.name(), p.database, p.table, p.detail))); @@ -1131,10 +1128,7 @@ impl RepackEnv<'_> { /// One migration pass for both realms, with shared history checks and one recovery point. fn migrate_databases(db: &crate::db::Db, root: &Path, manifest: &Manifest, staged: &Path, snapshot: &dyn Fn() -> Result) -> Result { let realms = crate::realms::state(root)?; - let mut modes = vec![realms.active]; - if realms.wildcard_created { - modes.push(if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa }); - } + let modes = realms.modes(); // Reject a broken history in either realm before changing the first one. for (index, mode) in modes.iter().enumerate() { let list: Vec<_> = manifest.migrations.iter().filter(|m| index == 0 || !crate::migrations::shared_auth(&m.db)).cloned().collect(); @@ -1168,6 +1162,7 @@ fn database_identities(db: &crate::db::Db) -> Result = FILES.iter().map(|p| fs::read(root.join(p)).ok()).collect(); begin(&root, &meta).unwrap(); assert!(crate::update::ensure_recovered(&meta).is_err()); @@ -106,6 +108,7 @@ mod tests { let config = ConfFile::parse_bytes(&fs::read(root.join(FILES[2])).unwrap()).unwrap(); assert_eq!(config.get("BindIP"), Some("\"127.0.0.1\"")); fsx::atomic_write(&root.join(FILES[4]), b"rendered temporary configuration").unwrap(); + fsx::atomic_write(&root.join("Settings/realm-profiles/reborn.json"), b"temporary reborn profile").unwrap(); restore(&root, &meta).unwrap(); for (rel, bytes) in FILES.iter().zip(original) { assert_eq!(fs::read(root.join(rel)).ok(), bytes); } assert!(!pending(&meta)); @@ -141,7 +144,11 @@ pub(crate) fn restore(root: &Path, meta: &Path) -> Result<()> { if !pending(meta) { return Ok(()); } let journal = meta.join("validation-configs.json"); let saved: BTreeMap = fsx::read_json(&journal)?; - if saved.len() != FILES.len() || FILES.iter().any(|rel| !saved.contains_key(*rel)) { + // Previous managers could journal only the first two profiles. Recover those + // journals too, while continuing to reject missing or unknown legacy entries. + let legacy = saved.len() == FILES.len() - 1 && !saved.contains_key("Settings/realm-profiles/reborn.json"); + let required = if legacy { &FILES[..FILES.len() - 1] } else { FILES }; + if saved.len() != required.len() || required.iter().any(|rel| !saved.contains_key(*rel)) { return Err(Error::Invalid("Isolated validation configuration journal is incomplete.".into())); } for (rel, file) in &saved { diff --git a/docs/WARCRAFT-REBORN.md b/docs/WARCRAFT-REBORN.md new file mode 100644 index 0000000..bbb258a --- /dev/null +++ b/docs/WARCRAFT-REBORN.md @@ -0,0 +1,32 @@ +# Warcraft Reborn + +Choose **Warcraft Reborn** on Overview to create or switch to this realm. The +installed worldserver must contain Warcraft Reborn support; an old build is +refused before any databases are created. Stop the client before switching to +have its saved realm updated immediately. + +The profile uses `CoA.ClassModel = "wcr"`, game-mode mask `0`, live realm type, +and realm ID `3`. Accounts remain in the shared `acore_auth` database. World data +is initially copied from CoA into `acore_world_reborn`; the structure of +`acore_characters` is cloned into `acore_characters_reborn` without copying +players. Existing database names or realm ID 3 block creation. + +Settings are stored in `Settings/realm-profiles/reborn.json`. Creating a profile +from Wildcard uses the saved CoA settings as its base, preventing inheritance of +Wildcard gameplay flags. Both bot systems are disabled and cannot be enabled +through this profile; their class mechanics have not been validated. Other +optional modules are marked experimental. + +Backups, updates and database checks include every created realm. Restore keeps +using the realm recorded in the recovery point. The Windows launcher is upgraded +from the Manager's previous two-realm patch and routes Warcraft Reborn to its +own databases. Docker uses the same realm schema mapping. + +Simultaneous startup continues to support CoA + Wildcard only. Disable that +option before switching to Warcraft Reborn; it cannot be enabled while Warcraft +Reborn is selected. + +Automated checks cover profile configuration and restoration, old state files, +binary support detection, database routing, all-realm enumeration, client realm +selection, and upgrading/reversing the launcher patch. These checks do not +constitute a gameplay validation of Warcraft Reborn or optional modules. diff --git a/src/dev/mock.ts b/src/dev/mock.ts index 1b1159b..5806768 100644 --- a/src/dev/mock.ts +++ b/src/dev/mock.ts @@ -8,7 +8,7 @@ export {}; (() => { let added = new URLSearchParams(location.search).has("demo"), running = false; - let realm: "coa" | "wildcard" = "coa", wildcardCreated = false; + let realm: "coa" | "wildcard" | "reborn" = "coa", wildcardCreated = false, rebornCreated = false; let simultaneous = false; let remoteHost = localStorage.getItem("demo-remote-host") ?? ""; const moduleEdits: Record> = {}; @@ -26,11 +26,11 @@ export {}; (window as any).__TAURI_INTERNALS__ = { transformCallback: (cb: unknown)=>cb, unregisterCallback(){}, convertFileSrc:(x: unknown)=>x, invoke: async (cmd: string, args?: any)=>{ - if(cmd==="realm_profiles") return {active:realm,wildcard_created:wildcardCreated,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running}; - if(cmd==="realm_simultaneous") { if(running) throw new Error("Stop both realms before changing simultaneous startup."); simultaneous=args.enabled; wildcardCreated ||= simultaneous; return {active:realm,wildcard_created:wildcardCreated,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false}; } + if(cmd==="realm_profiles") return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running}; + if(cmd==="realm_simultaneous") { if(running) throw new Error("Stop both realms before changing simultaneous startup."); simultaneous=args.enabled; wildcardCreated ||= simultaneous; return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false}; } if(cmd==="check_database") return [{realm, migrations:[],problems:[],full_schema:false}]; if(cmd==="repair_server") { if(running) throw new Error("Stop the server before repairing it."); return {restored:[],applied:[],backup:"demo-before-repair",database:[{realm,migrations:[],problems:[],full_schema:false}],error:null}; } - if(cmd==="realm_select"){await new Promise(r=>setTimeout(r,600));realm=args.mode;wildcardCreated ||= realm==="wildcard";modState.companions=realm==="coa";return {active:realm,wildcard_created:wildcardCreated,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running};} + if(cmd==="realm_select"){await new Promise(r=>setTimeout(r,600));realm=args.mode;rebornCreated ||= realm==="reborn";wildcardCreated ||= realm==="wildcard";modState.companions=realm==="coa";return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running};} if(cmd==="remote_connection") return {host:remoteHost,client_path:null}; if(cmd==="remote_connect") { remoteHost=args.host.trim(); localStorage.setItem("demo-remote-host",remoteHost); return {host:remoteHost,client_path:null}; } if(cmd==="play") return {ok:true,exit_code:null,code:null,human:null,output:""}; @@ -69,7 +69,7 @@ export {}; if(cmd==="realmlist_save"){const w=window as any;const rl=w.__rl;if(args.profileId){const p=rl.profiles.find((x: any)=>x.id===args.profileId);p.name=args.name;p.data=args.data;return p;}if(rl.profiles.some((x: any)=>x.name.toLowerCase()===String(args.name).toLowerCase()))throw {human:{code:"unknown",title:"",message:"",actions:[]},technical:"A realmlist with that name already exists."};const p={id:String(args.name).toLowerCase().replace(/[^a-z0-9]+/g,"-"),name:args.name,data:(/\s/.test(args.data.trim())?args.data.trim():"set realmlist "+args.data.trim())+"\r\n"};rl.profiles.push(p);return p;} if(cmd==="realmlist_delete"){const rl=(window as any).__rl;rl.profiles=rl.profiles.filter((x: any)=>x.id!==args.profileId);return null;} if(cmd==="account_delete") return null; - if(cmd==="modules_list") return [{id:"companions",name:"CoA Companions",description:{en:"Companion bots for groups, dungeons and your guild.",ru:"Боты-компаньоны для групп, подземелий и гильдии."},repo:"https://github.com/Corfirean/mod-coa-playerbots",installed:true,enabled:modState["companions"],switchable:true,status:"beta",icon:"bot",page:"bots"},{id:"content-scaling",name:"Content Scaling",description:{en:"Scales dungeons and raids to your group, with solo modes.",ru:"Подстраивает подземелья и рейды под вашу группу, есть соло-режимы."},repo:"https://github.com/Corfirean/mod-coa-content-scaling",installed:true,enabled:modState["content-scaling"],switchable:true,status:"early",icon:"scaling",page:null},{id:"tbc-content",name:"TBC Content",description:{en:"Outland dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Запределья, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-tbc-content",installed:true,enabled:modState["tbc-content"],switchable:true,status:"early",icon:"tbc",page:null},{id:"wotlk-content",name:"WotLK Content",description:{en:"Northrend dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Нордскола, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-wotlk-content",installed:true,enabled:modState["wotlk-content"],switchable:true,status:"early",icon:"wotlk",page:null},{id:"ah-bot",name:"Auction House Bot",description:{en:"Fills the auction house with realistic, adjustable listings.",ru:"Наполняет аукцион реалистичными настраиваемыми лотами."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["ah-bot"] ?? false,switchable:true,status:"early",icon:"gavel",page:null,hidden:false},{id:"npc-enchanter",name:"NPC Enchanter",description:{en:"An NPC that enchants your gear for you.",ru:"НПС, который зачаровывает ваше снаряжение."},repo:"https://github.com/azerothcore/mod-npc-enchanter",installed:true,enabled:modState["npc-enchanter"],switchable:true,status:"early",icon:"sparkles",page:null,hidden:false},{id:"playerbots",name:"SQUID's Playerbots",description:{en:"An alternative bot system with random bots and full AI.",ru:"Альтернативная система ботов со случайными ботами и полным ИИ."},repo:"https://github.com/Zyth45/mod-playerbots",installed:true,enabled:modState["playerbots"] ?? false,switchable:true,status:"early",icon:"swords",page:"bots",hidden:false},{id:"client-compat",name:"Client compatibility",description:{en:"Client-server link and appearance unlocks.",ru:"Связь клиента с сервером и разблокировка внешних видов."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["client-compat"],switchable:false,status:"release",icon:"plug",page:null,hidden:true}].map(m => ({...m, has_settings: !["tbc-content", "wotlk-content"].includes(m.id), compatibility: realm === "wildcard" ? (["companions", "playerbots"].includes(m.id) ? "unsupported" : m.id === "client-compat" ? "compatible" : "experimental") : "compatible", switchable: realm === "wildcard" && ["companions", "playerbots"].includes(m.id) ? false : m.switchable})); + if(cmd==="modules_list") return [{id:"companions",name:"CoA Companions",description:{en:"Companion bots for groups, dungeons and your guild.",ru:"Боты-компаньоны для групп, подземелий и гильдии."},repo:"https://github.com/Corfirean/mod-coa-playerbots",installed:true,enabled:modState["companions"],switchable:true,status:"beta",icon:"bot",page:"bots"},{id:"content-scaling",name:"Content Scaling",description:{en:"Scales dungeons and raids to your group, with solo modes.",ru:"Подстраивает подземелья и рейды под вашу группу, есть соло-режимы."},repo:"https://github.com/Corfirean/mod-coa-content-scaling",installed:true,enabled:modState["content-scaling"],switchable:true,status:"early",icon:"scaling",page:null},{id:"tbc-content",name:"TBC Content",description:{en:"Outland dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Запределья, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-tbc-content",installed:true,enabled:modState["tbc-content"],switchable:true,status:"early",icon:"tbc",page:null},{id:"wotlk-content",name:"WotLK Content",description:{en:"Northrend dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Нордскола, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-wotlk-content",installed:true,enabled:modState["wotlk-content"],switchable:true,status:"early",icon:"wotlk",page:null},{id:"ah-bot",name:"Auction House Bot",description:{en:"Fills the auction house with realistic, adjustable listings.",ru:"Наполняет аукцион реалистичными настраиваемыми лотами."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["ah-bot"] ?? false,switchable:true,status:"early",icon:"gavel",page:null,hidden:false},{id:"npc-enchanter",name:"NPC Enchanter",description:{en:"An NPC that enchants your gear for you.",ru:"НПС, который зачаровывает ваше снаряжение."},repo:"https://github.com/azerothcore/mod-npc-enchanter",installed:true,enabled:modState["npc-enchanter"],switchable:true,status:"early",icon:"sparkles",page:null,hidden:false},{id:"playerbots",name:"SQUID's Playerbots",description:{en:"An alternative bot system with random bots and full AI.",ru:"Альтернативная система ботов со случайными ботами и полным ИИ."},repo:"https://github.com/Zyth45/mod-playerbots",installed:true,enabled:modState["playerbots"] ?? false,switchable:true,status:"early",icon:"swords",page:"bots",hidden:false},{id:"client-compat",name:"Client compatibility",description:{en:"Client-server link and appearance unlocks.",ru:"Связь клиента с сервером и разблокировка внешних видов."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["client-compat"],switchable:false,status:"release",icon:"plug",page:null,hidden:true}].map(m => ({...m, has_settings: !["tbc-content", "wotlk-content"].includes(m.id), compatibility: realm !== "coa" ? (["companions", "playerbots"].includes(m.id) ? "unsupported" : m.id === "client-compat" ? "compatible" : "experimental") : "compatible", switchable: realm !== "coa" && ["companions", "playerbots"].includes(m.id) ? false : m.switchable})); if(cmd==="module_set_enabled"){ if(args.enabled && ["companions","playerbots"].includes(args.module) && modState[args.module === "companions" ? "playerbots" : "companions"]) throw {human:{code:"bot_modules_conflict",title:"",message:"",actions:[]},technical:"Only one bot system may be enabled."}; modState[args.module]=args.enabled; return null; } if(cmd==="all_settings") return [{key:"Visibility.Distance.Continents",value:"100",default:"90",doc:"Description: Visibility distance on continents. Range: 45-250 Default: 90",changed:true},{key:"Death.SicknessLevel",value:"11",default:"11",doc:"Description: Character level up to which characters get resurrection sickness. Default: 11",changed:false},{key:"Rate.Drop.Item.Epic",value:"3",default:"1",doc:"Description: Drop rates for money and items based on quality. Default: 1",changed:true},{key:"Instance.ResetTimeHour",value:"4",default:"4",doc:"Description: Hour of the day when the global instance reset occurs. Range: 0-23 Default: 4 - (04:00 AM)",changed:false},{key:"PlayerLimit",value:"1000",default:"1000",doc:"Description: Maximum number of players in the world.",changed:false}]; if(cmd==="all_settings_save") return Object.keys(args&&args.changes||{}); diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts index cff440f..16b1068 100644 --- a/src/i18n/locales/de.ts +++ b/src/i18n/locales/de.ts @@ -730,6 +730,9 @@ const de: Partial> = { // Realmlist switcher and modules page "realm.profileLabel": "Realm", "realm.switching": "Realm wird gewechselt…", + "realm.rebornCreate": "Warcraft-Reborn-Realm erstellen", + "realm.rebornModules": "Die Klassenmechaniken der Bots sind für Warcraft Reborn noch nicht geprüft. Andere Module bleiben experimentell.", + "realm.rebornUpdate": "Aktualisiere den Server auf eine Version mit Warcraft-Reborn-Unterstützung.", "realm.create": "Wildcard-Realm erstellen", "realm.restart": "Wechseln und neu starten", "realm.select": "Realm auswählen", @@ -738,8 +741,8 @@ const de: Partial> = { "realm.modules": "CoA-Begleiter sind hier nicht verfügbar. Content Scaling und andere Module sind auf Wildcard experimentell.", "realm.update": "Aktualisiere den Server auf eine Version mit Wildcard-Unterstützung, um diesen Realm zu erstellen.", "realm.recovery": "Ein Realm-Wechsel wurde unterbrochen. Wähle einen Realm, um die gespeicherte Konfiguration wiederherzustellen.", - "realm.unsupported": "Auf Wildcard nicht verfügbar: Die Klassenmechanik wurde noch nicht geprüft.", - "realm.experimental": "Experimentell auf Wildcard · Spielkompatibilität noch nicht geprüft.", + "realm.unsupported": "Auf Wildcard / Warcraft Reborn nicht verfügbar: Die Klassenmechanik wurde noch nicht geprüft.", + "realm.experimental": "Experimentell auf Wildcard / Warcraft Reborn · Spielkompatibilität noch nicht geprüft.", "realm.label": "Realm", "realm.other": "Anderer", "realm.add": "Realmlist hinzufügen …", diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts index cd158eb..b69fa40 100644 --- a/src/i18n/locales/en.ts +++ b/src/i18n/locales/en.ts @@ -38,6 +38,9 @@ const en = { "repair.limited": "This older package has no full schema contract. Only character-save columns and starting data are checked.", "repair.unresolved": "Database problems remain. Repair does not replay already applied SQL or invent column changes. Export diagnostics with the listed problems for a corrective server update.", "realm.switching": "Switching realm…", + "realm.rebornCreate": "Create Warcraft Reborn realm", + "realm.rebornModules": "Bot class mechanics are not yet validated for Warcraft Reborn. Other modules remain experimental.", + "realm.rebornUpdate": "Update the server to a build with Warcraft Reborn support to create this realm.", "realm.create": "Create Wildcard realm", "realm.restart": "Switch and restart", "realm.select": "Select realm", @@ -46,8 +49,8 @@ const en = { "realm.modules": "CoA companions are unavailable here. Content Scaling and other modules remain experimental on Wildcard.", "realm.update": "Update the server to a build with Wildcard support to create this realm.", "realm.recovery": "A realm switch was interrupted. Select a realm to recover the saved configuration.", - "realm.unsupported": "Unavailable on Wildcard: class mechanics have not been validated.", - "realm.experimental": "Experimental on Wildcard · gameplay compatibility is not yet verified.", + "realm.unsupported": "Unavailable on Wildcard / Warcraft Reborn: class mechanics have not been validated.", + "realm.experimental": "Experimental on Wildcard / Warcraft Reborn · gameplay compatibility is not yet verified.", "app.name": "CoA Server Manager", "nav.overview": "Overview", diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts index 00ce747..2ad9dc1 100644 --- a/src/i18n/locales/es.ts +++ b/src/i18n/locales/es.ts @@ -730,6 +730,9 @@ const es: Partial> = { // Realmlist switcher and modules page "realm.profileLabel": "Reino", "realm.switching": "Cambiando de reino…", + "realm.rebornCreate": "Crear reino Warcraft Reborn", + "realm.rebornModules": "Las mecánicas de clase de los bots aún no se han validado en Warcraft Reborn. Los demás módulos siguen siendo experimentales.", + "realm.rebornUpdate": "Actualiza el servidor a una versión compatible con Warcraft Reborn.", "realm.create": "Crear reino Wildcard", "realm.restart": "Cambiar y reiniciar", "realm.select": "Seleccionar reino", @@ -738,8 +741,8 @@ const es: Partial> = { "realm.modules": "Los compañeros de CoA no están disponibles aquí. Content Scaling y los demás módulos siguen siendo experimentales en Wildcard.", "realm.update": "Actualiza el servidor a una versión compatible con Wildcard para crear este reino.", "realm.recovery": "Se interrumpió un cambio de reino. Selecciona un reino para recuperar la configuración guardada.", - "realm.unsupported": "No disponible en Wildcard: las mecánicas de clase aún no se han validado.", - "realm.experimental": "Experimental en Wildcard · compatibilidad en juego sin verificar.", + "realm.unsupported": "No disponible en Wildcard / Warcraft Reborn: las mecánicas de clase aún no se han validado.", + "realm.experimental": "Experimental en Wildcard / Warcraft Reborn · compatibilidad en juego sin verificar.", "realm.label": "Reino", "realm.other": "Otro", "realm.add": "Añadir una realmlist…", diff --git a/src/i18n/locales/fr.ts b/src/i18n/locales/fr.ts index 6ba40c9..c6d77c5 100644 --- a/src/i18n/locales/fr.ts +++ b/src/i18n/locales/fr.ts @@ -730,6 +730,9 @@ const fr: Partial> = { // Realmlist switcher and modules page "realm.profileLabel": "Royaume", "realm.switching": "Changement de royaume…", + "realm.rebornCreate": "Créer le royaume Warcraft Reborn", + "realm.rebornModules": "Les mécaniques de classe des bots ne sont pas encore validées sur Warcraft Reborn. Les autres modules restent expérimentaux.", + "realm.rebornUpdate": "Mettez le serveur à jour vers une version compatible avec Warcraft Reborn.", "realm.create": "Créer le royaume Wildcard", "realm.restart": "Changer et redémarrer", "realm.select": "Choisir le royaume", @@ -738,8 +741,8 @@ const fr: Partial> = { "realm.modules": "Les compagnons CoA sont indisponibles ici. Content Scaling et les autres modules restent expérimentaux sur Wildcard.", "realm.update": "Mettez le serveur à jour vers une version compatible avec Wildcard pour créer ce royaume.", "realm.recovery": "Un changement de royaume a été interrompu. Choisissez un royaume pour restaurer la configuration enregistrée.", - "realm.unsupported": "Indisponible sur Wildcard : les mécaniques de classe ne sont pas encore validées.", - "realm.experimental": "Expérimental sur Wildcard · compatibilité en jeu non vérifiée.", + "realm.unsupported": "Indisponible sur Wildcard / Warcraft Reborn : les mécaniques de classe ne sont pas encore validées.", + "realm.experimental": "Expérimental sur Wildcard / Warcraft Reborn · compatibilité en jeu non vérifiée.", "realm.label": "Royaume", "realm.other": "Autre", "realm.add": "Ajouter une realmlist…", diff --git a/src/i18n/locales/ru.ts b/src/i18n/locales/ru.ts index 3b8d2b4..72a2ecf 100644 --- a/src/i18n/locales/ru.ts +++ b/src/i18n/locales/ru.ts @@ -40,6 +40,9 @@ const ru: Partial> = { "repair.limited": "В старом пакете нет полного описания схемы. Проверяются только колонки сохранения персонажей и стартовые данные.", "repair.unresolved": "Проблемы БД остались. Repair не повторяет уже применённые SQL и не добавляет колонки наугад. Экспортируйте диагностику с этим списком для исправляющего обновления сервера.", "realm.switching": "Переключение реалма…", + "realm.rebornCreate": "Создать реалм Warcraft Reborn", + "realm.rebornModules": "Классовые механики ботов пока не проверены в Warcraft Reborn. Остальные модули экспериментальны.", + "realm.rebornUpdate": "Для создания реалма обновите сервер до сборки с поддержкой Warcraft Reborn.", "realm.create": "Создать реалм Wildcard", "realm.restart": "Переключить и перезапустить", "realm.select": "Выбрать реалм", @@ -48,8 +51,8 @@ const ru: Partial> = { "realm.modules": "CoA-боты здесь недоступны. Скалирование и другие модули пока экспериментальны для Wildcard.", "realm.update": "Для создания реалма обновите сервер до сборки с поддержкой Wildcard.", "realm.recovery": "Переключение прервалось. Выберите реалм, чтобы восстановить сохранённые настройки.", - "realm.unsupported": "Недоступен в Wildcard: классовые механики ещё не проверены.", - "realm.experimental": "Экспериментально в Wildcard · игровая совместимость пока не проверена.", + "realm.unsupported": "Недоступен в Wildcard / Warcraft Reborn: классовые механики ещё не проверены.", + "realm.experimental": "Экспериментально в Wildcard / Warcraft Reborn · игровая совместимость пока не проверена.", "nav.overview": "Обзор", "nav.bots": "Боты", "nav.server": "Сервер", diff --git a/src/i18n/locales/zh.ts b/src/i18n/locales/zh.ts index 466b3e0..6db946e 100644 --- a/src/i18n/locales/zh.ts +++ b/src/i18n/locales/zh.ts @@ -17,6 +17,9 @@ const zh = { "realm.profileLabel": "服务器", "realm.switching": "正在切换服务器…", + "realm.rebornCreate": "创建 Warcraft Reborn 服务器", + "realm.rebornModules": "Warcraft Reborn 的机器人职业机制尚未验证,其他模块仍处于实验阶段。", + "realm.rebornUpdate": "请将服务器更新至支持 Warcraft Reborn 的版本。", "realm.create": "创建 Wildcard 服务器", "realm.restart": "切换并重启", "realm.select": "选择服务器", @@ -25,8 +28,8 @@ const zh = { "realm.modules": "此处无法使用 CoA 随从。动态难度等级缩放及其他模块在 Wildcard 上仍处于实验阶段。", "realm.update": "请先将服务器更新至支持 Wildcard 的版本以创建此服务器。", "realm.recovery": "服务器切换被中断。请选择一个服务器以恢复保存的配置。", - "realm.unsupported": "在 Wildcard 上不可用:职业机制尚未验证通过。", - "realm.experimental": "在 Wildcard 上处于实验阶段 · 游戏玩法兼容性尚未验证。", + "realm.unsupported": "在 Wildcard / Warcraft Reborn 上不可用:职业机制尚未验证通过。", + "realm.experimental": "在 Wildcard / Warcraft Reborn 上处于实验阶段 · 游戏玩法兼容性尚未验证。", "app.name": "CoA Server Manager", "nav.overview": "概览", diff --git a/src/lib/api.ts b/src/lib/api.ts index f1a4fc4..be9488f 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -53,8 +53,8 @@ export interface StatusView { path_exists: boolean; } -export type RealmMode = "coa" | "wildcard"; -export interface RealmProfiles { active: RealmMode; wildcard_created: boolean; supported: boolean; recovery_pending: boolean; simultaneous: boolean; secondary_world_port: number | null; secondary_running: boolean } +export type RealmMode = "coa" | "wildcard" | "reborn"; +export interface RealmProfiles { active: RealmMode; wildcard_created: boolean; reborn_created: boolean; reborn_supported: boolean; supported: boolean; recovery_pending: boolean; simultaneous: boolean; secondary_world_port: number | null; secondary_running: boolean } export interface DatabaseCheck { realm: RealmMode; migrations: { id: string; db: string; status: "applied" | "pending" | "failed"; error: string | null }[]; diff --git a/src/screens/BackupsPage.tsx b/src/screens/BackupsPage.tsx index 5dc2724..e196cac 100644 --- a/src/screens/BackupsPage.tsx +++ b/src/screens/BackupsPage.tsx @@ -36,7 +36,7 @@ export function BackupsPage({ serverId }: { serverId: string }) { const trigger = (x: string) => (TRIGGER_KEYS.includes(x) ? t(`bk.trigger.${x}` as Key) : x); const dbLabel = (x: string) => { const [realm, kind] = x.split("-"); - if (kind && DB_KEYS.includes(kind)) return `${realm === "coa" ? "CoA" : "Wildcard"} · ${t(`bk.db.${kind}` as Key)}`; + if (kind && DB_KEYS.includes(kind)) return `${realm === "coa" ? "CoA" : realm === "reborn" ? "Warcraft Reborn" : "Wildcard"} · ${t(`bk.db.${kind}` as Key)}`; return DB_KEYS.includes(x) ? t(`bk.db.${x}` as Key) : x; }; const [points, setPoints] = useState(null); @@ -198,7 +198,7 @@ export function BackupsPage({ serverId }: { serverId: string }) {

{p.label && p.trigger === "manual" && p.label !== "e2e" ? p.label : trigger(p.trigger)}

- {w(p.created_at)} · {p.realm === "wildcard" ? "Wildcard" : "CoA"} · {t(`bk.kind.${p.kind}` as Key)} · {size(p.components.reduce((a, c) => a + c.bytes, p.mysql_snapshot?.bytes ?? 0))} + {w(p.created_at)} · {p.realm === "reborn" ? "Warcraft Reborn" : p.realm === "wildcard" ? "Wildcard" : "CoA"} · {t(`bk.kind.${p.kind}` as Key)} · {size(p.components.reduce((a, c) => a + c.bytes, p.mysql_snapshot?.bytes ?? 0))}

diff --git a/src/screens/Overview.tsx b/src/screens/Overview.tsx index d2e162f..e3ac530 100644 --- a/src/screens/Overview.tsx +++ b/src/screens/Overview.tsx @@ -79,7 +79,7 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o let alive = true; void api.realmProfiles(server.id).then((r) => { if (!alive) return; - const name = (m: "coa" | "wildcard") => (m === "coa" ? "Conquest of Azeroth" : "Wildcard"); + const name = (m: "coa" | "wildcard" | "reborn") => (m === "coa" ? "Conquest of Azeroth" : m === "reborn" ? "Warcraft Reborn" : "Wildcard"); setRealms({ first: name(r.active), second: name(r.active === "coa" ? "wildcard" : "coa") }); }).catch(() => { if (alive) setRealms(null); }); return () => { alive = false; }; diff --git a/src/screens/RealmPicker.tsx b/src/screens/RealmPicker.tsx index 5cde7cf..54de2ca 100644 --- a/src/screens/RealmPicker.tsx +++ b/src/screens/RealmPicker.tsx @@ -37,16 +37,19 @@ export function RealmPicker({ serverId, running, disabled, onChanged, onBusy }: {view?.simultaneous ? Conquest of Azeroth + Wildcard : } {view && !view.simultaneous && (selected !== view.active || view.recovery_pending) && } - {view && !view.simultaneous && {t("realm.active", { name: view.active === "coa" ? "CoA" : "Wildcard" })}} + {view && !view.simultaneous && {t("realm.active", { name: view.active === "coa" ? "CoA" : view.active === "reborn" ? "Warcraft Reborn" : "Wildcard" })}}

{t(view?.simultaneous ? "realm.bothRunning" : "realm.separate")}

+ {selected === "reborn" &&

{t("realm.rebornModules")}

} + {view && selected === "reborn" && !view.reborn_supported &&

{t("realm.rebornUpdate")}

} {selected === "wildcard" &&

{t("realm.modules")}

} - {view && !view.supported &&

{t("realm.update")}

} + {view && selected === "wildcard" && !view.supported &&

{t("realm.update")}

} {view?.recovery_pending &&

{t("realm.recovery")}

} {error &&

{error}

} ; diff --git a/src/screens/RealmStartupSettings.tsx b/src/screens/RealmStartupSettings.tsx index 5e2c4b7..f84b1bb 100644 --- a/src/screens/RealmStartupSettings.tsx +++ b/src/screens/RealmStartupSettings.tsx @@ -22,7 +22,7 @@ export function RealmStartupSettings({ serverId }: { serverId: string }) { return

{t("realm.startupTitle")}

{t("realm.simultaneousHint")}

diff --git a/src/screens/RepairCard.tsx b/src/screens/RepairCard.tsx index 9d3f23d..98ec36b 100644 --- a/src/screens/RepairCard.tsx +++ b/src/screens/RepairCard.tsx @@ -45,7 +45,7 @@ export function RepairCard({ serverId }: { serverId: string }) { {checks?.map(c => { const pending = c.migrations.filter(m => m.status !== "applied"); return
-

{c.realm === "coa" ? "Conquest of Azeroth" : "Wildcard"}

+

{c.realm === "coa" ? "Conquest of Azeroth" : c.realm === "reborn" ? "Warcraft Reborn" : "Wildcard"}

{t("repair.dbCount", { columns: c.problems.length, sql: pending.length })}

{!c.full_schema &&

{t("repair.limited")}

}