+ Player items

This commit is contained in:
Wiktor Mazur
2019-12-12 15:58:14 +01:00
parent 9296f536e7
commit 47f64a9834
21 changed files with 10266 additions and 88 deletions
+1
View File
@@ -2,4 +2,5 @@ pyside2~=5.13
pyinstaller
toml~=0.10
requests~=2.22
Pillow~=6.2
./backend
+6
View File
@@ -0,0 +1,6 @@
import os
assets_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'assets')
def path(file):
return os.path.join(assets_path, file)
File diff suppressed because it is too large Load Diff
+70 -10
View File
@@ -1,3 +1,10 @@
import collections
import functools
import requests
from PIL import Image, ImageQt
from io import BytesIO
from PySide2.QtCore import Qt
from PySide2.QtWidgets import QApplication
from PySide2.QtWidgets import QMessageBox
@@ -14,43 +21,96 @@ from PySide2.QtGui import QStandardItem
from PySide2 import QtGui
from PySide2 import QtCore
from . import weapon
from . import assets
Style = collections.namedtuple('Style', 'bg')
def player_style(items):
weapon_type = weapon.get_weapon_type(items)
if weapon_type == weapon.WeaponType.Arcane:
return Style(bg = '#f032e6')
elif weapon_type == weapon.WeaponType.Axe:
return Style(bg = '#800000')
elif weapon_type == weapon.WeaponType.Bow:
return Style(bg = '#469990')
elif weapon_type == weapon.WeaponType.Crossbow:
return Style(bg = '#000075')
elif weapon_type == weapon.WeaponType.Curse:
return Style(bg = '#911eb4')
elif weapon_type == weapon.WeaponType.Dagger:
return Style(bg = '#4d5f20')
elif weapon_type == weapon.WeaponType.Fire:
return Style(bg = '#e6194B')
elif weapon_type == weapon.WeaponType.Frost:
return Style(bg = '#4363d8')
elif weapon_type == weapon.WeaponType.Hammer:
return Style(bg = '#9A6324')
elif weapon_type == weapon.WeaponType.Holy:
return Style(bg = '#42d4f4')
elif weapon_type == weapon.WeaponType.Mace:
return Style(bg = '#808000')
elif weapon_type == weapon.WeaponType.Nature:
return Style(bg = '#3cb44b')
elif weapon_type == weapon.WeaponType.Quarterstaff:
return Style(bg = '#f58231')
elif weapon_type == weapon.WeaponType.Spear:
return Style(bg = '#a9a9a9')
elif weapon_type == weapon.WeaponType.Sword:
return Style(bg = '#ffe119')
else:
return Style(bg = '#42413c')
@functools.lru_cache(maxsize=None)
def player_icon(weapon):
url = f'https://albiononline2d.ams3.cdn.digitaloceanspaces.com/thumbnails/orig/{weapon}'
r = requests.get(url)
img = Image.open(BytesIO(r.content))
img_qt = ImageQt.ImageQt(img)
pix = QtGui.QPixmap.fromImage(img_qt)
return QtGui.QIcon(pix)
class DmgList(QListView):
class DmgItem(QtGui.QStandardItem):
def __init__(self, player, parent):
QtGui.QStandardItem .__init__(self)
self.parent = parent
self.player = player
self.player_style = player_style(player.items)
self.update(player)
self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter)
def update(self, player):
self.name = player.name
self.damage = player.damage
self.dps = player.dps
self.percentage = player.percentage
self.best_damage = player.best_damage
self.player = player
self.setText("{} {} ({}, {}%)".format(
self.name, self.damage, self.dps, self.percentage
self.player.name, self.player.damage, self.player.dps, self.player.percentage
))
self.refresh()
def refresh(self):
value = round(self.damage / self.best_damage, 2)
value = round(self.player.damage / self.player.best_damage, 2)
QRectF = QtCore.QRectF(self.parent.rect())
gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight())
gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor('#42413c'))
gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor(self.player_style.bg))
gradient.setColorAt(value, QtGui.QColor('#000000'))
gradient.setColorAt(value+0.001 if value < 1 else 1, QtGui.QColor('#000000'))
brush = QtGui.QBrush(gradient)
self.setBackground(brush)
self.setIcon(player_icon(self.player.items['weapon']))
class SortProxyModel(QtCore.QSortFilterProxyModel):
def lessThan(self, left, right):
l = self.sourceModel().item(left.row())
r = self.sourceModel().item(right.row())
return l.percentage < r.percentage
return l.player.percentage < r.player.percentage
class DmgItemModel(QStandardItemModel):
def __init__(self, view):
@@ -69,7 +129,7 @@ class DmgList(QListView):
visible_names = []
for player in players:
items = (self.model.item(i) for i in range(self.model.rowCount()))
found = next((i for i in items if i.name == player.name), None)
found = next((i for i in items if i.player.name == player.name), None)
if found:
found.update(player)
else:
+53 -16
View File
@@ -38,8 +38,9 @@ INITIALIZATION_RESULT = {
}
class DamageStat:
def __init__(self, name, damage, time_in_combat, dps, percentage, best_damage):
def __init__(self, name, items, damage, time_in_combat, dps, percentage, best_damage):
self.name = name
self.items = items
self.damage = Number(damage)
self.time_in_combat = Number(time_in_combat)
self.dps = Number(dps)
@@ -60,10 +61,10 @@ class FameStat:
def stats(session):
with_damage = [s for s in session if s['damage'] != 0.0]
extended_session = with_percentage(with_damage)
extended_session = with_percentage(session)
statistics = [DamageStat(
s['player'],
s['player'],
s['items'],
s['damage'],
s['time_in_combat'],
s['dps'],
@@ -93,7 +94,7 @@ def with_percentage(session):
damage_done += damage
for s in session:
s['dmg_percentage'] = s['damage'] / damage_done * 100
s['dmg_percentage'] = s['damage'] / damage_done * 100 if s['damage'] else 0.0
s['best_damage'] = best_damage
return session
@@ -101,15 +102,51 @@ def with_percentage(session):
def zone_stats():
if TESTING_ENABLED:
session = [
{'player': 'John Wick', 'damage': 1234.02,
'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30},
{'player': 'The Warrior', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
{'player': 'The Mage', 'damage': 23000.02, 'time_in_combat': 12.0, 'dps': 13},
{'player': 'Someone', 'damage': 2000.02, 'time_in_combat': 12.0, 'dps': 13},
{'player': 'The chosen one', 'damage': 230.02, 'time_in_combat': 12.0, 'dps': 13},
{'player': 'Party filler', 'damage': 20.02, 'time_in_combat': 12.0, 'dps': 13},
{'player': 'OneMoreToGo', 'damage': 2000.02, 'time_in_combat': 12.0, 'dps': 13},
{'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
{'player': 'Arcane', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': {
'weapon': 'T3_MAIN_ARCANESTAFF'
}},
{'player': 'Cursed', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12, 'items': {
'weapon': 'T5_MAIN_CURSEDSTAFF'
}},
{'player': 'Fire', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T5_MAIN_FIRESTAFF'
}},
{'player': 'Frost', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T5_MAIN_FROSTSTAFF@1'
}},
{'player': 'Holy', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T6_MAIN_HOLYSTAFF'
}},
{'player': 'Nature', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_NATURESTAFF@3'
}},
{'player': 'Axe', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_AXE'
}},
{'player': 'Dagger', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_DAGGER@2'
}},
{'player': 'Hammer', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T7_MAIN_HAMMER@2'
}},
{'player': 'Mace', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T6_MAIN_MACE@2'
}},
{'player': 'Quarterstaff', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T5_2H_IRONCLADEDSTAFF'
}},
{'player': 'Spear', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_SPEAR@2'
}},
{'player': 'Sword', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T7_2H_CLAYMORE@1'
}},
{'player': 'Bow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_2H_BOW'
}},
{'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_2H_CROSSBOWLARGE@3'
}},
]
else:
session = aostats.stats(StatType.Zone)
@@ -120,7 +157,7 @@ def zone_stats():
def overall_stats():
if TESTING_ENABLED:
session = [
{'player': 'overall', 'damage': 1234.02,
{'player': 'overall', 'damage': 1000.0,
'time_in_combat': 12.0, 'dps': 12.4234},
]
else:
@@ -132,7 +169,7 @@ def overall_stats():
def last_fight_stats():
if TESTING_ENABLED:
session = [
{'player': 'last fight', 'damage': 1234.02,
{'player': 'last fight', 'damage': 1000.0,
'time_in_combat': 12.0, 'dps': 12.4234},
]
else:
+5 -7
View File
@@ -1,5 +1,4 @@
import sys
import os
from PySide2.QtCore import QTimer
from PySide2.QtCore import Qt
@@ -17,8 +16,7 @@ from PySide2 import QtCore
from .dmg_list import DmgList
from . import about
from . import engine
assets_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'assets')
from . import assets
class Mode:
CURRENT_ZONE = 'Statistics: Current zone'
@@ -37,16 +35,16 @@ class InteractiveBar(QWidget):
self.clipboard = clipboard
self.copy_button = QPushButton(self)
self.copy_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'copy.png')))
self.copy_button.setIcon(QtGui.QIcon(assets.path('copy.png')))
self.reset_button = QPushButton()
self.reset_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'reset.png')))
self.reset_button.setIcon(QtGui.QIcon(assets.path('reset.png')))
self.close_button = QPushButton(self)
self.close_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'close.png')))
self.close_button.setIcon(QtGui.QIcon(assets.path('close.png')))
self.about_button = QPushButton(self)
self.about_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'about.png')))
self.about_button.setIcon(QtGui.QIcon(assets.path('about.png')))
self.layout.addWidget(self.mode)
self.layout.addWidget(self.copy_button)
+68
View File
@@ -0,0 +1,68 @@
import json
from . import assets
class WeaponType:
Arcane = 'arcanestaff'
Axe = 'axe'
Bow = 'bow'
Crossbow = 'crossbow'
Curse = 'cursestaff'
Dagger = 'dagger'
Fire = 'firestaff'
Frost = 'froststaff'
Hammer = 'hammer'
Holy = 'holystaff'
Mace = 'mace'
Nature = 'naturestaff'
Quarterstaff = 'quarterstaff'
Spear = 'spear'
Sword = 'sword'
_mappings = None
def map_weapon(weapon):
global _mappings
if not _mappings:
with open(assets.path('item_category_map.json')) as m:
_mappings = json.loads(m.read())
return _mappings[weapon]
def get_weapon_type(items):
weapon = map_weapon(items['weapon'])
if weapon == WeaponType.Arcane:
return WeaponType.Arcane
elif weapon == WeaponType.Axe:
return WeaponType.Axe
elif weapon == WeaponType.Bow:
return WeaponType.Bow
elif weapon == WeaponType.Crossbow:
return WeaponType.Crossbow
elif weapon == WeaponType.Curse:
return WeaponType.Curse
elif weapon == WeaponType.Dagger:
return WeaponType.Dagger
elif weapon == WeaponType.Fire:
return WeaponType.Fire
elif weapon == WeaponType.Frost:
return WeaponType.Frost
elif weapon == WeaponType.Hammer:
return WeaponType.Hammer
elif weapon == WeaponType.Holy:
return WeaponType.Holy
elif weapon == WeaponType.Mace:
return WeaponType.Mace
elif weapon == WeaponType.Nature:
return WeaponType.Nature
elif weapon == WeaponType.Quarterstaff:
return WeaponType.Quarterstaff
elif weapon == WeaponType.Spear:
return WeaponType.Spear
elif weapon == WeaponType.Sword:
return WeaponType.Sword
else:
return None