Add QpartPart step option command

Azeroth-Pilot-Reloaded · Jul 20, 2024 · f20e4d0 · f20e4d0
1 parent 8eacccf
commit f20e4d0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/Commands.lua b/Commands.lua
@@ -219,6 +219,25 @@ function AprRC.command:SlashCmd(input)
             end
             return
         elseif inputText == "qpartpart" then
+            AprRC.QuestObjectiveSelector:Show({
+                title = "Qpartpart quest list",
+                statusText = "Click on an objective to create a Qpartpart ",
+                questList = AprRC.QuestObjectiveSelector:GetQuestList(),
+                onClick = function(questID, objectiveID)
+                    AprRC.questionDialog:CreateEditBoxPopupWithCallback("Text Trigger for Qpart Part", function(text)
+                        local step = {
+                            TrigText = text,
+                            QpartPart = { [questID] = { objectiveID } }
+                        }
+                        AprRC:SetStepCoord(step)
+                        AprRC:NewStep(step)
+                        print("|cff00bfffQpartPart - [" ..
+                            C_QuestLog.GetTitleForQuestID(questID) .. "] - " .. objectiveID .. "|r Added")
+                        print("|cff00bfffTrigText - " .. text .. "|r Added")
+                    end)
+                end
+            })
+            return
         elseif inputText == "zonetrigger" then
             local currentStep = AprRC:GetLastStep()
             local y, x = UnitPosition("player")

diff --git a/Event.lua b/Event.lua
@@ -195,7 +195,7 @@ function AprRC.event.functions.spell(event, unitTarget, castGUID, spellID)
             key = "UseDalaHS"
         elseif spellID == APR.garrisonHSSpellID then
             key = "UseGarrisonHS"
-        elseif AprRC:Contains(APR.hearthStoneSpellID, spellID) then
+        elseif tContains(APR.hearthStoneSpellID, spellID) then
             key = "UseHS"
         elseif spellID == 126389 then
             local currentStep = AprRC:GetLastStep()
@@ -239,11 +239,11 @@ local function SetGossipOptionID(self)
     local gossipInfo = self:GetData().info
     local gossipIcon = gossipInfo.icon
     local gossipOptionID = gossipInfo.gossipOptionID
-    if gossipIcon == 132053 and not AprRC:Contains({ 51901, 51902 }, gossipOptionID) then --bubble icon and not chromie select timeline
+    if gossipIcon == 132053 and not tContains({ 51901, 51902 }, gossipOptionID) then --bubble icon and not chromie select timeline
         if not AprRC:IsCurrentStepFarAway() then
             local currentStep = AprRC:GetLastStep()
             if AprRC:HasStepOption("GossipOptionIDs") then
-                if not AprRC:Contains(currentStep["GossipOptionIDs"], gossipOptionID) then
+                if not tContains(currentStep["GossipOptionIDs"], gossipOptionID) then
                     tinsert(currentStep["GossipOptionIDs"], gossipOptionID)
                 end
             else
@@ -356,7 +356,7 @@ function AprRC.event.functions.fly(event, ...)
             currentStep.NodeID = taxiNodeId
 
             --Boat
-            if AprRC:Contains(boatsNodeID, AprRC.CurrentTaxiNode) then
+            if tContains(boatsNodeID, AprRC.CurrentTaxiNode) then
                 currentStep.Boat = 1
             end
 

diff --git a/frames/CommandsBar.lua b/frames/CommandsBar.lua
@@ -11,8 +11,6 @@ local FRAME_HEIGHT = 35
 ---------------------------------------------------------------------------------------
 --------------------------------- CommandBar Frames -----------------------------------
 ---------------------------------------------------------------------------------------
-
-print('OUIIIIIIIIIIIIIIIIIIIII')
 local CommandBarFrame = CreateFrame("Frame", "CommandBarFrame", UIParent, "BackdropTemplate")
 CommandBarFrame:SetSize(FRAME_WIDTH, FRAME_HEIGHT)
 CommandBarFrame:SetFrameStrata("MEDIUM")

diff --git a/helper/Utils.lua b/helper/Utils.lua
@@ -25,21 +25,6 @@ function AprRC:Error(errorMessage, data)
     end
 end
 
---- Contain data in list
----@param list array list
----@param x object object to check if in the list
----@return true|false Boolean
-function AprRC:Contains(list, x)
-    if list then
-        for _, v in pairs(list) do
-            if v == x then
-                return true
-            end
-        end
-    end
-    return false
-end
-
 function AprRC:DeepCompare(t1, t2)
     if t1 == t2 then return true end
     if type(t1) ~= "table" or type(t2) ~= "table" then return false end
@@ -160,6 +145,7 @@ function AprRC:RouteToString(tbl, level)
     local indent = string.rep("    ", level)
     local str = "{\n"
     local itemIndent = string.rep("    ", level + 1)
+    local qpartTableLis = { "Fillers", "Qpart", "QpartPart", "Button", "SpellButton" }
 
     local keys = {}
     for k in pairs(tbl) do
@@ -176,7 +162,7 @@ function AprRC:RouteToString(tbl, level)
                 str = str .. itemIndent .. keyStr .. "{}" .. ",\n"
             else
                 local valueStr
-                if k == "Qpart" or k == "Fillers" or k == "Button" or k == "SpellButton" then
+                if tContains(qpartTableLis, k) then
                     valueStr = qpartTableToString(v, level + 1, k)
                 else
                     valueStr = self:RouteToString(v, level + 1)