Merge develop into master for U36 (#125)

added support for U36 skills (Pelargir in King's Gondor) in EN/DE/FR

CHANGELOG.md

@@ -1,3 +1,5 @@
+## v1.0.26
+- added support for U36 skills (Pelargir in King's Gondor) in EN/DE/FR
 ## v1.0.25beta
 - fixed typo in Carn Dum skills introduced in v1.0.24beta
 - added Glan Vraig skill in EN/DE/FR

TravelWindowII.plugin

@@ -3,7 +3,7 @@
     <Information>
         <Name>Travel Window II</Name>
         <Author>Hyoss</Author>
-        <Version>v1.0.25beta</Version>
+        <Version>v1.0.26beta</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.25beta</Version>
+  <Version>v1.0.26beta</Version>
   <Author>Hyoss</Author>
   <InfoUrl>http://www.lotrointerface.com/downloads/info1113</InfoUrl>
   <DownloadUrl>http://www.lotrointerface.com/downloads/download1113</DownloadUrl>

doc/lotroforums.md

@@ -1,8 +1,6 @@
 A new version is available!
 
-v1.0.25beta
-- fixed typo in Carn Dum skills introduced in v1.0.24beta
-- added Glan Vraig skill in EN/DE/FR
-- fixed some DE/FR skill labels to better reflect the source of the skill
+v1.0.26
+- added support for U36 skills (Pelargir in King's Gondor) in EN/DE/FR
 
 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

@@ -31,20 +31,13 @@ Why does a reputation or store version of my racial skill show up even though I
 [*]This is because the racial and those store-bought skills have identical names ingame (i.e. "Return to Bree") and the plugin obtains a list of learned skills for your character that includes that particular name at least once. Based on that name alone the plugin cannot know which of the two skills you have obtained, while you can get both through the Racial+Store combo. You can use the Enable/Disable options to hide the skill you do not have that is greyed out.
 [/LIST]
 
-How to handle the settings reset introduced by v1.0.7beta?
+How do I use the Carousel mode?
 [LIST]
-[*] if you had v1.0.6beta or earlier and update to v1.0.8beta or newer, you will keep your settings, but enable/disable and sorting will have to be reset - this is the best case where most settings can be kept
-[*] if you updated to v.1.0.7beta but never logged that character in, an update to v1.0.8beta or newer will work as the above best case
-[*] if you updated to v.1.0.7beta and logged that character in, you lost all settings, you now have two choices
-[*]1. keep the settings you made manually after logging in with v1.0.7beta installed
-[*]2. delete the TravelWindowII.plugindata file, and your settings from before will be imported by v1.0.8beta or newer, the same as the best-case scenario
-[*]The file can be found at C:\Users\%USERNAME%\Documents\The Lord of the Rings Online\PluginData\%ACCOUNTNAME%\%SERVERNAME%\%CHARACTERNAME%
+Use the mousewheel while hovering over the travel skill icon to change the selected skill.
 [/LIST]
 
 Version history:
-v1.0.25beta
-- fixed typo in Carn Dum skills introduced in v1.0.24beta
-- added Glan Vraig skill in EN/DE/FR
-- fixed some DE/FR skill labels to better reflect the source of the skill
+v1.0.26
+- added support for U36 skills (Pelargir in King's Gondor) in EN/DE/FR
 
 Rest of changelog found [URL="https://github.com/wduda/TravelWindowII/blob/master/CHANGELOG.md"]here[/URL].

src/IndexedDictionary.lua

@@ -1,5 +1,6 @@
 --[[ use a modified table to maintain data for travel skills
-     specifically skill name, ID and label                   ]] IndexedDictionary = class()
+     specifically skill name, ID and label                   ]]
+IndexedDictionary = class()
 
 function IndexedDictionary:Constructor()
     -- set default tables

src/IndexedDictionaryDe.lua

@@ -166,6 +166,7 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Führer nach Cardolan", "0x700634A7", "Cardolan (Führer)");
     hunterLocations:AddSkill("Führer nach Carn Dûm", "0x70064AC8", "Carn Dûm (Führer)");
     hunterLocations:AddSkill("Führer nach Clegur", "0x70064F4C", "Clegur (Führer)");
+    hunterLocations:AddSkill("Führer nach Pelargir", "0x700658EA", "Pelargir (Führer)");
 
     wardenLocations:AddSkill("Appell in der Feste Guruth", "0x70014786", "Feste Guruth (Appell)");
     wardenLocations:AddSkill("Appell in Esteldín", "0x70014798", "Esteldín (Appell)");
@@ -214,6 +215,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Appell in Cardolan", "0x700634AD", "Cardolan (Appell)");
     wardenLocations:AddSkill("Appell in Carn Dûm", "0x70064ACB", "Carn Dûm (Appell)");
     wardenLocations:AddSkill("Appell in Clegur", "0x70064F4D", "Clegur (Appell)");
+    wardenLocations:AddSkill("Heerschau in Pelargir", "0x700658E8", "Pelargir (Appell)");
 
     racialLocations:AddSkill("Rückkehr nach Bree", "0x700062F6", "Bree (Rasse)");
     racialLocations:AddSkill("Rückkehr ins Auenland", "0x700062C8", "Michelbinge (Rasse)");
@@ -292,8 +294,9 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Rückkehr nach Carn Dûm", "0x70064ACA", "Carn Dûm (Ruf)");
     repLocations:AddSkill("Rückkehr nach Clegur", "0x70064F47", "Clegur (Ruf)");
     repLocations:AddSkill("Nach Glân Vraig zurückkehren", "0x7005B38E", "Glân Vraig (Aufgabe)");
+    repLocations:AddSkill("Rückkehr nach Pelargir", "0x700658EB", "Pelargir (Ruf)");
 
--- monster player maps
+    -- monster player maps
     creepLocations:AddSkill("Kartenskizze zum Gramfuss", "0x70028BBC");
     creepLocations:AddSkill("Karte zum Gramfuss", "0x70028BC1");
 

src/IndexedDictionaryEn.lua

@@ -17,7 +17,7 @@ gondorMapTitleString = "Gondor Destinations"
 glanMapString = "Glân Vraig Map";
 glanMapItemString = "Map to Glân Vraig";
 
-skillNotTrainedString = "Skills not trained: ";
+skillNotTrainedString = "Skills not trained:";
 
 -- options window strings
 generalTabString = "General";
@@ -159,6 +159,7 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Guide to Cardolan", "0x700634A7", "Cardolan (Guide)");
     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)");
 
     wardenLocations:AddSkill("Muster in Ost Guruth", "0x70014786", "Ost Guruth (Muster)");
     wardenLocations:AddSkill("Muster in Esteldín", "0x70014798", "Esteldín (Muster)");
@@ -207,6 +208,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Muster at Cardolan", "0x700634AD", "Cardolan (Muster)");
     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)");
 
     -- add the racial travel skills
     racialLocations:AddSkill("Return to Bree", "0x700062F6", "Bree (Racial)");
@@ -288,7 +290,8 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Return to Carn Dûm", "0x70064ACA", "Carn Dûm (Rep)");
     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)");
