diff --git a/Doc/Changelog.txt b/Doc/Changelog.txt
index 78f13a1..acbd14d 100644
--- a/Doc/Changelog.txt
+++ b/Doc/Changelog.txt
@@ -1,3 +1,6 @@
+2020-08 Version 70
+Southern Elsweyr Skill Quests (Dragonhold)
+
2020-08-14 Version 69
Wasn't recording the DLC Grp events correctly.
Nobody cared.
diff --git a/HistOffline.lua b/HistOffline.lua
index c1511ba..0be7b55 100644
--- a/HistOffline.lua
+++ b/HistOffline.lua
@@ -17,7 +17,7 @@ Settings_s ="./my/visibility.lua"
--force_lang = "ru" -- or "de" or "fr" or "ru" for debugging
-- ========================
-version= "69"
+version= "70"
require( "iuplua" )
require( "iupluacontrols" )
diff --git a/data/Quest.lua b/data/Quest.lua
index bbaea9a..8915d86 100644
--- a/data/Quest.lua
+++ b/data/Quest.lua
@@ -183,8 +183,17 @@ SQ_dat = {
[2485] = {Location=25, ["link1"] = "https://en.uesp.net/wiki/Online:Two_Queens"}, -- (Quests) Rimmen Revolution, Complete the "Two Queens" quest in Northern Elsweyr.
[2488] = {Location=25, ["link1"] = "https://en.uesp.net/wiki/Online:Moonwalker"}, -- (Quests) Moonwalker, Complete the "Jode's Core" quest in Northern Elsweyr.
+--Dragonhold
+[2596] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:The_Dragon%27s_Lair"}, -- (Quests) Lair Locator, Complete the "The Dragon's Lair" quest in Southern Elsweyr.
+[2597] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:Uneasy_Alliances"}, -- (Quests) Khenarthi's Guidance, Complete the "Uneasy Alliances" quest in Southern Elsweyr.
+[2598] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:Order_of_the_New_Moon"}, -- (Quests) Infiltrating the New Moon, Complete the "Order of the New Moon" quest in Southern Elsweyr.
+[2599] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:The_Pride_of_Alkosh_(quest)"}, -- (Quests) Halls of the Highmane, Complete the "Pride of Alkosh" quest in Southern Elsweyr.
+[2600] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:The_Dragonguard"}, -- (Quests) Return of the Dragonguard, Complete "The Dragonguard" quest in Southern Elsweyr.
+[2602] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:The_Dark_Aeon"}, -- (Quests) The Dragon's Wrath, Complete the "Dark Aeon" quest in Southern Elsweyr, which becomes available after completing the main questlines in Elsweyr and Dragonhold.
+[2603] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:New_Moon_Rising"}, -- (Quests) Fall of the Dark Aeon, Complete the "New Moon Rising" quest in Southern Elsweyr.
+[2604] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:The_Pride_of_Elsweyr"}, -- (Quests) Bright Moons Over Elsweyr, Complete the "Pride of Elsweyr" quest in Southern Elsweyr.
--Greymoor
-[2722] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:The_Vampire_Scholar"}, -- (Quests) Friend to Fennorian, Complete "The Vampire Scholar" quest in Western Skyrim.
-[2720] = {Location=26, ["link1"] = "https://en.uesp.net/wiki/Online:Dark_Clouds_Over_Solitude"}, -- (Quests) Assassin Assassinator, Complete the "Dark Clouds Over Solitude" quest in Western Skyrim.
+[2722] = {Location=27, ["link1"] = "https://en.uesp.net/wiki/Online:The_Vampire_Scholar"}, -- (Quests) Friend to Fennorian, Complete "The Vampire Scholar" quest in Western Skyrim.
+[2720] = {Location=27, ["link1"] = "https://en.uesp.net/wiki/Online:Dark_Clouds_Over_Solitude"}, -- (Quests) Assassin Assassinator, Complete the "Dark Clouds Over Solitude" quest in Western Skyrim.
}
diff --git a/data/WB.lua b/data/WB.lua
index c3fe93e..c839a6a 100644
--- a/data/WB.lua
+++ b/data/WB.lua
@@ -201,7 +201,7 @@ WB_dat = { --World Boss Achievements
[2293] = {Location=24}, -- Fiend of the Fens, Defeat the necromancer Baxilt-Gah at Bok-Xul.
[2294] = {Location=24}, -- Feller of Thunder, Defeat the miregaunt Walks-Like-Thunder at the Echoing Hollow.
---Elsweyr
+--Nothern Elsweyr
[2405] = {Location=25}, -- (Exploration) Skullcracker, Defeat the skullguard, Na'ruzz the Boneweaver, at the Bone Pit.
[2406] = {Location=25}, -- (Exploration) Dro-m'Athra Destroyer, Defeat the dro-m'Athra, Zalsheem, on the Nightmare Plateau.
[2407] = {Location=25}, -- (Exploration) Terror Bird Terminator, Defeat the terror bird, Wily Kee'va, at Talon Gulch.
@@ -211,11 +211,11 @@ WB_dat = { --World Boss Achievements
--2411 = {Location=25}, -- (Exploration) Defender of Northern Elsweyr, Defeat all six world bosses in Northern Elsweyr.
--Greymoor
-[2648] = {Location=26},-- (Exploration) Beach Battler, Defeat Ysmgar the Sea Giant at Ysmgar's Beach in Western Skyrim.
-[2649] = {Location=26},-- (Exploration) Hunting the Hunters, Defeat the Werewolves of Hordrek's Stalkers at Hordrek's Hunting Grounds in Western Skyrim.
-[2650] = {Location=26},-- (Exploration) Champion's Champion, Defeat the Orc called Skreg the Undefeatable at the Circle of Champions in Western Skyrim.
-[2651] = {Location=26},-- (Exploration) Shades of Gray, Defeat the Hagraven known as Shademother at Shademother's Haven in Western Skyrim.
-[2652] = {Location=26},-- (Exploration) No Food For You, Defeat Hjorrenn the Harvester, Doomclaw, and Exarch Savfyr of the Gray Host at the Vampire Feeding Grounds in Blackreach: Greymoor Caverns.
-[2653] = {Location=26},-- (Exploration) Dwarven Disassembler, Defeat the Dwarven Colossus at the Dwarven Charging Station in Blackreach: Greymoor Caverns.
+[2648] = {Location=27},-- (Exploration) Beach Battler, Defeat Ysmgar the Sea Giant at Ysmgar's Beach in Western Skyrim.
+[2649] = {Location=27},-- (Exploration) Hunting the Hunters, Defeat the Werewolves of Hordrek's Stalkers at Hordrek's Hunting Grounds in Western Skyrim.
+[2650] = {Location=27},-- (Exploration) Champion's Champion, Defeat the Orc called Skreg the Undefeatable at the Circle of Champions in Western Skyrim.
+[2651] = {Location=27},-- (Exploration) Shades of Gray, Defeat the Hagraven known as Shademother at Shademother's Haven in Western Skyrim.
+[2652] = {Location=27},-- (Exploration) No Food For You, Defeat Hjorrenn the Harvester, Doomclaw, and Exarch Savfyr of the Gray Host at the Vampire Feeding Grounds in Blackreach: Greymoor Caverns.
+[2653] = {Location=27},-- (Exploration) Dwarven Disassembler, Defeat the Dwarven Colossus at the Dwarven Charging Station in Blackreach: Greymoor Caverns.
--[2654], = {Location=26}-- (Exploration) Defender of Western Skyrim, Defeat all six world bosses in Western Skyrim and Blackreach: Greymoor Caverns.
}
diff --git a/data/de/de.lua b/data/de/de.lua
index 2431f07..d10ff59 100644
--- a/data/de/de.lua
+++ b/data/de/de.lua
@@ -190,8 +190,9 @@ Locations2 = { -- Used for WB and SQ,
{ name="Stadt der Uhrwerke"},
{ name="Sommersend"},
{ name="Trübmoor"}, --24
-{ name="Elsweyr"}, --25
-{ name="Greymoor"}, --26
+{ name="Northern Elsweyr"}, --25
+{ name="Southern Elsweyr"}, --26
+{ name="Greymoor"}, --27
}
diff --git a/data/en/en.lua b/data/en/en.lua
index 8ea5135..3a087e2 100644
--- a/data/en/en.lua
+++ b/data/en/en.lua
@@ -195,7 +195,7 @@ Locations2 = { -- Used for WB and SQ,
{ name="Greenshade", Grp="City of Ash", Pub="Rulanyil's Fall"}, --13
{ name="Malabal-Tor", Grp="Tempest Island", Pub="Crimson Cove"}, --14
{ name="Reaper's March", Grp="Selene's Web", Pub="The Vile Manse"}, --15
---Coldharbour
+--Other
{ name="Coldharbour", Grp="Vaults of Madness", Pub="Village of the Lost"}, --16
{ name="Dark Brotherhood"}, --17
{ name="Thieves Guild"}, --18
@@ -205,8 +205,9 @@ Locations2 = { -- Used for WB and SQ,
{ name="Clockwork City"}, --22
{ name="Summerset"}, --23
{ name="Murkmire"}, --24
-{ name="Elsweyr"}, --25
-{ name="Greymoor"}, --26
+{ name="Northern Elsweyr"}, --25
+{ name="Southern Elsweyr"}, --26
+{ name="Greymoor"}, --27
} --Update Keys Location2Key when updating this (Keys.lua)
diff --git a/data/fr/fr.lua b/data/fr/fr.lua
index 8348cab..3dfaa3a 100644
--- a/data/fr/fr.lua
+++ b/data/fr/fr.lua
@@ -184,8 +184,9 @@ Locations2 = { -- Used for WB and SQ,
{ name="Cité mécanique"},
{ name="Summerset"},
{ name="Murkmire"}, --24
-{ name="Elsweyr"}, --25
-{ name="Greymoor"}, --26
+{ name="Northern Elsweyr"}, --25
+{ name="Southern Elsweyr"}, --26
+{ name="Greymoor"}, --27
}
--With Dungeons No thieves guild or dark brotherhood
diff --git a/data/ids.lua b/data/ids.lua
index 8052612..7823ff5 100644
--- a/data/ids.lua
+++ b/data/ids.lua
@@ -1,4 +1,4 @@
-hist.IDVersion="69"
+hist.IDVersion="70"
hist.IDs = {
-- Group 1N
[1073] = true,
@@ -180,6 +180,13 @@ hist.IDs = {
[1441] = true,
[1442] = true,
[1444] = true,
+[2597] = true,
+[2598] = true,
+[2599] = true,
+[2600] = true,
+[2602] = true,
+[2603] = true,
+[2604] = true,
[1325] = true,
[1326] = true,
[1327] = true,
@@ -197,11 +204,12 @@ hist.IDs = {
[336] = true,
[209] = true,
[1363] = true,
+[2720] = true,
[597] = true,
[598] = true,
[599] = true,
-[2720] = true,
[2722] = true,
+[2596] = true,
[1370] = true,
[2488] = true,
[2338] = true,
diff --git a/data/keys.lua b/data/keys.lua
index 77a555a..ff9ee51 100644
--- a/data/keys.lua
+++ b/data/keys.lua
@@ -22,7 +22,7 @@ Locations2Key = { -- Used for WB and SQ,
{ key="3:3",L=3,C=3,Area=3},-- -- name="Greenshade"},
{ key="4:3",L=4,C=3,Area=3},-- -- name="Malabal-Tor"},
{ key="5:3",L=5,C=3,Area=3},-- -- name="Reaper's March"}, 15
---Coldharbour
+--Other
{ key="1:4",L=1,C=4,Area=4}, -- name="Coldharbour}, --16
{ key="2:4",L=2,C=4,Area=4}, -- name="Dark Brotherhood"}, 17
{ key="3:4",L=3,C=4,Area=4}, -- name="Thieves Guild"}, 18
@@ -33,8 +33,8 @@ Locations2Key = { -- Used for WB and SQ,
{ key="2:5",L=2,C=5,Area=4}, -- name="Clockwork City"}, 22
{ key="3:5",L=3,C=5,Area=4}, -- name="Summerset"}, 23
{ key="4:5",L=4,C=5,Area=4}, -- name="Murkmire"}, 24
-{ key="5:5",L=5,C=5,Area=4}, -- name="Elswyr"}, 25
-
-{ key="1:6",L=1,C=6,Area=4}, -- name="Greymoor"}, 26
+{ key="5:5",L=5,C=5,Area=4}, -- name="Northern Elswyr"}, 25
+{ key="1:6",L=1,C=6,Area=4}, -- name="Southern Elswyr"}, 26 (Dragonhold)
+{ key="2:6",L=2,C=6,Area=4}, -- name="Greymoor"}, 27
}
diff --git a/data/ru/ru.lua b/data/ru/ru.lua
index 8ea5135..3f7251b 100644
--- a/data/ru/ru.lua
+++ b/data/ru/ru.lua
@@ -205,8 +205,9 @@ Locations2 = { -- Used for WB and SQ,
{ name="Clockwork City"}, --22
{ name="Summerset"}, --23
{ name="Murkmire"}, --24
-{ name="Elsweyr"}, --25
-{ name="Greymoor"}, --26
+{ name="Northern Elsweyr"}, --25
+{ name="Southern Elsweyr"}, --26
+{ name="Greymoor"}, --27
} --Update Keys Location2Key when updating this (Keys.lua)
diff --git a/history.lua b/history.lua
index 5193865..353a558 100644
--- a/history.lua
+++ b/history.lua
@@ -1,6 +1,6 @@
hist = {
name = "history",
- version = 69,
+ version = 70,
initialised = false,
SV={},
L={},
@@ -107,8 +107,10 @@ end
function load_history()
-- load up historic Achievements.
-- Note some achievements like "Level 40 Hero" have become obsolete. CategoryID is nil
- log("Request to load historic Dungeon Achievements")
- local name,points,description,completed,adate,atime
+ if hist.debug then
+ log("Request to load historic Dungeon Achievements")
+ end
+ --local name,points,description,completed,adate,atime
local count = 0
local reject = 0
local flag = 0
@@ -140,7 +142,9 @@ function load_history()
end
end --Keep
end --for
- log("Added " .. tostring(count) .. " historic achievements.")
+ if count > 0 then
+ log("Added " .. tostring(count) .. " historic achievements.")
+ end
end
local function new_map()
@@ -150,9 +154,10 @@ local map = zo_strformat("<<C:1>>",GetMapName())
hist.me.maps[map].visit = 1
hist.me.maps[map].firstvisitdate = GetTimeStamp()
if hist.debug then
+ log("New map: " .. map)
d("New Map: " .. map )
end
- log("New map: " .. map)
+
end
return map
end
@@ -201,8 +206,10 @@ local function levelup(_, unitTag,_)
-- if hist.me.veteran_level > 0 then return end
hist.me.level = hist.me.base_level + hist.me.veteran_level
-
- log("Level up to " .. hist.me.level)
+ if hist.debug then
+ log("Level up to " .. hist.me.level)
+ end
+
hist.me.levels[hist.me.level] = {
begin = GetTimeStamp(),
time = 0, -- Accumulated time in Minutes
@@ -215,8 +222,8 @@ local function levelup(_, unitTag,_)
hist.me.levels[hist.me.level].map = map
local msg = "First Levelup in map " .. map
- log (msg)
if hist.debug then
+ log (msg)
d(msg)
end
end
@@ -307,8 +314,8 @@ local function Dead()
hist.me.maps[map].deaths = 0
hist.me.maps[map].firstdeathlevel = hist.me.level
local msg = "First Death in map " .. map
- log (msg)
if hist.debug then
+ log (msg)
d("First Death in map " ..map)
end
end
@@ -456,9 +463,9 @@ if (hist.name ~= addOnName) then return end
end
if hist.debug then
- log_truncate(500)
+ log_truncate(5000)
else
- log_truncate(200)
+ log_truncate(2000)
end
hist.SV.lang=GetCVar("language.2") -- For offline use
@@ -477,19 +484,21 @@ if (hist.name ~= addOnName) then return end
if hist.me["ReloadTime"] + 80080 <= GetTimeStamp() then -- 23 hours or more have past
load_history() -- pickup anything that might be missed
hist.me["ReloadTime"] = GetTimeStamp()
- log ("Startup: Timed check on missed achievements.")
+ if hist.debug then
+ log ("Startup: Timed check on missed achievements.")
+ end
end
if hist.me.IDVersion ~= hist.IDVersion then
- log ("ID file version changed, loading")
+ log ("ID file version was " .. hist.me.IDVersion .. ", now " .. hist.IDVersion .. " loading")
hist.me.IDVersion = hist.IDVersion
load_history()
end
if hist.me.name ~= hist.playerName then
- log("Changed Name, Was " .. hist.me.name)
+ log("Changed Name, Was: " .. hist.me.name .. ", now: " .. hist.playerName)
log_me("Changed Name, Was " .. hist.me.name)
hist.me.name = hist.playerName
end
diff --git a/history.txt b/history.txt
index 33a3c26..df9c157 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,6 @@
-## Title: Dad's History 69
+## Title: Dad's History 70
## APIVersion: 100031 100032
-## Version: 69
+## Version: 70
## Author: HisDad
## Description: Record progress of all characters for offline viewing. No in-game interface.
## SavedVariables: History_SV