Skip to content

Commit 7ccc9f2

Browse files
NightbladeNightblade
authored
pimp up the quest rewards display a bit (#1347)
* pimp up the quest rewards display a bit * naming things is hard * improve "key"
1 parent 5457bca commit 7ccc9f2

2 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎src/Data/QuestRewards.lua‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
return {
22
{
3-
-- "Beira of the Rotten Pack"
43
["Act"] = 1,
5-
["Type"] = "",
4+
["Description"] = "Act 1",
65
["Area"] = "Clearfell",
6+
["Info"] = "Beira",
77
["Stat"] = "+10% to Cold Resistance",
88
["AreaLevel"] = 2,
99
["useConfig"] = true
1010
},
1111
{
12-
-- "The Crowbell"
1312
["Act"] = 1,
14-
["Type"] = "",
13+
["Description"] = "Act 1",
1514
["Area"] = "Hunting Grounds",
15+
["Info"] = "Crowbell",
1616
["Stat"] = "+2 Weapon Set Passive Skill Points",
1717
["questPoints"] = 2,
1818
["AreaLevel"] = 10,
1919
["useConfig"] = false
2020
},
2121
{
22-
-- "The King in the Mists"
2322
["Act"] = 1,
24-
["Type"] = "",
23+
["Description"] = "Act 1",
2524
["Area"] = "Freythorn",
25+
["Info"] = "King In The Mists",
2626
["Stat"] = "+30 to Spirit",
2727
["AreaLevel"] = 11,
2828
["useConfig"] = true
2929
},
3030
{
31-
-- Una's Lute
3231
["Act"] = 1,
33-
["Type"] = "",
32+
["Description"] = "Act 1",
3433
["Area"] = "Ogham Farmlands",
34+
["Info"] = "Una's Lute",
3535
["Stat"] = "+2 Weapon Set Passive Skill Points",
3636
["questPoints"] = 2,
3737
["AreaLevel"] = 12,
3838
["useConfig"] = false
3939
},
4040
{
41-
-- "Candlemass, the Living Rite"
4241
["Act"] = 1,
43-
["Type"] = "",
42+
["Description"] = "Act 1",
4443
["Area"] = "Ogham Manor",
44+
["Info"] = "Candlemass",
4545
["Stat"] = "+20 to maximum Life",
4646
["AreaLevel"] = 15,
4747
["useConfig"] = true
4848
},
4949
{
50-
-- "Kabala, Constrictor Queen"
5150
["Act"] = 2,
52-
["Type"] = "",
51+
["Description"] = "Act 2",
5352
["Area"] = "Keth",
53+
["Info"] = "Kabala",
5454
["Stat"] = "+2 Weapon Set Passive Skill Points",
5555
["questPoints"] = 2,
5656
["AreaLevel"] = 25,
5757
["useConfig"] = false
5858
},
5959
{
60-
-- "Medallion"
6160
["Act"] = 2,
62-
["Type"] = "",
61+
["Description"] = "Act 2",
6362
["Area"] = "Valley of the Titans",
63+
["Info"] = "Medallion",
6464
["Options"] = {
6565
"30% increased Charm Charges Gained\n\t+1 Charm Slot",
6666
"30% increased Charm Effect Duration\n\t+1 Charm Slot",
@@ -69,48 +69,48 @@ return {
6969
["useConfig"] = true
7070
},
7171
{
72-
-- "Final Letter"
7372
["Act"] = 2,
74-
["Type"] = "",
73+
["Description"] = "Act 2",
7574
["Area"] = "Deshar",
75+
["Info"] = "The Final Letter",
7676
["Stat"] = "+2 Weapon Set Passive Skill Points",
7777
["questPoints"] = 2,
7878
["AreaLevel"] = 28,
7979
["useConfig"] = false
8080
},
8181
{
82-
-- "Sisters of Garukhan Shrine"
8382
["Act"] = 2,
84-
["Type"] = "",
85-
["Area"] = "The Spires of Deshar",
83+
["Description"] = "Act 2",
84+
["Area"] = "Spires of Deshar",
85+
["Info"] = "Sisters of Garukhan Shrine",
8686
["Stat"] = "+10% to Lightning Resistance",
8787
["AreaLevel"] = 30,
8888
["useConfig"] = true
8989
},
9090
{
91-
-- "Mighty Silverfist"
9291
["Act"] = 3,
93-
["Type"] = "",
92+
["Description"] = "Act 3",
9493
["Area"] = "Jungle Ruins",
94+
["Info"] = "Mighty Silverfist",
9595
["Stat"] = "+2 Weapon Set Passive Skill Points",
9696
["questPoints"] = 2,
9797
["AreaLevel"] = 34,
9898
["useConfig"] = false
9999
},
100100
{
101-
-- "Ignagduk, the Bog Witch"
102101
["Act"] = 3,
103-
["Type"] = "",
104-
["Area"] = "The Azak Bog",
102+
["Description"] = "Act 3",
103+
["Area"] = "Azak Bog",
104+
["Info"] = "Ignagduk",
105105
["Stat"] = "+30 to Spirit",
106106
["AreaLevel"] = 36,
107107
["useConfig"] = true
108108
},
109109
{
110-
-- "Venom Draught"
111110
["Act"] = 3,
112-
["Type"] = "",
113-
["Area"] = "The Venom Crypts",
111+
["Description"] = "Act 3",
112+
["Area"] = "Venom Crypts",
113+
["Info"] = "Venom Draught",
114114
["Options"] = {
115115
"25% increased Stun Threshold",
116116
"30% increased Elemental Ailment Threshold",
@@ -120,48 +120,48 @@ return {
120120
["useConfig"] = true
121121
},
122122
{
123-
-- "Blackjaw, the Remnant"
124123
["Act"] = 3,
125-
["Type"] = "",
124+
["Description"] = "Act 3",
126125
["Area"] = "Jiquani's Machinarium",
126+
["Info"] = "Blackjaw",
127127
["Stat"] = "+10% to Fire Resistance",
128128
["AreaLevel"] = 37,
129129
["useConfig"] = true
130130
},
131131
{
132-
-- "Blood Sacrifice"
133132
["Act"] = 3,
134-
["Type"] = "",
133+
["Description"] = "Act 3",
135134
["Area"] = "Aggorat",
135+
["Info"] = "Blood Sacrifice",
136136
["Stat"] = "+2 Weapon Set Passive Skill Points",
137137
["questPoints"] = 2,
138138
["AreaLevel"] = 44,
139139
["useConfig"] = false
140140
},
141141
{
142-
-- The Blind Beast
143142
["Act"] = 4,
144-
["Type"] = "",
143+
["Description"] = "Act 4",
145144
["Area"] = "Isle Of Kin",
145+
["Info"] = "Blind Beast",
146146
["Stat"] = "+2 Weapon Set Passive Skill Points",
147147
["questPoints"] = 2,
148148
["AreaLevel"] = 51,
149149
["useConfig"] = false
150150
},
151151
{
152-
-- Silent Hall
153152
["Act"] = 4,
154-
["Type"] = "",
153+
["Description"] = "Act 4",
155154
["Area"] = "Eye of Hinekora",
155+
["Info"] = "Silent Hall",
156156
["Stat"] = "5% increased Maximum Mana",
157157
["AreaLevel"] = 51,
158158
["useConfig"] = true
159159
},
160160
{
161-
-- Halls of the dead
162161
["Act"] = 4,
163-
["Type"] = "",
164-
["Area"] = "Tawhoa's Test",
162+
["Description"] = "Act 4",
163+
["Area"] = "Halls Of The Dead",
164+
["Info"] = "Tawhoa's Test",
165165
["Options"] = {
166166
"+5 to Dexterity",
167167
"+5% to Lightning Resistance",
@@ -170,10 +170,10 @@ return {
170170
["useConfig"] = true
171171
},
172172
{
173-
-- Halls of the dead
174173
["Act"] = 4,
175-
["Type"] = "",
176-
["Area"] = "Tasalio's Test",
174+
["Description"] = "Act 4",
175+
["Area"] = "Halls Of The Dead",
176+
["Info"] = "Tasalio's Test",
177177
["Options"] = {
178178
"+5 to Intelligence",
179179
"+5% to Cold Resistance",
@@ -182,10 +182,10 @@ return {
182182
["useConfig"] = true
183183
},
184184
{
185-
-- Halls of the dead
186185
["Act"] = 4,
187-
["Type"] = "",
188-
["Area"] = "Ngamahu's Test",
186+
["Description"] = "Act 4",
187+
["Area"] = "Halls Of The Dead",
188+
["Info"] = "Ngamahu's Test",
189189
["Options"] = {
190190
"+5 to Strength",
191191
"+5% to Fire Resistance",
@@ -194,20 +194,20 @@ return {
194194
["useConfig"] = true
195195
},
196196
{
197-
-- Hinekora
198197
["Act"] = 4,
199-
["Type"] = "",
198+
["Description"] = "Act 4",
200199
["Area"] = "Trial Of The Ancestors",
200+
["Info"] = "Hinekora",
201201
["Stat"] = "+2 Weapon Set Passive Skill Points",
202202
["questPoints"] = 2,
203203
["AreaLevel"] = 51,
204204
["useConfig"] = false
205205
},
206206
{
207-
-- "Goddess of Justice"
208207
["Act"] = 4,
209-
["Type"] = "",
210-
["Area"] = "Abandoned prison",
208+
["Description"] = "Act 4",
209+
["Area"] = "Abandoned Prison",
210+
["Info"] = "Goddess of Justice",
211211
["Options"] = {
212212
"30% increased Life Recovery from Flasks",
213213
"30% increased Mana Recovery from Flasks",
@@ -216,39 +216,39 @@ return {
216216
["useConfig"] = true
217217
},
218218
{
219-
-- "Oswin, the Dread Warden"
220219
["Act"] = 5,
221-
["Type"] = "Interlude 1",
220+
["Description"] = "Interlude 1",
222221
["Area"] = "Wolvenhold",
222+
["Info"] = "Oswin",
223223
["Stat"] = "+2 Weapon Set Passive Skill Points",
224224
["questPoints"] = 2,
225225
["AreaLevel"] = 64,
226226
["useConfig"] = false
227227
},
228228
{
229-
-- "Clearing The Way"
230229
["Act"] = 5,
231-
["Type"] = "Interlude 2",
230+
["Description"] = "Interlude 2",
232231
["Area"] = "Khari Bazaar",
232+
["Info"] = "Clearing The Way",
233233
["Stat"] = "+2 Weapon Set Passive Skill Points",
234234
["questPoints"] = 2,
235235
["AreaLevel"] = 61,
236236
["useConfig"] = false
237237
},
238238
{
239-
-- "Molten Shrine"
240239
["Act"] = 5,
241-
["Type"] = "Interlude 2",
242-
["Area"] = "The Khari Crossing",
240+
["Description"] = "Interlude 2",
241+
["Area"] = "Khari Crossing",
242+
["Info"] = "Molten Shrine",
243243
["Stat"] = "5% increased maximum Life",
244244
["AreaLevel"] = 61,
245245
["useConfig"] = true
246246
},
247247
{
248-
-- "The Seven Pillars"
249248
["Act"] = 5,
250-
["Type"] = "Interlude 2",
249+
["Description"] = "Interlude 2",
251250
["Area"] = "Qimah",
251+
["Info"] = "Seven Pillars",
252252
["Options"] = {
253253
"+5% to Elemental Resistances",
254254
"3% increased Movement Speed",
@@ -262,29 +262,29 @@ return {
262262
["useConfig"] = true
263263
},
264264
{
265-
-- "Lythara, the Wayward Spear"
266265
["Act"] = 5,
267-
["Type"] = "Interlude 3",
266+
["Description"] = "Interlude 3",
268267
["Area"] = "Kriar Village",
268+
["Info"] = "Lythara",
269269
["Stat"] = "+40 to Spirit",
270270
["AreaLevel"] = 61,
271271
["useConfig"] = true
272272
},
273273
{
274-
-- "The Abominable Yeti"
275274
["Act"] = 5,
276-
["Type"] = "Interlude 3",
275+
["Description"] = "Interlude 3",
277276
["Area"] = "Howling Caves",
277+
["Info"] = "Abominable Yeti",
278278
["Stat"] = "+2 Weapon Set Passive Skill Points",
279279
["questPoints"] = 2,
280280
["AreaLevel"] = 62,
281281
["useConfig"] = false
282282
},
283283
{
284-
-- "Siege Of Oriath"
285284
["Act"] = 6,
286-
["Type"] = "Epilog",
285+
["Description"] = "Epilog",
287286
["Area"] = "Kingsmarch",
287+
["Info"] = "Siege Of Oriath",
288288
["Stat"] = "+2 Weapon Set Passive Skill Points",
289289
["questPoints"] = 2,
290290
["AreaLevel"] = 62,

‎src/Modules/ConfigOptions.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ end
5555

5656
local function addQuestModsRewardsConfigOptions(configSettings)
5757
table.insert(configSettings, { section = "Quest Rewards", col = 3 })
58-
58+
5959
-- Loop through sections of line to apply multiple mods
6060
local function applyModsFromString(source, str, modList)
6161
for line in tostring(str):gmatch("[^\r\n]+") do
@@ -69,16 +69,16 @@ local function addQuestModsRewardsConfigOptions(configSettings)
6969
if quest.useConfig == false then
7070
goto continue
7171
end
72-
local key = "questAct" .. quest.Act .. quest.Type .. quest.Area
73-
local label = string.format("Act %d %s: %s", quest.Act, quest.Type, quest.Area)
74-
local source = string.format("Quest:Act %d %s %s", quest.Act, quest.Type, quest.Area)
72+
local key = "quest" .. quest.Description .. quest.Area .. quest.Info
73+
local label = string.format("%s: %s", quest.Description, quest.Area)
74+
local source = string.format("Quest:%s: %s", quest.Description, quest.Area)
7575
if quest.Stat then
7676
table.insert(configSettings, {
7777
var = key,
7878
label = label,
7979
type = "check",
8080
defaultState = true,
81-
tooltip = quest.Stat,
81+
tooltip = "^x88FFFF" .. quest.Info .. "^7\n" .. quest.Stat,
8282
apply = function(val, modList, enemyModList)
8383
applyModsFromString(source, quest.Stat, modList)
8484
end
@@ -94,7 +94,7 @@ local function addQuestModsRewardsConfigOptions(configSettings)
9494
type = "list",
9595
list = listOptions,
9696
defaultIndex = 1,
97-
tooltip = "Choose one of the following options:\n" .. table.concat(quest.Options, "\n"),
97+
tooltip = "^x88FFFF" .. quest.Info .. "^7\nOne of the following:\n" .. table.concat(quest.Options, "\n"),
9898
apply = function(val, modList, enemyModList)
9999
if val == "None" then
100100
return

0 commit comments

Comments
 (0)