29 DLC Imp Prison

His Dad [12-06-16 - 18:56]
29 DLC Imp Prison
Filename
Doc/Changelog.txt
HistOffline.lua
data/DLC.lua
data/en/en.lua
data/keys.lua
history.lua
history.txt
diff --git a/Doc/Changelog.txt b/Doc/Changelog.txt
index d0ee8ea..893cf19 100644
--- a/Doc/Changelog.txt
+++ b/Doc/Changelog.txt
@@ -1,5 +1,8 @@
+2016-12-07 version 30
+	Added IC dungeons in DLC
+
 2016-12-03 version 29
-	Filtered too many achievments, stopping world boss and skill quests  being populated.
+	Filtered too many achievements, stopping world boss and skill quests  being populated.

 2016-11-30 version 28
 	Fix for Wrong Achievements on some mode II veteran dungeons
diff --git a/HistOffline.lua b/HistOffline.lua
index 69892a4..a8fadba 100644
--- a/HistOffline.lua
+++ b/HistOffline.lua
@@ -14,7 +14,7 @@ local Colour_Heading_Complete = "#58FA58"

 --iup.SetGlobal("UTF8MODE","YES")
 -- ========================
-version= "29"
+version= "30"
 require( "iuplua" )
 require( "iupluacontrols" )
 dofile "../../SavedVariables/History.lua"
@@ -891,18 +891,19 @@ end
 		end
 --========== DLC

-		me.DLC_box= iup.matrix {numcol=1, numcol_visible=1,  numlin=4, widthdef=100}
+		me.DLC_box= iup.matrix {numcol=2, numcol_visible=2,  numlin=4, widthdef=100}
 		--Set Column titles
-		for i=1,1 do
-			me.DLC_box:setcell(0,i, DLC_names[i].long)
-		end
+
+		me.DLC_box:setcell(0,1, DLC_names[1].long)	-- Orsinium
+		me.DLC_box:setcell(0,2, DLC_names[3].long)	-- IC
+--[[  -- Doesn really work with multiple DLC's
 		--set lines
 		me.DLC_box:setcell(0,0, "")
 		me.DLC_box:setcell(1,0, L.PubDungeon)
 		me.DLC_box:setcell(2,0, L.GrpDungeon)
-		me.DLC_box:setcell(3,0, L.Trial)
-		me.DLC_box:setcell(4,0, L.Trial)    -- Veteran.
-
+		me.DLC_box:setcell(3,0, L.Trial) -- Veteran.
+		me.DLC_box:setcell(4,0, L.Trial)
+--]]

 		iup.SetAttribute(me.DLC_box, "READONLY", "YES")

diff --git a/data/DLC.lua b/data/DLC.lua
index 1fca4df..f49167a 100644
--- a/data/DLC.lua
+++ b/data/DLC.lua
@@ -1,7 +1,11 @@

 DLC_dat ={
+--Orsinium
 [1236]= {L=1, C=1},		-- "Defeat all of Rkindaleft's champions.",
 [1239]= {L=2, C=1}, 	-- "Defeat all of the champions in Old Orsinium.",
 [1304]= {L=3, C=1},		-- "Conquer all challengers and earn the title of Maelstrom Arena Champion.",  (NonVet)
 [1305]=	{L=4, C=1},		-- "Conquer all challengers in Veteran Maelstrom Arena.",
+--IC
+[1345] ={L=1, C=2},		-- "Defeat the Overfiend, Ibomez the Flesh Sculptor, the Gravelight Sentry, the Flesh Abomination, the Lord Warden\'s Council, and Lord Warden Dusk in the Imperial City Prison.",
+[880] = {L=2, C=2},		-- "Defeat the Overfiend, Ibomez the Flesh Sculptor, the Gravelight Sentry, the Flesh Abomination, the Lord Warden\'s Council, and Lord Warden Dusk in Veteran Imperial City Prison.",
 }  -- No dungeon in TG
\ No newline at end of file
diff --git a/data/en/en.lua b/data/en/en.lua
index e312fa6..9d70101 100644
--- a/data/en/en.lua
+++ b/data/en/en.lua
@@ -23,6 +23,9 @@ DLC_names = {
 	[2] = { short= "TG",	     -- Not using, no dungeons..
 			medium = "Hew's Bane",
 			long = "Hew's Bane"},
+	[3] = { short= "IC",
+			medium = "Imperial City",
+			long = "Imperial City"},
 }

 	L = {
@@ -202,6 +205,8 @@ DLC_Location_names = {
 ["11"]	= "Rkindaleft",
 ["21"]	= "Old Orsinum",
 ["31"]  = "Maelstrom(Vet)",
-["41"]  = "Maelstrom"
+["41"]  = "Maelstrom",
+["12"]  = "Imperial Prison",
+["22"]  = "Imperial Prison (vet)",
 }

diff --git a/data/keys.lua b/data/keys.lua
index 0571584..dc81cec 100644
--- a/data/keys.lua
+++ b/data/keys.lua
@@ -40,6 +40,9 @@ DLC2key={
 "21",
 "31",
 "41",
+-- IC
+"12",
+"22",
 }

 --Craglorn Trials
diff --git a/history.lua b/history.lua
index d2ca55e..17e54d2 100644
--- a/history.lua
+++ b/history.lua
@@ -1,6 +1,6 @@
 hist = {
 	name = "history",
-	version = "29",
+	version = "30",
 	initialised = false,
 	SV={},
 	L={},
diff --git a/history.txt b/history.txt
index 77a7ad4..3da3c30 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,6 @@
 ## Title: Dad's History
 ## APIVersion: 100017
-## Version: 29
+## Version: 30
 ## Author: HisDad
 ## Description: Record progress of all characters for offline viewing.
 ## SavedVariables: History_SV