45 Trials Fixed,

His Dad [05-14-18 - 08:59]
45  Trials Fixed,

Signed-off-by: His Dad <John@hisdad.org>
Filename
Doc/Changelog.txt
HistOffline.lua
data/Trials.lua
data/de/de.lua
data/en/en.lua
data/fr/fr.lua
data/ids.lua
data/keys.lua
diff --git a/Doc/Changelog.txt b/Doc/Changelog.txt
index f41b80a..f551b14 100644
--- a/Doc/Changelog.txt
+++ b/Doc/Changelog.txt
@@ -1,7 +1,8 @@
-2018-05-13 version 45
-	Fixed problem with Trials
+2018-05-14 version 45
+	Fixed problems with Trials
 	Added Asylum
 	Improved DE translations by Snakefish.
+	Lots of other help from Snakefish!!!


 2018-05-11 version 44
diff --git a/HistOffline.lua b/HistOffline.lua
index 04677dd..8ba500b 100644
--- a/HistOffline.lua
+++ b/HistOffline.lua
@@ -11,7 +11,7 @@ local FG_Colour_Complete = "#000000"
 local BG_Colour_Not_Complete = "#FFB67D"
 local BG_Colour_Complete = "#A4FF5A"
 local Colour_Heading_Complete = "#58FA58"
---force_lang = "de"   --	or "de" or "en"  for debugging
+--force_lang = "fr"  --	or "de" or "en"  for debugging

 -- ========================
 version= "45"
diff --git a/data/Trials.lua b/data/Trials.lua
index 5b7e4f0..07b456c 100644
--- a/data/Trials.lua
+++ b/data/Trials.lua
@@ -61,12 +61,14 @@ Trials_Dat["V"].id = {
 [2238] = {L=41, C=1, key ="411"},	-- "Valorous Combustion""While battling Siroria's shadow by itself, every Roaring Flare throughout the entire encounter must be split between at least 6 players in Cloudrest.",
 [2077] = {L=42, C=1, key ="421"},	-- "Asylum Sanctorium Conqueror", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in Veteran Asylum Sanctorium.",
 [2079] = {L=43, C=1, key ="431"},	-- "Asylum Sanctorium Vanquisher", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in the same fight in Veteran Asylum Sanctorium.",
-[2082] = {L=44, C=1, key ="441"},	-- "Beatific Beatdown", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold at the same time without allowing Saint Felms or Saint Llothis to enrage during the fight in Veteran Asylum Sanctorium.",
-[2083] = {L=45, C=1, key ="451"},	-- "Placid Projections", "Defeat Saint Felms the Bold without allowing either of his Pneuma Projections to enrage in Veteran Asylum Sanctorium.",
-[2084] = {L=46, C=1, key ="461"},	-- "Imperfect Attendance,"Defeat Saint Llothis the Pious without dismantling his Imperfect Attendants in Veteran Asylum Sanctorium.",
-[2085] = {L=47, C=1, key ="471"},	-- "Righteous Condemnation""Defeat Saint Olms the Just and Saint Llothis the Pious in the same battle in Veteran Asylum Sanctorium.",
-[2086] = {L=48, C=1, key ="481"},	-- "Executioners' Judgement""Defeat Saint Olms the Just and Saint Felms the Bold in the same battle in Veteran Asylum Sanctorium.",
-[2087] = {L=49, C=1, key ="491"},	-- "Perfect Purification" Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in the same battle without suffering a group member death within 15 minutes of entering the Sanctuary Atrium in Veteran Asylum Sanctorium.",
+[2080] = {L=44, C=1, key ="441"},	-- "Sanctified" "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold without suffering a group member death in Veteran Asylum Sanctorium.",
+[2081] = {L=45, C=1, key ="451"},	-- "Swift Mercy" "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold within a time limit of 15 minutes in Veteran Asylum Sanctorium. Timer starts when players enter the Sanctuary Atrium.",
+[2082] = {L=46, C=1, key ="461"},	-- "Beatific Beatdown", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold at the same time without allowing Saint Felms or Saint Llothis to enrage during the fight in Veteran Asylum Sanctorium.",
+[2083] = {L=47, C=1, key ="471"},	-- "Placid Projections", "Defeat Saint Felms the Bold without allowing either of his Pneuma Projections to enrage in Veteran Asylum Sanctorium.",
+[2084] = {L=48, C=1, key ="481"},	-- "Imperfect Attendance,"Defeat Saint Llothis the Pious without dismantling his Imperfect Attendants in Veteran Asylum Sanctorium.",
+[2085] = {L=49, C=1, key ="491"},	-- "Righteous Condemnation""Defeat Saint Olms the Just and Saint Llothis the Pious in the same battle in Veteran Asylum Sanctorium.",
+[2086] = {L=50, C=1, key ="501"},	-- "Executioners' Judgement""Defeat Saint Olms the Just and Saint Felms the Bold in the same battle in Veteran Asylum Sanctorium.",
+[2087] = {L=51, C=1, key ="511"},	-- "Perfect Purification" Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in the same battle without suffering a group member death within 15 minutes of entering the Sanctuary Atrium in Veteran Asylum Sanctorium.",

 }
 Trials_Dat["V"].vet = true
