Merge remote-tracking branch 'origin/master' into test-3

# Conflicts:
#	config.py
#	eos/saveddata/fighter.py

config.py

@@ -23,7 +23,7 @@ saveInRoot = False
 version = "2.0.x"
 tag = "git"
 expansionName = "YC120.2"
-expansionVersion = "1.1"
+expansionVersion = "1.2"
 evemonMinVersion = "4081"
 
 pyfaPath = None

eos/effects/scriptstandupwarpscram.py

@@ -0,0 +1,11 @@
+# scriptStandupWarpScram
+#
+# Used by:
+# Charge: Standup Focused Warp Scrambling Script
+
+type = "passive"
+runTime = "early"
+
+
+def handler(fit, src, context, *args, **kwargs):
+    src.boostItemAttr("maxRange", src.getModifiedChargeAttr("warpScrambleRangeBonus"))

eos/saveddata/fighter.py

@@ -89,8 +89,8 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             self.__itemModifiedAttributes.overrides = self.__item.overrides
             self.__slot = self.__calculateSlot(self.__item)
 
-            chargeID = self.getModifiedItemAttr("fighterAbilityLaunchBombType", None)
+            chargeID = self.getModifiedItemAttr("fighterAbilityLaunchBombType")
-            if chargeID is not None:
+            if chargeID:
                 charge = eos.db.getItem(int(chargeID))
                 self.__charge = charge
                 self.__chargeModifiedAttributes.original = charge.attributes

gui/builtinItemStatsViews/itemAttributes.py

@@ -243,6 +243,8 @@ class ItemParams(wx.Panel):
             return "%s (%d)" % (group.name, value) if group is not None else str(value)
 
         def attributeIDCallback():
+            if not value:  # some attributes come through with a value of 0? See #1387
+                return "%d" % (value)
             attribute = Attribute.getInstance().getAttributeInfo(value)
             return "%s (%d)" % (attribute.name.capitalize(), value)