Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/perks/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,14 @@ impl ReloadOverrideResponse {
#[derive(Debug, Clone, PartialEq)]
pub struct ExplosivePercentResponse {
pub percent: f64,
pub delyed: f64,
pub delay: f64,
pub retain_base_total: bool,
}
impl Default for ExplosivePercentResponse {
fn default() -> Self {
Self {
percent: 0.0,
delyed: 0.0,
delay: 0.0,
retain_base_total: false,
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/perks/meta_perks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ pub fn meta_perks() {
if _input.calc_data.ammo_type == &AmmoType::SPECIAL {
return ExplosivePercentResponse {
percent: 0.5 + 0.003 * blast_radius as f64,
delyed: 0.0,
delay: 0.0,
retain_base_total: true,
};
} else if _input.calc_data.ammo_type == &AmmoType::HEAVY {
return ExplosivePercentResponse {
percent: 0.7 + 0.00175 * blast_radius as f64,
delyed: 0.0,
delay: 0.0,
retain_base_total: true,
};
};
Expand All @@ -152,13 +152,13 @@ pub fn meta_perks() {
{
return ExplosivePercentResponse {
percent: 0.778,
delyed: 0.0,
delay: 0.0,
retain_base_total: true,
};
}
ExplosivePercentResponse {
percent: 0.0,
delyed: 0.0,
delay: 0.0,
retain_base_total: true,
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/perks/year_1_perks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ pub fn year_1_perks() {
|_input: ModifierResponseInput| -> ExplosivePercentResponse {
ExplosivePercentResponse {
percent: 0.5,
delyed: 0.0,
delay: 0.0,
retain_base_total: true,
}
},
Expand Down Expand Up @@ -211,7 +211,7 @@ pub fn year_1_perks() {
|_input: ModifierResponseInput| -> ExplosivePercentResponse {
ExplosivePercentResponse {
percent: 0.5,
delyed: 0.6,
delay: 0.6,
retain_base_total: true,
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/perks/year_2_perks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pub fn year_2_perks() {
|_input: ModifierResponseInput| -> ExplosivePercentResponse {
ExplosivePercentResponse {
percent: 0.5,
delyed: if _input.pvp { 0.0 } else { 0.2 },
delay: if _input.pvp { 0.0 } else { 0.2 },
retain_base_total: true,
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/weapons/stat_calc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ impl Weapon {
if epr.retain_base_total && self.firing_data.crit_mult > 1.0 {
crit = (self.firing_data.crit_mult - 1.0) / (1.0 - epr.percent) + 1.0
}
delay = epr.delyed;
delay = epr.delay;
}
(impact, explosion, crit, delay)
}
Expand Down