show everything
This commit is contained in:
+1
-1
@@ -137,7 +137,7 @@ pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
|
|||||||
if let Ok(ref mut meter) = m.lock() {
|
if let Ok(ref mut meter) = m.lock() {
|
||||||
return Ok(core::stats(&meter, stat_type)
|
return Ok(core::stats(&meter, stat_type)
|
||||||
.into_iter()
|
.into_iter()
|
||||||
// .filter(|s| s.damage != 0.0 || s.fame != 0.0)
|
.filter(|s| !s.idle || s.fame != 0.0)
|
||||||
.collect::<Vec<meter::PlayerStatistics>>()
|
.collect::<Vec<meter::PlayerStatistics>>()
|
||||||
.into_py_object(py))
|
.into_py_object(py))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,8 @@ impl Session {
|
|||||||
fame: player.fame(),
|
fame: player.fame(),
|
||||||
fame_per_minute: player.fame_per_minute(),
|
fame_per_minute: player.fame_per_minute(),
|
||||||
fame_per_hour: player.fame_per_hour(),
|
fame_per_hour: player.fame_per_hour(),
|
||||||
items: player.items()
|
items: player.items(),
|
||||||
|
idle: player.idle(),
|
||||||
})
|
})
|
||||||
.collect(),
|
.collect(),
|
||||||
)
|
)
|
||||||
@@ -100,6 +101,7 @@ pub struct Meter {
|
|||||||
last_fight_session: Session,
|
last_fight_session: Session,
|
||||||
main_player_id: Option<usize>,
|
main_player_id: Option<usize>,
|
||||||
party: Option<types::Party>,
|
party: Option<types::Party>,
|
||||||
|
unconsumed_items: HashMap<usize, game_protocol::Items>,
|
||||||
config: MeterConfig,
|
config: MeterConfig,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,6 +113,7 @@ impl Meter {
|
|||||||
last_fight_session: Session::new(),
|
last_fight_session: Session::new(),
|
||||||
main_player_id: None,
|
main_player_id: None,
|
||||||
party: None,
|
party: None,
|
||||||
|
unconsumed_items: HashMap::new(),
|
||||||
config: Default::default(),
|
config: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -211,6 +214,21 @@ impl PlayerEvents for Meter {
|
|||||||
Some(vec![zone_player, las_fight_session_player])
|
Some(vec![zone_player, las_fight_session_player])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn register_item_update(&mut self, player_id: usize, items: &game_protocol::Items) -> Option<()> {
|
||||||
|
let mut consumed = false;
|
||||||
|
for player in self.get_item_carriers_in_zone(player_id).unwrap_or(vec![]) {
|
||||||
|
player.items_update(items);
|
||||||
|
consumed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if !consumed {
|
||||||
|
info!("Storing not consumed items for player id: {}", player_id);
|
||||||
|
self.unconsumed_items.insert(player_id, items.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(())
|
||||||
|
}
|
||||||
|
|
||||||
fn register_main_player(&mut self, name: &str, id: usize) {
|
fn register_main_player(&mut self, name: &str, id: usize) {
|
||||||
info!("Main player {} registered with id {}", name, id);
|
info!("Main player {} registered with id {}", name, id);
|
||||||
self.main_player_id = Some(id);
|
self.main_player_id = Some(id);
|
||||||
@@ -219,6 +237,11 @@ impl PlayerEvents for Meter {
|
|||||||
self.new_session();
|
self.new_session();
|
||||||
}
|
}
|
||||||
self.add_player(name, id);
|
self.add_player(name, id);
|
||||||
|
if let Some(items) = self.unconsumed_items.get(&id) {
|
||||||
|
let i = items.clone();
|
||||||
|
self.register_item_update(id, &i);
|
||||||
|
self.unconsumed_items.remove(&id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn register_leave(&mut self, id: usize) -> Option<()> {
|
fn register_leave(&mut self, id: usize) -> Option<()> {
|
||||||
@@ -261,6 +284,7 @@ impl LastFightStats for Meter {
|
|||||||
|
|
||||||
fn reset_last_fight_stats(&mut self) -> Option<()> {
|
fn reset_last_fight_stats(&mut self) -> Option<()> {
|
||||||
self.last_fight_session = Session::from(&self.last_fight_session);
|
self.last_fight_session = Session::from(&self.last_fight_session);
|
||||||
|
info!("Reset: last fight");
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -274,7 +298,7 @@ impl ZoneStats for Meter {
|
|||||||
fn reset_zone_stats(&mut self) -> Option<()> {
|
fn reset_zone_stats(&mut self) -> Option<()> {
|
||||||
let last_session = self.zone_session_mut()?;
|
let last_session = self.zone_session_mut()?;
|
||||||
self.zone_session = Some(Session::from(&last_session));
|
self.zone_session = Some(Session::from(&last_session));
|
||||||
|
info!("Reset: zone");
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -298,7 +322,7 @@ impl GameStats for Meter {
|
|||||||
let last_session = self.zone_session_mut()?;
|
let last_session = self.zone_session_mut()?;
|
||||||
self.zone_session = Some(Session::from(&last_session));
|
self.zone_session = Some(Session::from(&last_session));
|
||||||
self.last_fight_session = Session::from(&self.last_fight_session);
|
self.last_fight_session = Session::from(&self.last_fight_session);
|
||||||
|
info!("Reset: overall");
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,8 @@ pub struct Player {
|
|||||||
combat_state: CombatState,
|
combat_state: CombatState,
|
||||||
time_started: Instant,
|
time_started: Instant,
|
||||||
fame: f32,
|
fame: f32,
|
||||||
items: Items
|
items: Items,
|
||||||
|
idle: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -50,8 +51,13 @@ impl Player {
|
|||||||
time_started: Instant::now(),
|
time_started: Instant::now(),
|
||||||
fame: 0.0,
|
fame: 0.0,
|
||||||
items: Default::default(),
|
items: Default::default(),
|
||||||
|
idle: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn idle(&self) -> bool {
|
||||||
|
self.idle
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DamageDealer for Player {
|
impl DamageDealer for Player {
|
||||||
@@ -59,11 +65,12 @@ impl DamageDealer for Player {
|
|||||||
if self.combat_state == CombatState::OutOfCombat {
|
if self.combat_state == CombatState::OutOfCombat {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
self.idle = false;
|
||||||
self.damage_dealt += damage_dealt
|
self.damage_dealt += damage_dealt
|
||||||
}
|
}
|
||||||
|
|
||||||
fn enter_combat(&mut self) {
|
fn enter_combat(&mut self) {
|
||||||
|
self.idle = false;
|
||||||
self.combat_time.entered_combat = Some(Instant::now());
|
self.combat_time.entered_combat = Some(Instant::now());
|
||||||
self.combat_state = CombatState::InCombat;
|
self.combat_state = CombatState::InCombat;
|
||||||
}
|
}
|
||||||
@@ -103,12 +110,14 @@ impl DamageStats for Player {
|
|||||||
impl FameGatherer for Player {
|
impl FameGatherer for Player {
|
||||||
fn register_fame_gain(&mut self, fame: f32) {
|
fn register_fame_gain(&mut self, fame: f32) {
|
||||||
self.fame += fame;
|
self.fame += fame;
|
||||||
|
self.idle = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ItemCarrier for Player {
|
impl ItemCarrier for Player {
|
||||||
fn items_update(&mut self, items: &Items) {
|
fn items_update(&mut self, items: &Items) {
|
||||||
self.items = items.clone();
|
self.items = items.clone();
|
||||||
|
self.idle = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn items(&self) -> Items {
|
fn items(&self) -> Items {
|
||||||
|
|||||||
@@ -74,6 +74,8 @@ pub trait PlayerEvents {
|
|||||||
|
|
||||||
fn register_player(&mut self, name: &str, id: usize);
|
fn register_player(&mut self, name: &str, id: usize);
|
||||||
|
|
||||||
|
fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()>;
|
||||||
|
|
||||||
fn register_fame_gain(&mut self, player_id: usize, fame: f32) -> Option<()> {
|
fn register_fame_gain(&mut self, player_id: usize, fame: f32) -> Option<()> {
|
||||||
for player in self.get_fame_gatherers_in_zone(player_id)? {
|
for player in self.get_fame_gatherers_in_zone(player_id)? {
|
||||||
player.register_fame_gain(fame);
|
player.register_fame_gain(fame);
|
||||||
@@ -82,14 +84,6 @@ pub trait PlayerEvents {
|
|||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()> {
|
|
||||||
for player in self.get_item_carriers_in_zone(player_id)? {
|
|
||||||
player.items_update(items);
|
|
||||||
}
|
|
||||||
|
|
||||||
Some(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
|
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
|
||||||
for player in self.get_damage_dealers_in_zone(player_id)? {
|
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||||
if damage < 0.0 {
|
if damage < 0.0 {
|
||||||
|
|||||||
@@ -44,7 +44,8 @@ pub struct PlayerStatistics {
|
|||||||
pub fame: f32,
|
pub fame: f32,
|
||||||
pub fame_per_minute: u32,
|
pub fame_per_minute: u32,
|
||||||
pub fame_per_hour: u32,
|
pub fame_per_hour: u32,
|
||||||
pub items: Items
|
pub items: Items,
|
||||||
|
pub idle: bool
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import threading
|
||||||
|
import queue
|
||||||
|
import requests
|
||||||
|
import collections
|
||||||
|
|
||||||
|
|
||||||
|
Item = collections.namedtuple('Item', 'key value')
|
||||||
|
|
||||||
|
|
||||||
|
_queue = queue.Queue()
|
||||||
|
_requests = {}
|
||||||
|
_requests_threads = {}
|
||||||
|
|
||||||
|
|
||||||
|
def update_loop():
|
||||||
|
while True:
|
||||||
|
item = _queue.get()
|
||||||
|
|
||||||
|
_requests[item.key] = item.value
|
||||||
|
_requests_threads[item.key].join()
|
||||||
|
del _requests_threads[item.key]
|
||||||
|
|
||||||
|
_update_thread = threading.Thread(target=update_loop, daemon=True)
|
||||||
|
_update_thread.start()
|
||||||
|
|
||||||
|
def _async_req(url):
|
||||||
|
req = requests.get(url)
|
||||||
|
|
||||||
|
_queue.put(Item(key=url, value=req))
|
||||||
|
|
||||||
|
def get(url):
|
||||||
|
|
||||||
|
if url in _requests:
|
||||||
|
return _requests[url]
|
||||||
|
|
||||||
|
if url in _requests_threads:
|
||||||
|
return None
|
||||||
|
|
||||||
|
rt = threading.Thread(target=_async_req, args=(url,))
|
||||||
|
_requests_threads[url] = rt
|
||||||
|
rt.start()
|
||||||
|
|
||||||
|
return None
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import collections
|
import collections
|
||||||
import functools
|
import functools
|
||||||
import requests
|
|
||||||
from PIL import Image, ImageQt
|
from PIL import Image, ImageQt
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
|
|
||||||
@@ -23,6 +22,7 @@ from PySide2 import QtCore
|
|||||||
|
|
||||||
from . import weapon
|
from . import weapon
|
||||||
from . import assets
|
from . import assets
|
||||||
|
from . import async_request
|
||||||
|
|
||||||
Style = collections.namedtuple('Style', 'bg')
|
Style = collections.namedtuple('Style', 'bg')
|
||||||
|
|
||||||
@@ -62,17 +62,19 @@ def player_style(items):
|
|||||||
else:
|
else:
|
||||||
return Style(bg = '#42413c')
|
return Style(bg = '#42413c')
|
||||||
|
|
||||||
@functools.lru_cache(maxsize=None)
|
# @functools.lru_cache(maxsize=None)
|
||||||
def player_icon(weapon):
|
def player_icon(weapon):
|
||||||
url = f'https://albiononline2d.ams3.cdn.digitaloceanspaces.com/thumbnails/orig/{weapon}'
|
url = f'https://albiononline2d.ams3.cdn.digitaloceanspaces.com/thumbnails/orig/{weapon}'
|
||||||
|
try:
|
||||||
r = requests.get(url)
|
r = async_request.get(url)
|
||||||
img = Image.open(BytesIO(r.content))
|
img = Image.open(BytesIO(r.content))
|
||||||
|
|
||||||
img_qt = ImageQt.ImageQt(img)
|
img_qt = ImageQt.ImageQt(img)
|
||||||
pix = QtGui.QPixmap.fromImage(img_qt)
|
pix = QtGui.QPixmap.fromImage(img_qt)
|
||||||
|
|
||||||
return QtGui.QIcon(pix)
|
return QtGui.QIcon(pix)
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
|
||||||
class DmgList(QListView):
|
class DmgList(QListView):
|
||||||
class DmgItem(QtGui.QStandardItem):
|
class DmgItem(QtGui.QStandardItem):
|
||||||
@@ -83,7 +85,7 @@ class DmgList(QListView):
|
|||||||
self.player_style = player_style(player.items)
|
self.player_style = player_style(player.items)
|
||||||
self.update(player)
|
self.update(player)
|
||||||
|
|
||||||
self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter)
|
self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter | QtCore.Qt.AlignmentFlag.AlignVCenter)
|
||||||
|
|
||||||
def update(self, player):
|
def update(self, player):
|
||||||
self.player = player
|
self.player = player
|
||||||
@@ -103,8 +105,9 @@ class DmgList(QListView):
|
|||||||
brush = QtGui.QBrush(gradient)
|
brush = QtGui.QBrush(gradient)
|
||||||
|
|
||||||
self.setBackground(brush)
|
self.setBackground(brush)
|
||||||
|
icon = player_icon(self.player.items['weapon'])
|
||||||
self.setIcon(player_icon(self.player.items['weapon']))
|
if icon:
|
||||||
|
self.setIcon(icon)
|
||||||
|
|
||||||
class SortProxyModel(QtCore.QSortFilterProxyModel):
|
class SortProxyModel(QtCore.QSortFilterProxyModel):
|
||||||
def lessThan(self, left, right):
|
def lessThan(self, left, right):
|
||||||
@@ -126,6 +129,10 @@ class DmgList(QListView):
|
|||||||
self.setModel(self.proxy)
|
self.setModel(self.proxy)
|
||||||
|
|
||||||
def update(self, players):
|
def update(self, players):
|
||||||
|
if not players:
|
||||||
|
self.model.clear()
|
||||||
|
return
|
||||||
|
|
||||||
visible_names = []
|
visible_names = []
|
||||||
for player in players:
|
for player in players:
|
||||||
items = (self.model.item(i) for i in range(self.model.rowCount()))
|
items = (self.model.item(i) for i in range(self.model.rowCount()))
|
||||||
@@ -137,7 +144,7 @@ class DmgList(QListView):
|
|||||||
visible_names.append(player.name)
|
visible_names.append(player.name)
|
||||||
for i in range(self.model.rowCount()):
|
for i in range(self.model.rowCount()):
|
||||||
item = self.model.item(i)
|
item = self.model.item(i)
|
||||||
if hasattr(item, 'name') and item.name not in visible_names:
|
if hasattr(item.player, 'name') and item.player.name not in visible_names:
|
||||||
self.model.removeRow(i)
|
self.model.removeRow(i)
|
||||||
|
|
||||||
self.proxy.sort(0, QtCore.Qt.DescendingOrder)
|
self.proxy.sort(0, QtCore.Qt.DescendingOrder)
|
||||||
|
|||||||
@@ -60,8 +60,9 @@ class FameStat:
|
|||||||
self.fame_per_minute = fame_per_minute
|
self.fame_per_minute = fame_per_minute
|
||||||
|
|
||||||
|
|
||||||
def stats(session):
|
def stats(session, with_dmg=False):
|
||||||
extended_session = with_percentage(session)
|
with_damage = [s for s in session if s['damage'] != 0.0] if with_dmg else session
|
||||||
|
extended_session = with_percentage(with_damage)
|
||||||
statistics = [DamageStat(
|
statistics = [DamageStat(
|
||||||
s['player'],
|
s['player'],
|
||||||
s['items'],
|
s['items'],
|
||||||
@@ -99,7 +100,7 @@ def with_percentage(session):
|
|||||||
|
|
||||||
return session
|
return session
|
||||||
|
|
||||||
def zone_stats():
|
def zone_stats(with_damage=False):
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = [
|
||||||
{'player': 'Arcane', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': {
|
{'player': 'Arcane', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': {
|
||||||
@@ -151,10 +152,10 @@ def zone_stats():
|
|||||||
else:
|
else:
|
||||||
session = aostats.stats(StatType.Zone)
|
session = aostats.stats(StatType.Zone)
|
||||||
|
|
||||||
return stats(session)
|
return stats(session, with_damage)
|
||||||
|
|
||||||
|
|
||||||
def overall_stats():
|
def overall_stats(with_damage=False):
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = [
|
||||||
{'player': 'overall', 'damage': 1000.0,
|
{'player': 'overall', 'damage': 1000.0,
|
||||||
@@ -163,10 +164,10 @@ def overall_stats():
|
|||||||
else:
|
else:
|
||||||
session = aostats.stats(StatType.Overall)
|
session = aostats.stats(StatType.Overall)
|
||||||
|
|
||||||
return stats(session)
|
return stats(session, with_damage)
|
||||||
|
|
||||||
|
|
||||||
def last_fight_stats():
|
def last_fight_stats(with_damage=False):
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = [
|
||||||
{'player': 'last fight', 'damage': 1000.0,
|
{'player': 'last fight', 'damage': 1000.0,
|
||||||
@@ -175,7 +176,7 @@ def last_fight_stats():
|
|||||||
else:
|
else:
|
||||||
session = aostats.stats(StatType.LastFight)
|
session = aostats.stats(StatType.LastFight)
|
||||||
|
|
||||||
return stats(session)
|
return stats(session, with_damage)
|
||||||
|
|
||||||
def get_party_members():
|
def get_party_members():
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
|
|||||||
+17
-6
@@ -1,4 +1,5 @@
|
|||||||
import sys
|
import sys
|
||||||
|
import functools
|
||||||
|
|
||||||
from PySide2.QtCore import QTimer
|
from PySide2.QtCore import QTimer
|
||||||
from PySide2.QtCore import Qt
|
from PySide2.QtCore import Qt
|
||||||
@@ -19,10 +20,12 @@ from . import engine
|
|||||||
from . import assets
|
from . import assets
|
||||||
|
|
||||||
class Mode:
|
class Mode:
|
||||||
CURRENT_ZONE = 'Statistics: Current zone'
|
DMG_CURRENT_ZONE = 'Stats (dmg): Current zone'
|
||||||
OVERALL = 'Statistics: Overall'
|
DMG_OVERALL = 'Stats (dmg): Overall'
|
||||||
LAST_FIGHT = 'Statistics: Last fight'
|
DMG_LAST_FIGHT = 'Stats (dmg): Last fight'
|
||||||
|
CURRENT_ZONE = 'Stats (all): Current zone'
|
||||||
|
OVERALL = 'Stats (all): Overall'
|
||||||
|
LAST_FIGHT = 'Stats (all): Last fight'
|
||||||
|
|
||||||
class InteractiveBar(QWidget):
|
class InteractiveBar(QWidget):
|
||||||
def __init__(self, table, clipboard):
|
def __init__(self, table, clipboard):
|
||||||
@@ -78,9 +81,12 @@ class InteractiveBar(QWidget):
|
|||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
reset = {
|
reset = {
|
||||||
|
Mode.DMG_CURRENT_ZONE: engine.reset_zone_stats,
|
||||||
|
Mode.DMG_LAST_FIGHT: engine.reset_last_fight_stats,
|
||||||
|
Mode.DMG_OVERALL: engine.reset_stats,
|
||||||
Mode.CURRENT_ZONE: engine.reset_zone_stats,
|
Mode.CURRENT_ZONE: engine.reset_zone_stats,
|
||||||
Mode.LAST_FIGHT: engine.reset_last_fight_stats,
|
Mode.LAST_FIGHT: engine.reset_last_fight_stats,
|
||||||
Mode.OVERALL: engine.reset_stats
|
Mode.OVERALL: engine.reset_stats,
|
||||||
}
|
}
|
||||||
|
|
||||||
reset[self.mode.currentText()]()
|
reset[self.mode.currentText()]()
|
||||||
@@ -91,7 +97,9 @@ class InteractiveBar(QWidget):
|
|||||||
class ModeWidget(QComboBox):
|
class ModeWidget(QComboBox):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
QComboBox.__init__(self)
|
QComboBox.__init__(self)
|
||||||
|
self.addItem(Mode.DMG_CURRENT_ZONE)
|
||||||
|
self.addItem(Mode.DMG_OVERALL)
|
||||||
|
self.addItem(Mode.DMG_LAST_FIGHT)
|
||||||
self.addItem(Mode.CURRENT_ZONE)
|
self.addItem(Mode.CURRENT_ZONE)
|
||||||
self.addItem(Mode.OVERALL)
|
self.addItem(Mode.OVERALL)
|
||||||
self.addItem(Mode.LAST_FIGHT)
|
self.addItem(Mode.LAST_FIGHT)
|
||||||
@@ -143,6 +151,9 @@ class MainWidget(QWidget):
|
|||||||
|
|
||||||
def session(self):
|
def session(self):
|
||||||
sessions = {
|
sessions = {
|
||||||
|
Mode.DMG_CURRENT_ZONE: functools.partial(engine.zone_stats, with_damage=True),
|
||||||
|
Mode.DMG_LAST_FIGHT: functools.partial(engine.last_fight_stats, with_damage=True),
|
||||||
|
Mode.DMG_OVERALL: functools.partial(engine.overall_stats, with_damage=True),
|
||||||
Mode.CURRENT_ZONE: engine.zone_stats,
|
Mode.CURRENT_ZONE: engine.zone_stats,
|
||||||
Mode.LAST_FIGHT: engine.last_fight_stats,
|
Mode.LAST_FIGHT: engine.last_fight_stats,
|
||||||
Mode.OVERALL: engine.overall_stats
|
Mode.OVERALL: engine.overall_stats
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ class Number:
|
|||||||
|
|
||||||
def __truediv__(self, other):
|
def __truediv__(self, other):
|
||||||
if isinstance(other, Number):
|
if isinstance(other, Number):
|
||||||
return self.number / other.number
|
return self.number / other.number if other.number else other.number
|
||||||
return self.number / other
|
return self.number / other if other else other
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
if self.number / 1000 < 1:
|
if self.number / 1000 < 1:
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ def map_weapon(weapon):
|
|||||||
with open(assets.path('item_category_map.json')) as m:
|
with open(assets.path('item_category_map.json')) as m:
|
||||||
_mappings = json.loads(m.read())
|
_mappings = json.loads(m.read())
|
||||||
|
|
||||||
return _mappings[weapon]
|
return _mappings[weapon] if weapon in _mappings else None
|
||||||
|
|
||||||
def get_weapon_type(items):
|
def get_weapon_type(items):
|
||||||
weapon = map_weapon(items['weapon'])
|
weapon = map_weapon(items['weapon'])
|
||||||
|
|||||||
Reference in New Issue
Block a user