Переглянути джерело

9.0 updates and TOC bump

tags/2.1.10
SabinDeus 5 роки тому
джерело
коміт
47a99070cf
5 змінених файлів з 58 додано та 54 видалено
  1. 1
    0
      .gitignore
  2. 21
    43
      TurnIn.lua
  3. 2
    2
      TurnIn.toc
  4. 31
    6
      TurnIn.xml
  5. 3
    3
      TurnInUI.lua

+ 1
- 0
.gitignore Переглянути файл

@@ -0,0 +1 @@
.sync/

+ 21
- 43
TurnIn.lua Переглянути файл

@@ -37,9 +37,9 @@ local TI_GossipDefaults = {

local TI_FunctionList = {
g = {
availquest = SelectGossipAvailableQuest,
activequest = SelectGossipActiveQuest,
default = SelectGossipOption
availquest = C_GossipInfo.SelectActiveQuest,
activequest = C_GossipInfo.SelectAvailableQuest,
default = C_GossipInfo.SelectOption
},
q = {
availquest = SelectAvailableQuest,
@@ -394,11 +394,11 @@ function TI_HandleGossipWindow(gorq)
local ActiveQuests;
local GossipOptions;
if(gorq == "g") then
AvailableQuests = TI_TabulateGossipAvailableQuests(GetGossipAvailableQuests());
ActiveQuests = TI_TabulateGossipActiveQuests(GetGossipActiveQuests());
GossipOptions = TI_TabulateGossipOptions(GetGossipOptions());
SAcQ = SelectGossipActiveQuest;
SAvQ = SelectGossipAvailableQuest;
AvailableQuests = TI_TabulateGossipQuestUIInfo(C_GossipInfo.GetAvailableQuests());
ActiveQuests = TI_TabulateGossipQuestUIInfo(C_GossipInfo.GetActiveQuests());
GossipOptions = TI_TabulateGossipUIInfo(C_GossipInfo.GetOptions());
SAcQ = C_GossipInfo.SelectActiveQuest;
SAvQ = C_GossipInfo.SelectAvailableQuest;
elseif(gorq == "q") then
AvailableQuests = TI_GetQuests("Available");
ActiveQuests = TI_GetQuests("Active");
@@ -507,7 +507,7 @@ function TI_HandleGossipWindow(gorq)
for i2,v2 in ipairs(GossipOptions) do
if (v2.name == current.name) then
TI_debug(i1.."-Gossip Match Found: "..current.name..", "..current.type);
SelectGossipOption(i2);
C_GossipInfo.SelectOption(i2);
return;
end
end
@@ -543,7 +543,7 @@ function TI_HandleGossipWindow(gorq)
for j,val in ipairs(GossipOptions) do
if(val.type == current.type) then
TI_ResetPointers();
SelectGossipOption(j);
C_GossipInfo.SelectOption(j);
return;
end
end
@@ -628,56 +628,34 @@ function TI_TabulateGossipOptions(...)
return x;
end

function TI_TabulateGossipAvailableQuests(...)
function TI_TabulateGossipQuestUIInfo(gquis)
local x = {};
for i=1, select("#", ...), 7 do
for i,gqui in ipairs(gquis) do
local temp = {};
temp.name = select(i, ...);
temp.name = gqui.name;
temp.icon = QuestUtil.GetQuestIconActive(gqui.isComplete, gqui.isLegendary,
gqui.frequency, gqui.isRepeatable, gqui.isCampaign, gqui.isCovenantCalling)
local isTrivial = select(i+2, ...);
local isDaily = select(i+3, ...);
local isRepeatable = select(i+4, ...);
local isLegendary = select(i+5, ...);
local isIgnored = select(i+6, ...);
if ( isDaily ) then
temp.icon = "Interface\\GossipFrame\\DailyQuestIcon";
elseif ( isRepeatable ) then
temp.icon = "Interface\\GossipFrame\\DailyActiveQuestIcon";
elseif ( isLegendary ) then
temp.icon = "Interface\\GossipFrame\\AvailableLegendaryQuestIcon";
else
temp.icon = "Interface\\GossipFrame\\AvailableQuestIcon";
end
table.insert(x, temp);
end
return x;
end

function TI_TabulateGossipActiveQuests(...)
function TI_TabulateGossipUIInfo(guis)
local x = {};
for i=1, select("#", ...), 6 do
for i,gui in ipairs(guis) do
local temp = {};
temp.name = select(i, ...);
local isComplete = select(i+3, ...);
local isLegendary = select(i+4, ...);
if(isComplete) then
if(isLegendary) then
temp.icon = "Interface\\GossipFrame\\ActiveLegendaryQuestIcon";
else
temp.icon = "Interface\\GossipFrame\\ActiveQuestIcon";
end
else
temp.icon = "Interface\\GossipFrame\\IncompleteQuestIcon";
end
temp.name = gui.name;
temp.type = gui.type;
table.insert(x, temp);
end
return x;
end

--[[this function stolen from WhisperCast by Sarris, whom I love dearly for his contribution to Paladins everywhere.
]]

+ 2
- 2
TurnIn.toc Переглянути файл

@@ -1,5 +1,5 @@
## Interface: 80000
## X-Compatible-With: 80000
## Interface: 90002
## X-Compatible-With: 90002
## Title: Turn In
## Notes: Automates the selection of quest and gossip options.
## SavedVariables: TI_status, TI_NPCDB, TI_NPCIndex

+ 31
- 6
TurnIn.xml Переглянути файл

@@ -2,7 +2,7 @@
<Script file="TurnIn.lua" />
<Script file="TurnInUI.lua" />
<Frame name="TI_OptionFrameBoxTemplate" virtual="true">
<Frame name="TI_OptionFrameBoxTemplate" virtual="true" inherits="BackdropTemplate">
<!-- shamelessly stolen from blizzard -->
<Layers>
<Layer level="BACKGROUND">
@@ -17,6 +17,9 @@
</FontString>
</Layer>
</Layers>
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_TOOLTIP_16_16_5555" type="global"/>
</KeyValues>
<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<EdgeSize>
<AbsValue val="16"/>
@@ -30,6 +33,7 @@
</Backdrop>
<Scripts>
<OnLoad>
self:ApplyBackdrop();
self:SetBackdropBorderColor(0.4, 0.4, 0.4);
self:SetBackdropColor(0.5, 0.5, 0.5);
</OnLoad>
@@ -333,7 +337,7 @@
</Frames>
</Frame>
<Frame Name="TI_TempNPCListWindow" parent="UIParent" frameStrata="DIALOG" toplevel="true" enableMouse="true" movable="true" hidden="true">
<Frame Name="TI_TempNPCListWindow" parent="UIParent" frameStrata="DIALOG" toplevel="true" enableMouse="true" movable="true" hidden="true" inherits="BackdropTemplate">
<Size>
<AbsDimension x="200" y="130" />
</Size>
@@ -403,6 +407,9 @@
</Anchors>
</Frame>
</Frames>
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_TOOLTIP_16_16_5555" type="global"/>
</KeyValues>
<Backdrop bgFile="Interface\DialogFrame\UI-DialogBox-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<EdgeSize>
<AbsValue val="16"/>
@@ -415,6 +422,11 @@
</BackgroundInsets>
</Backdrop>
<Scripts>
<OnLoad>
self:ApplyBackdrop();
self:SetBackdropBorderColor(0.6, 0.6, 0.6);
self:SetBackdropColor(0.2, 0.2, 0.2);
</OnLoad>
<OnMouseUp>
if ( self.isMoving ) then
self:StopMovingOrSizing();
@@ -436,7 +448,7 @@
</Scripts>
</Frame>
<Frame Name="TI_OptionsFrame" frameStrata="DIALOG" toplevel="true" enableMouse="true" enableMouseWheel="true" movable="true" parent="UIParent">
<Frame Name="TI_OptionsFrame" inherits="BackdropTemplate" frameStrata="DIALOG" toplevel="true" enableMouse="true" enableMouseWheel="true" movable="true" parent="UIParent">
<TitleRegion>
<Size>
<AbsDimension x="128" y="64"/>
@@ -450,6 +462,9 @@
</Anchors>
</TitleRegion>
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_DIALOG_32_32" type="global"/>
</KeyValues>
<Backdrop bgFile="Interface\DialogFrame\UI-DialogBox-Background" edgeFile="Interface\DialogFrame\UI-DialogBox-Border" tile="true">
<BackgroundInsets>
<AbsInset left="11" right="12" top="12" bottom="11"/>
@@ -463,9 +478,17 @@
</Backdrop>
<Scripts>
<OnShow>
</OnShow>
<OnLoad>
self:ApplyBackdrop()
self:EnableMouse(true)
self:RegisterForDrag("LeftButton")
</OnLoad>
<OnDragStart>
self:StartMoving()
</OnDragStart>
<OnDragStop>
self:StopMovingOrSizing()
</OnDragStop>
</Scripts>
<Size>
<AbsDimension x="300" y="500"/>
@@ -658,6 +681,7 @@
<Frame name="TI_OptionsPriorityContainer" inherits="TI_OptionFrameBoxTemplate">
<Scripts>
<OnLoad>
self:ApplyBackdrop();
self:SetBackdropBorderColor(0.4, 0.4, 0.4);
self:SetBackdropColor(0.15, 0.15, 0.15);
getglobal(self:GetName().."Title"):SetText("Gossip Options Priority List");
@@ -865,6 +889,7 @@
<Frame name="TI_OptionsNPCContainer" inherits="TI_OptionFrameBoxTemplate">
<Scripts>
<OnLoad>
self:ApplyBackdrop();
self:SetBackdropBorderColor(0.4, 0.4, 0.4);
self:SetBackdropColor(0.15, 0.15, 0.15);
getglobal(self:GetName().."Title"):SetText("NPC Database");

+ 3
- 3
TurnInUI.lua Переглянути файл

@@ -20,16 +20,16 @@ function TI_PopulateOptions(arg)
if(v.icon) then
iconpath = v.icon;
else
iconpath = "Interface\\GossipFrame\\ActiveQuestIcon";
iconpath = "Interface/GossipFrame/ActiveQuestIcon";
end
elseif(v.type == "availquest") then
if(v.icon) then
iconpath = v.icon;
else
iconpath = "Interface\\GossipFrame\\AvailableQuestIcon";
iconpath = "Interface/GossipFrame/AvailableQuestIcon";
end
else
iconpath = "Interface\\GossipFrame\\" .. v.type .. "GossipIcon";
iconpath = "Interface/GossipFrame/" .. v.type .. "GossipIcon";
end
getglobal(entry .. "_Icon"):SetTexture(iconpath);
getglobal(entry .. "_Check"):SetChecked(v.state);

Завантаження…
Відмінити
Зберегти