Skip to content

Commit c2e1af6

Browse files
committed
Adding support for Iron Banner Tribute
1 parent 9f05de8 commit c2e1af6

File tree

22 files changed

+55
-35
lines changed

22 files changed

+55
-35
lines changed

RELEASE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# dcli Release Notes
22

3+
## v0.99.6 December 5,2023
4+
5+
- Added support for Iron Banner Tribute (iron_banner_tribute)
6+
37
## v0.99.5 November 28,2023
48

59
- Added support for Countdown Competitive (countdown_competitive), Checkmate Rumble (checkmate_control), Checkmate Clash (checkmate_clash), Checkmate Countdown (checkmate_countdown)

src/Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dcli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "dcli"
33
#version
4-
version = "0.99.5"
4+
version = "0.99.6"
55
authors = ["Mike Chambers <mikechambers@gmail.com>"]
66
edition = "2018"
77
description = "Library for the dcli collection of command line tools for Destiny 2."

src/dcli/src/activitystoreinterface.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ use crate::utils::{
3333
CHECKMATE_CONTROL_ACTIVITY_HASHES, CHECKMATE_COUNTDOWN_ACTIVITY_HASH,
3434
CHECKMATE_RUMBLE_ACTIVITY_HASH, CHECKMATE_SURVIVAL_ACTIVITY_HASH,
3535
COMPETITIVE_PVP_ACTIVITY_HASH, FREELANCE_COMPETITIVE_PVP_ACTIVITY_HASH,
36+
IRON_BANNER_TRIBUTE_ACTIVITY_HASH,
3637
};
3738
use crate::{
3839
crucible::{CrucibleActivity, Member, PlayerName, Team},
@@ -988,6 +989,13 @@ impl ActivityStoreInterface {
988989
}
989990
}
990991

992+
if activity.activity_details.director_activity_hash
993+
== IRON_BANNER_TRIBUTE_ACTIVITY_HASH
994+
{
995+
self.set_mode(activity, Mode::IronBannerTribute);
996+
self.remove_from_modes(activity, Mode::IronBannerSupremacy);
997+
}
998+
991999
//add support for checkmate (adding modes)
9921000

9931001
if CHECKMATE_CONTROL_ACTIVITY_HASHES

src/dcli/src/enums/mode.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ pub enum Mode {
130130
CheckmateRumble = 713,
131131
CheckmateClash = 714,
132132
CheckmateCountdown = 715,
133+
134+
IronBannerTribute = 800,
133135
}
134136

135137
impl Mode {
@@ -232,6 +234,7 @@ impl Mode {
232234
713 => Ok(Mode::CheckmateRumble),
233235
714 => Ok(Mode::CheckmateClash),
234236
715 => Ok(Mode::CheckmateCountdown),
237+
800 => Ok(Mode::IronBannerTribute),
235238

236239
_ => Err(Error::UnknownEnumValue),
237240
}
@@ -314,6 +317,7 @@ impl Mode {
314317
|| *self == Mode::CheckmateRumble
315318
|| *self == Mode::CheckmateClash
316319
|| *self == Mode::CheckmateCountdown
320+
|| *self == Mode::IronBannerTribute
317321
}
318322

319323
pub fn is_private(&self) -> bool {
@@ -434,6 +438,7 @@ impl FromStr for Mode {
434438
"checkmate_rumble" => Ok(Mode::CheckmateRumble),
435439
"checkmate_clash" => Ok(Mode::CheckmateClash),
436440
"checkmate_countdown" => Ok(Mode::CheckmateCountdown),
441+
"iron_banner_tribute" => Ok(Mode::IronBannerTribute),
437442

438443
_ => Err("Unknown Mode type"),
439444
}
@@ -539,6 +544,7 @@ impl fmt::Display for Mode {
539544
Mode::CheckmateRumble => "Checkmate Rumble",
540545
Mode::CheckmateClash => "Checkmate Clash",
541546
Mode::CheckmateCountdown => "Checkmate Countdown",
547+
Mode::IronBannerTribute => "Iron Banner Tribute",
542548
};
543549

544550
write!(f, "{}", out)

src/dcli/src/utils.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ pub const CHECKMATE_CLASH_ACTIVITY_HASH: u32 = 1251966208;
5555
pub const CHECKMATE_COUNTDOWN_ACTIVITY_HASH: u32 = 2344293485;
5656
pub const CHECKMATE_RUMBLE_ACTIVITY_HASH: u32 = 2461220411;
5757

58+
pub const IRON_BANNER_TRIBUTE_ACTIVITY_HASH: u32 = 2955009825;
59+
5860
pub const CHECKMATE_SURVIVAL_ACTIVITY_HASH: u32 = 3876264582;
5961

6062
const VERSION: &str = env!("CARGO_PKG_VERSION");

src/dclia/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "dclia"
33
#version
4-
version = "0.99.5"
4+
version = "0.99.6"
55
authors = ["Mike Chambers <mikechambers@gmail.com>"]
66
description = "Command line tool for retrieving information on current activity for specified player character."
77
homepage = "https://www.mikechambers.com"

src/dcliad/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "dcliad"
33
#version
4-
version = "0.99.5"
4+
version = "0.99.6"
55
authors = ["Mike Chambers <mikechambers@gmail.com>"]
66
edition = "2018"
77
description = "Command line tool for viewing Destiny 2 activity details."

src/dcliad/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ OPTIONS:
6767
6868
Addition values available are crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles,
6969
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
70-
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]
70+
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]
7171
-n, --name <name>
7272
Bungie name for player
7373
@@ -77,9 +77,9 @@ OPTIONS:
7777
The number of weapons to display details for [default: 5]
7878
```
7979

80-
| ARGUMENT | OPTIONS |
81-
| -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
82-
| --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 |
80+
| ARGUMENT | OPTIONS |
81+
| -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
82+
| --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 |
8383

8484
Manifest can be downloaded and synced with from [dclim](https://github.com/mikechambers/dcli/tree/main/src/dclim).
8585

src/dcliad/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ struct Opt {
508508
/// private_survival, private_rumble, showdown_competitive, survival_competitive,
509509
/// rift_competitive, showdown, lockdown, iron_banner_rift,
510510
/// zone_control, iron_banner_zone_control, rift,
511-
/// 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
511+
/// 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
512512
#[structopt(long = "mode", short = "M",
513513
parse(try_from_str=parse_and_validate_mode), default_value = "all_pvp")]
514514
mode: Mode,

0 commit comments

Comments
 (0)