Skip to content

Commit 7a2b8f4

Browse files
wdudawduda
authored
Merge pull request #63 from wduda/develop
## v1.0.10beta - U29 travel skills support for EN (enhancement) - attempted U29 travel skills support for DE and FR - no translations for skills were available on Bullroarer (enhancement) - checking for untrained skills both through options button and menu item will now add newly learned skills immediately (enhancement) - fixed bug in textlist mode where only last skill was highlighted on mouseover (bugfix) - fixed bug that caused skill enabled list and skill order to reset after SSG releases an update (bugfix) - automated github builds to create github releases for easy access to finished zip (internal) - cleaned up a lot of global/local internal variables and names (internal)
2 parents dbcc887 + 7fe3ce2 commit 7a2b8f4

21 files changed

+390
-304
lines changed

‎.github/workflows/assign_project.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Auto assign issues and PRs to project
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
env:
7+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8+
9+
jobs:
10+
assign_project:
11+
runs-on: ubuntu-latest
12+
name: Auto assign issues and PRs to project
13+
steps:
14+
- name: Assign new issues to project into triage column
15+
uses: srggrs/[email protected]
16+
with:
17+
project: 'https://github.com/wduda/TravelWindowII/projects/1'
18+
column_name: 'Triage'

‎.github/workflows/release.yml

+24-5
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,35 @@ jobs:
1818
uses: actions/checkout@v2
1919
with:
2020
ref: '${{ github.event.inputs.tag }}'
21+
path: 'TravelWindowII'
2122

2223
# create a zip as a release archive
2324
- name: create release archive
2425
uses: thedoctor0/zip-release@master
2526
with:
2627
filename: 'TravelWindowII-${{ github.event.inputs.tag }}.zip'
27-
exclusions: '*.git* .github* *.vscode* *.gitignore*'
28+
exclusions: '*.git* *.github* *.vscode* *.gitignore*'
2829

29-
- name: upload release archive
30-
uses: actions/upload-artifact@v2
30+
# create the actual release
31+
- name: create a github release
32+
id: create_release
33+
uses: actions/create-release@v1
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3136
with:
32-
name: 'Release archive ${{ github.event.inputs.tag }}'
33-
path: 'TravelWindowII-${{ github.event.inputs.tag }}.zip'
37+
tag_name: ${{ github.event.inputs.tag }}
38+
release_name: ${{ github.event.inputs.tag }}
39+
draft: true
40+
prerelease: false
41+
42+
# upload the asset into the release
43+
- name: upload release asset
44+
id: upload-release-asset
45+
uses: actions/upload-release-asset@v1
46+
env:
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
with:
49+
upload_url: ${{ steps.create_release.outputs.upload_url }}
50+
asset_path: './TravelWindowII-${{ github.event.inputs.tag }}.zip'
51+
asset_name: 'TravelWindowII-${{ github.event.inputs.tag }}.zip'
52+
asset_content_type: application/zip

‎CHANGELOG.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
# Changelog
2+
## v1.0.10beta
3+
- U29 travel skills support for EN (enhancement)
4+
- attempted U29 travel skills support for DE and FR - no translations for skills were available on Bullroarer (enhancement)
5+
- checking for untrained skills both through options button and menu item will now add newly learned skills immediately (enhancement)
6+
- fixed bug in textlist mode where only last skill was highlighted on mouseover (bugfix)
7+
- fixed bug that caused skill enabled list and skill order to reset after SSG releases an update (bugfix)
8+
- automated github builds to create github releases for easy access to finished zip (internal)
9+
- cleaned up a lot of global/local internal variables and names (internal)
210

311
## v1.0.9beta
412
- fixed bug where pressing Esc did not close the options window (bugfix)
5-
- fixed bug where changing options was lagging the client, especially on chamging opacity sliders (bugfix)
13+
- fixed bug where changing options was lagging the client, especially on changing opacity sliders (bugfix)
614
- automated github builds for faster releases (internal)
715
- cleaned up settings stored by plugin to remove unused data (internal)
816
- cleaned up some code for better readability (internal)

‎TravelWindowII.plugin

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Information>
44
<Name>Travel Window II</Name>
55
<Author>Hyoss</Author>
6-
<Version>v1.0.9beta</Version>
6+
<Version>v1.0.10beta</Version>
77
<Description>
88
This plugin creates a single window that contains all the available travel skills, including the race, class and reputation skills.
99
It is a further development of Travel Window, that has been worked on by multiple authors before.

