Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9.2.5 Compatibility #34

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CatchTheWind.lua
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,6 @@ local function onQuestComplete()
_G["CTWChoicePanelItem"..i]:Hide();
end
else
print("rewardPanel hide")
letterBox.rewardPanel:Hide();
end
end
Expand Down
14 changes: 7 additions & 7 deletions CatchTheWind.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</Frame>

<!--QuestItem Button Template -->
<Button name="CTWItemButtonTemplate" hidden="true" inherits="QuestInfoRewardItemTemplate" virtual="true">
<Button name="CTWItemButtonTemplate" hidden="true" inherits="LargeQuestRewardItemButtonTemplate" virtual="true">

<Size x="48" y="48"/>

Expand Down Expand Up @@ -88,9 +88,9 @@
GameTooltip:SetQuestItem(self.type, self:GetID());

if(IsShiftKeyDown()) then
for i=1,3 do
_G["ShoppingTooltip"..i]:SetParent(CatchTheWind);
_G["ShoppingTooltip"..i]:SetFrameStrata("TOOLTIP");
for i=1,2 do
_G["ItemRefShoppingTooltip"..i]:SetParent(CatchTheWind);
_G["ItemRefShoppingTooltip"..i]:SetFrameStrata("TOOLTIP");
end
CTW_GameTooltip_ShowCompareItem(GameTooltip);
end
Expand All @@ -100,9 +100,9 @@
GameTooltip:SetParent(UIParent);
GameTooltip:SetFrameStrata("TOOLTIP");
GameTooltip:Hide();
for i=1,3 do
_G["ShoppingTooltip"..i]:SetParent(UIParent);
_G["ShoppingTooltip"..i]:SetFrameStrata("TOOLTIP");
for i=1,2 do
_G["ItemRefShoppingTooltip"..i]:SetParent(UIParent);
_G["ItemRefShoppingTooltip"..i]:SetFrameStrata("TOOLTIP");
end
ResetCursor();
</OnLeave>
Expand Down
4 changes: 2 additions & 2 deletions GUIConfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function CatchTheWindConfigMenuButton_OnClick(self, button)
for num, button in pairs(self:GetParent().menuButtonsTable) do
button:Enable();
end
PlaySound("igMainMenuOptionCheckBoxOn");
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
self:Disable();

self.func();
Expand All @@ -18,7 +18,7 @@ function CatchTheWindConfigCheckButton_OnClick(self, button)
else
self.text:SetTextColor(1, 0.4, 0.4);
end
PlaySound("igMainMenuOptionCheckBoxOn");
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
self.func(self:GetChecked());
end

Expand Down