Merge remote-tracking branch 'origin/dev'

Tny5989 · Feb 7, 2019 · e7bf49e · e7bf49e
2 parents 91e6f05 + e256e1a
commit e7bf49e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,8 @@ Aliases:
 Action                | Addon Command
 --------------------- | -----------------------------
 Buy SP Gobbie Key     | //buykeys \<count\>
-Buy Warp Scroll       | //getscroll
+Buy Prize Powder      | //buypowder \<count\>
+Buy Warp Scroll       | //buywarp
 
 \<zone\> should be replaced with zone names (you can use the in-game auto-translate feature).  
 \<item\> should be replaced with item names from [data/items.lua](https://github.com/Tny5989/UnityNPC/blob/master/data/items.lua)  

diff --git a/data/items.lua b/data/items.lua
@@ -47,6 +47,7 @@ Items.Values[9051] = { id = 9051, idx = 23, type = 'special', en = 'Camahueto\'s
 Items.Values[9094] = { id = 9094, idx = 33, type = 'special', en = 'Clawberry\'s Coat' }
 Items.Values[9097] = { id = 9097, idx = 35, type = 'special', en = 'Mhuufya\'s Beak' }
 Items.Values[9098] = { id = 9098, idx = 39, type = 'special', en = 'G. Grenade\s Ash' }
+Items.Values[9151] = { id = 9151, idx = 40, type = 'special', en = 'Sovereign\'s Hide' }
 Items.Values[8974] = { id = 8974, idx = 53, type = 'special', en = 'Harold\s Ore' }
 Items.Values[8975] = { id = 8975, idx = 54, type = 'special', en = 'Belinda\s Hide' }
 

diff --git a/unitynpc.lua b/unitynpc.lua
@@ -1,6 +1,6 @@
 _addon.name = 'UnityNPC'
 _addon.author = 'Areint/Alzade'
-_addon.version = '1.1.0'
+_addon.version = '1.1.1'
 _addon.commands = {'unpc'}
 
 --------------------------------------------------------------------------------
@@ -35,7 +35,7 @@ local function OnCommand(cmd, p1, p2)
         command:SetFailureCallback(OnCommandFinished)
         command()
     else
-        log('Already running a command')
+        log('Already running a complex command')
     end
 end
 

diff --git a/util/aliases.lua b/util/aliases.lua
@@ -5,7 +5,8 @@ local Aliases = {}
 --------------------------------------------------------------------------------
 function Aliases.Update()
     windower.send_command('alias buykeys input //unpc buy "SP Gobbie Key" ')
-    windower.send_command('alias getscroll input //unpc buy "Warp Scroll" 1')
+    windower.send_command('alias buypowder input //unpc buy "Prize Powder" ')
+    windower.send_command('alias buywarp input //unpc buy "Warp Scroll" 1')
 end
 
 return Aliases