Merge pull request #132 from wduda/dev

U38 support

CHANGELOG.md

@@ -1,4 +1,7 @@
-## v1.0.28
+## v1.0.29alpha
+- fixed Mariner skills showing up twice in DE client
+- adding U38 skills in EN/FR
+## v1.0.28alpha
 - added support for Mariner Sail skills in EN/DE/FR
 - added support for River Hobbits racial travel
 - fixed rare bug in hunter skills sorting

TravelWindowII.plugin

@@ -3,7 +3,7 @@
     <Information>
         <Name>Travel Window II</Name>
         <Author>Hyoss</Author>
-        <Version>v1.0.28alpha</Version>
+        <Version>v1.0.29alpha</Version>
         <Description>
         This plugin creates a single window that contains all the available travel skills, including the race, class and reputation skills.
 It is a further development of Travel Window, that has been worked on by multiple authors before.

TravelWindowII.plugincompendium

@@ -2,7 +2,7 @@
 <PluginConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Id>1113</Id>
   <Name>Travel Window II</Name>
-  <Version>v1.0.28alpha</Version>
+  <Version>v1.0.29alpha</Version>
   <Author>Hyoss</Author>
   <InfoUrl>http://www.lotrointerface.com/downloads/info1113</InfoUrl>
   <DownloadUrl>http://www.lotrointerface.com/downloads/download1113</DownloadUrl>

doc/credits.md

@@ -20,5 +20,8 @@ Thaliruth
 Drogo
 Adra
 Lossensinome
-mhdubose
 Garan
+mhdubose
+Eili
+Lumbago
+daks-ua

doc/lotroforums.md

@@ -1,8 +1,9 @@
 A new version is available!
 
