Skip to content

Commit

Permalink
Fix a copy-paste error with practice arrows.
Browse files Browse the repository at this point in the history
  • Loading branch information
ceejbot committed Dec 14, 2023
1 parent 2ba5168 commit f536d43
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/data/ammo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ use crate::images::icons::Icon;
#[derive(Clone, Debug, Display, Eq, Hash, PartialEq)]
pub enum AmmoType {
Arrow(InvColor),
BodkinArrow(InvColor),
Bolt(InvColor),
BroadheadArrow(InvColor),
Bullet(InvColor),
CrescentArrow(InvColor),
Dart(InvColor),
Slingshot(InvColor),
Melee(InvColor),
FireArrow(InvColor),
Grenade(InvColor),
BodkinArrow(InvColor),
BroadheadArrow(InvColor),
HammerheadArrow(InvColor),
CrescentArrow(InvColor),
FireArrow(InvColor),
Melee(InvColor),
PracticeArrow(InvColor),
Slingshot(InvColor),
WhistleArrow(InvColor),
PractceArrow(InvColor),
}

/// The default ammunition is an arrow drawn in white.
Expand All @@ -50,7 +50,7 @@ impl HasKeywords for AmmoType {
"ArrowCrescent" => Some(Self::CrescentArrow(color.clone())),
"ArrowFire" => Some(Self::FireArrow(color.clone())),
"ArrowWhistle" => Some(Self::WhistleArrow(color.clone())),
"ArrowPractice" => Some(Self::PractceArrowArrow(color.clone())),
"ArrowPractice" => Some(Self::PracticeArrow(color.clone())),
"OCF_AmmoTypeArrow" => Some(Self::Arrow(color.clone())),
"OCF_AmmoTypeBolt" => Some(Self::Bolt(color.clone())),
"OCF_AmmoTypeBullet" => Some(Self::Bullet(color.clone())),
Expand Down Expand Up @@ -85,7 +85,7 @@ impl HasIcon for AmmoType {
Self::CrescentArrow(c) => c.color(),
Self::FireArrow(c) => c.color(),
Self::WhistleArrow(c) => c.color(),
Self::PractceArrow(c) => c.color(),
Self::PracticeArrow(c) => c.color(),
}
}

Expand All @@ -101,7 +101,7 @@ impl HasIcon for AmmoType {
AmmoType::CrescentArrow(_) => &Icon::AmmoCrescentArrow,
AmmoType::FireArrow(_) => &Icon::AmmoFireArrow,
AmmoType::WhistleArrow(_) => &Icon::AmmoWhistleArrow,
AmmoType::PractceArrow(_) => &Icon::AmmoPractceArrow,
AmmoType::PracticeArrow(_) => &Icon::AmmoPracticeArrow,
_ => &Icon::AmmoArrow,
}
}
Expand Down

0 comments on commit f536d43

Please sign in to comment.