diff options
| author |  Daniel <dmt@daniel-desktop.(none)> | 2011-01-29 18:54:50 -0800 |
|---|---|---|
| committer | Daniel <dmt@daniel-desktop.(none)> | 2011-01-29 18:54:50 -0800 |
| commit | ff07b18748c64243c1c6bc62f489bfd03205d13a (patch) | |
| tree | db95373a3511be0dd1e700a78e9f1ea7320769a4 /behaviors/MoveBehavior.py | |
| parent | 83931a3c8e65b4018e98b4986458d1df7172ab91 (diff) | |
| parent | 277a5143165d2553ce5e97f151cc6b3cea426468 (diff) | |
Merge branch 'master' of github.com:rcoh/SmootLight
Diffstat (limited to 'behaviors/MoveBehavior.py')
| -rw-r--r-- | behaviors/MoveBehavior.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/behaviors/MoveBehavior.py b/behaviors/MoveBehavior.py index e504ca9..6e7fc6a 100644 --- a/behaviors/MoveBehavior.py +++ b/behaviors/MoveBehavior.py @@ -19,12 +19,13 @@ class MoveBehavior(Behavior): currDict = dict(currRecLoc) for sensorInput in sensorInputs: if 'type' in sensorInput and sensorInput['type'] == 1: + currDict['Shake'] = 0 currDict['Location'] = (currDict['Location'][0] - sensorInput['x'] * self['XStep'], \ currDict['Location'][1] + sensorInput['y'] * self['YStep']) currDict['Color'] = [sensorInput['r'], sensorInput['g'], sensorInput['b']] - #elif sensorInput['type'] == 2: - # currDict['Shake'] = 1 - # currDict['Force'] = sensorInput['force'] + elif sensorInput['type'] == 2: + currDict['Shake'] = 1 + #currDict['Force'] = sensorInput['force'] ret.append(currDict) #print ret return (ret, ret) |