From 1eaf83275f6462c1409a4072adae14235baceb68 Mon Sep 17 00:00:00 2001
From: Durel <aardurel@gmail.com>
Date: Sat, 21 Apr 2018 22:57:54 -0400
Subject: [PATCH] 1) Removed pathing code that attempted to get a full path to
 plugin files and state files.  Dinv    now uses the relative paths returned
 by GetInfo(85) and GetInfo(60).  This should improve    compatibility on some
 systems that didn't correctly report full path names.

---
 aard_inventory.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/aard_inventory.xml b/aard_inventory.xml
index 55a4833..bc1b9f5 100644
--- a/aard_inventory.xml
+++ b/aard_inventory.xml
@@ -662,7 +662,7 @@ Feature Wishlist
 
   <alias
    script="inv.cli.autoQueue.fn2"
-   match="^[ ]*dinv[ ]+auto[ ]+([0-9]+)[ ]+([0-9]+)[ ]+([0-9]+)[ ]+([0-9]+)[ ]+(.*?)$"
+   match="^[ ]*dinv[ ]+auto[ ]+([0-9]+)[ ]+([0-9]+)[ ]+([0-9]+)[ ]+([^ ]+)[ ]+(.*?)$"
    enabled="y"
    regexp="y"
    send_to="12"
@@ -685,12 +685,7 @@ Feature Wishlist
 pluginNameCmd   = "dinv" 
 pluginNameAbbr  = "DINV" 
 pluginId        = "88c86ea252fc1918556df9fe"
-
--- Get an absolute path to the plugin's state directory.  We don't want to use just the relative
--- path in GetInfo(85) in case someone's current directory isn't where we'd expect.  We no longer
--- care where the plugin file is installed because we will use mush's state directory for our
--- saved data regardless of where the plugin xml file lives.
-pluginStatePath = GetInfo(56) .. GetInfo(85) .. pluginNameCmd .. "-" .. pluginId
+pluginStatePath = GetInfo(85) .. pluginNameCmd .. "-" .. pluginId
 
 -- Some versions of windows don't like if a path has something like "foo\.\bar" in it.  This 
 -- strips out any redundant ".\" in the path if it exists.
@@ -710,8 +705,7 @@ require "tprint"
 require "gmcphelper"
 require "async"
 
--- Use the absolute path to the file in case a user's current directory isn't what we'd expect
-dofile(GetInfo(56) .. GetInfo(60) .. "aardwolf_colors.lua")
+dofile(GetInfo(60) .. "aardwolf_colors.lua")
 
 
 ----------------------------------------------------------------------------------------------------
@@ -4984,6 +4978,12 @@ function inv.cli.autoQueue.fn2(name, line, wildcards)
   local paramStr = (command or "none") .. ", maxCommands=" .. (maxCmds or "nil")
   local endTag = inv.tags.new(paramStr, nil, nil, nil)
 
+  if (state == "active") then
+    state = "3"
+  elseif (state == "combat") then
+    state = "8"
+  end -- if
+
   dbot.debug("Auto Queue: cmd=\"" .. command .. "\", maxCmds=" .. maxCmds .. ", cmdTO=" .. cmdTimeout ..
              ", totTO=" .. totTimeout .. ", state=" .. state)