Merge remote-tracking branch 'origin/dev'

data/keys.lua

@@ -31,8 +31,9 @@ Keys.Values = {}
 Keys.Values['']   = { id = 0000, idx = 0, en = '' }
 
 -- Keys
-Keys.Values[8973] = { id = 8973, idx = 1, en = 'SP Gobbie Key' }
-Keys.Values[4181] = { id = 4181, idx = 2, en = 'Warp Scroll' }
+Keys.Values[8973] = { id = 8973, idx = 01, en = 'SP Gobbie Key' }
+Keys.Values[4181] = { id = 4181, idx = 02, en = 'Warp Scroll' }
+Keys.Values[5945] = { id = 5945, idx = 12, en = "Prize Powder" }
 
 --------------------------------------------------------------------------------
 function Keys.GetByProperty(key, value)

model/dialogue/buy.lua

@@ -76,7 +76,7 @@ function BuyDialogue:_OnSuccess()
     local menu_id = self._menu:Id()
     local next = self._interactions[self._idx]
 
-    next(self._target, menu_id, option.option, option.automated)
+    next(self._target, menu_id, option.option, option.automated, option.cycle)
 end
 
 return BuyDialogue

model/dialogue/use.lua

@@ -85,7 +85,7 @@ function UseDialogue:_OnSuccess()
     local menu_id = self._menu:Id()
     local next = self._interactions[self._idx]
 
-    next(self._target, menu_id, option.option, option.automated, self._player, self._item_id)
+    next(self._target, menu_id, option.option, option.automated, option.cycle, self._player, self._item_id)
 end
 
 return UseDialogue

model/interaction/choice.lua

@@ -1,11 +1,12 @@
 local NilInteraction = require('model/interaction/nil')
 
 --------------------------------------------------------------------------------
-local function CreateChoicePacket(target, menu, choice, automated)
+local function CreateChoicePacket(target, menu, choice, automated, cycles)
     local pkt = packets.new('outgoing', 0x05B)
     pkt['Target'] = target:Id()
     pkt['Target Index'] = target:Index()
     pkt['Option Index'] = choice
+    pkt['_unknown1'] = cycles
     pkt['Automated Message'] = automated
     pkt['Zone'] = target:Zone()
     pkt['Menu ID'] = menu
@@ -21,7 +22,7 @@ Choice.__index = Choice
 function Choice:Choice()
     local o = NilInteraction:NilInteraction()
     setmetatable(o, self)
-    o._to_send = { [1] = function(target, menu, choice, automated) return {CreateChoicePacket(target, menu, choice, automated)} end }
+    o._to_send = { [1] = function(target, menu, choice, automated, cycles) return {CreateChoicePacket(target, menu, choice, automated, cycles)} end }
     o._idx = 1
     o._type = 'Choice'
 
@@ -43,15 +44,15 @@ function Choice:OnIncomingData(id, pkt)
 end
 
 --------------------------------------------------------------------------------
-function Choice:_GeneratePackets(target, menu, choice, automated)
-    local pkts = self._to_send[self._idx](target, menu, choice, automated)
+function Choice:_GeneratePackets(target, menu, choice, automated, cycles)
+    local pkts = self._to_send[self._idx](target, menu, choice, automated, cycles)
     self._idx = self._idx + 1
     return pkts
 end
 
 --------------------------------------------------------------------------------
-function Choice:__call(target, menu, choice, automated)
-    local pkts = self:_GeneratePackets(target, menu, choice, automated)
+function Choice:__call(target, menu, choice, automated, cycles)
+    local pkts = self:_GeneratePackets(target, menu, choice, automated, cycles)
     for _, pkt in pairs(pkts) do
         packets.inject(pkt)
     end

model/interaction/trade.lua

@@ -51,7 +51,7 @@ function Trade:_GeneratePackets(target, player, item_id)
 end
 
 --------------------------------------------------------------------------------
-function Trade:__call(target, _, _, _, player, item_id)
+function Trade:__call(target, _, _, _, _, player, item_id)
     local pkts = self:_GeneratePackets(target, player, item_id)
     for _, pkt in pairs(pkts) do
         packets.inject(pkt)

model/menu/buy.lua

@@ -7,7 +7,7 @@ BuyMenu.__index = BuyMenu
 
 --------------------------------------------------------------------------------
 function BuyMenu:BuyMenu(id)
-    local o = SimpleMenu:SimpleMenu(id, 10, true)
+    local o = SimpleMenu:SimpleMenu(id, 10, true, 0)
     setmetatable(o, self)
     o._type = 'BuyMenu'
 

model/menu/count.lua

@@ -7,7 +7,7 @@ CountMenu.__index = CountMenu
 
 --------------------------------------------------------------------------------
 function CountMenu:CountMenu(id, idx, count)
-    local o = SimpleMenu:SimpleMenu(id, (count * (2^13) + (idx * (2^5) + 3) + 1), true)
+    local o = SimpleMenu:SimpleMenu(id, (count % 8) * (2^13) + (idx * (2^5)) + 4, true, math.floor(count / 8))
     setmetatable(o, self)
     o._type = 'CountMenu'
 

model/menu/item.lua

@@ -7,7 +7,7 @@ ItemMenu.__index = ItemMenu
 
 --------------------------------------------------------------------------------
 function ItemMenu:ItemMenu(id, idx)
-    local o = SimpleMenu:SimpleMenu(id, (idx * (2^5) + 3), true)
+    local o = SimpleMenu:SimpleMenu(id, (idx * (2^5) + 3), true, 0)
     setmetatable(o, self)
     o._type = 'ItemMenu'
 

model/menu/nil.lua

@@ -8,7 +8,7 @@ function NilMenu:NilMenu(id)
     local o = {}
     setmetatable(o, self)
     o._id = id
-    o._option = { option = 0, automated = false }
+    o._option = { option = 0, automated = false, cycle = 0 }
     o._type = 'NilMenu'
     return o
 end

model/menu/simple.lua

@@ -6,12 +6,12 @@ local SimpleMenu = NilMenu:NilMenu()
 SimpleMenu.__index = SimpleMenu
 
 --------------------------------------------------------------------------------
-function SimpleMenu:SimpleMenu(id, option, automated)
+function SimpleMenu:SimpleMenu(id, option, automated, cycle)
     local o = NilMenu:NilMenu()
     setmetatable(o, self)
 
     o._id = id
-    o._option = { option = option, automated = automated }
+    o._option = { option = option, automated = automated, cycle = cycle }
     o._type = 'SimpleMenu'
 
     return o