Skip to content

Commit

Permalink
Housekeeping (#62)
Browse files Browse the repository at this point in the history
* chore: remove bracket from tags

* chore: add ds store to gitignore

* chore: bump manifest

* chore: refactor successful warmup
  • Loading branch information
JayAndromeda authored Oct 6, 2023
1 parent d90b9f3 commit 6615d93
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature Request
description: Create an issue for a new feature or enhancement
title: "[feat]: <title>"
title: "feat: <title>"
labels: "enhancement"
body:
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/generic.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Generic Issue
about: Open a general issue
title: "[General]: "
title: "General: "
labels: bug
assignees: ''

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/perk.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Perk Support
description: Create an issue for a new perk/fix a current perk
title: "[perk]: <title>"
title: "perk: <title>"
labels: "perk support"
body:
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/weapon.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Weapon Support
description: Create an issue for a new weapon/fix a current weapon
title: "[weapon]: <title>"
title: "weapon: <title>"
labels: "weapon support"
body:
- type: input
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ database/weapon_test.json
database/enhanced_handler.rs
/zPythonStuff
/zPveReverser
data.json
data.json
.database
.DS_Store
2 changes: 1 addition & 1 deletion build_resources/cached_build.ron
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(
last_manifest_version: "119105.23.09.20.1915-2-bnet.52254",
last_manifest_version: "119335.23.09.27.1916-1-bnet.52347",
dim_perk_mappings: [
(23371658, 2551157718),
(64866129, 3038247973),
Expand Down
22 changes: 6 additions & 16 deletions src/perks/year_5_perks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ pub fn year_5_perks() {
add_dmr(
Perks::FocusedFury,
Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse {

let shots_needed = (_input.calc_data.base_mag
* (_input.calc_data.curr_firing_data.burst_size as f64))
/ 2.0;
Expand Down Expand Up @@ -516,21 +515,12 @@ pub fn year_5_perks() {
add_fmr(
Perks::SuccesfulWarmup,
Box::new(|_input: ModifierResponseInput| -> FiringModifierResponse {
let fire_rate_buff = if _input.value > 0 { 0.625 } else { 1.0 };
let duration = if _input.value > 0 {
6_f64
+ (if _input.is_enhanced { 5_f64 } else { 4_f64 })
* clamp(_input.value as f64 - 1_f64, 0_f64, 4_f64)
} else {
0.0
};
if _input.calc_data.time_total < duration as f64 {
FiringModifierResponse {
burst_delay_scale: fire_rate_buff,
..Default::default()
}
} else {
FiringModifierResponse::default()
if _input.value == 0 {
return FiringModifierResponse::default();
}
FiringModifierResponse {
burst_delay_scale: 0.625,
..Default::default()
}
}),
);
Expand Down

0 comments on commit 6615d93

Please sign in to comment.