+
     -- monster player maps
     creepLocations:AddSkill("Crude Map to Gramsfoot", "0x70028BBC");
     creepLocations:AddSkill("Map to Gramsfoot", "0x70028BC1");

src/IndexedDictionaryFr.lua

@@ -166,6 +166,7 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Guide vers le Cardolan", "0x700634A7", "Cardolan (Guide)");
     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)");
 
     wardenLocations:AddSkill("Rassemblement : Ost Guruth", "0x70014786", "Ost Guruth (Rassemblement)");
     wardenLocations:AddSkill("Rassemblement : Esteldin", "0x70014798", "Esteldin (Rassemblement)");
@@ -214,6 +215,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Rassemblement au Cardolan", "0x700634AD", "Cardolan (Rassemblement)");
     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)");
 
     racialLocations:AddSkill("Retour à Bree", "0x700062F6", "Bree (Race)");
     racialLocations:AddSkill("Retournez dans la Comté", "0x700062C8", "Comté (Race)");
@@ -292,8 +294,9 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Retour à Carn Dûm", "0x70064ACA", " Carn Dûm (Rep)");
     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)");
 
-    -- monster player maps
+  -- monster player maps
     creepLocations:AddSkill("Carte grossière pour aller au Pied de Gram", "0x70028BBC");
     creepLocations:AddSkill("Carte pour aller au Pied de Gram", "0x70028BC1");
 

src/__init__.lua

@@ -4,7 +4,7 @@ import "TravelWindowII.src.TravelListTab";
 import "TravelWindowII.src.TravelGridTab";
 import "TravelWindowII.src.TravelCaroTab";
 import "TravelWindowII.src.TravelPulldownTab"
-import "TravelWindowII.src.IndexedDictionary"
+-- import "TravelWindowII.src.IndexedDictionary"
 
 -- get language from Turbine API to load corresponding translated strings
 GLocale = Turbine.Engine.GetLanguage();
@@ -19,7 +19,7 @@ end
 import "TravelWindowII.src.TravelShortcut";
 import "TravelWindowII.src.OptionsWindow";
 import "TravelWindowII.src.TravelButton";
-import "TravelWindowII.src.TravelTests";
+-- import "TravelWindowII.src.TravelTests";
 import "TravelWindowII.src.MoorMapWindow";
 import "TravelWindowII.src.EriadorMapWindow";
 import "TravelWindowII.src.RhovanionMapWindow";