Simplified Chained Comparison

This commit is contained in:
Ebag333
2016-10-19 08:11:20 -07:00
parent c1dfd676e1
commit 3187bab90a
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -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