From bb359af22df915eb4fa17cbff76af0e6fc2a3d64 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 05 Dec 2011 15:36:40 +0000
Subject: more checks on incompatible blocks

---
(limited to 'TurtleArt/tawindow.py')

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index dae617c..e890be2 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -1035,22 +1035,25 @@ class TurtleArtWindow():
                     # You cannot mix and match sensor blocks
                     elif blk.name in ['sound', 'volume', 'pitch']:
                         if len(self.block_list.get_similar_blocks(
-                                'block', ['resistance', 'voltage'])) > 0:
+                                'block', ['resistance', 'voltage',
+                                          'resistance2', 'voltage2'])) > 0:
                             self.showlabel('incompatible')
                             return True
-                    elif blk.name in ['resistance', 'voltage']:
+                    elif blk.name in ['resistance', 'voltage',
+                                      'resistance2', 'voltage2']:
                         if len(self.block_list.get_similar_blocks(
                                 'block', ['sound', 'volume', 'pitch'])) > 0:
                             self.showlabel('incompatible')
                             return True
-                        if blk.name == 'resistance':
+                        if blk.name in ['resistance', 'resistance2']:
                             if len(self.block_list.get_similar_blocks(
-                                    'block', 'voltage')) > 0:
+                                    'block', ['voltage', 'voltage2'])) > 0:
                                 self.showlabel('incompatible')
                                 return True
-                        elif blk.name == 'voltage':
+                        elif blk.name in ['voltage', 'voltage2']:
                             if len(self.block_list.get_similar_blocks(
-                                    'block', 'resistance')) > 0:
+                                    'block', ['resistance',
+                                              'resistance2'])) > 0:
                                 self.showlabel('incompatible')
                                 return True
                     blk.highlight()
--
cgit v0.9.1