‎TravelWindowII.plugincompendium

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PluginConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<Id>1113</Id>
44
<Name>Travel Window II</Name>
5-
<Version>v1.0.9beta</Version>
5+
<Version>v1.0.10beta</Version>
66
<Author>Hyoss</Author>
77
<InfoUrl>http://www.lotrointerface.com/downloads/info1113</InfoUrl>
88
<DownloadUrl>http://www.lotrointerface.com/downloads/download1113</DownloadUrl>

‎doc/lotrointerface.md

+25-13
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,44 @@ If you do not use Plugin Compendium, you need to manually install Turbine utilit
1111
This has to be extracted to your "Documents\The Lord of the Rings Online\Plugins" folder (if you are on Windows) so two folders called Turbine and TurbinePlugins show up there.
1212

1313
[SIZE="3"]FAQ:[/SIZE]
14-
How to handle the settings reset introduced by v1.0.7beta?
14+
How can I make a newly learned skill show up in Travel Window II?
1515
[LIST]
16-
[*] 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
17-
[*] 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
18-
[*] if you updated to v.1.0.7beta and logged that character in, you lost all settings, you now have two choices
19-
[*]1. keep the settings you made manually after logging in with v1.0.7beta installed
20-
[*]2. delete the TravelWindowII.plugindata file, and your settings from before will be imported by v1.0.8beta or newer, same as the best-case scenario
21-
[*]The file can be found at C:\Users\%USERNAME%\Documents\The Lord of the Rings Online\PluginData\%ACCOUNTNAME%\%SERVERNAME%\%CHARACTERNAME%
16+
[*] rightclick anywhere on TW II, select "Check untrained skills" from menu, skill will show up
17+
[*] open options window, go to Enable tab, click "Check untrained skills" button, skill will show up
18+
[*] relog thew character
2219
[/LIST]
20+
2321
Why does my racial skill show up even though I do not have the racial trait equipped?
2422
[LIST]
2523
[*]Because once the trait is aquired, it is classified as a "learned" skill by LOTRO itself, even though it is greyed out. Travel Window II, unfortunately, has no way of knowing if you have the racial trait equipped and the skill is usable. If you are not using the skill permanently, you can use the Enable/Disable options to hide it like any other skill.
2624
[/LIST]
25+
2726
Why does a reputation or store version of my racial skill show up even though I have not obtained or bought it?
2827
[LIST]
2928
[*]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 that includes that 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 Racial+Store combo. You can use the Enable/Disable options to hide the skill you do not have that is greyed out.
3029
[/LIST]
3130

31+
How to handle the settings reset introduced by v1.0.7beta?
32+
[LIST]
33+
[*] 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
34+
[*] 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
35+
[*] if you updated to v.1.0.7beta and logged that character in, you lost all settings, you now have two choices
36+
[*]1. keep the settings you made manually after logging in with v1.0.7beta installed
37+
[*]2. delete the TravelWindowII.plugindata file, and your settings from before will be imported by v1.0.8beta or newer, same as the best-case scenario
38+
[*]The file can be found at C:\Users\%USERNAME%\Documents\The Lord of the Rings Online\PluginData\%ACCOUNTNAME%\%SERVERNAME%\%CHARACTERNAME%
39+
[/LIST]
40+
3241
Version history:
33-
v1.0.9beta
42+
v1.0.10beta
3443
[SIZE="1"]
35-
- fixed bug where pressing Esc did not close the options window (bugfix)
36-
- fixed bug where changing options was lagging the client, especially on chamging opacity sliders (bugfix)
37-
- automated github builds for faster releases (internal)
38-
- cleaned up settings stored by plugin to remove unused data (internal)
39-
- cleaned up some code for better readability (internal)
44+
## v1.0.10beta
45+
- U29 travel skills support for EN (enhancement)
46+
- attempted U29 travel skills support for DE and FR - no translations for skills were available on Bullroarer (enhancement)
47+
- checking for untrained skills both through options button and menu item will now add newly learned skills immediately (enhancement)
48+
- fixed bug in textlist mode where only last skill was highlighted on mouseover (bugfix)
49+
- fixed bug that caused skill enabled list and skill order to reset after SSG releases an update (bugfix)
50+
- automated github builds to create github releases for easy access to finished zip (internal)
51+
- cleaned up a lot of global/local internal variables and names (internal)
4052
[/SIZE]
4153

4254
Rest of changelog found [URL="https://github.com/wduda/TravelWindowII/blob/master/CHANGELOG.md"]here[/URL].

‎src/EriadorMapWindow.lua