-v1.0.28alpha
-- added support for Mariner Sail skills in EN/DE/FR
-- added support for River Hobbits racial travel
-- fixed rare bug in hunter skills sorting
+v1.0.29alpha
+- fixed Mariner skills showing up twice in DE client
+- adding U38 skills support for EN/FR client
+
+There is a bug with the skills returning you to Dol Amroth - the skills are named identically by SSG and I need to see if this can be fixed. I will look into that together with the next update that will add support for the DE client. 
 
 Download it at [url=https://www.lotrointerface.com/downloads/fileinfo.php?id=1113]Lotrointerface[/url], [url=https://github.com/wduda/TravelWindowII/releases]GitHub[/url], via [url=https://github.com/JeremyStepp/OneLauncher]OneLauncher[/url] or via [url=https://www.lotrointerface.com/downloads/info663-LOTROPluginCompendium.html]Plugin Compendium[/url].

doc/lotrointerface.md

@@ -37,9 +37,10 @@ Use the mousewheel while hovering over the travel skill icon to change the selec
 [/LIST]
 
 Version history:
-v1.0.28alpha
-- added support for Mariner Sail skills in EN/DE/FR
-- added support for River Hobbits racial travel
-- fixed rare bug in hunter skills sorting
+v1.0.29alpha
+- fixed Mariner skills showing up twice in DE client
+- adding U38 skills in EN/DE/FR
+
+There is a bug with the skills returning you to Dol Amroth - the skills are named identically by SSG and I need to see if this can be fixed. I will look into that together with the next update that will add support for the DE client. 
 
 Rest of changelog found [URL="https://github.com/wduda/TravelWindowII/blob/master/CHANGELOG.md"]here[/URL].

src/IndexedDictionaryEn.lua

@@ -170,6 +170,11 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Guide to Carn Dûm", "0x70064AC8", "Carn Dûm (Guide)");
     hunterLocations:AddSkill("Guide to Clegur", "0x70064F4C", "Clegur (Guide)");
     hunterLocations:AddSkill("Guide to Pelargir", "0x700658EA", "Pelargir (Guide)");
+    hunterLocations:AddSkill("Guide to Dol Amroth", "0x70068711", "Dol Amroth (Guide U38)");
+    hunterLocations:AddSkill("Guide to Halrax", "0x70068713", "Halrax (Guide)");
+    hunterLocations:AddSkill("Guide to Lond Cirion", "0x70068717", "Lond Cirion (Guide)");
+    hunterLocations:AddSkill("Guide to Umbar", "0x70068718", "Umbar (Guide)");
+    hunterLocations:AddSkill("Guide to Jax Phanâl", "0x70068719", "Jax Phanâl (Guide)");
 
     -- add the Warden locations
     wardenLocations:AddSkill("Muster in Ost Guruth", "0x70014786", "Ost Guruth (Muster)");
@@ -220,6 +225,32 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Muster at Carn Dûm", "0x70064ACB", "Carn Dûm (Muster)");
     wardenLocations:AddSkill("Muster at Clegur", "0x70064F4D", "Clegur (Muster)");
     wardenLocations:AddSkill("Muster at Pelargir", "0x700658E8", "Pelargir (Muster)");
+    wardenLocations:AddSkill("Muster at Jax Phanâl","0x7006870C", "Jax Phanâl (Muster)");
+    wardenLocations:AddSkill("Muster at Umbar","0x7006870F","Umbar (Muster)");
+    wardenLocations:AddSkill("Muster at Halrax","0x70068710", "Halrax (Muster)");
+    wardenLocations:AddSkill("Muster at Dol Amroth","0x70068712", "Dol Amroth (Muster)");
+    wardenLocations:AddSkill("Muster at Lond Cirion","0x70068715", "Lond Cirion (Muster)");
+
+    -- add the Mariner locations
+    marinerLocations:AddSkill("Sail to Celondim", "0x70066100", "Celondim (Sail)")
+    marinerLocations:AddSkill("Sail to the Brown Lands", "0x70066101", "Brown Lands (Sail)")
+    marinerLocations:AddSkill("Sail to Trader's Wharf", "0x70066105", "Trader's Wharf (Sail)")
+    marinerLocations:AddSkill("Sail to after-battle Osgiliath", "0x70066109", "After-battle Osgiliath (Sail)")
+    marinerLocations:AddSkill("Sail to Lake-town", "0x7006610C", "Lake-town (Sail)")
+    marinerLocations:AddSkill("Sail to the Mirk-eaves", "0x7006610E", "Mirk-eaves (Sail)")
+    marinerLocations:AddSkill("Sail to Tinnudir", "0x7006610F", "Tinnudir (Sail)")
+    marinerLocations:AddSkill("Sail to Dol Amroth", "0x70066117", "Dol Amroth (Sail)")
+    marinerLocations:AddSkill("Sail to Buckland", "0x7006611A", "Buckland (Sail)")
+    marinerLocations:AddSkill("Sail to Pelargir", "0x7006611B", "Pelargir (Sail)")
+    marinerLocations:AddSkill("Sail to Sûri-kylä", "0x7006611C", "Sûri-kylä (Sail)")
+    marinerLocations:AddSkill("Sail to Lothlórien", "0x7006611E", "Lothlórien (Sail)")
+    marinerLocations:AddSkill("Sail to Tharbad", "0x70066120", "Tharbad (Sail)")
+    marinerLocations:AddSkill("Sail to Snowbourn", "0x70066121", "Snowbourn (Sail)")
+    marinerLocations:AddSkill("Sail to Umbar", "0x700687BB", "Umbar (Sail)")
+    marinerLocations:AddSkill("Sail to Lond Cirion", "0x70066121", "Lond Cirion (Sail)")
+    marinerLocations:AddSkill("Sail to Jax Phanâl", "0x70066121", "Jax Phanâl (Sail)")
+    marinerLocations:AddSkill("Sail to Dol Amroth", "0x70066121", "Dol Amroth (Sail)")
+    marinerLocations:AddSkill("Sail to Halrax", "0x70066121", "Halrax (Sail)")
 
     -- add the Mariner locations
     marinerLocations:AddSkill("Sail to Celondim", "0x70066100", "Celondim (Sail)")
@@ -319,6 +350,13 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Return to Clegur", "0x70064F47", "Clegur (Rep)");
     repLocations:AddSkill("Return to Glân Vraig", "0x7005B38E", "Glân Vraig (Quest)");
     repLocations:AddSkill("Return to Pelargir", "0x700658EB", "Pelargir (Rep)");
+    repLocations:AddSkill("Return to The Order of the Eagle", "0x700686FE", "Order of the Eagle (Rep)");
+    repLocations:AddSkill("Return to Umbar", "0x700686FF", "Umbar (Rep)");
+    repLocations:AddSkill("Return to Dol Amroth", "0x70068700", "Dol Amroth (Rep U38)");
+    repLocations:AddSkill("Return to Jax Phanal", "0x70068701", "Jax Phanal (Rep)");
+    repLocations:AddSkill("Return to Harlax", "0x70068702", "Harlax (Rep)");
+    repLocations:AddSkill("Return to Lond Cirion", "0x70068703", "Lord Cirion (Rep)");
+    repLocations:AddSkill("Return to Ledger-Keepers", "0x70068704", "Ledger-Keepers (Rep)");
 
     -- monster player maps
     creepLocations:AddSkill("Crude Map to Gramsfoot", "0x70028BBC");

src/IndexedDictionaryFr.lua

@@ -169,6 +169,11 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Guide vers Carn Dûm", "0x70064AC8", "Carn Dûm (Guide)");
     hunterLocations:AddSkill("Guide vers Clegur", "0x70064F4C", "Clegur (Guide)");
     hunterLocations:AddSkill("Guide vers Pelargir", "0x700658EA", "Pelargir (Guide)");
+    hunterLocations:AddSkill("Guide vers Dol Amroth", "0x70068711", "Dol Amroth (Guide U38)");
+    hunterLocations:AddSkill("Guide vers Halrax", "0x70068713", "Halrax (Guide)");
+    hunterLocations:AddSkill("Guide vers Lond Cirion", "0x70068717", "Lond Cirion (Guide)");
+    hunterLocations:AddSkill("Guide vers Umbar", "0x70068718", "Umbar (Guide)");
+    hunterLocations:AddSkill("Guide vers Jax Phanâl", "0x70068719", "Jax Phanâl (Guide)");
 
     wardenLocations:AddSkill("Rassemblement : Ost Guruth", "0x70014786", "Ost Guruth (Rassemblement)");
     wardenLocations:AddSkill("Rassemblement : Esteldin", "0x70014798", "Esteldin (Rassemblement)");
@@ -218,6 +223,31 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Rassemblement : Carn Dûm", "0x70064ACB", "Carn Dûm (Rassemblement)");
     wardenLocations:AddSkill("Rassemblement à Clegur", "0x70064F4D", "Clegur (Rassemblement)");
     wardenLocations:AddSkill("Rassemblement à Pelargir", "0x700658E8", "Pelargir (Rassemblement)");
+    wardenLocations:AddSkill("Rassemblement à Jax Phanâl","0x7006870C", "Jax Phanâl (Rassemblement)");
+    wardenLocations:AddSkill("Rassemblement à Umbar","0x7006870F","Umbar (Rassemblement)");
+    wardenLocations:AddSkill("Rassemblement à Halrax","0x70068710", "Halrax (Rassemblement)");
+    wardenLocations:AddSkill("Rassemblement à Dol Amroth","0x70068712", "Dol Amroth (Rassemblement)");
+    wardenLocations:AddSkill("Rassemblement à Lond Cirion","0x70068715", "Lond Cirion (Rassemblement)");
+
+    marinerLocations:AddSkill("Naviguer vers Celondim", "0x70066100", "Celondim (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers les Terres brunes", "0x70066101", "Terres brunes (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers le Quai des marchands", "0x70066105", "Quai des marchands (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Osgiliath après la bataille", "0x70066109", "Osgiliath après la bataille (Naviguer)")
+    marinerLocations:AddSkill("Cap sur la Ville du Lac", "0x7006610C", "Ville du Lac (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers l'Orée Noire", "0x7006610E", "Orée Noire (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Tinnudir", "0x7006610F", "Tinnudir (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Dol Amroth", "0x70066117", "Dol Amroth (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers le Pays de Bouc", "0x7006611A", "Pays de Bouc (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Pelargir", "0x7006611B", "Pelargir (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Sûri-kylä", "0x7006611C", "Sûri-kylä (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers la Lothlorien", "0x7006611E", "Lothlorien (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers le Gué de Sarn", "0x70066120", "le Gué de Sarn (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Neigebronne", "0x70066121", "Neigebronne (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Umbar", "0x700687BB", "Umbar (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Lond Cirion", "0x70066121", "Lond Cirion (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Jax Phanâl", "0x70066121", "Jax Phanâl (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Dol Amroth", "0x70066121", "Dol Amroth (Naviguer)")
+    marinerLocations:AddSkill("Naviguer vers Halrax", "0x70066121", "Halrax (Naviguer)")
 
     marinerLocations:AddSkill("Naviguer vers Celondim", "0x70066100", "Celondim (Naviguer)")
     marinerLocations:AddSkill("Naviguer vers les Terres brunes", "0x70066101", "Terres brunes (Naviguer)")
@@ -313,6 +343,13 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Retournez voir Clegur", "0x70064F47", "Clegur (Rep)");
     repLocations:AddSkill("Retour à Glân Vraig", "0x7005B38E", "Glân Vraig (Quête)");
     repLocations:AddSkill("Retournez à Pelargir", "0x700658EB", "Pelargir (Rep)");
+    repLocations:AddSkill("Retour auprès de l'Ordre de l'Aigle", "0x700686FE", "L'Ordre de l'Aigle (Rep)");
+    repLocations:AddSkill("Retour à Umbar", "0x700686FF", "Umbar (Rep)");
+    repLocations:AddSkill("Retour à Dol Amroth", "0x70068700", "Dol Amroth (Rep U38)");
+    repLocations:AddSkill("Retour à Jax Phanâl", "0x70068701", "Jax Phanâl (Rep)");
+    repLocations:AddSkill("Retournez voir Halrax", "0x70068702", "Halrax (Rep)");
+    repLocations:AddSkill("Retour à Lond Cirion", "0x70068703", "Lond Cirion (Rep)");
+    repLocations:AddSkill("Retour auprès des Gardiens des écrits", "0x70068704", "Gardiens des écrits (Rep)");
 
   -- monster player maps
     creepLocations:AddSkill("Carte grossière pour aller au Pied de Gram", "0x70028BBC");