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

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

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)
-            if chargeID is not None:
+            chargeID = self.getModifiedItemAttr("fighterAbilityLaunchBombType")
+            if chargeID:
                 charge = eos.db.getItem(int(chargeID))
                 self.__charge = charge
                 self.__chargeModifiedAttributes.original = charge.attributes