Update for Season of the Witch

- Added support for Season of the Witch - Added support for Relic mode - Fixed bug where Season of the Deep had wrong date (was one day late)
mikechambers · Sep 2, 2023 · 492fe3c · 492fe3c
1 parent 89530f6
commit 492fe3c
Show file tree

Hide file tree

Showing 22 changed files with 76 additions and 57 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,9 +1,17 @@
 # dcli Release Notes
 
+## v0.99.2 September 2, 2023
+
+-   Added support for Season of the Witch
+-   Added support for Relic mode
+-   Fixed bug where Season of the Deep had wrong date (was one day late)
+
 ## v0.99.1 May 24, 2023
+
 -   Updating Mac build environment to macos-11.
 
 ## v0.99.0 May 24, 2023
+
 -   Added support for Season of the Deep (season_of_the_deep) moment.
 
 ## v0.98.0 March 3 2023

diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/dcli/Cargo.toml b/src/dcli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dcli"
 #version
-version = "0.99.1"
+version = "0.99.2"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Library for the dcli collection of command line tools for Destiny 2."

diff --git a/src/dcli/src/enums/mode.rs b/src/dcli/src/enums/mode.rs
@@ -116,6 +116,7 @@ pub enum Mode {
     ZoneControl = 89,
     IronBannerRift = 90,
     IronBannerZoneControl = 91,
+    Relic = 92,
 
     //Added by dcli
     RiftCompetitive = 700,
@@ -210,6 +211,7 @@ impl Mode {
             89 => Ok(Mode::ZoneControl),
             90 => Ok(Mode::IronBannerRift),
             91 => Ok(Mode::IronBannerZoneControl),
+            92 => Ok(Mode::Relic),
 
             700 => Ok(Mode::RiftCompetitive),
             701 => Ok(Mode::ShowdownCompetitive),
@@ -288,6 +290,7 @@ impl Mode {
             || *self == Mode::RiftCompetitive
             || *self == Mode::ShowdownCompetitive
             || *self == Mode::SurvivalCompetitive
+            || *self == Mode::Relic
     }
 
     pub fn is_private(&self) -> bool {
@@ -399,6 +402,7 @@ impl FromStr for Mode {
             "rift_competitive" => Ok(Mode::RiftCompetitive),
             "showdown_competitive" => Ok(Mode::ShowdownCompetitive),
             "survival_competitive" => Ok(Mode::SurvivalCompetitive),
+            "relic" => Ok(Mode::Relic),
 
             _ => Err("Unknown Mode type"),
         }
@@ -495,6 +499,7 @@ impl fmt::Display for Mode {
             Mode::RiftCompetitive => "Rift Competitive",
             Mode::ShowdownCompetitive => "Showdown Competitive",
             Mode::SurvivalCompetitive => "Survival Competitive",
+            Mode::Relic => "Relic",
         };
 
         write!(f, "{}", out)

diff --git a/src/dcli/src/enums/moment.rs b/src/dcli/src/enums/moment.rs
@@ -74,7 +74,8 @@ pub enum Moment {
     SeasonOfTheSeraph,
     Lightfall,
     SeasonOfDefiance,
-    SeasonOfTheDeep
+    SeasonOfTheDeep,
+    SeasonOfTheWitch,
 }
 
 impl Moment {
@@ -168,9 +169,12 @@ impl Moment {
                 Utc.with_ymd_and_hms(2023, 2, 28, 17, 0, 0).unwrap()
             }
 
-
             Moment::SeasonOfTheDeep => {
-                Utc.with_ymd_and_hms(2023, 5, 23, 17, 0, 0).unwrap()
+                Utc.with_ymd_and_hms(2023, 5, 22, 17, 0, 0).unwrap()
+            }
+
+            Moment::SeasonOfTheWitch => {
+                Utc.with_ymd_and_hms(2023, 8, 22, 17, 0, 0).unwrap()
             }
         }
     }
@@ -224,6 +228,7 @@ impl FromStr for Moment {
             "lightfall" => Ok(Moment::Lightfall),
             "season_of_defiance" => Ok(Moment::SeasonOfDefiance),
             "season_of_the_deep" => Ok(Moment::SeasonOfTheDeep),
+            "season_of_the_witch" => Ok(Moment::SeasonOfTheWitch),
 
             _ => Err("Unknown Moment type"),
         }
@@ -272,7 +277,8 @@ impl fmt::Display for Moment {
             Moment::SeasonOfTheSeraph => "Season of the Seraph",
             Moment::Lightfall => "Lightfall",
             Moment::SeasonOfDefiance => "Season of Defiance",
-            Moment::SeasonOfTheDeep => "Season of the Deep"
+            Moment::SeasonOfTheDeep => "Season of the Deep",
+            Moment::SeasonOfTheWitch => "Season of the Witch",
         };
 
         write!(f, "{}", out)

diff --git a/src/dclia/Cargo.toml b/src/dclia/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclia"
 #version
-version = "0.99.1"
+version = "0.99.2"
 authors = ["Mike Chambers <[email protected]>"]
 description = "Command line tool for retrieving information on current activity for specified player character."
 homepage = "https://www.mikechambers.com"

diff --git a/src/dcliad/Cargo.toml b/src/dcliad/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dcliad"
 #version
-version = "0.99.1"
+version = "0.99.2"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Command line tool for viewing Destiny 2 activity details."

diff --git a/src/dcliad/README.md b/src/dcliad/README.md
@@ -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 [default: all_pvp]
+            scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic [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 |
+| 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 |
 
 Manifest can be downloaded and synced with from [dclim](https://github.com/mikechambers/dcli/tree/main/src/dclim).
 

diff --git a/src/dcliad/src/main.rs b/src/dcliad/src/main.rs
@@ -508,7 +508,7 @@ struct Opt {
     /// private_survival, private_rumble, showdown_competitive, survival_competitive,
     /// rift_competitive, showdown, lockdown, iron_banner_rift,
     /// zone_control, iron_banner_zone_control, rift,
-    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine
+    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic
     #[structopt(long = "mode", short = "M", 
         parse(try_from_str=parse_and_validate_mode), default_value = "all_pvp")]
     mode: Mode,

diff --git a/src/dcliah/Cargo.toml b/src/dcliah/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dcliah"
 #version
-version = "0.99.1"
+version = "0.99.2"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Command line tool for viewing Destiny 2 activity history."

diff --git a/src/dcliah/README.md b/src/dcliah/README.md
@@ -93,7 +93,7 @@ OPTIONS:
             rumble, pvp_competitive, quickplay and trials_of_osiris.
 
             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 [default: all_pvp]
+            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 [default: all_pvp]
     -T, --moment <moment>
             Start moment from which to pull activities from
 
@@ -126,12 +126,12 @@ OPTIONS:
             type, wins_percent [default: kills]
 ```
 
-| 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                                                                                                |
-| --moment      | daily (last daily reset), weekend (last weekend reset on Friday), weekly (last weekly reset on Tuesday), day (last day), week (last week), month (last month), all_time, custom, launch, curse_of_osiris, warmind, season_of_the_outlaw, season_of_the_forge, season_of_the_drifter, season_of_opulence, season_of_the_undying, season_of_dawn, season_of_the_worthy, season_of_arrivals, season_of_the_hunt, season_of_the_chosen, season_of_the_splicer, season_of_the_lost, season_of_the_risen, witch_queen, season_of_the_haunted, season_of_plunder, season_of_the_seraph, lightfall, season_of_defiance |
-| --end-moment  | daily (last daily reset), weekend (last weekend reset on Friday), weekly (last weekly reset on Tuesday), day (last day), week (last week), month (last month), all_time, custom, launch, curse_of_osiris, warmind, season_of_the_outlaw, season_of_the_forge, season_of_the_drifter, season_of_opulence, season_of_the_undying, season_of_dawn, season_of_the_worthy, season_of_arrivals, season_of_the_hunt, season_of_the_chosen, season_of_the_splicer, season_of_the_lost, season_of_the_risen, witch_queen, season_of_the_haunted, season_of_plunder, season_of_the_seraph, lightfall, season_of_defiance |
-| --weapon-sort | name, kills (default), games, kills_per_game_kills kills_per_game_total, precision_total, precision_percent, type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| 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                                                                                                                                   |
+| --moment      | daily (last daily reset), weekend (last weekend reset on Friday), weekly (last weekly reset on Tuesday), day (last day), week (last week), month (last month), all_time, custom, launch, curse_of_osiris, warmind, season_of_the_outlaw, season_of_the_forge, season_of_the_drifter, season_of_opulence, season_of_the_undying, season_of_dawn, season_of_the_worthy, season_of_arrivals, season_of_the_hunt, season_of_the_chosen, season_of_the_splicer, season_of_the_lost, season_of_the_risen, witch_queen, season_of_the_haunted, season_of_plunder, season_of_the_seraph, lightfall, season_of_defiance, season_of_the_deep, season_of_the_witch |
+| --end-moment  | daily (last daily reset), weekend (last weekend reset on Friday), weekly (last weekly reset on Tuesday), day (last day), week (last week), month (last month), all_time, custom, launch, curse_of_osiris, warmind, season_of_the_outlaw, season_of_the_forge, season_of_the_drifter, season_of_opulence, season_of_the_undying, season_of_dawn, season_of_the_worthy, season_of_arrivals, season_of_the_hunt, season_of_the_chosen, season_of_the_splicer, season_of_the_lost, season_of_the_risen, witch_queen, season_of_the_haunted, season_of_plunder, season_of_the_seraph, lightfall, season_of_defiance, season_of_the_deep, season_of_the_witch |
+| --weapon-sort | name, kills (default), games, kills_per_game_kills kills_per_game_total, precision_total, precision_percent, type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 
 Manifest can be downloaded and synced with from [dclim](https://github.com/mikechambers/dcli/tree/main/src/dclim).