adding support for season of the wish and new modes

Author: mikechambers

RELEASE.md

@@ -1,5 +1,10 @@
 # dcli Release Notes
 
+## v0.99.5 November 28,2023
+
+-   Added support for Countdown Competitive (countdown_competitive), Checkmate Rumble (checkmate_control), Checkmate Clash (checkmate_clash), Checkmate Countdown (checkmate_countdown)
+-   Added support for Season of the Wish (season_of_the_wish)
+
 ## v0.99.4 September 22,2023
 
 -   Added support for Checkmate Survival (checkmate_survival), and Checkmate Control (checkmate_control)

src/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "dcli"
 #version
-version = "0.99.4"
+version = "0.99.5"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Library for the dcli collection of command line tools for Destiny 2."

src/dcli/Cargo.toml

@@ -29,9 +29,10 @@ use indicatif::{ProgressBar, ProgressState, ProgressStyle};
 
 use crate::playeractivitiessummary::PlayerActivitiesSummary;
 use crate::utils::{
-    format_error, CHECKMATE_CONTROL_ACTIVITY_HASH,
-    CHECKMATE_SURVIVAL_ACTIVITY_HASH, COMPETITIVE_PVP_ACTIVITY_HASH,
-    FREELANCE_COMPETITIVE_PVP_ACTIVITY_HASH,
+    format_error, CHECKMATE_CLASH_ACTIVITY_HASH,
+    CHECKMATE_CONTROL_ACTIVITY_HASHES, CHECKMATE_COUNTDOWN_ACTIVITY_HASH,
+    CHECKMATE_RUMBLE_ACTIVITY_HASH, CHECKMATE_SURVIVAL_ACTIVITY_HASH,
+    COMPETITIVE_PVP_ACTIVITY_HASH, FREELANCE_COMPETITIVE_PVP_ACTIVITY_HASH,
 };
 use crate::{
     crucible::{CrucibleActivity, Member, PlayerName, Team},
@@ -979,30 +980,58 @@ impl ActivityStoreInterface {
                 self.add_to_modes(activity, Mode::SurvivalCompetitive);
                 was_updated = true;
             }
+
+            if activity.activity_details.mode == Mode::Countdown {
+                self.set_mode(activity, Mode::CountdownCompetitive);
+                self.add_to_modes(activity, Mode::PvPCompetitive);
+                was_updated = true;
+            }
         }
 
         //add support for checkmate (adding modes)
 
-        if activity.activity_details.director_activity_hash
-            == CHECKMATE_CONTROL_ACTIVITY_HASH
+        if CHECKMATE_CONTROL_ACTIVITY_HASHES
+            .contains(&activity.activity_details.director_activity_hash)
         {
             self.set_mode(activity, Mode::CheckmateControl);
 
             self.add_to_modes(activity, Mode::CheckmateAll);
-            //self.add_to_modes(activity, Mode::CheckmateControl);
 
             self.remove_from_modes(activity, Mode::PvPQuickplay);
             self.remove_from_modes(activity, Mode::ControlQuickplay);
         }
 
         if activity.activity_details.director_activity_hash
-            == CHECKMATE_SURVIVAL_ACTIVITY_HASH
+            == CHECKMATE_CLASH_ACTIVITY_HASH
         {
-            self.set_mode(activity, Mode::CheckmateSurvival);
+            self.set_mode(activity, Mode::CheckmateClash);
+            self.add_to_modes(activity, Mode::CheckmateAll);
+            self.remove_from_modes(activity, Mode::ClashQuickplay);
+            self.remove_from_modes(activity, Mode::PvPQuickplay);
+        }
+
+        if activity.activity_details.director_activity_hash
+            == CHECKMATE_COUNTDOWN_ACTIVITY_HASH
+        {
+            self.set_mode(activity, Mode::CheckmateCountdown);
+            self.add_to_modes(activity, Mode::CheckmateAll);
+            self.remove_from_modes(activity, Mode::PvPQuickplay);
+        }
 
+        if activity.activity_details.director_activity_hash
+            == CHECKMATE_RUMBLE_ACTIVITY_HASH
+        {
+            self.set_mode(activity, Mode::CheckmateRumble);
             self.add_to_modes(activity, Mode::CheckmateAll);
+            self.remove_from_modes(activity, Mode::PvPQuickplay);
+        }
 