+11-5
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ function EriadorMapWindow:Constructor(parent, class, race, shortcuts)
2020
self.windowWidth, self.windowHeight = Turbine.UI.Display:GetSize();
2121

2222
self.mainWindow = parent;
23-
self.playerClass = class;
24-
self.playerRace = race;
23+
self.PlayerClass = class;
24+
self.PlayerRace = race;
2525
self.shortcuts = shortcuts;
2626

2727
-- table of shortcuts
@@ -86,6 +86,8 @@ function EriadorMapWindow:Constructor(parent, class, race, shortcuts)
8686
{ -1, -1 }, -- Estolad Lân
8787
{ -1, -1 }, -- Limlók
8888
{ -1, -1 }, -- Annâk-khurfu
89+
{ -1, -1 }, -- Trader's Wharf
90+
{ -1, -1 }, -- Trestlebridge
8991

9092
-- Warden skills
9193
{ 725, 400 }, -- Ost Guruth
@@ -122,6 +124,8 @@ function EriadorMapWindow:Constructor(parent, class, race, shortcuts)
122124
{ -1, -1 }, -- Estolad Lân
123125
{ -1, -1 }, -- Limlók
124126
{ -1, -1 }, -- Annâk-khurfu
127+
{ -1, -1 }, -- Trader's Wharf
128+
{ -1, -1 }, -- Trestlebridge
125129

126130
-- Reputation skills
127131
{ 305, 330 }, -- Thorin's Hall
@@ -161,6 +165,8 @@ function EriadorMapWindow:Constructor(parent, class, race, shortcuts)
161165
{ -1, -1 }, -- Estolad Lân
162166
{ -1, -1 }, -- Limlók
163167
{ -1, -1 }, -- Annâk-khurfu
168+
{ -1, -1 }, -- Trader's Wharf
169+
{ -1, -1 }, -- Trestlebridge
164170

165171
-- Racial skills
166172
{ 620, 400 }, -- Bree
@@ -199,7 +205,7 @@ function EriadorMapWindow:AddShortcuts()
199205
for i = 1, travelCount[1], 1 do
200206

201207
-- add hunter locations if they should be on this map
202-
if (self.mapLocations[counter][1] > 0 and self.playerClass == Turbine.Gameplay.Class.Hunter and self:IsShortcutEnabled(hunterLocations:IdAtIndex(i)) == 1) then
208+
if (self.mapLocations[counter][1] > 0 and self.PlayerClass == Turbine.Gameplay.Class.Hunter and self:IsShortcutEnabled(hunterLocations:IdAtIndex(i)) == 1) then
203209
self:AddSingleShortcut(counter, Turbine.UI.Lotro.Shortcut(6.0, hunterLocations:IdAtIndex(i)));
204210
end
205211

@@ -210,7 +216,7 @@ function EriadorMapWindow:AddShortcuts()
210216
for i = 1, travelCount[2], 1 do
211217

212218
-- add warden locations if they should be on this map
213-
if (self.mapLocations[counter][1] > 0 and self.playerClass == Turbine.Gameplay.Class.Warden and self:IsShortcutEnabled(wardenLocations:IdAtIndex(i)) == 1) then
219+
if (self.mapLocations[counter][1] > 0 and self.PlayerClass == Turbine.Gameplay.Class.Warden and self:IsShortcutEnabled(wardenLocations:IdAtIndex(i)) == 1) then
214220
self:AddSingleShortcut(counter, Turbine.UI.Lotro.Shortcut(6.0, wardenLocations:IdAtIndex(i)));
215221
end
216222

@@ -232,7 +238,7 @@ function EriadorMapWindow:AddShortcuts()
232238
for i = 1, travelCount[5], 1 do
233239

234240
if (self.mapLocations[counter][1] > 0 and self:IsShortcutEnabled(racialLocations:IdAtIndex(i)) == 1) then
235-
if (i == self.playerRace) then
241+
if (i == self.PlayerRace) then
236242
self:AddSingleShortcut(counter, Turbine.UI.Lotro.Shortcut(6.0, racialLocations:IdAtIndex(i)));
237243
end
238244
end

‎src/GondorMapWindow.lua

+14-8
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ function GondorMapWindow:Constructor(parent, class, race, shortcuts)
2020
self.windowWidth, self.windowHeight = Turbine.UI.Display:GetSize();
2121

2222
self.mainWindow = parent;
23-
self.playerClass = class;
24-
self.playerRace = race;
23+
self.PlayerClass = class;
24+
self.PlayerRace = race;
2525
self.shortcuts = shortcuts;
2626

