diff --git a/eos/saveddata/damagePattern.py b/eos/saveddata/damagePattern.py index 6f3ec94322..2c52b98785 100644 --- a/eos/saveddata/damagePattern.py +++ b/eos/saveddata/damagePattern.py @@ -91,6 +91,13 @@ def _c(x): (-52, (_c(_t('Bombs')) + _t('Scorch Bomb'), 0, 6400, 0, 0)), (-53, (_c(_t('Bombs')) + _t('Concussion Bomb'), 0, 0, 6400, 0)), (-54, (_c(_t('Bombs')) + _t('Shrapnel Bomb'), 0, 0, 0, 6400)), + # ticket #2413 + (-113, (_c(_t('Condenser Packs')) + _t('BlastShot'), 133, 0, 457, 0)), + (-114, (_c(_t('Condenser Packs')) + _t('GalvaSurge'), 457.3, 0, 133, 0)), + (-115, (_c(_t('Condenser Packs')) + _t('MesmerFlux'), 220.6, 0, 75, 0)), + (-116, (_c(_t('Condenser Packs')) + _t('SlamBolt'), 74, 0, 220.6, 0)), + (-117, (_c(_t('Condenser Packs')) + _t('[T2] ElectroPunch'), 359, 0, 350, 0)), + (-118, (_c(_t('Condenser Packs')) + _t('[T2] StrikeSnipe'), 197., 0, 191, 0)), # Source: ticket #2067 and #2265 (-55, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('All'), 126, 427, 218, 230)), (-109, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Angel'), 450, 72, 80, 398)), diff --git a/eve.db b/eve.db new file mode 100644 index 0000000000..3b357c781c Binary files /dev/null and b/eve.db differ diff --git a/gui/builtinContextMenus/cargoAddAmmo.py b/gui/builtinContextMenus/cargoAddAmmo.py index 4bc312512f..810d091239 100644 --- a/gui/builtinContextMenus/cargoAddAmmo.py +++ b/gui/builtinContextMenus/cargoAddAmmo.py @@ -27,9 +27,8 @@ def display(self, callingWindow, srcContext, mainItem): def getText(self, callingWindow, itmContext, mainItem): if mainItem.marketGroup.name == "Scan Probes": return _t("Add {0} to Cargo (x8)").format(itmContext) - - return _t("Add {0} to Cargo (x1000)").format(itmContext) - + return _t("Add a variable amount of {0} to cargo").format(itmContext) + def activate(self, callingWindow, fullContext, mainItem, i): fitID = self.mainFrame.getActiveFit() typeID = int(mainItem.ID) @@ -37,8 +36,17 @@ def activate(self, callingWindow, fullContext, mainItem, i): if mainItem.marketGroup.name == "Scan Probes": command = cmd.GuiAddCargoCommand(fitID=fitID, itemID=typeID, amount=8) else: - command = cmd.GuiAddCargoCommand(fitID=fitID, itemID=typeID, amount=1000) - + quantity_to_add = wx.TextEntryDialog(None, "How many would you like to add to cargo", + 'Quantity', 'number') + if quantity_to_add.ShowModal() == wx.ID_OK: + try: + quantity = int(quantity_to_add.GetValue()) + except: + quantity = 0 + else: + quantity = 0 + command = cmd.GuiAddCargoCommand(fitID=fitID, itemID=typeID, amount=quantity) + if self.mainFrame.command.Submit(command): self.mainFrame.additionsPane.select("Cargo", focus=False) diff --git a/pyfa.py b/pyfa.py index 706af752c3..735ba18242 100755 --- a/pyfa.py +++ b/pyfa.py @@ -47,7 +47,6 @@ # # print(ascii_text) - class PassThroughOptionParser(OptionParser): """ An unknown option pass-through implementation of OptionParser. @@ -67,13 +66,20 @@ def _process_args(self, largs, rargs, values): # Parse command line options usage = "usage: %prog [--root]" parser = PassThroughOptionParser(usage=usage) -parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data in root folder, use this option", default=False) +parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data " + "in root folder, use this option", + default=False) parser.add_option("-d", "--debug", action="store_true", dest="debug", help="Set logger to debug level.", default=False) parser.add_option("-t", "--title", action="store", dest="title", help="Set Window Title", default=None) parser.add_option("-s", "--savepath", action="store", dest="savepath", help="Set the folder for savedata", default=None) -parser.add_option("-l", "--logginglevel", action="store", dest="logginglevel", help="Set desired logging level [Critical|Error|Warning|Info|Debug]", default="Error") -parser.add_option("-p", "--profile", action="store", dest="profile_path", help="Set location to save profileing.", default=None) -parser.add_option("-i", "--language", action="store", dest="language", help="Sets the language for pyfa. Overrides user's saved settings. Format: xx_YY (eg: en_US). If translation doesn't exist, defaults to en_US", default=None) +parser.add_option("-l", "--logginglevel", action="store", dest="logginglevel", + help="Set desired logging level [""Critical|Error|Warning|Info|Debug]", default="Error") +parser.add_option("-p", "--profile", action="store", dest="profile_path", help="Set location to save profileing.", + default=None) +parser.add_option("-i", "--language", action="store", dest="language", help="Sets the language for pyfa. Overrides " + "user's saved settings. Format: xx_YY (" + "eg: en_US). If translation doesn't " + "exist, defaults to en_US", default=None) (options, args) = parser.parse_args() @@ -151,7 +157,8 @@ def _process_args(self, largs, rargs, values): ErrorHandler.SetParent(mf) if options.profile_path: - profile_path = os.path.join(options.profile_path, 'pyfa-{}.profile'.format(datetime.datetime.now().strftime('%Y%m%d_%H%M%S'))) + profile_path = os.path.join(options.profile_path, + 'pyfa-{}.profile'.format(datetime.datetime.now().strftime('%Y%m%d_%H%M%S'))) pyfalog.debug("Starting pyfa with a profiler, saving to {}".format(profile_path)) import cProfile diff --git a/requirements.txt b/requirements.txt index 4a95eb125c..d28327b6a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -wxPython == 4.0.6 +wxPython >= 4.0.6 logbook >= 1.0.0 -numpy == 1.19.2 +numpy >= 1.19.2 matplotlib == 3.2.2 python-dateutil requests >= 2.0.0