From eeb5f40e68ad1433b7695e10b6a3f2b1f0991a71 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Wed, 20 Oct 2010 09:25:19 +0200 Subject: [PATCH] Make sure ammo with identical meta levels are sorted consistently --- gui/builtinContextMenus/moduleAmmoPicker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py index afd2fa247..8381c0156 100644 --- a/gui/builtinContextMenus/moduleAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoPicker.py @@ -39,14 +39,14 @@ class ModuleAmmoPicker(ContextMenu): for type in ("em", "explosive", "kinetic", "thermal"): damage += charge.getAttribute("%sDamage" % type) - return (-range, damage) + return (-range, damage, charge.name) MISSILE_ORDER = ["em", "explosive", "kinetic", "thermal"] def missileSorter(self, charge): for i, type in enumerate(self.MISSILE_ORDER): damage = charge.getAttribute("%sDamage" % type) if damage > 0: - return (type, damage) + return (type, damage, charge.name) def nameSorter(self, charge): n = charge.name