From 8e9ea0a36bc9756e88d9724764863176474ff039 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 3 May 2014 21:21:21 -0400 Subject: [PATCH] Allow any item to be added to cargo (allows to distribute "refits" with fit) --- eos/saveddata/cargo.py | 3 --- gui/builtinContextMenus/cargo.py | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/eos/saveddata/cargo.py b/eos/saveddata/cargo.py index 5ad050515..54ca21d0e 100644 --- a/eos/saveddata/cargo.py +++ b/eos/saveddata/cargo.py @@ -26,9 +26,6 @@ from sqlalchemy.orm import validates, reconstructor class Cargo(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): def __init__(self, item): - if item.category.name != "Charge": - raise ValueError("Passed item is not a charge") - self.__item = item self.itemID = item.ID self.active = True diff --git a/gui/builtinContextMenus/cargo.py b/gui/builtinContextMenus/cargo.py index 8e0512588..35a818b37 100644 --- a/gui/builtinContextMenus/cargo.py +++ b/gui/builtinContextMenus/cargo.py @@ -14,11 +14,7 @@ class Cargo(ContextMenu): # Make sure context menu registers in the correct view if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None: return False - - item = selection[0] - sFit = service.Fit.getInstance() - - return sFit.isAmmo(item.ID) + return True def getText(self, itmContext, selection): return "Add {0} to Cargo".format(itmContext)