Merge develop into master (#105)

* adding lua formatter config

* updated formatting

* updated formatting of maps files

* updated formatting of tabs files

* updated formatting of main files

* updated more formatting

* added option to hide window on travel skill use

* changed order of options in general options panel

* fixed buggy behaviour on pressing escape and f12

* fixed whitespace

* renamed two global variables

* some beta19 preparation changes

* renamed global variable

* Added port to Thorenhad

* adding metadata

* added Yondershire skill

* set pluginversion to 20

* replaced options in plugin manager with a simple button opening the options window

* updated changelog

Author: wduda

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v1.0.20beta
+- added Yondershire port
+- worked around plugin manager causing client crash; replaced the manager options with a button opening the actual options window
 ## v1.0.19beta
 - added new option to close Travel Window when using a travel skill regardless of window mode
 - updated behaviour of Travel Window when using function key and escape to hide the UI, should now handle all cases correctly

TravelWindowII.plugin

@@ -3,7 +3,7 @@
     <Information>
         <Name>Travel Window II</Name>
         <Author>Hyoss</Author>
-        <Version>v1.0.19beta</Version>
+        <Version>v1.0.20beta</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.19beta</Version>
+  <Version>v1.0.20beta</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,7 @@
 A new version is available!
 
-- added new option to close Travel Window when using a travel skill regardless of window mode
-- updated behaviour of Travel Window when using function key and escape to hide the UI, should now handle all cases correctly
-- added Tornhad travel skills
-- fixed many French Warden skills that were renamed by SSG
+v1.0.20beta
+- added Yondershire port
+- worked around plugin manager causing client crash; replaced the manager options with a button opening the actual options window
 
 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

@@ -19,7 +19,6 @@ These three options work:
 [*] right-click anywhere on TW II, select "Check untrained skills" from the menu, the skill will show up
 [*] open options window, go to Enable tab, click "Check untrained skills" button, the skill will show up
 [*] relog the character
-
 [/LIST]
 
 Why does my racial skill show up even though I do not have the racial trait equipped?
@@ -43,10 +42,9 @@ How to handle the settings reset introduced by v1.0.7beta?
 [/LIST]
 
 Version history:
-v1.0.19beta
-- added new option to close Travel Window when using a travel skill regardless of window mode
-- updated behaviour of Travel Window when using function key and escape to hide the UI, should now handle all cases correctly
-- added Tornhad travel skills
-- fixed many French Warden skills that were renamed by SSG
+v1.0.20beta
+- added Yondershire port
+- worked around plugin manager causing client crash; replaced the manager options with a button opening the actual options window
+
 
 Rest of changelog found [URL="https://github.com/wduda/TravelWindowII/blob/master/CHANGELOG.md"]here[/URL].

src/IndexedDictionaryDe.lua

@@ -160,6 +160,7 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Führer zum Prachttor", "0x7005D487", "Prachttor (Führer)");
     hunterLocations:AddSkill("Führer nach Leitstáth", "0x7005D47D", "Leitstáth (Führer)");
     hunterLocations:AddSkill("Führer nach Tornhad", "0x70060EA6", "Tornhad (Führer)");
+    hunterLocations:AddSkill("Führer nach Neuhausen", "0x7006133F", "Neuhausen (Führer)");
 
     wardenLocations:AddSkill("Appell in der Feste Guruth", "0x70014786", "Feste Guruth (Appell)");
     wardenLocations:AddSkill("Appell in Esteldín", "0x70014798", "Esteldín (Appell)");
@@ -202,6 +203,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Heerschau am Prachttor", "0x7005D48A", "Prachttor (Appell)");
     wardenLocations:AddSkill("Heerschau in Leitstáth", "0x7005D488", "Leitstáth (Appell)");
     wardenLocations:AddSkill("Heerschau in Tornhad", "0x70060EA5", "Tornhad (Appell)");
+    wardenLocations:AddSkill("Heerschau in Neuhausen", "0x7006133E", "Neuhausen (Appell)");
 
     racialLocations:AddSkill("Rückkehr nach Bree", "0x700062F6", "Bree (Rasse)");
     racialLocations:AddSkill("Rückkehr ins Auenland", "0x700062C8", "Michelbinge (Rasse)");
@@ -268,10 +270,11 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Kehrt nach Schragen zurück.", "0x70059D12", "Schragen (Ruf)");
     repLocations:AddSkill("Rückkehr nach Akrâz-zahar", "0x7005AA90", "Akrâz-zahar (Ruf)");
     repLocations:AddSkill("Rückkehre nach Azanulbizar", "0x7005AA92", "Azanulbizar (Ruf)");
-    repLocations:AddSkill("Reise zur Halle Vérnozal", "0x7005A596", "Vérnozal (Rep)");
-    repLocations:AddSkill("Rückkehr zum Prachttor", "0x7005D47C", "Prachttor (Rep)");
-    repLocations:AddSkill("Rückkehr nach Leitstáth", "0x7005D484", "Leitstáth (Rep)");
-    repLocations:AddSkill("Kehrt nach Tornhad zurück.", "0x70060EA8", "Tornhad (Rep)");
+    repLocations:AddSkill("Reise zur Halle Vérnozal", "0x7005A596", "Vérnozal (Ruf)");
+    repLocations:AddSkill("Rückkehr zum Prachttor", "0x7005D47C", "Prachttor (Ruf)");
+    repLocations:AddSkill("Rückkehr nach Leitstáth", "0x7005D484", "Leitstáth (Ruf)");
+    repLocations:AddSkill("Kehrt nach Tornhad zurück.", "0x70060EA8", "Tornhad (Ruf)");
+    repLocations:AddSkill("Kehrt nach Neuhausen zurück.", "0x70061340", "Neuhausen (Ruf)");
 
 -- monster player maps
     creepLocations:AddSkill("Kartenskizze zum Gramfuss", "0x70028BBC");

src/IndexedDictionaryEn.lua

@@ -160,6 +160,7 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Guide to the Noble Gate", "0x7005D487", "Noble Gate (Guide)");
     hunterLocations:AddSkill("Guide to Leitstáth", "0x7005D47D", "Leitstáth (Guide)");
     hunterLocations:AddSkill("Guide to Tornhad", "0x70060EA6", "Tornhad (Guide)");
+    hunterLocations:AddSkill("Guide to Nobottle", "0x7006133F", "Nobottle (Guide)");
 
     wardenLocations:AddSkill("Muster in Ost Guruth", "0x70014786", "Ost Guruth (Muster)");
     wardenLocations:AddSkill("Muster in Esteldín", "0x70014798", "Esteldín (Muster)");
@@ -202,6 +203,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Muster at the Noble Gate", "0x7005D48A", "Noble Gate (Muster)");
     wardenLocations:AddSkill("Muster at Leitstáth", "0x7005D488", "Leitstáth (Muster)");
     wardenLocations:AddSkill("Muster at Tornhad", "0x70060EA5", "Tornhad (Muster)");
+    wardenLocations:AddSkill("Muster at Nobottle", "0x7006133E", "Nobottle (Muster)");
 
     -- add the racial travel skills
     racialLocations:AddSkill("Return to Bree", "0x700062F6", "Bree (Racial)");
@@ -275,6 +277,7 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Return to the Noble Gate", "0x7005D47C", "Noble Gate (Rep)");
     repLocations:AddSkill("Return to Leitstáth", "0x7005D484", "Leitstáth (Rep)");
     repLocations:AddSkill("Return to Tornhad", "0x70060EA8", "Tornhad (Rep)");
+    repLocations:AddSkill("Return to Nobottle", "0x70061340", "Nobottle (Rep)");
 
     -- monster player maps
     creepLocations:AddSkill("Crude Map to Gramsfoot", "0x70028BBC");

src/IndexedDictionaryFr.lua

@@ -160,6 +160,7 @@ function TravelDictionaries:CreateDictionaries()
     hunterLocations:AddSkill("Guide vers la Porte Noble", "0x7005D487", "Porte Noble (Guide)");
     hunterLocations:AddSkill("Guide vers Leitstath", "0x7005D47D", "Leitstath (Guide)");
     hunterLocations:AddSkill("Guide vers Tornhad", "0x70060EA6", "Tornhad (Guide)");
+    hunterLocations:AddSkill("Guide vers Bourdeneuve", "0x7006133F", "Bourdeneuve (Guide)");
 
     wardenLocations:AddSkill("Rassemblement : Ost Guruth", "0x70014786", "Ost Guruth (Rassemblement)");
     wardenLocations:AddSkill("Rassemblement : Esteldin", "0x70014798", "Esteldin (Rassemblement)");
@@ -202,6 +203,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Rassemblement : La Porte Noble", "0x7005D48A", "Porte Noble (Rassemblement)");
     wardenLocations:AddSkill("Rassemblement : Leitstath", "0x7005D488", "Leitstath (Rassemblement)");
     wardenLocations:AddSkill("Retour à Tornhad", "0x70060EA5", "Tornhad (Rassemblement)");
+    wardenLocations:AddSkill("Rassemblement à Bourdeneuve", "0x7006133E", "Bourdeneuve (Rassemblement)");
 
     racialLocations:AddSkill("Retour à Bree", "0x700062F6", "Bree (Race)");
     racialLocations:AddSkill("Retournez dans la Comté", "0x700062C8", "Comté (Race)");
@@ -272,6 +274,8 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Retourner à la Porte Noble", "0x7005D47C", "Porte Noble (Rep)");
     repLocations:AddSkill("Retourner à Leitstath", "0x7005D484", "Leitstath (Rep)");
     repLocations:AddSkill("Retournez voir Tornhad", "0x70060EA8", "Tornhad (Rep)");
+    repLocations:AddSkill("Retour à Bourdeneuve", "0x70061340", "Bourdeneuve (Rep)");
+
 
     -- monster player maps
     creepLocations:AddSkill("Carte grossière pour aller au Pied de Gram", "0x70028BBC");

src/TravelWindow.lua

@@ -139,7 +139,20 @@ function TravelWindow:Constructor()
 
     pcall(function()
         plugin.GetOptionsPanel = function(self)
-            return optionsPanel;
+            local options = Turbine.UI.Control()
+            options:SetSize(500, 200)
+
+            local OptionsButton = Turbine.UI.Lotro.Button()
+            OptionsButton:SetParent(options)
+            OptionsButton:SetPosition(100, 100)
+            OptionsButton:SetSize(200,15)
+            OptionsButton:SetText(menuOptionsString)
+            OptionsButton:SetVisible(true)
+
+            OptionsButton.Click = function()
+                TravelWindow:OpenOptions();
+            end
+            return options;
         end
     end);
 
@@ -809,7 +822,7 @@ function TravelWindow:LoadSettings()
     if (not SettingsStrings.pulldownTravel or SettingsStrings.pulldownTravel == "nil") then
         SettingsStrings.pulldownTravel = tostring(0);
     end
-
+  
     if (not SettingsStrings.hideOnTravel or SettingsStrings.hideOnTravel == "nil") then
         SettingsStrings.hideOnTravel = tostring(0);
     end