Fame per minute -> fame per hour
This commit is contained in:
@@ -59,9 +59,9 @@ class DamageStat:
|
|||||||
|
|
||||||
|
|
||||||
class FameStat:
|
class FameStat:
|
||||||
def __init__(self, fame, fame_per_minute):
|
def __init__(self, fame, fame_per_hour):
|
||||||
self.fame = fame
|
self.fame = fame
|
||||||
self.fame_per_minute = fame_per_minute
|
self.fame_per_hour = fame_per_hour
|
||||||
|
|
||||||
|
|
||||||
def stats(session, with_dmg=False):
|
def stats(session, with_dmg=False):
|
||||||
@@ -85,7 +85,7 @@ def stats(session, with_dmg=False):
|
|||||||
if main_player:
|
if main_player:
|
||||||
if 'fame' in main_player:
|
if 'fame' in main_player:
|
||||||
fame = FameStat(Number(main_player['fame']), Number(
|
fame = FameStat(Number(main_player['fame']), Number(
|
||||||
main_player['fame_per_minute']))
|
main_player['fame_per_hour']))
|
||||||
if 'seconds_in_game' in main_player:
|
if 'seconds_in_game' in main_player:
|
||||||
elapsed = main_player['seconds_in_game']
|
elapsed = main_player['seconds_in_game']
|
||||||
|
|
||||||
@@ -113,7 +113,7 @@ def zone_stats(with_damage=False):
|
|||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = {
|
session = {
|
||||||
'players': [
|
'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'
|
'weapon': 'T4_MAIN_ARCANESTAFF@3'
|
||||||
}},
|
}},
|
||||||
{'player': 'Cursed', 'damage': 1100.0, 'time_in_combat': 12.0, 'dps': 222, 'items': {
|
{'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': {
|
'main': {'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 120000.0, 'dps': 13, 'items': {
|
||||||
'weapon': 'T8_2H_CROSSBOWLARGE@3'
|
'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:
|
else:
|
||||||
session = aostats.stats(StatType.Zone)
|
session = aostats.stats(StatType.Zone)
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class InteractiveBar(QWidget):
|
|||||||
self.table = table
|
self.table = table
|
||||||
self.layout = QHBoxLayout()
|
self.layout = QHBoxLayout()
|
||||||
self.about = about.About()
|
self.about = about.About()
|
||||||
self.fame_per_minute = 0.0
|
self.fame_per_hour = 0.0
|
||||||
self.clipboard = clipboard
|
self.clipboard = clipboard
|
||||||
|
|
||||||
self.layout.addWidget(self.mode)
|
self.layout.addWidget(self.mode)
|
||||||
@@ -76,8 +76,8 @@ class InteractiveBar(QWidget):
|
|||||||
[model.item(i).player for i in range(model.rowCount())],
|
[model.item(i).player for i in range(model.rowCount())],
|
||||||
key=lambda i: i.damage,
|
key=lambda i: i.damage,
|
||||||
reverse=True)
|
reverse=True)
|
||||||
clip = "{}, FPM: {}\nDMG: \n".format(
|
clip = "{}, FPH: {}\nDMG: \n".format(
|
||||||
self.mode.currentText(), self.fame_per_minute)
|
self.mode.currentText(), self.fame_per_hour)
|
||||||
for index, i in enumerate(items[:3]):
|
for index, i in enumerate(items[:3]):
|
||||||
clip += '{}. {}-{}/{}-{}%'.format(index+1,
|
clip += '{}. {}-{}/{}-{}%'.format(index+1,
|
||||||
i.name, i.damage, i.dps, i.percentage)
|
i.name, i.damage, i.dps, i.percentage)
|
||||||
@@ -87,8 +87,8 @@ class InteractiveBar(QWidget):
|
|||||||
self.clipboard.clear(mode=self.clipboard.Clipboard)
|
self.clipboard.clear(mode=self.clipboard.Clipboard)
|
||||||
self.clipboard.setText(clip, mode=self.clipboard.Clipboard)
|
self.clipboard.setText(clip, mode=self.clipboard.Clipboard)
|
||||||
|
|
||||||
def set_fame_per_minute(self, fpm):
|
def set_fame_per_hour(self, fpm):
|
||||||
self.fame_per_minute = fpm
|
self.fame_per_hour = fpm
|
||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
reset = {
|
reset = {
|
||||||
@@ -142,9 +142,9 @@ class MainWidget(QWidget):
|
|||||||
def refresh(self):
|
def refresh(self):
|
||||||
damage_session, fame_stat, elapsed = self.session()
|
damage_session, fame_stat, elapsed = self.session()
|
||||||
self.table.update(damage_session)
|
self.table.update(damage_session)
|
||||||
self.bar.set_fame_per_minute(fame_stat.fame_per_minute)
|
self.bar.set_fame_per_hour(fame_stat.fame_per_hour)
|
||||||
self.fame_label.setText("<b>{}</b> | Fame <b>{}</b> | FPM <b>{}</b>".format(
|
self.fame_label.setText("<b>{}</b> | Fame <b>{}</b> | FPH <b>{}</b>".format(
|
||||||
datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_minute))
|
datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_hour))
|
||||||
|
|
||||||
def mousePressEvent(self, event):
|
def mousePressEvent(self, event):
|
||||||
self.mouse_pos = event.pos()
|
self.mouse_pos = event.pos()
|
||||||
|
|||||||
Reference in New Issue
Block a user