-            self.remove_from_modes(activity, Mode::PvPCompetitive)
+        if activity.activity_details.director_activity_hash
+            == CHECKMATE_SURVIVAL_ACTIVITY_HASH
+        {
+            self.set_mode(activity, Mode::CheckmateSurvival);
+            self.add_to_modes(activity, Mode::CheckmateAll);
+            self.remove_from_modes(activity, Mode::PvPCompetitive);
         }
 
         if activity.activity_details.mode == Mode::PrivateMatchesAll {

src/dcli/src/activitystoreinterface.rs

@@ -122,11 +122,14 @@ pub enum Mode {
     RiftCompetitive = 700,
     ShowdownCompetitive = 701,
     SurvivalCompetitive = 702,
+    CountdownCompetitive = 703,
 
     CheckmateAll = 710,
     CheckmateControl = 711,
     CheckmateSurvival = 712,
     CheckmateRumble = 713,
+    CheckmateClash = 714,
+    CheckmateCountdown = 715,
 }
 
 impl Mode {
@@ -221,11 +224,14 @@ impl Mode {
             700 => Ok(Mode::RiftCompetitive),
             701 => Ok(Mode::ShowdownCompetitive),
             702 => Ok(Mode::SurvivalCompetitive),
+            703 => Ok(Mode::CountdownCompetitive),
 
             710 => Ok(Mode::CheckmateAll),
             711 => Ok(Mode::CheckmateControl),
             712 => Ok(Mode::CheckmateSurvival),
             713 => Ok(Mode::CheckmateRumble),
+            714 => Ok(Mode::CheckmateClash),
+            715 => Ok(Mode::CheckmateCountdown),
 
             _ => Err(Error::UnknownEnumValue),
         }
@@ -300,11 +306,14 @@ impl Mode {
             || *self == Mode::RiftCompetitive
             || *self == Mode::ShowdownCompetitive
             || *self == Mode::SurvivalCompetitive
+            || *self == Mode::CountdownCompetitive
             || *self == Mode::Relic
             || *self == Mode::CheckmateAll
             || *self == Mode::CheckmateControl
             || *self == Mode::CheckmateSurvival
             || *self == Mode::CheckmateRumble
+            || *self == Mode::CheckmateClash
+            || *self == Mode::CheckmateCountdown
     }
 
     pub fn is_private(&self) -> bool {
@@ -416,12 +425,15 @@ impl FromStr for Mode {
             "rift_competitive" => Ok(Mode::RiftCompetitive),
             "showdown_competitive" => Ok(Mode::ShowdownCompetitive),
             "survival_competitive" => Ok(Mode::SurvivalCompetitive),
+            "countdown_competitive" => Ok(Mode::CountdownCompetitive),
             "relic" => Ok(Mode::Relic),
 
             "checkmate_all" => Ok(Mode::CheckmateAll),
             "checkmate_control" => Ok(Mode::CheckmateControl),
             "checkmate_survival" => Ok(Mode::CheckmateSurvival),
             "checkmate_rumble" => Ok(Mode::CheckmateRumble),
+            "checkmate_clash" => Ok(Mode::CheckmateClash),
+            "checkmate_countdown" => Ok(Mode::CheckmateCountdown),
 
             _ => Err("Unknown Mode type"),
         }
@@ -518,12 +530,15 @@ impl fmt::Display for Mode {
             Mode::RiftCompetitive => "Rift Competitive",
             Mode::ShowdownCompetitive => "Showdown Competitive",
             Mode::SurvivalCompetitive => "Survival Competitive",
+            Mode::CountdownCompetitive => "Countdown Competitive",
             Mode::Relic => "Relic",
 
             Mode::CheckmateAll => "All Checkmate",
             Mode::CheckmateControl => "Checkmate Control",
             Mode::CheckmateSurvival => "Checkmate Survival",
             Mode::CheckmateRumble => "Checkmate Rumble",
+            Mode::CheckmateClash => "Checkmate Clash",
+            Mode::CheckmateCountdown => "Checkmate Countdown",
         };
 
         write!(f, "{}", out)

src/dcli/src/enums/mode.rs

@@ -76,6 +76,7 @@ pub enum Moment {
     SeasonOfDefiance,
     SeasonOfTheDeep,
     SeasonOfTheWitch,
+    SeasonOfTheWish,
 }
 
 impl Moment {
@@ -176,6 +177,10 @@ impl Moment {
             Moment::SeasonOfTheWitch => {
                 Utc.with_ymd_and_hms(2023, 8, 22, 17, 0, 0).unwrap()
             }
+
+            Moment::SeasonOfTheWish => {
+                Utc.with_ymd_and_hms(2023, 11, 28, 17, 0, 0).unwrap()
+            }
         }
     }
 }
@@ -229,6 +234,7 @@ impl FromStr for Moment {
             "season_of_defiance" => Ok(Moment::SeasonOfDefiance),
             "season_of_the_deep" => Ok(Moment::SeasonOfTheDeep),
             "season_of_the_witch" => Ok(Moment::SeasonOfTheWitch),
+            "season_of_the_wish" => Ok(Moment::SeasonOfTheWish),
 
             _ => Err("Unknown Moment type"),
         }
@@ -279,6 +285,7 @@ impl fmt::Display for Moment {
             Moment::SeasonOfDefiance => "Season of Defiance",
             Moment::SeasonOfTheDeep => "Season of the Deep",
             Moment::SeasonOfTheWitch => "Season of the Witch",
+            Moment::SeasonOfTheWish => "Season of the Wish",
         };
 
         write!(f, "{}", out)

src/dcli/src/enums/moment.rs

@@ -47,8 +47,14 @@ pub const TSV_DELIM: &str = "\t";
 pub const COMPETITIVE_PVP_ACTIVITY_HASH: u32 = 2754695317;
 pub const FREELANCE_COMPETITIVE_PVP_ACTIVITY_HASH: u32 = 2607135461;
 
-pub const CHECKMATE_CONTROL_ACTIVITY_HASH: u32 = 3374318171;
+//pub const CHECKMATE_CONTROL_ACTIVITY_HASH: u32 = 3374318171;
+//480175362let my_array: [i32; 2] = [1, 2];
+pub const CHECKMATE_CONTROL_ACTIVITY_HASHES: [u32; 2] = [480175362, 2461220411];
+
+pub const CHECKMATE_CLASH_ACTIVITY_HASH: u32 = 1251966208;
+pub const CHECKMATE_COUNTDOWN_ACTIVITY_HASH: u32 = 2344293485;
 pub const CHECKMATE_RUMBLE_ACTIVITY_HASH: u32 = 2461220411;
+
 pub const CHECKMATE_SURVIVAL_ACTIVITY_HASH: u32 = 3876264582;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");

src/dcli/src/utils.rs

@@ -1,7 +1,7 @@
 [package]
 name = "dclia"
 #version
-version = "0.99.4"
+version = "0.99.5"
 authors = ["Mike Chambers <[email protected]>"]
 description = "Command line tool for retrieving information on current activity for specified player character."
 homepage = "https://www.mikechambers.com"

src/dclia/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dcliad"
 #version
-version = "0.99.4"
+version = "0.99.5"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Command line tool for viewing Destiny 2 activity details."

src/dcliad/Cargo.toml

@@ -67,7 +67,7 @@ OPTIONS:
 
             Addition values available are crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles,
             private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift, zone_control, iron_banner_zone_control
-            scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival [default: all_pvp]
+            scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown [default: all_pvp]
     -n, --name <name>
             Bungie name for player
 
@@ -77,9 +77,9 @@ OPTIONS:
             The number of weapons to display details for [default: 5]
 ```
 
-| ARGUMENT | OPTIONS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| --mode   | all_pvp (default), control, clash, elimination, mayhem, iron_banner, all_private, rumble, pvp_competitive, quickplay and trials_of_osiris, crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift, zone_control, iron_banner_zone_control, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival |
+| ARGUMENT | OPTIONS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| --mode   | all_pvp (default), control, clash, elimination, mayhem, iron_banner, all_private, rumble, pvp_competitive, quickplay and trials_of_osiris, crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift, zone_control, iron_banner_zone_control, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown |
 
 Manifest can be downloaded and synced with from [dclim](https://github.com/mikechambers/dcli/tree/main/src/dclim).