From d42102c388c5e1338939b2755097ffe8a6de2c73 Mon Sep 17 00:00:00 2001 From: Ridan Vandenbergh Date: Fri, 28 Jun 2024 23:19:21 +0200 Subject: [PATCH] Update for patch 7.0 +2 jobs, +4 worlds to dynamis, +1 dc with 4 worlds on it --- src/data_centers.rs | 5 ++++- src/jobs/combat.rs | 14 ++++++++++++++ src/worlds.rs | 30 ++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/data_centers.rs b/src/data_centers.rs index c0b0e57..24d9f32 100644 --- a/src/data_centers.rs +++ b/src/data_centers.rs @@ -19,11 +19,12 @@ pub enum DataCenter { Materia, Meteor, Primal, + Shadow, } impl DataCenter { #[cfg(feature = "all_const")] - pub const ALL: [DataCenter; 11] = [ + pub const ALL: [DataCenter; 12] = [ DataCenter::Aether, DataCenter::Chaos, DataCenter::Crystal, @@ -35,6 +36,7 @@ impl DataCenter { DataCenter::Materia, DataCenter::Meteor, DataCenter::Primal, + DataCenter::Shadow, ]; pub fn as_str(&self) -> &'static str { @@ -50,6 +52,7 @@ impl DataCenter { DataCenter::Materia => "Materia", DataCenter::Meteor => "Meteor", DataCenter::Primal => "Primal", + DataCenter::Shadow => "Shadow" } } diff --git a/src/jobs/combat.rs b/src/jobs/combat.rs index 1ec33eb..de17a2f 100644 --- a/src/jobs/combat.rs +++ b/src/jobs/combat.rs @@ -21,10 +21,12 @@ pub enum Job { Machinist, Monk, Ninja, + Pictomancer, Reaper, RedMage, Samurai, Summoner, + Viper, // Healer Astrologian, @@ -84,10 +86,12 @@ impl Job { Job::Machinist => "Machinist", Job::Monk => "Monk", Job::Ninja => "Ninja", + Job::Pictomancer => "Pictomancer", Job::Reaper => "Reaper", Job::RedMage => "RedMage", Job::Samurai => "Samurai", Job::Summoner => "Summoner", + Job::Viper => "Viper", Job::Astrologian => "Astrologian", Job::Sage => "Sage", @@ -115,10 +119,12 @@ impl Job { Job::Machinist => "Machinist", Job::Monk => "Monk", Job::Ninja => "Ninja", + Job::Pictomancer => "Pictomancer", Job::Reaper => "Reaper", Job::RedMage => "Red Mage", Job::Samurai => "Samurai", Job::Summoner => "Summoner", + Job::Viper => "Viper", Job::Astrologian => "Astrologian", Job::Sage => "Sage", @@ -146,10 +152,12 @@ impl Job { Job::Machinist => "MCH", Job::Monk => "MNK", Job::Ninja => "NIN", + Job::Pictomancer => "PCT", Job::Reaper => "RPR", Job::RedMage => "RDM", Job::Samurai => "SAM", Job::Summoner => "SMN", + Job::Viper => "VPR", Job::Astrologian => "AST", Job::Sage => "SGE", @@ -176,10 +184,12 @@ impl Job { Job::Machinist | Job::Monk | Job::Ninja | + Job::Pictomancer | Job::Reaper | Job::RedMage | Job::Samurai | Job::Summoner | + Job::Viper | Job::BlueMage => Role::Dps, Job::Astrologian | @@ -210,10 +220,12 @@ impl Job { Job::Reaper | Job::Samurai | Job::Warrior | + Job::Viper | Job::BlueMage => Classification::War, Job::Astrologian | Job::BlackMage | + Job::Pictomancer | Job::RedMage | Job::Sage | Job::Scholar | @@ -241,10 +253,12 @@ impl FromStr for Job { "machinist" | "mch" => Job::Machinist, "monk" | "mnk" => Job::Monk, "ninja" | "nin" => Job::Ninja, + "pictomancer" | "pct" => Job::Pictomancer, "reaper" | "rpr" => Job::Reaper, "red mage" | "redmage" | "rdm" => Job::RedMage, "samurai" | "sam" => Job::Samurai, "summoner" | "smn" => Job::Summoner, + "viper" | "vpr" => Job::Viper, "astrologian" | "ast" => Job::Astrologian, "sage" | "sge" => Job::Sage, diff --git a/src/worlds.rs b/src/worlds.rs index 7a7e5bc..b94b972 100644 --- a/src/worlds.rs +++ b/src/worlds.rs @@ -44,9 +44,13 @@ pub enum World { Zalera, // Dynamis + Cuchulainn, + Golem, Halicarnassus, + Kraken, Maduin, Marilith, + Rafflesia, Seraph, // Elemental @@ -115,6 +119,12 @@ pub enum World { Valefor, Yojimbo, Zeromus, + + // Shadow + Innocence, + Pixie, + Titania, + Tycoon, } impl World { @@ -258,9 +268,13 @@ impl World { World::Zalera => "Zalera", // Dynamis + World::Cuchulainn => "Cuchulainn", + World::Golem => "Golem", World::Halicarnassus => "Halicarnassus", + World::Kraken => "Kraken", World::Maduin => "Maduin", World::Marilith => "Marilith", + World::Rafflesia => "Rafflesia", World::Seraph => "Seraph", // Elemental @@ -329,6 +343,12 @@ impl World { World::Valefor => "Valefor", World::Yojimbo => "Yojimbo", World::Zeromus => "Zeromus", + + // Shadow + World::Innocence => "Innocence", + World::Pixie => "Pixie", + World::Titania => "Titania", + World::Tycoon => "Tycoon", } } @@ -372,9 +392,13 @@ impl World { World::Zalera => DataCenter::Crystal, // Dynamis + World::Cuchulainn | + World::Golem | World::Halicarnassus | + World::Kraken | World::Maduin | World::Marilith | + World::Rafflesia | World::Seraph => DataCenter::Dynamis, // Elemental @@ -443,6 +467,12 @@ impl World { World::Valefor | World::Yojimbo | World::Zeromus => DataCenter::Meteor, + + // Shadow + World::Innocence | + World::Pixie | + World::Titania | + World::Tycoon => DataCenter::Shadow, } } }