Merge pull request #54 from penguinencounter/fix-logistic-chests

Fix signatures of logistic request and buffer chests

Author: redruin1

draftsman/signatures.py

@@ -264,6 +264,8 @@ def normalize_signal_filters(entries):
     )
 )
 
+LOGISTIC_MODE_OF_OPERATION = Schema(Or(0, 1))
+
 # CONTROL_BEHAVIOR = Schema(
 #     And(
 #         Use(lambda x: {} if x is None else x),  # Convert to empty dict if None
@@ -450,11 +452,7 @@ def normalize_signal_filters(entries):
         Use(lambda x: {} if x is None else x),  # Convert to empty dict if None
         {
             # Circuit condition
-            Optional("circuit_enable_disable"): bool,
-            Optional("circuit_condition"): CONDITION,
-            # Logistic condition
-            Optional("connect_to_logistic_network"): bool,
-            Optional("logistic_condition"): CONDITION,
+            Optional("circuit_mode_of_operation"): LOGISTIC_MODE_OF_OPERATION,
         },
     )
 )
@@ -464,11 +462,7 @@ def normalize_signal_filters(entries):
         Use(lambda x: {} if x is None else x),  # Convert to empty dict if None
         {
             # Circuit condition
-            Optional("circuit_enable_disable"): bool,
-            Optional("circuit_condition"): CONDITION,
-            # Logistic condition
-            Optional("connect_to_logistic_network"): bool,
-            Optional("logistic_condition"): CONDITION,
+            Optional("circuit_mode_of_operation"): LOGISTIC_MODE_OF_OPERATION,
         },
     )
 )