0
@@ -26,14 +26,16 @@ end
0
 for i,v in pairs(items) do bests[i], items[i] = {}, TableStuffer(string.split(" ,", v)) end
0
 
0
 
0
-local function edit(name, ooc, ic, shift)
0
+local function edit(name, food, pot, stone, shift)
0
   local macroid = GetMacroIndexByName(name)
0
   if not macroid then return end
0
 
0
-	local body = "#showtooltip\n\n/use "
0
+	local body = "#showtooltip\n/use "
0
   if shift then body = body .. "[modifier:shift] item:"..shift.."; " end
0
-	if ic then body = body .. "[combat] item:"..ic.."; " end
0
-	body = body .. "item:"..(ooc or "6948")
0
+	if (pot and not stone) or (stone and not pot) then body = body .. "[combat] item:"..(pot or stone).."; " end
0
+	body = body .. (pot and stone and "[nocombat] " or "").."item:"..(food or "6948")
0
+
0
+	if pot and stone then body = body .. "\n/castsequence [combat] item:"..stone..", item:"..pot end
0
 
0
   EditMacro(macroid, name, 1, body, 1)
0
 end
0
@@ -60,8 +62,8 @@ local function scan()
0
     end
0
   end
0
 
0
-	edit("AutoHP", bests.conjfood.id or bests.percfood.id or bests.food.id or bests.hstone.id or bests.hppot.id, bests.hstone.id or bests.hppot.id, bests.bandage.id)
0
-	edit("AutoMP", bests.conjwater.id or bests.percwater.id or bests.water.id or bests.mstone.id or bests.mppot.id, bests.mstone.id or bests.mppot.id)
0
+	edit("AutoHP", bests.conjfood.id or bests.percfood.id or bests.food.id or bests.hstone.id or bests.hppot.id, bests.hppot.id, bests.hstone.id, bests.bandage.id)
0
+	edit("AutoMP", bests.conjwater.id or bests.percwater.id or bests.water.id or bests.mstone.id or bests.mppot.id, bests.mppot.id, bests.mstone.id)
0
   dirty = false
0
 end
0