2727
-- table of shortcuts
@@ -86,7 +86,9 @@ function GondorMapWindow:Constructor(parent, class, race, shortcuts)
8686
{ -1, -1 }, -- Estolad Lân
8787
{ -1, -1 }, -- Limlók
8888
{ -1, -1 }, -- Annâk-khurfu
89-
89+
{ -1, -1 }, -- Trader's Wharf
90+
{ -1, -1 }, -- Trestlebridge
91+
9092
-- Muster skills
9193
{ -1, -1 }, -- Ost Guruth
9294
{ -1, -1 }, -- Esteldin
@@ -122,7 +124,9 @@ function GondorMapWindow:Constructor(parent, class, race, shortcuts)
122124
{ -1, -1 }, -- Estolad Lân
123125
{ -1, -1 }, -- Limlók
124126
{ -1, -1 }, -- Annâk-khurfu
125-
127+
{ -1, -1 }, -- Trader's Wharf
128+
{ -1, -1 }, -- Trestlebridge
129+
126130
-- Reputation skills
127131
{ -1, -1 }, -- Thorin's Hall
128132
{ -1, -1 }, -- Bree
@@ -161,7 +165,9 @@ function GondorMapWindow:Constructor(parent, class, race, shortcuts)
161165
{ -1, -1 }, -- Estolad Lân
162166
{ -1, -1 }, -- Limlók
163167
{ -1, -1 }, -- Annâk-khurfu
164-
168+
{ -1, -1 }, -- Trader's Wharf
169+
{ -1, -1 }, -- Trestlebridge
170+
165171
-- Racial skills
166172
{ -1, -1 }, -- Bree
167173
{ -1, -1 }, -- Michel Delving
@@ -196,7 +202,7 @@ function GondorMapWindow:AddShortcuts()
196202
for i = 1, travelCount[1], 1 do
197203

198204
-- add hunter locations if they should be on this map
199-
if (self.mapLocations[counter][1] > 0 and self.playerClass == Turbine.Gameplay.Class.Hunter and self:IsShortcutEnabled(hunterLocations:IdAtIndex(i)) == 1) then
205+
if (self.mapLocations[counter][1] > 0 and self.PlayerClass == Turbine.Gameplay.Class.Hunter and self:IsShortcutEnabled(hunterLocations:IdAtIndex(i)) == 1) then
200206
self:AddSingleShortcut(counter, Turbine.UI.Lotro.Shortcut(6.0, hunterLocations:IdAtIndex(i)));
201207
end
202208

@@ -207,7 +213,7 @@ function GondorMapWindow:AddShortcuts()
207213
for i = 1, travelCount[2], 1 do
208214

209215
-- add warden locations if they should be on this map
210-
if (self.mapLocations[counter][1] > 0 and self.playerClass == Turbine.Gameplay.Class.Warden and self:IsShortcutEnabled(wardenLocations:IdAtIndex(i)) == 1) then
216+
if (self.mapLocations[counter][1] > 0 and self.PlayerClass == Turbine.Gameplay.Class.Warden and self:IsShortcutEnabled(wardenLocations:IdAtIndex(i)) == 1) then
211217
self:AddSingleShortcut(counter, Turbine.UI.Lotro.Shortcut(6.0, wardenLocations:IdAtIndex(i)));
212218
end
213219
counter = counter + 1;
@@ -228,7 +234,7 @@ function GondorMapWindow:AddShortcuts()
228234
for i = 1, travelCount[5], 1 do
229235

230236
if (self.mapLocations[counter][1] > 0 and self:IsShortcutEnabled(racialLocations:IdAtIndex(i)) == 1) then
231-
if (i == self.playerRace) then
237+
if (i == self.PlayerRace) then
232238
self:AddSingleShortcut(counter, Turbine.UI.Lotro.Shortcut(6.0, racialLocations:IdAtIndex(i)));
233239
end
234240
end

‎src/IndexedDictionary.lua

+14
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ function IndexedDictionary:Constructor()
66
-- set default tables
77
self.skillNames = {};
88
self.skillIds = {};
9+
self.skillIdList = {};
910
self.skillLabels = {};
1011
self.numberOfItems = 0;
1112
end
@@ -26,6 +27,9 @@ function IndexedDictionary:AddSkill(name, id, label)
2627
-- add the skill id and label into the table with name as index
2728
self.skillIds[name] = id;
2829
self.skillLabels[name] = label;
30+
31+
-- add the skill id to a list of Ids
32+
self.skillIdList[id] = true;
2933
end
3034

