diff --git a/frontend/src/engine.py b/frontend/src/engine.py index 044dc90..a5fa2ef 100644 --- a/frontend/src/engine.py +++ b/frontend/src/engine.py @@ -59,9 +59,9 @@ class DamageStat: class FameStat: - def __init__(self, fame, fame_per_minute): + def __init__(self, fame, fame_per_hour): self.fame = fame - self.fame_per_minute = fame_per_minute + self.fame_per_hour = fame_per_hour def stats(session, with_dmg=False): @@ -85,7 +85,7 @@ def stats(session, with_dmg=False): if main_player: if 'fame' in main_player: fame = FameStat(Number(main_player['fame']), Number( - main_player['fame_per_minute'])) + main_player['fame_per_hour'])) if 'seconds_in_game' in main_player: elapsed = main_player['seconds_in_game'] @@ -113,7 +113,7 @@ def zone_stats(with_damage=False): if TESTING_ENABLED: session = { 'players': [ - {'player': 'Arcane', 'damage': 200.0, 'time_in_combat': 12.0, 'dps': 142.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': { + {'player': 'Arcane', 'damage': 200.0, 'time_in_combat': 12.0, 'dps': 142.4234, 'fame': 20.0, 'fame_per_hour': 30, 'items': { 'weapon': 'T4_MAIN_ARCANESTAFF@3' }}, {'player': 'Cursed', 'damage': 1100.0, 'time_in_combat': 12.0, 'dps': 222, 'items': { @@ -161,7 +161,7 @@ def zone_stats(with_damage=False): ], 'main': {'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 120000.0, 'dps': 13, 'items': { 'weapon': 'T8_2H_CROSSBOWLARGE@3' - }, 'fame': 2300000, 'fame_per_minute': 46000.0, 'seconds_in_game': 3000} + }, 'fame': 2300000, 'fame_per_hour': 46000.0, 'seconds_in_game': 3000} } else: session = aostats.stats(StatType.Zone) diff --git a/frontend/src/main.py b/frontend/src/main.py index 86bfc8e..1656a79 100644 --- a/frontend/src/main.py +++ b/frontend/src/main.py @@ -38,7 +38,7 @@ class InteractiveBar(QWidget): self.table = table self.layout = QHBoxLayout() self.about = about.About() - self.fame_per_minute = 0.0 + self.fame_per_hour = 0.0 self.clipboard = clipboard self.layout.addWidget(self.mode) @@ -76,8 +76,8 @@ class InteractiveBar(QWidget): [model.item(i).player for i in range(model.rowCount())], key=lambda i: i.damage, reverse=True) - clip = "{}, FPM: {}\nDMG: \n".format( - self.mode.currentText(), self.fame_per_minute) + clip = "{}, FPH: {}\nDMG: \n".format( + self.mode.currentText(), self.fame_per_hour) for index, i in enumerate(items[:3]): clip += '{}. {}-{}/{}-{}%'.format(index+1, i.name, i.damage, i.dps, i.percentage) @@ -87,8 +87,8 @@ class InteractiveBar(QWidget): self.clipboard.clear(mode=self.clipboard.Clipboard) self.clipboard.setText(clip, mode=self.clipboard.Clipboard) - def set_fame_per_minute(self, fpm): - self.fame_per_minute = fpm + def set_fame_per_hour(self, fpm): + self.fame_per_hour = fpm def reset(self): reset = { @@ -142,9 +142,9 @@ class MainWidget(QWidget): def refresh(self): damage_session, fame_stat, elapsed = self.session() self.table.update(damage_session) - self.bar.set_fame_per_minute(fame_stat.fame_per_minute) - self.fame_label.setText("{} | Fame {} | FPM {}".format( - datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_minute)) + self.bar.set_fame_per_hour(fame_stat.fame_per_hour) + self.fame_label.setText("{} | Fame {} | FPH {}".format( + datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_hour)) def mousePressEvent(self, event): self.mouse_pos = event.pos()