Merge pull request #79 from wduda/develop

Merge for v1.0.13beta

Author: wduda

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## v1.0.13beta
+- fixed plugin crash for Wardens with travel to Trestlebridge learned (bugfix)
 ## v1.0.12beta
 - fixed unloadable settings for 64bit DE and FR clients (bugfix)
 - fixed label of Hultvis hunter guide in FR client (enhancement)

TravelWindowII.plugin

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

doc/lotrointerface.md

@@ -41,6 +41,9 @@ How to handle the settings reset introduced by v1.0.7beta?
 [/LIST]
 
 Version history:
+v1.0.13beta
+- fixed plugin crash for Wardens with travel to Trestlebridge learned (bugfix)
+
 v1.0.12beta
 - fixed unloadable settings for 64bit DE and FR clients (bugfix)
 - fixed label of Hultvis hunter guide in FR client (bugfix)

src/IndexedDictionaryDe.lua

@@ -190,7 +190,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Appell in Limlók", "0x70057635", "Limlók (Appell)");
     wardenLocations:AddSkill("Appell in Annâk-khurfu", "0x70058572", "Annâk-khurfu (Appell)");
     wardenLocations:AddSkill("Appell am Händlerkai", "0x70059D09", "Händlerkai (Appell)");
-    wardenLocations:AddSkill("Appell in Schragen", "0x700559D10", "Schragen (Appell)");
+    wardenLocations:AddSkill("Appell in Schragen", "0x70059D10", "Schragen (Appell)");
 
     racialLocations:AddSkill("Rückkehr nach Bree", "0x700062F6", "Bree (Rasse)");
     racialLocations:AddSkill("Rückkehr ins Auenland", "0x700062C8", "Michelbinge (Rasse)");
@@ -253,7 +253,7 @@ function TravelDictionaries:CreateDictionaries()
     repLocations:AddSkill("Zurück nach Estolad Lân", "0x700551F8", "Estolad Lân (Ruf)");
     repLocations:AddSkill("Rückkehr nach Limlók", "0x70057629", "Limlók (Ruf)");
     repLocations:AddSkill("Rückkehr nach Annâk-khurfu", "0x7005856F", "Annâk-khurfu (Ruf)");
-    repLocations:AddSkill("Kehrt zum Händlerkai zurück.", "0x70059D0E", "Händlerkai (Rep)");
+    repLocations:AddSkill("Kehrt zum Händlerkai zurück.", "0x70059D0E", "Händlerkai (Ruf)");
     repLocations:AddSkill("Kehrt nach Schragen zurück.", "0x70059D12", "Schragen (Ruf)");
 
 -- monster player maps

src/IndexedDictionaryEn.lua

@@ -190,7 +190,7 @@ function TravelDictionaries:CreateDictionaries()
     wardenLocations:AddSkill("Muster in Limlók", "0x70057635", "Limlók (Muster)");
     wardenLocations:AddSkill("Muster in Annâk-khurfu", "0x70058572", "Annâk-khurfu (Muster)");
     wardenLocations:AddSkill("Muster in Trader's Wharf", "0x70059D09", "Trader's Wharf (Muster)");
-    wardenLocations:AddSkill("Muster in Trestlebridge", "0x700559D10", "Trestlebridge (Muster)");
+    wardenLocations:AddSkill("Muster in Trestlebridge", "0x70059D10", "Trestlebridge (Muster)");
 
     -- add the racial travel skills
     racialLocations:AddSkill("Return to Bree", "0x700062F6", "Bree (Racial)");

src/TravelWindow.lua

@@ -298,7 +298,7 @@ function TravelWindow:Constructor()
     end
 
     Plugins["Travel Window II"].Load = function(sender, args)
-        Turbine.Shell.WriteLine("<u><rgb=#DAA520>Travel Window II v" .. Plugins["Travel Window II"]:GetVersion() .. " by Hyoss</rgb></u>");
+        Turbine.Shell.WriteLine("<u><rgb=#DAA520>Travel Window II " .. Plugins["Travel Window II"]:GetVersion() .. " by Hyoss</rgb></u>");
     end
 end
 
@@ -341,7 +341,7 @@ end
 
 function TravelWindow:LoadSettings()
     -- load the self.settings
-    -- If a value is not available, set a default value
+    -- if a value is not available, set a default value
 
     -- load TWII settings file
     pcall(function()
@@ -743,7 +743,7 @@ function TravelWindow:SetShortcuts()
     TravelShortcuts = {};
     local shortcutIndex = 1;
 
-    -- set the travel skills for free people
+    -- set the either the travel skills for free people or monsters
     if (PlayerAlignment == Turbine.Gameplay.Alignment.FreePeople) then
         -- set the generic travel items
         for i = 1, travelCount[3], 1 do
@@ -774,12 +774,12 @@ function TravelWindow:SetShortcuts()
         -- add the race travel to the list
         local racialShortcutIndex = self:TableIndex(settings.order, racialLocations:IdAtIndex(settings.playerRaceKey));
         table.insert(TravelShortcuts, TravelShortcut(6.0,
-        racialLocations:IdAtIndex(settings.playerRaceKey),
-        racialLocations:NameAtIndex(settings.playerRaceKey),
-        2,
-        racialShortcutIndex,
-        settings.enabled[racialLocations:IdAtIndex(settings.playerRaceKey)],
-        racialLocations:LabelAtIndex(settings.playerRaceKey)));
+            racialLocations:IdAtIndex(settings.playerRaceKey),
+            racialLocations:NameAtIndex(settings.playerRaceKey),
+            2,
+            racialShortcutIndex,
+            settings.enabled[racialLocations:IdAtIndex(settings.playerRaceKey)],
+            racialLocations:LabelAtIndex(settings.playerRaceKey)));
 
         -- set the reputation travel items
         for i = 1, travelCount[4], 1 do
@@ -1035,16 +1035,14 @@ function TravelWindow:TableIndex(tableToSearch, elementToSearchFor)
 end
 
 function TravelWindow:SortShortcuts()
-    -- ensure we have more than 2 shortcuts
+    -- do not sort if there is one or less shortcuts
     if #TravelShortcuts < 2 then
-        Turbine.Engine.WriteLine("Table does not have enough data in it");
         return;
     end
 
-    -- perform the bubble sort
+    -- perform a bubble sort
     for i = 1, #TravelShortcuts do
         for j = 2, #TravelShortcuts do
-
             -- if the index of the second shortcut is lower than the index of
             -- the first, switch the shortcuts
             if TravelShortcuts[j]:GetIndex() < TravelShortcuts[j - 1]:GetIndex() then