3135
-- function to add a skills name, and data pair of ID and label, to the dictionary at a specific index
@@ -101,6 +105,16 @@ function IndexedDictionary:IdByName(name)
101105
return self.skillIds[name];
102106
end
103107

108+
-- function to check if ID exists
109+
function IndexedDictionary:VerifyId(id)
110+
if (self.skillIdList[id] == true) then
111+
return true;
112+
else
113+
return false;
114+
end
115+
end
116+
117+
104118
-- function to find the index value based on a key
105119
function IndexedDictionary:IndexByName(name)
106120

‎src/IndexedDictionaryDe.lua

+6-10
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ gondorMapTitleString = "Gondor Reiseziele";
1717
glanMapString = "Genaue Karte nach Glân Vraig";
1818
glanMapItemString = "Genaue Karte nach Glân Vraig";
1919

20-
21-
-- error messages
22-
resetOrderString = "Deine Sortiereinstellungen wurden aufgrund einer Änderung der Anzahl " ..
23-
"der zu speichernden Elemente zurückgesetzt. Dies sollte nur einmal passieren.\n" ..
24-
"Entschuldige die Unannehmlichkeiten.";
25-
26-
resetEnabledString = "Deine ausgewählten Fertigkeiten wurden aufgrund einer Änderung der Anzahl " ..
27-
"der zu speichernden Elemente zurückgesetzt. Dies sollte nur einmal passieren.\n" ..
28-
"Entschuldige die Unannehmlichkeiten.";
29-
3020
skillNotTrainedString = "Nicht erlernte Fertigkeit: ";
3121

3222
-- options window strings
@@ -162,6 +152,8 @@ function TravelDictionaries:CreateDictionaries()
162152
hunterLocations:AddSkill("Führer nach Estolad Lân", "0x700551F4", "Estolad Lân (Führer)");
163153
hunterLocations:AddSkill("Führer nach Limlók", "0x7005762D", "Limlók (Führer)");
164154
hunterLocations:AddSkill("Führer nach Annâk-khurfu", "0x70058571", "Annâk-khurfu (Führer)");
155+
hunterLocations:AddSkill("Führer zum Händlerkai", "0x70059D0C", "Händlerkai (Führer)");
156+
hunterLocations:AddSkill("Führer nach Schragen", "0x70059D16", "Schragen (Führer)");
165157

166158
wardenLocations:AddSkill("Appell in der Feste Guruth", "0x70014786", "Feste Guruth (Appell)");
167159
wardenLocations:AddSkill("Appell in Esteldín", "0x70014798", "Esteldín (Appell)");
@@ -197,6 +189,8 @@ function TravelDictionaries:CreateDictionaries()
197189
wardenLocations:AddSkill("Appell in Estolad Lân", "0x700551F2", "Estolad Lân (Appell)");
198190
wardenLocations:AddSkill("Appell in Limlók", "0x70057635", "Limlók (Appell)");
199191
wardenLocations:AddSkill("Appell in Annâk-khurfu", "0x70058572", "Annâk-khurfu (Appell)");
192+
wardenLocations:AddSkill("Appell im Händlerkai", "0x70059D09", "Händlerkai (Appell)");
193+
wardenLocations:AddSkill("Appell in Schragen", "0x700559D10", "Schragen (Appell)");
200194

201195
racialLocations:AddSkill("Rückkehr nach Bree", "0x700062F6", "Bree (Rasse)");
202196
racialLocations:AddSkill("Rückkehr ins Auenland", "0x700062C8", "Michelbinge (Rasse)");
@@ -259,6 +253,8 @@ function TravelDictionaries:CreateDictionaries()
259253
repLocations:AddSkill("Zurück nach Estolad Lân", "0x700551F8", "Estolad Lân (Ruf)");
260254
repLocations:AddSkill("Rückkehr nach Limlók", "0x70057629", "Limlók (Ruf)");
261255
repLocations:AddSkill("Rückkehr nach Annâk-khurfu", "0x7005856F", "Annâk-khurfu (Ruf)");
256+
repLocations:AddSkill("Rückkehr zum Händlerkai", "0x70059D0E", "Händlerkai (Rep)");
257+
repLocations:AddSkill("Rückkehr nach Schragen", "0x70059D12", "Schragen (Ruf)");
262258

263259
-- monster player maps
264260
creepLocations:AddSkill("Kartenskizze zum Gramfuss", "0x70028BBC");

0 commit comments

Comments
 (0)