Merge branch 'ammo_graph' into singularity

# Conflicts:
#	gui/targetProfileEditor.py

eos/effects.py

@@ -26,6 +26,8 @@ from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, re
 
 class BaseEffect:
 
+    dealsDamage = False
+
     @staticmethod
     def handler(fit, module, context, projectionRange, **kwargs):
         pass
@@ -62,6 +64,7 @@ class Effect10(BaseEffect):
     Modules from group: Energy Weapon (212 of 214)
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -169,6 +172,7 @@ class Effect34(BaseEffect):
     Modules from group: Projectile Weapon (165 of 165)
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -189,6 +193,7 @@ class Effect38(BaseEffect):
     Modules from group: Smart Bomb (118 of 118)
     """
 
+    dealsDamage = True
     type = 'active'
 
 
@@ -555,6 +560,7 @@ class Effect101(BaseEffect):
     Structure Modules named like: Standup Launcher (7 of 7)
     """
 
+    dealsDamage = True
     type = 'active', 'projected'
 
     @staticmethod
@@ -15124,6 +15130,7 @@ class Effect4489(BaseEffect):
     Module: 'Judgment' Electromagnetic Doomsday
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -15140,6 +15147,7 @@ class Effect4490(BaseEffect):
     Module: 'Oblivion' Kinetic Doomsday
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -15156,6 +15164,7 @@ class Effect4491(BaseEffect):
     Module: 'Aurora Ominae' Thermal Doomsday
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -15172,6 +15181,7 @@ class Effect4492(BaseEffect):
     Module: 'Gjallarhorn' Explosive Doomsday
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -27364,6 +27374,7 @@ class Effect6431(BaseEffect):
     Fighters from group: Light Fighter (32 of 32)
     """
 
+    dealsDamage = True
     displayName = 'Missile Attack'
     hasCharges = True
     prefix = 'fighterAbilityMissiles'
@@ -27644,6 +27655,7 @@ class Effect6465(BaseEffect):
     Fighters from group: Heavy Fighter (34 of 34)
     """
 
+    dealsDamage = True
     displayName = 'Turret Attack'
     prefix = 'fighterAbilityAttackMissile'
     type = 'active'
@@ -27686,6 +27698,7 @@ class Effect6472(BaseEffect):
     Modules named like: Lance (4 of 4)
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -27702,6 +27715,7 @@ class Effect6473(BaseEffect):
     Module: Bosonic Field Generator
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod
@@ -27912,6 +27926,7 @@ class Effect6485(BaseEffect):
     Fighters from group: Heavy Fighter (16 of 34)
     """
 
+    dealsDamage = True
     displayName = 'Bomb'
     hasCharges = True
     prefix = 'fighterAbilityLaunchBomb'
@@ -33964,6 +33979,7 @@ class Effect6995(BaseEffect):
     Modules from group: Precursor Weapon (19 of 19)
     """
 
+    dealsDamage = True
     type = 'active'
 
     @staticmethod