Skip to content

Commit

Permalink
Fix max DPS calculation issue
Browse files Browse the repository at this point in the history
  • Loading branch information
GoldenChrysus committed Aug 1, 2020
1 parent e92d601 commit 9ef5f13
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# Changelog

## 0.20.1-alpha

**Released: 2020-08-01**

### Bug Fixes
- Fixed issue where max DPS is sometimes not registered correctly due to incorrect data types

### Features
- N/A

### UI Changes
- N/A

### Code Changes
- N/A

### Miscellaneous
- N/A

## 0.20.0-alpha

**Released: 2020-07-26**
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ffxiv-ember-overlay",
"description": "React + Redux overlay for the OverlayPlugin and ACTWebSocket plugins for Advanced Combat Tracker for use with Final Fantasy XIV.",
"license": "GPL-3.0-only",
"version": "0.20.0-alpha",
"version": "0.20.1-alpha",
"keywords": [
"ffxiv-overlays",
"ffxiv-act",
Expand Down
4 changes: 2 additions & 2 deletions src/processors/GameDataProcessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class GameDataProcessor {
for (let player_name in data.Combatant) {
data.Combatant[player_name].max_enc_dps = 0;

if (can_calculate_max && (!current_state || !current_state.internal.game.Combatant || !current_state.internal.game.Combatant[player_name] || data.Combatant[player_name].encdps > current_state.internal.game.Combatant[player_name].max_enc_dps)) {
data.Combatant[player_name].max_enc_dps = data.Combatant[player_name].encdps;
if (can_calculate_max && (!current_state || !current_state.internal.game.Combatant || !current_state.internal.game.Combatant[player_name] || +data.Combatant[player_name].encdps > current_state.internal.game.Combatant[player_name].max_enc_dps)) {
data.Combatant[player_name].max_enc_dps = +data.Combatant[player_name].encdps;
} else if (current_state && current_state.internal.game.Combatant && current_state.internal.game.Combatant[player_name]) {
data.Combatant[player_name].max_enc_dps = current_state.internal.game.Combatant[player_name].max_enc_dps;
}
Expand Down

0 comments on commit 9ef5f13

Please sign in to comment.