From 76d2c0afc5034b5bdd747124844e484ce90530ef Mon Sep 17 00:00:00 2001 From: Nightblade Date: Mon, 8 Sep 2025 18:21:15 +1000 Subject: [PATCH 1/9] fix: update quest rewards for 0.3 --- src/Data/QuestRewards.lua | 154 +++++++++++++++++++++----------------- 1 file changed, 87 insertions(+), 67 deletions(-) diff --git a/src/Data/QuestRewards.lua b/src/Data/QuestRewards.lua index 58f2f2189..98b7543bd 100644 --- a/src/Data/QuestRewards.lua +++ b/src/Data/QuestRewards.lua @@ -55,8 +55,8 @@ return { ["Type"] = "Normal", ["Area"] = "Valley of the Titans", ["Options"] = { - "30% increased Charm Charges gained", - "15% increased Mana Recovery from Flasks", + "30% increased Charm Charges Gained, +1 Charm Slot", + "30% increased Charm Effect Duration, +1 Charm Slot", }, ["AreaLevel"] = 26, ["useConfig"] = true @@ -125,120 +125,140 @@ return { ["useConfig"] = false }, { - ["Act"] = 1, - ["Type"] = "Cruel", - ["Area"] = "Clearfell", - ["Stat"] = "+10% to Cold Resistance", - ["AreaLevel"] = 45, - ["useConfig"] = true - }, - { - ["Act"] = 1, - ["Type"] = "Cruel", - ["Area"] = "Hunting Grounds", + ["Act"] = 4, + ["Type"] = "Normal", + ["Area"] = "Isle Of Kin", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 49, + ["AreaLevel"] = 45, ["useConfig"] = false }, { - ["Act"] = 1, - ["Type"] = "Cruel", - ["Area"] = "Ogham Farmlands", - ["Stat"] = "+2 Weapon Set Passive Skill Points", - ["questPoints"] = 2, + ["Act"] = 4, + ["Type"] = "Normal", + ["Area"] = "Eye of Hinekora", + ["Stat"] = "5% increased Maximum Mana", ["AreaLevel"] = 49, - ["useConfig"] = false + ["useConfig"] = true }, { - ["Act"] = 1, - ["Type"] = "Cruel", - ["Area"] = "Ogham Manor", - ["Stat"] = "5% increased maximum Life", + ["Act"] = 4, + ["Type"] = "Normal", + ["Area"] = "Tawhoa's Test", + ["Options"] = { + "+5 to Dexterity", + "+5% to Lightning Resistance", + }, + ["AreaLevel"] = 50, + ["useConfig"] = true + }, + { + ["Act"] = 4, + ["Type"] = "Normal", + ["Area"] = "Tasalio's Test", + ["Options"] = { + "+5 to Intelligence", + "+5% to Cold Resistance", + }, ["AreaLevel"] = 51, ["useConfig"] = true }, { - ["Act"] = 2, - ["Type"] = "Cruel", - ["Area"] = "Keth", + ["Act"] = 4, + ["Type"] = "Normal", + ["Area"] = "Ngamahu's Test", + ["Options"] = { + "+5 to Strength", + "+5% to Fire Resistance", + }, + ["AreaLevel"] = 52, + ["useConfig"] = true + }, + { + ["Act"] = 4, + ["Type"] = "Normal", + ["Area"] = "Trial Of The Ancestors", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, ["AreaLevel"] = 55, ["useConfig"] = false }, { - ["Act"] = 2, - ["Type"] = "Cruel", - ["Area"] = "Valley of the Titans", + ["Act"] = 4, + ["Type"] = "Normal", + ["Area"] = "Abandoned prison", ["Options"] = { - "30% increased Charm Charges gained", - "15% increased Life Recovery from Flasks", + "30% increased Mana Recovery from Flasks", + "30% increased Life Recovery from Flasks", }, - ["AreaLevel"] = 55, + ["AreaLevel"] = 56, ["useConfig"] = true }, { - ["Act"] = 2, - ["Type"] = "Cruel", - ["Area"] = "Deshar", + ["Act"] = 5, + ["Type"] = "Normal", + ["Area"] = "Wolvenhold", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 56, - ["useConfig"] = false - }, - { - ["Act"] = 2, - ["Type"] = "Cruel", - ["Area"] = "The Spires of Deshar", - ["Stat"] = "+10% to Lightning Resistance", ["AreaLevel"] = 57, - ["useConfig"] = true + ["useConfig"] = false }, { - ["Act"] = 3, - ["Type"] = "Cruel", - ["Area"] = "Jungle Ruins", + ["Act"] = 5, + ["Type"] = "Normal", + ["Area"] = "Clearing The Way", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, ["AreaLevel"] = 58, ["useConfig"] = false }, { - ["Act"] = 3, - ["Type"] = "Cruel", - ["Area"] = "The Azak Bog", - ["Stat"] = "+40 to Spirit", + ["Act"] = 6, + ["Type"] = "Normal", + ["Area"] = "The Khari Crossing", + ["Stat"] = "5% increased Maximum Life", ["AreaLevel"] = 60, ["useConfig"] = true }, { - ["Act"] = 3, - ["Type"] = "Cruel", - ["Area"] = "The Venom Crypts", + ["Act"] = 6, + ["Type"] = "Normal", + ["Area"] = "Qimah", ["Options"] = { - "+10% to Chaos Resistance", "+5 to All Attributes", - "15% reduced Slowing Potency of Debuffs on you", + "+5% to All Elemental Resistances", + "12% increased Cooldown Recovery Rate", + "3% increased Movement Speed", + "20% increased Presence Area Of Effect", + "15% increased Global Defences", }, - ["AreaLevel"] = 59, + ["AreaLevel"] = 61, ["useConfig"] = true }, { - ["Act"] = 3, - ["Type"] = "Cruel", - ["Area"] = "Jiquanis Machinarium", - ["Stat"] = "+10% to Fire Resistance", - ["AreaLevel"] = 60, + ["Act"] = 6, + ["Type"] = "Normal", + ["Area"] = "Kriar Village", + ["Stat"] = "+40 to Spirit", + ["AreaLevel"] = 62, ["useConfig"] = true }, { - ["Act"] = 3, - ["Type"] = "Cruel", - ["Area"] = "Aggorat", + ["Act"] = 6, + ["Type"] = "Normal", + ["Area"] = "Howling Caves", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, ["AreaLevel"] = 63, ["useConfig"] = false }, -} \ No newline at end of file + { + ["Act"] = 6, + ["Type"] = "Normal", + ["Area"] = "Kingsmarch", + ["Stat"] = "+2 Weapon Set Passive Skill Points", + ["questPoints"] = 2, + ["AreaLevel"] = 64, + ["useConfig"] = false + }, +} From 8a4babbe5e21d82eb2f8b07da1dbcb9431455ee3 Mon Sep 17 00:00:00 2001 From: Nightblade Date: Mon, 8 Sep 2025 18:34:12 +1000 Subject: [PATCH 2/9] fix caps and "act" numbers --- src/Data/QuestRewards.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Data/QuestRewards.lua b/src/Data/QuestRewards.lua index 98b7543bd..441ed34e1 100644 --- a/src/Data/QuestRewards.lua +++ b/src/Data/QuestRewards.lua @@ -37,7 +37,7 @@ return { ["Act"] = 1, ["Type"] = "Normal", ["Area"] = "Ogham Manor", - ["Stat"] = "+20 to maximum Life", + ["Stat"] = "+20 to Maximum Life", ["AreaLevel"] = 15, ["useConfig"] = true }, @@ -213,7 +213,7 @@ return { ["useConfig"] = false }, { - ["Act"] = 6, + ["Act"] = 5, ["Type"] = "Normal", ["Area"] = "The Khari Crossing", ["Stat"] = "5% increased Maximum Life", @@ -221,7 +221,7 @@ return { ["useConfig"] = true }, { - ["Act"] = 6, + ["Act"] = 5, ["Type"] = "Normal", ["Area"] = "Qimah", ["Options"] = { @@ -236,7 +236,7 @@ return { ["useConfig"] = true }, { - ["Act"] = 6, + ["Act"] = 5, ["Type"] = "Normal", ["Area"] = "Kriar Village", ["Stat"] = "+40 to Spirit", @@ -244,7 +244,7 @@ return { ["useConfig"] = true }, { - ["Act"] = 6, + ["Act"] = 5, ["Type"] = "Normal", ["Area"] = "Howling Caves", ["Stat"] = "+2 Weapon Set Passive Skill Points", From 7edb5319489a950498122741179fc3da3a70a85c Mon Sep 17 00:00:00 2001 From: Nightblade Date: Mon, 8 Sep 2025 18:46:06 +1000 Subject: [PATCH 3/9] use interlude+num instead of difficulty types --- src/Data/QuestRewards.lua | 58 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Data/QuestRewards.lua b/src/Data/QuestRewards.lua index 441ed34e1..f1f2393f1 100644 --- a/src/Data/QuestRewards.lua +++ b/src/Data/QuestRewards.lua @@ -1,7 +1,7 @@ return { { ["Act"] = 1, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Clearfell", ["Stat"] = "+10% to Cold Resistance", ["AreaLevel"] = 2, @@ -9,7 +9,7 @@ return { }, { ["Act"] = 1, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Hunting Grounds", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -18,7 +18,7 @@ return { }, { ["Act"] = 1, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Freythorn", ["Stat"] = "+30 to Spirit", ["AreaLevel"] = 11, @@ -26,7 +26,7 @@ return { }, { ["Act"] = 1, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Ogham Farmlands", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -35,7 +35,7 @@ return { }, { ["Act"] = 1, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Ogham Manor", ["Stat"] = "+20 to Maximum Life", ["AreaLevel"] = 15, @@ -43,7 +43,7 @@ return { }, { ["Act"] = 2, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Keth", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -52,7 +52,7 @@ return { }, { ["Act"] = 2, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Valley of the Titans", ["Options"] = { "30% increased Charm Charges Gained, +1 Charm Slot", @@ -63,7 +63,7 @@ return { }, { ["Act"] = 2, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Deshar", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -72,7 +72,7 @@ return { }, { ["Act"] = 2, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "The Spires of Deshar", ["Stat"] = "+10% to Lightning Resistance", ["AreaLevel"] = 30, @@ -80,7 +80,7 @@ return { }, { ["Act"] = 3, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Jungle Ruins", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -89,7 +89,7 @@ return { }, { ["Act"] = 3, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "The Azak Bog", ["Stat"] = "+30 to Spirit", ["AreaLevel"] = 38, @@ -97,7 +97,7 @@ return { }, { ["Act"] = 3, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "The Venom Crypts", ["Options"] = { "25% increased Stun Threshold", @@ -109,7 +109,7 @@ return { }, { ["Act"] = 3, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Jiquanis Machinarium", ["Stat"] = "+10% to Fire Resistance", ["AreaLevel"] = 40, @@ -117,7 +117,7 @@ return { }, { ["Act"] = 3, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Aggorat", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -126,7 +126,7 @@ return { }, { ["Act"] = 4, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Isle Of Kin", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -135,7 +135,7 @@ return { }, { ["Act"] = 4, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Eye of Hinekora", ["Stat"] = "5% increased Maximum Mana", ["AreaLevel"] = 49, @@ -143,7 +143,7 @@ return { }, { ["Act"] = 4, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Tawhoa's Test", ["Options"] = { "+5 to Dexterity", @@ -154,7 +154,7 @@ return { }, { ["Act"] = 4, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Tasalio's Test", ["Options"] = { "+5 to Intelligence", @@ -165,7 +165,7 @@ return { }, { ["Act"] = 4, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Ngamahu's Test", ["Options"] = { "+5 to Strength", @@ -176,7 +176,7 @@ return { }, { ["Act"] = 4, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Trial Of The Ancestors", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -185,7 +185,7 @@ return { }, { ["Act"] = 4, - ["Type"] = "Normal", + ["Type"] = "", ["Area"] = "Abandoned prison", ["Options"] = { "30% increased Mana Recovery from Flasks", @@ -196,7 +196,7 @@ return { }, { ["Act"] = 5, - ["Type"] = "Normal", + ["Type"] = "Interlude 1", ["Area"] = "Wolvenhold", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -205,8 +205,8 @@ return { }, { ["Act"] = 5, - ["Type"] = "Normal", - ["Area"] = "Clearing The Way", + ["Type"] = "Interlude 2", + ["Area"] = "Khari Bazaar", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, ["AreaLevel"] = 58, @@ -214,7 +214,7 @@ return { }, { ["Act"] = 5, - ["Type"] = "Normal", + ["Type"] = "Interlude 2", ["Area"] = "The Khari Crossing", ["Stat"] = "5% increased Maximum Life", ["AreaLevel"] = 60, @@ -222,7 +222,7 @@ return { }, { ["Act"] = 5, - ["Type"] = "Normal", + ["Type"] = "Interlude 2", ["Area"] = "Qimah", ["Options"] = { "+5 to All Attributes", @@ -237,7 +237,7 @@ return { }, { ["Act"] = 5, - ["Type"] = "Normal", + ["Type"] = "Interlude 3", ["Area"] = "Kriar Village", ["Stat"] = "+40 to Spirit", ["AreaLevel"] = 62, @@ -245,7 +245,7 @@ return { }, { ["Act"] = 5, - ["Type"] = "Normal", + ["Type"] = "Interlude 3", ["Area"] = "Howling Caves", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, @@ -254,7 +254,7 @@ return { }, { ["Act"] = 6, - ["Type"] = "Normal", + ["Type"] = "Epilog", ["Area"] = "Kingsmarch", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, From fb0de4e3b103cff4130acec564780dbf3db8cb56 Mon Sep 17 00:00:00 2001 From: Nightblade Date: Mon, 8 Sep 2025 19:15:30 +1000 Subject: [PATCH 4/9] update area levels --- src/Data/QuestRewards.lua | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Data/QuestRewards.lua b/src/Data/QuestRewards.lua index f1f2393f1..0517a5e8e 100644 --- a/src/Data/QuestRewards.lua +++ b/src/Data/QuestRewards.lua @@ -84,7 +84,7 @@ return { ["Area"] = "Jungle Ruins", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 32, + ["AreaLevel"] = 34, ["useConfig"] = false }, { @@ -92,7 +92,7 @@ return { ["Type"] = "", ["Area"] = "The Azak Bog", ["Stat"] = "+30 to Spirit", - ["AreaLevel"] = 38, + ["AreaLevel"] = 36, ["useConfig"] = true }, { @@ -104,7 +104,7 @@ return { "30% increased Elemental Ailment Threshold", "25% increased Mana Regeneration Rate", }, - ["AreaLevel"] = 39, + ["AreaLevel"] = 35, ["useConfig"] = true }, { @@ -112,7 +112,7 @@ return { ["Type"] = "", ["Area"] = "Jiquanis Machinarium", ["Stat"] = "+10% to Fire Resistance", - ["AreaLevel"] = 40, + ["AreaLevel"] = 37, ["useConfig"] = true }, { @@ -130,7 +130,7 @@ return { ["Area"] = "Isle Of Kin", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 45, + ["AreaLevel"] = 51, ["useConfig"] = false }, { @@ -138,7 +138,7 @@ return { ["Type"] = "", ["Area"] = "Eye of Hinekora", ["Stat"] = "5% increased Maximum Mana", - ["AreaLevel"] = 49, + ["AreaLevel"] = 51, ["useConfig"] = true }, { @@ -149,7 +149,7 @@ return { "+5 to Dexterity", "+5% to Lightning Resistance", }, - ["AreaLevel"] = 50, + ["AreaLevel"] = 52, ["useConfig"] = true }, { @@ -160,7 +160,7 @@ return { "+5 to Intelligence", "+5% to Cold Resistance", }, - ["AreaLevel"] = 51, + ["AreaLevel"] = 52, ["useConfig"] = true }, { @@ -180,7 +180,7 @@ return { ["Area"] = "Trial Of The Ancestors", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 55, + ["AreaLevel"] = 51, ["useConfig"] = false }, { @@ -191,7 +191,7 @@ return { "30% increased Mana Recovery from Flasks", "30% increased Life Recovery from Flasks", }, - ["AreaLevel"] = 56, + ["AreaLevel"] = 51, ["useConfig"] = true }, { @@ -200,7 +200,7 @@ return { ["Area"] = "Wolvenhold", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 57, + ["AreaLevel"] = 64, ["useConfig"] = false }, { @@ -209,7 +209,7 @@ return { ["Area"] = "Khari Bazaar", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 58, + ["AreaLevel"] = 61, ["useConfig"] = false }, { @@ -217,7 +217,7 @@ return { ["Type"] = "Interlude 2", ["Area"] = "The Khari Crossing", ["Stat"] = "5% increased Maximum Life", - ["AreaLevel"] = 60, + ["AreaLevel"] = 61, ["useConfig"] = true }, { @@ -232,7 +232,7 @@ return { "20% increased Presence Area Of Effect", "15% increased Global Defences", }, - ["AreaLevel"] = 61, + ["AreaLevel"] = 63, ["useConfig"] = true }, { @@ -240,7 +240,7 @@ return { ["Type"] = "Interlude 3", ["Area"] = "Kriar Village", ["Stat"] = "+40 to Spirit", - ["AreaLevel"] = 62, + ["AreaLevel"] = 61, ["useConfig"] = true }, { @@ -249,7 +249,7 @@ return { ["Area"] = "Howling Caves", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 63, + ["AreaLevel"] = 62, ["useConfig"] = false }, { @@ -258,7 +258,7 @@ return { ["Area"] = "Kingsmarch", ["Stat"] = "+2 Weapon Set Passive Skill Points", ["questPoints"] = 2, - ["AreaLevel"] = 64, + ["AreaLevel"] = 62, ["useConfig"] = false }, } From 9d4661f7d76a5695edee180e91a1461c7b3da27b Mon Sep 17 00:00:00 2001 From: Nightblade Date: Mon, 8 Sep 2025 20:03:45 +1000 Subject: [PATCH 5/9] add quest names/targets as comments, minor fixes: case, order, rm space --- src/Data/QuestRewards.lua | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/Data/QuestRewards.lua b/src/Data/QuestRewards.lua index 0517a5e8e..2bfd1825d 100644 --- a/src/Data/QuestRewards.lua +++ b/src/Data/QuestRewards.lua @@ -1,5 +1,6 @@ return { { + -- "Beira of the Rotten Pack" ["Act"] = 1, ["Type"] = "", ["Area"] = "Clearfell", @@ -8,6 +9,7 @@ return { ["useConfig"] = true }, { + -- "The Crowbell" ["Act"] = 1, ["Type"] = "", ["Area"] = "Hunting Grounds", @@ -17,6 +19,7 @@ return { ["useConfig"] = false }, { + -- "The King in the Mists" ["Act"] = 1, ["Type"] = "", ["Area"] = "Freythorn", @@ -25,6 +28,7 @@ return { ["useConfig"] = true }, { + -- Una's Lute ["Act"] = 1, ["Type"] = "", ["Area"] = "Ogham Farmlands", @@ -34,14 +38,16 @@ return { ["useConfig"] = false }, { + -- "Candlemass, the Living Rite" ["Act"] = 1, ["Type"] = "", ["Area"] = "Ogham Manor", - ["Stat"] = "+20 to Maximum Life", + ["Stat"] = "+20 to maximum Life", ["AreaLevel"] = 15, ["useConfig"] = true }, { + -- "Kabala, Constrictor Queen" ["Act"] = 2, ["Type"] = "", ["Area"] = "Keth", @@ -51,17 +57,19 @@ return { ["useConfig"] = false }, { + -- "Medallion" ["Act"] = 2, ["Type"] = "", ["Area"] = "Valley of the Titans", ["Options"] = { - "30% increased Charm Charges Gained, +1 Charm Slot", - "30% increased Charm Effect Duration, +1 Charm Slot", + "30% increased Charm Charges Gained,+1 Charm Slot", + "30% increased Charm Effect Duration,+1 Charm Slot", }, ["AreaLevel"] = 26, ["useConfig"] = true }, { + -- "Final Letter" ["Act"] = 2, ["Type"] = "", ["Area"] = "Deshar", @@ -71,6 +79,7 @@ return { ["useConfig"] = false }, { + -- "Sisters of Garukhan Shrine" ["Act"] = 2, ["Type"] = "", ["Area"] = "The Spires of Deshar", @@ -79,6 +88,7 @@ return { ["useConfig"] = true }, { + -- "Mighty Silverfist" ["Act"] = 3, ["Type"] = "", ["Area"] = "Jungle Ruins", @@ -88,6 +98,7 @@ return { ["useConfig"] = false }, { + -- "Ignagduk, the Bog Witch" ["Act"] = 3, ["Type"] = "", ["Area"] = "The Azak Bog", @@ -96,6 +107,7 @@ return { ["useConfig"] = true }, { + -- "Venom Draught" ["Act"] = 3, ["Type"] = "", ["Area"] = "The Venom Crypts", @@ -108,6 +120,7 @@ return { ["useConfig"] = true }, { + -- "Blackjaw, the Remnant" ["Act"] = 3, ["Type"] = "", ["Area"] = "Jiquanis Machinarium", @@ -116,6 +129,7 @@ return { ["useConfig"] = true }, { + -- "Blood Sacrifice" ["Act"] = 3, ["Type"] = "", ["Area"] = "Aggorat", @@ -125,6 +139,7 @@ return { ["useConfig"] = false }, { + -- The Blind Beast ["Act"] = 4, ["Type"] = "", ["Area"] = "Isle Of Kin", @@ -134,6 +149,7 @@ return { ["useConfig"] = false }, { + -- Silent Hall ["Act"] = 4, ["Type"] = "", ["Area"] = "Eye of Hinekora", @@ -142,6 +158,7 @@ return { ["useConfig"] = true }, { + -- Halls of the dead ["Act"] = 4, ["Type"] = "", ["Area"] = "Tawhoa's Test", @@ -153,6 +170,7 @@ return { ["useConfig"] = true }, { + -- Halls of the dead ["Act"] = 4, ["Type"] = "", ["Area"] = "Tasalio's Test", @@ -164,6 +182,7 @@ return { ["useConfig"] = true }, { + -- Halls of the dead ["Act"] = 4, ["Type"] = "", ["Area"] = "Ngamahu's Test", @@ -175,6 +194,7 @@ return { ["useConfig"] = true }, { + -- Hinekora ["Act"] = 4, ["Type"] = "", ["Area"] = "Trial Of The Ancestors", @@ -184,17 +204,19 @@ return { ["useConfig"] = false }, { + -- "Goddess of Justice" ["Act"] = 4, ["Type"] = "", ["Area"] = "Abandoned prison", ["Options"] = { - "30% increased Mana Recovery from Flasks", "30% increased Life Recovery from Flasks", + "30% increased Mana Recovery from Flasks", }, ["AreaLevel"] = 51, ["useConfig"] = true }, { + -- "Oswin, the Dread Warden" ["Act"] = 5, ["Type"] = "Interlude 1", ["Area"] = "Wolvenhold", @@ -204,6 +226,7 @@ return { ["useConfig"] = false }, { + -- "Clearing The Way" ["Act"] = 5, ["Type"] = "Interlude 2", ["Area"] = "Khari Bazaar", @@ -213,14 +236,16 @@ return { ["useConfig"] = false }, { + -- "Molten Shrine" ["Act"] = 5, ["Type"] = "Interlude 2", ["Area"] = "The Khari Crossing", - ["Stat"] = "5% increased Maximum Life", + ["Stat"] = "5% increased maximum Life", ["AreaLevel"] = 61, ["useConfig"] = true }, { + -- "The Seven Pillars" ["Act"] = 5, ["Type"] = "Interlude 2", ["Area"] = "Qimah", @@ -236,6 +261,7 @@ return { ["useConfig"] = true }, { + -- "Lythara, the Wayward Spear" ["Act"] = 5, ["Type"] = "Interlude 3", ["Area"] = "Kriar Village", @@ -244,6 +270,7 @@ return { ["useConfig"] = true }, { + -- "The Abominable Yeti" ["Act"] = 5, ["Type"] = "Interlude 3", ["Area"] = "Howling Caves", @@ -253,6 +280,7 @@ return { ["useConfig"] = false }, { + -- "Siege Of Oriath" ["Act"] = 6, ["Type"] = "Epilog", ["Area"] = "Kingsmarch", From 352fc7125c3af6ee8dc34615f4f44f2dc71d6746 Mon Sep 17 00:00:00 2001 From: Nightblade Date: Tue, 9 Sep 2025 13:05:11 +1000 Subject: [PATCH 6/9] move multi-line mods to comments --- src/Data/QuestRewards.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Data/QuestRewards.lua b/src/Data/QuestRewards.lua index 2bfd1825d..93a765416 100644 --- a/src/Data/QuestRewards.lua +++ b/src/Data/QuestRewards.lua @@ -58,12 +58,13 @@ return { }, { -- "Medallion" + -- NOTE: Both rewards include "+1 Charm Slot" ["Act"] = 2, ["Type"] = "", ["Area"] = "Valley of the Titans", ["Options"] = { - "30% increased Charm Charges Gained,+1 Charm Slot", - "30% increased Charm Effect Duration,+1 Charm Slot", + "30% increased Charm Charges Gained", + "30% increased Charm Effect Duration", }, ["AreaLevel"] = 26, ["useConfig"] = true @@ -246,16 +247,19 @@ return { }, { -- "The Seven Pillars" + -- TODO: The "5% increased Experience Gain" reward comes with the following downside: + -- "-5% to Elemental Resistances,3% reduced Movement Speed,15% reduced Global Defences,20% reduced Presence Area Of Effect,12% reduced Cooldown Recovery Rate,5% reduced Attributes" ["Act"] = 5, ["Type"] = "Interlude 2", ["Area"] = "Qimah", ["Options"] = { - "+5 to All Attributes", - "+5% to All Elemental Resistances", - "12% increased Cooldown Recovery Rate", + "+5% to Elemental Resistances", "3% increased Movement Speed", - "20% increased Presence Area Of Effect", "15% increased Global Defences", + "20% increased Presence Area Of Effect", + "12% increased Cooldown Recovery Rate", + "+5 to all Attributes", + "5% increased Experience Gain", }, ["AreaLevel"] = 63, ["useConfig"] = true From fc1f682d6b87adc032b1005e26b269478627ee47 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 10 Sep 2025 00:16:07 +1000 Subject: [PATCH 7/9] Add support for multi mod quest rewards --- src/Data/QuestRewards.lua | 9 +++------ src/Modules/ConfigOptions.lua | 37 +++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/Data/QuestRewards.lua b/src/Data/QuestRewards.lua index 93a765416..947249468 100644 --- a/src/Data/QuestRewards.lua +++ b/src/Data/QuestRewards.lua @@ -58,13 +58,12 @@ return { }, { -- "Medallion" - -- NOTE: Both rewards include "+1 Charm Slot" ["Act"] = 2, ["Type"] = "", ["Area"] = "Valley of the Titans", ["Options"] = { - "30% increased Charm Charges Gained", - "30% increased Charm Effect Duration", + "30% increased Charm Charges Gained\n\t+1 Charm Slot", + "30% increased Charm Effect Duration\n\t+1 Charm Slot", }, ["AreaLevel"] = 26, ["useConfig"] = true @@ -247,8 +246,6 @@ return { }, { -- "The Seven Pillars" - -- TODO: The "5% increased Experience Gain" reward comes with the following downside: - -- "-5% to Elemental Resistances,3% reduced Movement Speed,15% reduced Global Defences,20% reduced Presence Area Of Effect,12% reduced Cooldown Recovery Rate,5% reduced Attributes" ["Act"] = 5, ["Type"] = "Interlude 2", ["Area"] = "Qimah", @@ -259,7 +256,7 @@ return { "20% increased Presence Area Of Effect", "12% increased Cooldown Recovery Rate", "+5 to all Attributes", - "5% increased Experience Gain", + "5% increased Experience Gain\n\t-5% to Elemental Resistances\n\t3% reduced Movement Speed\n\t15% reduced Global Defences\n\t20% reduced Presence Area Of Effect\n\t12% reduced Cooldown Recovery Rate\n\t-5 to all Attributes", }, ["AreaLevel"] = 63, ["useConfig"] = true diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua index 46b609f17..cfbacabbe 100644 --- a/src/Modules/ConfigOptions.lua +++ b/src/Modules/ConfigOptions.lua @@ -55,40 +55,51 @@ 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 + if line ~= "" then + questModsRewards(source, line, modList) + end + end + end - for i, quest in ipairs(data.questRewards) do + for _, quest in ipairs(data.questRewards) do 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) if quest.Stat then - table.insert(configSettings,{ - var = "questAct".. quest.Act .. quest.Type .. quest.Area, - label = string.format("Act %d %s: %s", quest.Act, quest.Type, quest.Area), + table.insert(configSettings, { + var = key, + label = label, type = "check", defaultState = true, tooltip = quest.Stat, apply = function(val, modList, enemyModList) - questModsRewards(source, quest.Stat, modList) + applyModsFromString(source, quest.Stat, modList) end }) elseif quest.Options then local listOptions = { { label = "Nothing", val = "None" } } - for j, option in ipairs(quest.Options) do + for _, option in ipairs(quest.Options) do table.insert(listOptions, { label = option, val = option }) end - table.insert(configSettings,{ - var = "questAct".. quest.Act .. quest.Type .. quest.Area, - label = string.format("Act %d %s: %s", quest.Act, quest.Type, quest.Area), + table.insert(configSettings, { + var = key, + label = label, type = "list", list = listOptions, defaultIndex = 1, tooltip = "Choose one of the following options:\n" .. table.concat(quest.Options, "\n"), apply = function(val, modList, enemyModList) - if val == "None" then - return - end - questModsRewards(source, val, modList) + if val == "None" then + return + end + applyModsFromString(source, val, modList) end }) end From 2b0629a07b400e60b9da842120f42463701c7e8c Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 10 Sep 2025 00:36:12 +1000 Subject: [PATCH 8/9] Fix Tests --- spec/System/TestDefence_spec.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/System/TestDefence_spec.lua b/spec/System/TestDefence_spec.lua index 16300d48d..cc47593d6 100644 --- a/spec/System/TestDefence_spec.lua +++ b/spec/System/TestDefence_spec.lua @@ -11,9 +11,8 @@ describe("TestDefence", function() build.configTab.input.customMods = build.configTab.input.customMods.."\n\z 5% reduced maximum life\n\z -2 to life\n\z - -20% to elemental resistances\n\z + -10% to elemental resistances\n\z -60% to chaos resistance\n\z - +2 to mana\n\z " build.configTab:BuildModList() runCallback("OnFrame") From 1b1ceb9a20551746902af59a2a00396998b3f163 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 10 Sep 2025 00:50:02 +1000 Subject: [PATCH 9/9] Fix tests attempt #2 --- spec/System/TestDefence_spec.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/System/TestDefence_spec.lua b/spec/System/TestDefence_spec.lua index cc47593d6..0f8aa0bc7 100644 --- a/spec/System/TestDefence_spec.lua +++ b/spec/System/TestDefence_spec.lua @@ -10,9 +10,11 @@ describe("TestDefence", function() local function pob1and2Compat() build.configTab.input.customMods = build.configTab.input.customMods.."\n\z 5% reduced maximum life\n\z + 5% reduced maximum mana\n\z -2 to life\n\z -10% to elemental resistances\n\z -60% to chaos resistance\n\z + +2 to mana\n\z " build.configTab:BuildModList() runCallback("OnFrame")