diff --git a/data/de/de.lua b/data/de/de.lua
index 7334f8d..4923609 100644
--- a/data/de/de.lua
+++ b/data/de/de.lua
@@ -226,12 +226,14 @@ Trials_Names["V"] = {
 	["411"] = "Sommersend: Wolkenruh: Tapfere Verbrennung",
 	["421"] = "Stadt der Uhrwerke: Eroberer der Anstalt Sanctorium",
 	["431"] = "Stadt der Uhrwerke: Sieger der Anstalt Sanctorium",
-	["441"] = "Stadt der Uhrwerke: Glückselige Schlägerei",
-	["451"] = "Stadt der Uhrwerke: Seelenruhige Projektionen",
-	["461"] = "Stadt der Uhrwerke: Unvollendete Anwesenheit",
-	["471"] = "Stadt der Uhrwerke: Gerechte Verdammung",
-	["481"] = "Stadt der Uhrwerke: Henkersspruch",
-	["491"] = "Stadt der Uhrwerke: Perfekte Läuterung",
+	["441"]	= "Stadt der Uhrwerke: Heilig",			-- esiegt den Heiligen Olms, den Gerechten, den Heiligen Llothis, den Frommen, und den Heiligen Felms, den Tapferen, in der Anstalt Sanctorium (Veteranen), ohne dass ein Gruppenmitglied getötet wird.",
+	["451"]	= "Stadt der Uhrwerke: Schnelles Erbarmen",--	Besiegt den Heiligen Olms, den Gerechten, den Heiligen Llothis, den Frommen, und den Heiligen Felms, den Tapferen, in der Anstalt Sanctorium (Veteranen) innerhalb von 15 Minuten. Die Zeit läuft, sobald Ihr das Atrium betreten habt.",
+	["461"] = "Stadt der Uhrwerke: Glückselige Schlägerei",
+	["471"] = "Stadt der Uhrwerke: Seelenruhige Projektionen",
+	["481"] = "Stadt der Uhrwerke: Unvollendete Anwesenheit",
+	["491"] = "Stadt der Uhrwerke: Gerechte Verdammung",
+	["501"] = "Stadt der Uhrwerke: Henkersspruch",
+	["511"] = "Stadt der Uhrwerke: Perfekte Läuterung",
 }

 Trials_Names["VH"] = {
diff --git a/data/en/en.lua b/data/en/en.lua
index aa487c4..1ba5501 100644
--- a/data/en/en.lua
+++ b/data/en/en.lua
@@ -227,12 +227,14 @@ Trials_Names["V"] = {
 	["411"] = "Summerset: Cloudrest: Valorous Combustion",
 	["421"] = "Clockwork City: Asylum Sanctorium Conqueror",
 	["431"] = "Clockwork City: Asylum Sanctorium Vanquisher",
-	["441"] = "Clockwork City: Beatific Beatdown",
-	["451"] = "Clockwork City: Placid Projections",
-	["461"] = "Clockwork City: Imperfect Attendance",
-	["471"] = "Clockwork City: Righteous Condemnation",
-	["481"] = "Clockwork City: Executioners' Judgement",
-	["491"] = "Clockwork City: Perfect Purification",
+	["441"] = "Clockwork City: Sanctified",
+	["451"] = "Clockwork City: Swift Mercy",
+	["461"] = "Clockwork City: Beatific Beatdown",
+	["471"] = "Clockwork City: Placid Projections",
+	["481"] = "Clockwork City: Imperfect Attendance",
+	["491"] = "Clockwork City: Righteous Condemnation",
+	["501"] = "Clockwork City: Executioners' Judgement",
+	["511"] = "Clockwork City: Perfect Purification",
 }

 Trials_Names["VH"] = {
diff --git a/data/fr/fr.lua b/data/fr/fr.lua
index 153383c..4224a71 100644
--- a/data/fr/fr.lua
+++ b/data/fr/fr.lua
@@ -227,12 +227,14 @@ Trials_Names["V"] = {
 	["411"] = "Summerset: Cloudrest: Valorous Combustion",
 	["421"] = "Cité mécanique: Asylum Sanctorium Conqueror",
 	["431"] = "Cité mécanique: Asylum Sanctorium Vanquisher",
-	["441"] = "Cité mécanique: Beatific Beatdown",
-	["451"] = "Cité mécanique: Placid Projections",
-	["461"] = "Cité mécanique: Imperfect Attendance",
-	["471"] = "Cité mécanique: Righteous Condemnation",
-	["481"] = "Cité mécanique: Executioners' Judgement",
-	["491"] = "Cité mécanique:Perfect Purification",
+	["441"] = "Cité mécanique: Sanctified",
+	["451"] = "Cité mécanique: Swift Mercy",
+	["461"] = "Cité mécanique: Beatific Beatdown",
+	["471"] = "Cité mécanique: Placid Projections",
+	["481"] = "Cité mécanique: Imperfect Attendance",
+	["491"] = "Cité mécanique: Righteous Condemnation",
+	["501"] = "Cité mécanique: Executioners' Judgement",
+	["511"] = "Cité mécanique: Perfect Purification",
 }

 Trials_Names["VH"] = {
diff --git a/data/ids.lua b/data/ids.lua
index 3c294e6..d0c7719 100644
--- a/data/ids.lua
+++ b/data/ids.lua
@@ -93,10 +93,12 @@ hist.IDs = {
 -- Trial V
 [1474] = true,
 [2087] = true,
+[2086] = true,
+[1390] = true,
 [1809] = true,
 [1810] = true,
 [1811] = true,
-[2086] = true,
+[2084] = true,
 [2133] = true,
 [2134] = true,
 [1367] = true,
@@ -104,12 +106,12 @@ hist.IDs = {
 [1369] = true,
 [2138] = true,
 [2139] = true,
-[1390] = true,
-[2077] = true,
-[2084] = true,
-[1503] = true,
 [1389] = true,
+[2077] = true,
 [2079] = true,
+[1503] = true,
+[2080] = true,
+[2081] = true,
 [2082] = true,
 [2083] = true,
 [1124] = true,
diff --git a/data/keys.lua b/data/keys.lua
index 4a70bfe..45b88b3 100644
--- a/data/keys.lua
+++ b/data/keys.lua
@@ -158,12 +158,14 @@ Trials2key["V"] = {
 "411", 	-- "Valorous Combustion""While battling Siroria's shadow by itself, every Roaring Flare throughout the entire encounter must be split between at least 6 players in Cloudrest.",
 "421",	-- "Asylum Sanctorium Conqueror", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in Veteran Asylum Sanctorium.",
 "431",	-- "Asylum Sanctorium Vanquisher", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in the same fight in Veteran Asylum Sanctorium.",
-"441",	-- "Beatific Beatdown", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold at the same time without allowing Saint Felms or Saint Llothis to enrage during the fight in Veteran Asylum Sanctorium.",
-"451",	-- "Placid Projections", "Defeat Saint Felms the Bold without allowing either of his Pneuma Projections to enrage in Veteran Asylum Sanctorium.",
-"461",	-- "Imperfect Attendance,"Defeat Saint Llothis the Pious without dismantling his Imperfect Attendants in Veteran Asylum Sanctorium.",
-"471", 	-- "Righteous Condemnation""Defeat Saint Olms the Just and Saint Llothis the Pious in the same battle in Veteran Asylum Sanctorium.",
-"481",	-- "Executioners' Judgement""Defeat Saint Olms the Just and Saint Felms the Bold in the same battle in Veteran Asylum Sanctorium.",
-"491",	-- "Perfect Purification" Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in the same battle without suffering a group member
+"441",	-- "Sanctified" "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold without suffering a group member death in Veteran Asylum Sanctorium.",
+"451",	-- "Swift Mercy" "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold within a time limit of 15 minutes in Veteran Asylum Sanctorium. Timer starts when players enter the Sanctuary Atrium.",
+"461",	-- "Beatific Beatdown", "Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold at the same time without allowing Saint Felms or Saint Llothis to enrage during the fight in Veteran Asylum Sanctorium.",
+"471",	-- "Placid Projections", "Defeat Saint Felms the Bold without allowing either of his Pneuma Projections to enrage in Veteran Asylum Sanctorium.",
+"481",	-- "Imperfect Attendance,"Defeat Saint Llothis the Pious without dismantling his Imperfect Attendants in Veteran Asylum Sanctorium.",
+"491", 	-- "Righteous Condemnation""Defeat Saint Olms the Just and Saint Llothis the Pious in the same battle in Veteran Asylum Sanctorium.",
+"501",	-- "Executioners' Judgement""Defeat Saint Olms the Just and Saint Felms the Bold in the same battle in Veteran Asylum Sanctorium.",
+"511",	-- "Perfect Purification" Defeat Saint Olms the Just, Saint Llothis the Pious, and Saint Felms the Bold in the same battle without suffering a group member
 }
 Trials2key["VH"] = {
 "11",	-- "Hel Ra Citadel",