From c0f1f4c57bcf15f141eb8a02ba59bb4fa8871e45 Mon Sep 17 00:00:00 2001
From: Malcolm Roberts <malcolm@mroberts.dev>
Date: Thu, 11 Jan 2024 08:34:47 -0600
Subject: [PATCH] Naming convention

---
 commands/ProcessCommand.iss                      | 11 -----------
 common/Navigation/Movement.iss                   |  3 ++-
 common/Navigation/Test.iss                       |  1 +
 common/Relay.iss                                 | 16 ++++++++--------
 common/api.iss                                   |  2 +-
 common/{JsonHelpers.iss => json_helpers.iss}     |  0
 common/{StringHelpers.iss => string_helpers.iss} |  0
 mr.iss                                           |  9 +++++----
 8 files changed, 17 insertions(+), 25 deletions(-)
 delete mode 100644 commands/ProcessCommand.iss
 rename common/{JsonHelpers.iss => json_helpers.iss} (100%)
 rename common/{StringHelpers.iss => string_helpers.iss} (100%)

diff --git a/commands/ProcessCommand.iss b/commands/ProcessCommand.iss
deleted file mode 100644
index 994512f..0000000
--- a/commands/ProcessCommand.iss
+++ /dev/null
@@ -1,11 +0,0 @@
-function main(jsonvalue params)
-{
-    if ${params.Get[1].Equal["jk"]}
-    {
-        echo "JK JK"
-    }
-    else
-    {
-        echo "for real"
-    }
-}
\ No newline at end of file
diff --git a/common/Navigation/Movement.iss b/common/Navigation/Movement.iss
index d79a5b3..b96cbc9 100644
--- a/common/Navigation/Movement.iss
+++ b/common/Navigation/Movement.iss
@@ -17,9 +17,10 @@ objectdef MRNavigation
         Percision:Set[${persision}]
     }
 
-    method MoveTo(point3f point)
+    method MoveTo(point3f point, float minDistance = 1)
     {
         This:BreakCampSpot
+        This.Percision:Set[${minDistance}]
         MoveToRequested:Set[TRUE]
         MoveToPoint:Set[${point.X}, ${point.Z}, ${point.Z}]
     }
diff --git a/common/Navigation/Test.iss b/common/Navigation/Test.iss
index d52d6c6..c05ea2c 100644
--- a/common/Navigation/Test.iss
+++ b/common/Navigation/Test.iss
@@ -29,6 +29,7 @@ objectdef TestController
             "method": "SetMoveSpot",
             "parameters": {
                 "ForWho": "Dasteg",
+                "minDistance": 1,
                 "location": {
                     "X": ${Me.Target.Loc.X},
                     "Y": ${Me.Target.Loc.Y},
diff --git a/common/Relay.iss b/common/Relay.iss
index 0866aa6..7590353 100644
--- a/common/Relay.iss
+++ b/common/Relay.iss
@@ -3,15 +3,10 @@ objectdef RelayApi
 {
     method SetMoveSpot()
     {
-        "echo SetMoveSpot: ${Context.AsJSON~}"
-        if !${MRNav(exists)}
-        {
-            echo "Loading Movement"
-            RunScript "${LavishScript.HomeDirectory}/Scripts/mr/common/Navigation/Movement"
-        }
+        
         variable point3f location
         location:Set[${Context.Get["parameters", "location", "X"]}, ${Context.Get["parameters", "location", "Y"]}, ${Context.Get["parameters", "location", "Z"]}]
-        MRApi:MoveTo["${Context.Get["parameters","ForWho"]}", "${location}"]
+        MRApi:MoveTo["${Context.Get["parameters","ForWho"]}", "${location}", ${Context.Get["parameters", "minDistance"]}]
         
     }
 }
@@ -20,8 +15,13 @@ variable(global) RelayApi MRRelayApi
 
 function main()
 {
+    if !${Script[Movement](exists)}
+    {
+        RunScript "${LavishScript.HomeDirectory}/Scripts/mr/common/Navigation/Movement"
+    }
+
     while 1
     {
-        wait 1
+        wait 100
     }
 }
\ No newline at end of file
diff --git a/common/api.iss b/common/api.iss
index d76eebc..6bd84a3 100644
--- a/common/api.iss
+++ b/common/api.iss
@@ -62,7 +62,7 @@ objectdef MRApi
         return ${negate}
     }
 
-    static method MoveTo(string forWho, point3f location)
+    static method MoveTo(string forWho, point3f location, float minDistance = 0)
     {
         echo "Moving to ${location}"
         if ${MRApi.IsForMe[${forWho}]}
diff --git a/common/JsonHelpers.iss b/common/json_helpers.iss
similarity index 100%
rename from common/JsonHelpers.iss
rename to common/json_helpers.iss
diff --git a/common/StringHelpers.iss b/common/string_helpers.iss
similarity index 100%
rename from common/StringHelpers.iss
rename to common/string_helpers.iss
diff --git a/mr.iss b/mr.iss
index 054d7c0..8185fa1 100644
--- a/mr.iss
+++ b/mr.iss
@@ -1,6 +1,10 @@
 
 function main(... params)
 {
+    if !${Script[Relay](exists)}
+    {
+        RunScript "${LavishScript.HomeDirectory}/Scripts/mr/common/Relay"
+    }
     variable string command = ${params[1].Lower}
     if ${command.Equal["osa"]}
     {
@@ -17,10 +21,7 @@ function main(... params)
     }
     elseif ${command.Equal["relay"]}
     {
-        if !${MRRelayApi(exists)}
-        {
-            RunScript "${LavishScript.HomeDirectory}/Scripts/mr/common/Relay"
-        }
+ 
     }
     elseif ${command.Equal["!c"]}
     {