Adding support for Iron Banner Fortress

mikechambers · Jan 26, 2024 · abf6b13 · abf6b13
1 parent c2e1af6
commit abf6b13
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 36 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,9 @@
 # dcli Release Notes
 
+## v0.99.7 January 26, 2024
+
+-   Added support for Iron Banner Fortress (iron_banner_fortress)
+
 ## v0.99.6 December 5,2023
 
 -   Added support for Iron Banner Tribute (iron_banner_tribute)

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.6"
+version = "0.99.7"
 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/activitystoreinterface.rs b/src/dcli/src/activitystoreinterface.rs
@@ -33,7 +33,7 @@ use crate::utils::{
     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,
-    IRON_BANNER_TRIBUTE_ACTIVITY_HASH,
+    IRON_BANNER_FORTRESS_ACTIVITY_HASH, IRON_BANNER_TRIBUTE_ACTIVITY_HASH,
 };
 use crate::{
     crucible::{CrucibleActivity, Member, PlayerName, Team},
@@ -996,6 +996,13 @@ impl ActivityStoreInterface {
             self.remove_from_modes(activity, Mode::IronBannerSupremacy);
         }
 
+        if activity.activity_details.director_activity_hash
+            == IRON_BANNER_FORTRESS_ACTIVITY_HASH
+        {
+            self.set_mode(activity, Mode::IronBannerFortress);
+            self.remove_from_modes(activity, Mode::IronBannerZoneControl);
+        }
+
         //add support for checkmate (adding modes)
 
         if CHECKMATE_CONTROL_ACTIVITY_HASHES

diff --git a/src/dcli/src/enums/mode.rs b/src/dcli/src/enums/mode.rs
@@ -132,6 +132,7 @@ pub enum Mode {
     CheckmateCountdown = 715,
 
     IronBannerTribute = 800,
+    IronBannerFortress = 801,
 }
 
 impl Mode {
@@ -235,6 +236,7 @@ impl Mode {
             714 => Ok(Mode::CheckmateClash),
             715 => Ok(Mode::CheckmateCountdown),
             800 => Ok(Mode::IronBannerTribute),
+            801 => Ok(Mode::IronBannerFortress),
 
             _ => Err(Error::UnknownEnumValue),
         }
@@ -318,6 +320,7 @@ impl Mode {
             || *self == Mode::CheckmateClash
             || *self == Mode::CheckmateCountdown
             || *self == Mode::IronBannerTribute
+            || *self == Mode::IronBannerFortress
     }
 
     pub fn is_private(&self) -> bool {
@@ -439,6 +442,7 @@ impl FromStr for Mode {
             "checkmate_clash" => Ok(Mode::CheckmateClash),
             "checkmate_countdown" => Ok(Mode::CheckmateCountdown),
             "iron_banner_tribute" => Ok(Mode::IronBannerTribute),
+            "iron_banner_fortress" => Ok(Mode::IronBannerFortress),
 
             _ => Err("Unknown Mode type"),
         }
@@ -545,6 +549,7 @@ impl fmt::Display for Mode {
             Mode::CheckmateClash => "Checkmate Clash",
             Mode::CheckmateCountdown => "Checkmate Countdown",
             Mode::IronBannerTribute => "Iron Banner Tribute",
+            Mode::IronBannerFortress => "Iron Banner Fortress",
         };
 
         write!(f, "{}", out)

diff --git a/src/dcli/src/utils.rs b/src/dcli/src/utils.rs
@@ -56,6 +56,7 @@ pub const CHECKMATE_COUNTDOWN_ACTIVITY_HASH: u32 = 2344293485;
 pub const CHECKMATE_RUMBLE_ACTIVITY_HASH: u32 = 2461220411;
 
 pub const IRON_BANNER_TRIBUTE_ACTIVITY_HASH: u32 = 2955009825;
+pub const IRON_BANNER_FORTRESS_ACTIVITY_HASH: u32 = 2888503916;
 
 pub const CHECKMATE_SURVIVAL_ACTIVITY_HASH: u32 = 3876264582;
 

diff --git a/src/dclia/Cargo.toml b/src/dclia/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclia"
 #version
-version = "0.99.6"
+version = "0.99.7"
 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.6"
+version = "0.99.7"
 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, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute [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, iron_banner_tribute, iron_banner_fortress [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, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute |
+| 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, iron_banner_tribute, iron_banner_fortress |
 
 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, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute
+    /// scorched, 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, iron_banner_tribute, iron_banner_fortress
     #[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.6"
+version = "0.99.7"
 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, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute [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, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute, iron_banner_fortress [default: all_pvp]
     -T, --moment <moment>
             Start moment from which to pull activities from
 

diff --git a/src/dcliah/src/main.rs b/src/dcliah/src/main.rs
@@ -663,7 +663,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, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute
+    /// scorched, 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, iron_banner_tribute, iron_banner_fortress
     #[structopt(long = "mode", short = "M", 
         parse(try_from_str=parse_and_validate_crucible_mode), default_value = "all_pvp")]
     mode: Mode,

diff --git a/src/dclif/Cargo.toml b/src/dclif/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclif"
 #version
-version = "0.99.6"
+version = "0.99.7"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Command line tool for querying specific Destiny 2 pvp stats."

diff --git a/src/dclif/src/main.rs b/src/dclif/src/main.rs
@@ -207,7 +207,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, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute
+    /// scorched, 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, iron_banner_tribute, iron_banner_fortress
     #[structopt(long = "mode", short = "M", 
         parse(try_from_str=parse_and_validate_crucible_mode), default_value = "all_pvp")]
     mode: Mode,

diff --git a/src/dclim/Cargo.toml b/src/dclim/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclim"
 #version
-version = "0.99.6"
+version = "0.99.7"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Command line tool for managing and syncing the remote Destiny 2 API manifest database."

diff --git a/src/dclistat/Cargo.toml b/src/dclistat/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclistat"
 #version
-version = "0.99.6"
+version = "0.99.7"
 authors = ["Mike Chambers <[email protected]>"]
 edition = "2018"
 description = "Command line tool for querying specific Destiny 2 pvp stats."