Merge branch 'master' into ammo_graph

2019-12-07 03:34:26 +03:00
parent 61e32d0b1b 2962ce1945
commit 78423f67dd
129 changed files with 17059 additions and 845 deletions
--- a/graphs/wrapper.py
+++ b/graphs/wrapper.py
@@ -43,7 +43,7 @@ class BaseWrapper:
        if self.isFit:
            return '{} ({})'.format(self.item.name, self.item.ship.item.name)
        elif self.isProfile:
-            return self.item.name
+            return self.item.fullName
        return ''

    @property
@@ -51,7 +51,7 @@ class BaseWrapper:
        if self.isFit:
            return '{} ({})'.format(self.item.name, self.item.ship.item.getShortName())
        elif self.isProfile:
-            return self.item.name
+            return self.item.shortName
        return ''

    def getMaxVelocity(self, extraMultipliers=None, ignoreAfflictors=()):