diff --git a/DailyAutoShare/DailyAutoShare.txt b/DailyAutoShare/DailyAutoShare.txt
index 8d73ca9..cfe43ac 100644
--- a/DailyAutoShare/DailyAutoShare.txt
+++ b/DailyAutoShare/DailyAutoShare.txt
@@ -1,6 +1,6 @@
## Title: DailyAutoShare
## Author: manavortex
-## Version: 3.0.1
+## Version: 3.0.2
## APIVersion: 100022
## SavedVariables: DAS_Settings DAS_Globals
## OptionalDependsOn: LibStub LibAddonMenu-2.0 LibMediaProvider-1.0
diff --git a/DailyAutoShare/DailyAutoShare.xml b/DailyAutoShare/DailyAutoShare.xml
index b3ecdd3..14f442c 100644
--- a/DailyAutoShare/DailyAutoShare.xml
+++ b/DailyAutoShare/DailyAutoShare.xml
@@ -29,7 +29,6 @@
mouseOver="/esoui/art/miscellaneous/locked_over.dds"
/>
</Button>
-
<Button name="DasButtonHide" >
<Dimensions x="15" y="15" />
<Anchor point="LEFT" relativeTo="DasButtonLock" relativePoint="RIGHT" offsetX="10" offsetY="2"/>
@@ -49,6 +48,19 @@
<OnMouseUp>DailyAutoShare.MinMaxButton()</OnMouseUp>
</Button>
+ <Button name="DasButtonRefresh">
+ <Anchor point="RIGHT" relativeTo="DasHandle" relativePoint="RIGHT" offsetX="-40"/>
+ <Dimensions x="28" y="28" />
+ <Textures
+ normal ="/esoui/art/help/help_tabicon_feedback_up.dds"
+ pressed ="/esoui/art/help/help_tabicon_feedback_down.dds "
+ mouseOver ="/esoui/art/help/help_tabicon_feedback_over.dds"
+ />
+ <OnMouseEnter> DailyAutoShare.CreateControlTooltip(self) </OnMouseEnter>
+ <OnMouseExit> DailyAutoShare.HideTooltip(self) </OnMouseExit>
+ <OnMouseUp> DailyAutoShare.RefreshLabels(true, true) </OnMouseUp>
+ </Button>
+
<Label name="$(parent)_Label" font="ZoFontWinH2" color="ffffff" text="DailyAutoShare"
verticalAlignment="CENTER" horizontalAlignment="LEFT" alpha="0.85">
<Dimensions x="350" y="50" />
@@ -146,18 +158,7 @@
<OnMouseUp> DailyAutoShare.Donate(self, button) </OnMouseUp>
</Button>
- <Button name="DasButtonRefresh">
- <Anchor point="RIGHT" relativeTo="DasButtonDonate" relativePoint="LEFT" />
- <Dimensions x="28" y="28" />
- <Textures
- normal ="/esoui/art/help/help_tabicon_feedback_up.dds"
- pressed ="/esoui/art/help/help_tabicon_feedback_down.dds "
- mouseOver ="/esoui/art/help/help_tabicon_feedback_over.dds"
- />
- <OnMouseEnter> DailyAutoShare.CreateControlTooltip(self) </OnMouseEnter>
- <OnMouseExit> DailyAutoShare.HideTooltip(self) </OnMouseExit>
- <OnMouseUp> DailyAutoShare.RefreshLabels(true, true) </OnMouseUp>
- </Button>
+
</Controls>
</Control>
diff --git a/DailyAutoShare/locale/en.lua b/DailyAutoShare/locale/en.lua
index 4299af6..e7cd3ab 100644
--- a/DailyAutoShare/locale/en.lua
+++ b/DailyAutoShare/locale/en.lua
@@ -29,8 +29,7 @@ local strings = {
DAS_CLOCK_IMP = "Inciting the Imperfect",
DAS_CLOCK_FOE = "A Fine-Feathered Foe",
- DAS_CLOCK_IMP_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_FOE_TURNIN = "IMPLEMENT_ME",
+ DAS_CLOCK_IMP_TURNIN = "I've completed the contract.",
-- Clockwork City
DAS_CLOCK_BOSS_START = "I'll take on a contract.",
@@ -45,12 +44,12 @@ local strings = {
DAS_CLOCK_CRAFT_ALCH = "A Bitter Pill",
DAS_CLOCK_CRAFT_WOOD = "Fuel for our Fires",
- DAS_CLOCK_CRAFT_CLOTH_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_CRAFT_WATER_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_CRAFT_RUNE_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_CRAFT_SMITH_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_CRAFT_ALCH_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_CRAFT_WOOD_TURNIN = "IMPLEMENT_ME",
+ DAS_CLOCK_CRAFT_CLOTH_TURNIN = "I have the metallic fibers.", -- guessed
+ DAS_CLOCK_CRAFT_WATER_TURNIN = "I have the fabricated husk.", -- guessed
+ DAS_CLOCK_CRAFT_RUNE_TURNIN = "I have the runestones.", -- guessed
+ DAS_CLOCK_CRAFT_SMITH_TURNIN = "I have the flash stone.", -- guessed
+ DAS_CLOCK_CRAFT_ALCH_TURNIN = "I have the herbalist's satchels.",
+ DAS_CLOCK_CRAFT_WOOD_TURNIN = "I have the synthetic oils.",
DAS_CLOCK_DELVE_FILT = "Changing the Filters",
@@ -60,11 +59,11 @@ local strings = {
DAS_CLOCK_DELVE_MISP = "A Shadow Misplaced",
DAS_CLOCK_DELVE_AGAI = "Again Into the Shadows",
- DAS_CLOCK_DELVE_FILT_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_DELVE_FANS_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_DELVE_COMM_TURNIN = "IMPLEMENT_ME",
+ DAS_CLOCK_DELVE_FILT_TURNIN = "I was able to change the filters.", -- guessed
+ DAS_CLOCK_DELVE_FANS_TURNIN = "I was able to oil the fans.", -- guessed
+ DAS_CLOCK_DELVE_COMM_TURNIN = "I was able to replace the commutators.",
DAS_CLOCK_DELVE_MALF_TURNIN = "IMPLEMENT_ME",
- DAS_CLOCK_DELVE_MISP_TURNIN = "IMPLEMENT_ME",
+ DAS_CLOCK_DELVE_MISP_TURNIN = "And here are Oscard's research notes.",
DAS_CLOCK_DELVE_AGAI_TURNIN = "IMPLEMENT_ME",
DAS_CLOCK_CROW_GLIT = "Glitter and Gleam",
diff --git a/DailyAutoShare/questData/ClockworkCity.lua b/DailyAutoShare/questData/ClockworkCity.lua
index 66c3ada..d9c2e48 100644
--- a/DailyAutoShare/questData/ClockworkCity.lua
+++ b/DailyAutoShare/questData/ClockworkCity.lua
@@ -9,6 +9,8 @@ local zoneId3 = 983
local halls_of_regulation_id = 985
local shadow_cleft_id = 986
local planisphere_id = 993
+local wellspring_id = 992
+
local bingo
-- =============================================================================================== --
@@ -63,9 +65,14 @@ DAS.shareables[shadow_cleft_id] = tbl3
-- Planisphere
local tbl4 = {}
-table.insert(tbl3, GetString(DAS_CLOCK_CRAFT_CLOTH))
+table.insert(tbl4, GetString(DAS_CLOCK_CRAFT_CLOTH))
DAS.shareables[planisphere_id] = tbl4
+-- Everwound Wellspring
+local tbl5 = {}
+table.insert(tbl5, GetString(DAS_CLOCK_CRAFT_ALCH))
+DAS.shareables[wellspring_id] = tbl5
+
DAS.QuestLists[zoneId] = {
["boss"] = {
[GetString(DAS_CLOCK_IMP)] = true,
@@ -135,6 +142,10 @@ table.insert(bingo, "shadow")
table.insert(bingo, "comm")
DAS.makeBingoTable(shadow_cleft_id, bingo)
+bingo = {}
+table.insert(bingo, "pill")
+DAS.makeBingoTable(wellspring_id, bingo)
+
DAS.shareables[zoneId2] = DAS.shareables[zoneId]
diff --git a/DailyAutoShare/startup.lua b/DailyAutoShare/startup.lua
index c5126b0..05b9086 100644
--- a/DailyAutoShare/startup.lua
+++ b/DailyAutoShare/startup.lua
@@ -37,12 +37,7 @@ local fullBingoString = DAS.fullBingoString
local defaults = {
- ["tracked"] = {
- [684] = true,
- [823] = true,
- [849] = true, -- Vvardenfell
- [181] = false,
- },
+
["singleDailies"] = {},
["shareableDailies"] = {},
@@ -96,8 +91,7 @@ local defaults = {
["invisible"] = false,
["active"] = true,
},
- },
-
+ },
debugOutput = false,
currentlyWithQuest = false,
currentQuestIndex = nil,
@@ -126,9 +120,49 @@ local defaults = {
guildInviteNumber = 1,
guildInviteText,
listenInGuilds,
-
+ ["tracked"] = {
+ [684] = true,
+ [823] = true,
+ [849] = true, -- Vvardenfell
+ [181] = false,
+ },
}
+local function pointerUpSubzones()
+ -- Clockwork City
+ defaults[981] = defaults[980]
+ defaults[981] = defaults[980]
+ defaults[982] = defaults[980]
+ defaults.tracked[982] = defaults.tracked[980]
+ defaults.tracked[983] = defaults.tracked[980]
+ defaults.tracked[983] = defaults.tracked[980]
+
+ -- Morrowind
+ defaults[921] = defaults[849]
+ defaults[922] = defaults[849]
+ defaults[923] = defaults[849]
+ defaults[924] = defaults[849]
+ defaults.tracked[921] = defaults.tracked[849]
+ defaults.tracked[922] = defaults.tracked[849]
+ defaults.tracked[923] = defaults.tracked[849]
+ defaults.tracked[924] = defaults.tracked[849]
+
+ -- Wrothgar
+ defaults[689] = defaults[684]
+ defaults[690] = defaults[684]
+ defaults[691] = defaults[684]
+ defaults[692] = defaults[684]
+ defaults[693] = defaults[684]
+ defaults[694] = defaults[684]
+ defaults.tracked[689] = defaults.tracked[684]
+ defaults.tracked[690] = defaults.tracked[684]
+ defaults.tracked[691] = defaults.tracked[684]
+ defaults.tracked[692] = defaults.tracked[684]
+ defaults.tracked[693] = defaults.tracked[684]
+ defaults.tracked[694] = defaults.tracked[684]
+end
+pointerUpSubzones()
+
local characterName = zo_strformat(GetUnitName('player'))
local allDailyQuestIds = DAS_QUEST_IDS