From 3187bab90a4382a30f4816f14e6f2747bb5d2f2b Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Wed, 19 Oct 2016 08:11:20 -0700 Subject: [PATCH] Simplified Chained Comparison --- eos/saveddata/booster.py | 2 +- eos/saveddata/drone.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eos/saveddata/booster.py b/eos/saveddata/booster.py index a8c496ae0..cfe9b5a72 100644 --- a/eos/saveddata/booster.py +++ b/eos/saveddata/booster.py @@ -120,7 +120,7 @@ class Booster(HandledItem, ItemAttrShortcut): "itemID" : lambda val: isinstance(val, int), "ammoID" : lambda val: isinstance(val, int), "active" : lambda val: isinstance(val, bool), - "slot" : lambda val: isinstance(val, int) and val >= 1 and val <= 3} + "slot" : lambda val: isinstance(val, int) and 1 <= val <= 3} if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key) else: return val diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py index 29e05d41e..750d0bf8e 100644 --- a/eos/saveddata/drone.py +++ b/eos/saveddata/drone.py @@ -183,7 +183,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): "itemID" : lambda val: isinstance(val, int), "chargeID" : lambda val: isinstance(val, int), "amount" : lambda val: isinstance(val, int) and val >= 0, - "amountActive" : lambda val: isinstance(val, int) and val <= self.amount and val >= 0} + "amountActive" : lambda val: isinstance(val, int) and self.amount >= val >= 0} if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key) else: return val