Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 64 additions & 64 deletions src/Data/QuestRewards.lua
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
return {
{
-- "Beira of the Rotten Pack"
["Act"] = 1,
["Type"] = "",
["Description"] = "Act 1",
["Area"] = "Clearfell",
["Info"] = "Beira",
["Stat"] = "+10% to Cold Resistance",
["AreaLevel"] = 2,
["useConfig"] = true
},
{
-- "The Crowbell"
["Act"] = 1,
["Type"] = "",
["Description"] = "Act 1",
["Area"] = "Hunting Grounds",
["Info"] = "Crowbell",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 10,
["useConfig"] = false
},
{
-- "The King in the Mists"
["Act"] = 1,
["Type"] = "",
["Description"] = "Act 1",
["Area"] = "Freythorn",
["Info"] = "King In The Mists",
["Stat"] = "+30 to Spirit",
["AreaLevel"] = 11,
["useConfig"] = true
},
{
-- Una's Lute
["Act"] = 1,
["Type"] = "",
["Description"] = "Act 1",
["Area"] = "Ogham Farmlands",
["Info"] = "Una's Lute",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 12,
["useConfig"] = false
},
{
-- "Candlemass, the Living Rite"
["Act"] = 1,
["Type"] = "",
["Description"] = "Act 1",
["Area"] = "Ogham Manor",
["Info"] = "Candlemass",
["Stat"] = "+20 to maximum Life",
["AreaLevel"] = 15,
["useConfig"] = true
},
{
-- "Kabala, Constrictor Queen"
["Act"] = 2,
["Type"] = "",
["Description"] = "Act 2",
["Area"] = "Keth",
["Info"] = "Kabala",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 25,
["useConfig"] = false
},
{
-- "Medallion"
["Act"] = 2,
["Type"] = "",
["Description"] = "Act 2",
["Area"] = "Valley of the Titans",
["Info"] = "Medallion",
["Options"] = {
"30% increased Charm Charges Gained\n\t+1 Charm Slot",
"30% increased Charm Effect Duration\n\t+1 Charm Slot",
Expand All @@ -69,48 +69,48 @@ return {
["useConfig"] = true
},
{
-- "Final Letter"
["Act"] = 2,
["Type"] = "",
["Description"] = "Act 2",
["Area"] = "Deshar",
["Info"] = "The Final Letter",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 28,
["useConfig"] = false
},
{
-- "Sisters of Garukhan Shrine"
["Act"] = 2,
["Type"] = "",
["Area"] = "The Spires of Deshar",
["Description"] = "Act 2",
["Area"] = "Spires of Deshar",
["Info"] = "Sisters of Garukhan Shrine",
["Stat"] = "+10% to Lightning Resistance",
["AreaLevel"] = 30,
["useConfig"] = true
},
{
-- "Mighty Silverfist"
["Act"] = 3,
["Type"] = "",
["Description"] = "Act 3",
["Area"] = "Jungle Ruins",
["Info"] = "Mighty Silverfist",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 34,
["useConfig"] = false
},
{
-- "Ignagduk, the Bog Witch"
["Act"] = 3,
["Type"] = "",
["Area"] = "The Azak Bog",
["Description"] = "Act 3",
["Area"] = "Azak Bog",
["Info"] = "Ignagduk",
["Stat"] = "+30 to Spirit",
["AreaLevel"] = 36,
["useConfig"] = true
},
{
-- "Venom Draught"
["Act"] = 3,
["Type"] = "",
["Area"] = "The Venom Crypts",
["Description"] = "Act 3",
["Area"] = "Venom Crypts",
["Info"] = "Venom Draught",
["Options"] = {
"25% increased Stun Threshold",
"30% increased Elemental Ailment Threshold",
Expand All @@ -120,48 +120,48 @@ return {
["useConfig"] = true
},
{
-- "Blackjaw, the Remnant"
["Act"] = 3,
["Type"] = "",
["Description"] = "Act 3",
["Area"] = "Jiquani's Machinarium",
["Info"] = "Blackjaw",
["Stat"] = "+10% to Fire Resistance",
["AreaLevel"] = 37,
["useConfig"] = true
},
{
-- "Blood Sacrifice"
["Act"] = 3,
["Type"] = "",
["Description"] = "Act 3",
["Area"] = "Aggorat",
["Info"] = "Blood Sacrifice",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 44,
["useConfig"] = false
},
{
-- The Blind Beast
["Act"] = 4,
["Type"] = "",
["Description"] = "Act 4",
["Area"] = "Isle Of Kin",
["Info"] = "Blind Beast",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 51,
["useConfig"] = false
},
{
-- Silent Hall
["Act"] = 4,
["Type"] = "",
["Description"] = "Act 4",
["Area"] = "Eye of Hinekora",
["Info"] = "Silent Hall",
["Stat"] = "5% increased Maximum Mana",
["AreaLevel"] = 51,
["useConfig"] = true
},
{
-- Halls of the dead
["Act"] = 4,
["Type"] = "",
["Area"] = "Tawhoa's Test",
["Description"] = "Act 4",
["Area"] = "Halls Of The Dead",
["Info"] = "Tawhoa's Test",
["Options"] = {
"+5 to Dexterity",
"+5% to Lightning Resistance",
Expand All @@ -170,10 +170,10 @@ return {
["useConfig"] = true
},
{
-- Halls of the dead
["Act"] = 4,
["Type"] = "",
["Area"] = "Tasalio's Test",
["Description"] = "Act 4",
["Area"] = "Halls Of The Dead",
["Info"] = "Tasalio's Test",
["Options"] = {
"+5 to Intelligence",
"+5% to Cold Resistance",
Expand All @@ -182,10 +182,10 @@ return {
["useConfig"] = true
},
{
-- Halls of the dead
["Act"] = 4,
["Type"] = "",
["Area"] = "Ngamahu's Test",
["Description"] = "Act 4",
["Area"] = "Halls Of The Dead",
["Info"] = "Ngamahu's Test",
["Options"] = {
"+5 to Strength",
"+5% to Fire Resistance",
Expand All @@ -194,20 +194,20 @@ return {
["useConfig"] = true
},
{
-- Hinekora
["Act"] = 4,
["Type"] = "",
["Description"] = "Act 4",
["Area"] = "Trial Of The Ancestors",
["Info"] = "Hinekora",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 51,
["useConfig"] = false
},
{
-- "Goddess of Justice"
["Act"] = 4,
["Type"] = "",
["Area"] = "Abandoned prison",
["Description"] = "Act 4",
["Area"] = "Abandoned Prison",
["Info"] = "Goddess of Justice",
["Options"] = {
"30% increased Life Recovery from Flasks",
"30% increased Mana Recovery from Flasks",
Expand All @@ -216,39 +216,39 @@ return {
["useConfig"] = true
},
{
-- "Oswin, the Dread Warden"
["Act"] = 5,
["Type"] = "Interlude 1",
["Description"] = "Interlude 1",
["Area"] = "Wolvenhold",
["Info"] = "Oswin",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 64,
["useConfig"] = false
},
{
-- "Clearing The Way"
["Act"] = 5,
["Type"] = "Interlude 2",
["Description"] = "Interlude 2",
["Area"] = "Khari Bazaar",
["Info"] = "Clearing The Way",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 61,
["useConfig"] = false
},
{
-- "Molten Shrine"
["Act"] = 5,
["Type"] = "Interlude 2",
["Area"] = "The Khari Crossing",
["Description"] = "Interlude 2",
["Area"] = "Khari Crossing",
["Info"] = "Molten Shrine",
["Stat"] = "5% increased maximum Life",
["AreaLevel"] = 61,
["useConfig"] = true
},
{
-- "The Seven Pillars"
["Act"] = 5,
["Type"] = "Interlude 2",
["Description"] = "Interlude 2",
["Area"] = "Qimah",
["Info"] = "Seven Pillars",
["Options"] = {
"+5% to Elemental Resistances",
"3% increased Movement Speed",
Expand All @@ -262,29 +262,29 @@ return {
["useConfig"] = true
},
{
-- "Lythara, the Wayward Spear"
["Act"] = 5,
["Type"] = "Interlude 3",
["Description"] = "Interlude 3",
["Area"] = "Kriar Village",
["Info"] = "Lythara",
["Stat"] = "+40 to Spirit",
["AreaLevel"] = 61,
["useConfig"] = true
},
{
-- "The Abominable Yeti"
["Act"] = 5,
["Type"] = "Interlude 3",
["Description"] = "Interlude 3",
["Area"] = "Howling Caves",
["Info"] = "Abominable Yeti",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 62,
["useConfig"] = false
},
{
-- "Siege Of Oriath"
["Act"] = 6,
["Type"] = "Epilog",
["Description"] = "Epilog",
["Area"] = "Kingsmarch",
["Info"] = "Siege Of Oriath",
["Stat"] = "+2 Weapon Set Passive Skill Points",
["questPoints"] = 2,
["AreaLevel"] = 62,
Expand Down
12 changes: 6 additions & 6 deletions src/Modules/ConfigOptions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ end

local function addQuestModsRewardsConfigOptions(configSettings)
table.insert(configSettings, { section = "Quest Rewards", col = 3 })

-- Loop through sections of line to apply multiple mods
local function applyModsFromString(source, str, modList)
for line in tostring(str):gmatch("[^\r\n]+") do
Expand All @@ -69,16 +69,16 @@ local function addQuestModsRewardsConfigOptions(configSettings)
if quest.useConfig == false then
goto continue
end
local key = "questAct" .. quest.Act .. quest.Type .. quest.Area
local label = string.format("Act %d %s: %s", quest.Act, quest.Type, quest.Area)
local source = string.format("Quest:Act %d %s %s", quest.Act, quest.Type, quest.Area)
local key = "quest" .. quest.Description .. quest.Area .. quest.Info
local label = string.format("%s: %s", quest.Description, quest.Area)
local source = string.format("Quest:%s: %s", quest.Description, quest.Area)
if quest.Stat then
table.insert(configSettings, {
var = key,
label = label,
type = "check",
defaultState = true,
tooltip = quest.Stat,
tooltip = "^x88FFFF" .. quest.Info .. "^7\n" .. quest.Stat,
apply = function(val, modList, enemyModList)
applyModsFromString(source, quest.Stat, modList)
end
Expand All @@ -94,7 +94,7 @@ local function addQuestModsRewardsConfigOptions(configSettings)
type = "list",
list = listOptions,
defaultIndex = 1,
tooltip = "Choose one of the following options:\n" .. table.concat(quest.Options, "\n"),
tooltip = "^x88FFFF" .. quest.Info .. "^7\nOne of the following:\n" .. table.concat(quest.Options, "\n"),
apply = function(val, modList, enemyModList)
if val == "None" then
return
Expand Down