Merge branch 'experimental'

Conflicts:
	config/6thFloor.xml

1 files changed, 4 insertions, 0 deletions

diff --git a/behaviors/ModifyParam.py b/behaviors/ModifyParam.py
index 4f45be0..2c8f12d 100644
--- a/behaviors/ModifyParam.py
+++ b/behaviors/ModifyParam.py
@@ -1,4 +1,5 @@
 from operationscore.Behavior import *
+import math
 import pdb
 #Class to perform a given operation on some element of an argDict.  Designed to be used a recursive hook, but can serve sensor-based functions as well.  Specify ParamType (Sensor or Recurse), ParamName, and ParamOp, (a valid python statement with the old value represented as {val})
 class ModifyParam(Behavior):
@@ -25,6 +26,9 @@ class ModifyParam(Behavior):
             if paramName in behaviorInput: #TODO: copy -> modify instead of just
             #copying
                     paramOp = paramOp.replace('{val}', 'behaviorInput[paramName]') #convert the {val} marker to something we can execute
+                    #TODO: move elsewhere
+                    paramOp = paramOp.replace('{y}', "behaviorInput['Location'][1]")
+                    paramOp = paramOp.replace('{x}', "behaviorInput['Location'][0]")
                     behaviorInput[paramName] = eval(paramOp)
         if paramType == 'Sensor': #return accordingly
             return (searchSet, recursiveInputs)